diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..d7439836b241cfe721bb8c1a64cfbef3bc001a69
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "nextcloud-android-lib"]
+	path = nextcloud-android-lib
+	url = https://gitlab.e.foundation/e/apps/nextcloud-android-lib
diff --git a/Android.mk b/Android.mk
index a72311d25b9b9e3d4968690282dc5ad57c95c293..1863d7348fc8c6268af46f3ade6373fa3a1854e4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,7 +37,8 @@ LOCAL_JAVA_LIBRARIES := \
 LOCAL_STATIC_JAVA_LIBRARIES := \
     jsr305 \
     settings-logtags \
-    org.lineageos.platform.internal
+    org.lineageos.platform.internal \
+    httpclient
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
@@ -52,6 +53,10 @@ include frameworks/base/packages/SettingsLib/common.mk
 
 include $(BUILD_PACKAGE)
 
+include $(CLEAR_VARS)
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES:=httpclient:libs/httpclient-4.5.10.jar
+include $(BUILD_MULTI_PREBUILT)
+
 # Use the following include to make our test apk.
 ifeq (,$(ONE_SHOT_MAKEFILE))
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/libs/httpclient-4.5.10.jar b/libs/httpclient-4.5.10.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d0c7821c82a3d7a3a9566fee9e77d9d90a2ce14d
Binary files /dev/null and b/libs/httpclient-4.5.10.jar differ
diff --git a/nextcloud-android-lib b/nextcloud-android-lib
new file mode 160000
index 0000000000000000000000000000000000000000..00ced4edeec0de7a271cdb99e61025ac290e9ce2
--- /dev/null
+++ b/nextcloud-android-lib
@@ -0,0 +1 @@
+Subproject commit 00ced4edeec0de7a271cdb99e61025ac290e9ce2
diff --git a/proguard.flags b/proguard.flags
index e78c6456d9704762bd36685fd70a77162a629a93..dcf2d9f7df8ee7c5e41875a694ee6443f1597227 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -41,3 +41,9 @@
     public static ** SEARCH_INDEX_DATA_PROVIDER;
     public static ** SUMMARY_PROVIDER_FACTORY;
 }
+-keep class org.apache.http.** { *; }
+-keep class org.apache.** { *; }
+-keepclassmembers class org.apache.http.** {*;}
+-dontwarn org.apache.**
+-dontwarn org.apache.http.**
+-dontwarn org.apache.commons.**
\ No newline at end of file
diff --git a/res/layout/account_remote_storage.xml b/res/layout/account_remote_storage.xml
new file mode 100644
index 0000000000000000000000000000000000000000..24de817c5f0ce665a3d980d62632d95f7dd94b8a
--- /dev/null
+++ b/res/layout/account_remote_storage.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/storage_usage_text"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:gravity="left"
+        android:text="@string/e_used_space"/>
+
+    <ProgressBar
+        android:id="@+id/storage_usage_bar"
+        style="@android:style/Widget.ProgressBar.Horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:progress="75"/>
+
+    <Button
+        android:id="@+id/increase_storage_button"
+        android:text="@string/e_increase_storage_size"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="10dip"
+        android:layout_marginBottom="12dip"
+        android:gravity="center"/>
+
+</LinearLayout>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index cf20b80475cbbdcd48e24f3868a046a22244ea41..1a631022caab9d53af2622c50cc0b5d9a5e501fb 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--  Copyright (C) 2007 The Android Open Source Project
       Copyright (C) 2018 e.foundation
-      
+
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 90b0878974e8a5a8a859d2eafc6f1c6d4f1fc70c..62d90d57987aa9649b4da678894a0f9a9eacffa9 100755
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3736,7 +3736,8 @@
     <string name="e_dns_name_summary">"Définissez le DNS à utiliser"</string>
     <string name="e_dns_not_set">"9.9.9.9"</string>
     <string name="e_dns_summary">"Configuration du DNS"</string>
-
+    <string name="e_increase_storage_size">"Augmenter l'espace de stockage"</string>
+    <string name="e_used_space">"Espace de stockage utilisé : %1$d%% (%2$s/%3$s)"</string>
 
 
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2a677f9978804503a0cbc2437e5329213eecc100..8167d5a79c7391c0bbb3a776729085136378d8c1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9071,5 +9071,7 @@
     <string name="e_dns_name_summary">"Set DNS to use"</string>
     <string name="e_dns_not_set">"9.9.9.9"</string>
     <string name="e_dns_summary">"DNS configuration"</string>
-
+    <string name="e_increase_storage_size">"Increase storage size"</string>
+    <string name="e_used_space">"Used storage space : %1$d%% (%2$s/%3$s)"</string>
+    <string name="e_ecloud_server_uri">https://ecloud.global</string>
 </resources>
diff --git a/res/xml/account_type_settings.xml b/res/xml/account_type_settings.xml
index 31f3f69dfa1fb499002888b409612f0f646e6f51..17d3277fce144f910f1e6ce5268003997d3b6452 100644
--- a/res/xml/account_type_settings.xml
+++ b/res/xml/account_type_settings.xml
@@ -25,6 +25,12 @@
         android:selectable="false"
         android:order="-10000"/>
 
+    <com.android.settings.applications.LayoutPreference
+        android:key="account_remote_storage"
+        android:layout="@layout/account_remote_storage"
+        android:order="10"
+        android:selectable="false"/>
+
     <PreferenceCategory
       android:key="dashboard_tile_placeholder"
       android:order="100"/>
diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
index 53664f521386878c47b4747a1d5d75d58b7f1eb1..741354252b3b61a1a7bb4af7b117df65c3947084 100644
--- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
@@ -54,6 +54,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
     String mAccountType;
     private AccountSyncPreferenceController mAccountSynController;
     private RemoveAccountPreferenceController mRemoveAccountController;
+    private AccountRemoteStoragePreferenceController mAccountRemoteStorageController;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -77,6 +78,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
         }
         mAccountSynController.init(mAccount, userHandle);
         mRemoveAccountController.init(mAccount, userHandle);
+        mAccountRemoteStorageController.init(mAccount, userHandle);
     }
 
     @Override
diff --git a/src/com/android/settings/accounts/AccountRemoteStoragePreferenceController.java b/src/com/android/settings/accounts/AccountRemoteStoragePreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..21124a9b7d9a43542afe8a0849875e14557a8aa8
--- /dev/null
+++ b/src/com/android/settings/accounts/AccountRemoteStoragePreferenceController.java
@@ -0,0 +1,83 @@
+package com.android.settings.accounts;
+
+import android.accounts.Account;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.net.Uri;
+import android.view.View;
+
+import org.apache.commons.httpclient.auth.AuthScope;
+import org.apache.commons.httpclient.Credentials;
+
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settings.R;
+import com.android.settings.accounts.FollowNSULinkRemoteOperation;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.OwnCloudClientFactory;
+import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;
+
+public class AccountRemoteStoragePreferenceController 
+        extends AbstractPreferenceController
+        implements OnClickListener {
+    private static final String KEY_ACCOUNT_REMOTE_STORAGE = "account_remote_storage";
+
+    private OwnCloudClient mClient;
+    private Handler mhandler;
+    private Account mAccount;
+    private UserHandle mUserHandle;
+
+    public AccountRemoteStoragePreferenceController(Context context) {
+        super(context);
+    }
+
+
+    @Override
+    public boolean isAvailable() {
+        return this.mAccount.type.equals("e.foundation.webdav.eelo");
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_ACCOUNT_REMOTE_STORAGE;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+    }
+
+    public void init(Account account, UserHandle userHandle) {
+        this.mAccount = account;
+        this.mUserHandle = userHandle;
+
+        setContentView(R.layout.remove_account_button);
+
+        Uri serverUri = Uri.parse(getString(R.string.e_ecloud_server_uri));
+
+        this.mHandler = new Handler();
+        this.mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);
+
+        Credentials cred = this.mAccount.getState().getCredentials(AuthScope.ANY);
+
+        this.mClient.setCredentials(
+      			OwnCloudCredentialsFactory.newBasicCredentials(
+      					cred.getUserName(),
+      					cred.getPassword()
+  				  )
+  		  );
+    }
+
+    @Override
+    public void onClick(View button) {
+        if (button.getId() == R.id.increase_storage_button)
+            followNSULink();
+    }
+
+    private void followNSULink() {
+        FollowNSULinkRemoteOperation followNSULinkOp = new FollowNSULinkRemoteOperation();
+        followNSULinkOp.execute(mClient, this, mHandler);
+    }
+}
diff --git a/src/com/android/settings/accounts/FollowNSULinkRemoteOperation.java b/src/com/android/settings/accounts/FollowNSULinkRemoteOperation.java
new file mode 100644
index 0000000000000000000000000000000000000000..376aeaee62714e425f59252ce5759bcd16f47697
--- /dev/null
+++ b/src/com/android/settings/accounts/FollowNSULinkRemoteOperation.java
@@ -0,0 +1,41 @@
+package com.android.settings.accounts;
+
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.Cookie;
+
+import android.net.Uri;
+
+import com.owncloud.android.lib.common.OwnCloudClient;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+
+
+public class FollowNSULinkRemoteOperation extends RemoteOperation {
+    protected RemoteOperationResult run(OwnCloudClient client) {
+        Uri serverUri = (client.getBaseUri() != null)? client.getBaseUri() : client.getWebdavUri();
+
+        Cookie usernameCookie = new Cookie();
+        usernameCookie.setName("username");
+        usernameCookie.setValue("x@e.email");
+        usernameCookie.setDomain(serverUri.getHost());
+        usernameCookie.setPath(serverUri.getPath());
+
+        Cookie tokenCookie = new Cookie();
+        tokenCookie.setName("token");
+        tokenCookie.setValue("x");
+        tokenCookie.setDomain(serverUri.getHost());
+        tokenCookie.setPath(serverUri.getPath());
+
+        client.getState().addCookie(usernameCookie);
+        client.getState().addCookie(tokenCookie);
+
+        String url = client.getBaseUri() + "/apps/increasestoragebutton/get-redirect-link";
+        GetMethod get = new GetMethod(url);
+        int status = client.executeMethod(get);
+
+        if(status == 0)
+            return new RemoteOperationResult(false, get);
+
+        String redirectLink = get.getResponseBodyAsString();
+        startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(redirectLink)));
+    }
+}