diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b525a98cdb34b7d65767ffd93e7cb110a5410a3a..de3c2e028affa1561495301f926446787898fb63 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,6 +61,12 @@
             android:enabled="true"
             android:exported="true"
             android:label="Application settings" />
+        <provider
+            android:name=".providers.MeteredConnectionAllowedProvider"
+            android:authorities="foundation.e.drive.providers.MeteredConnectionAllowedProvider"
+            android:enabled="true"
+            android:exported="true"
+            android:label="Sync on metered network" />
 
         <!-- Services -->
         <service
diff --git a/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java b/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java
index 5b0f31e992d5fd98f87e5a63a95304b03cbf8cea..d5deafc38bdb9fa75b270803924e78793ece4973 100644
--- a/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java
+++ b/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java
@@ -101,7 +101,7 @@ public class AccountsActivity extends AppCompatActivity {
             }
         };
 
-        if (!CommonUtils.haveNetworkConnection(this)) {
+        if (!CommonUtils.haveNetworkConnection(this, account)) {
             handleNoInternetConnection();
             return;
         }
diff --git a/app/src/main/java/foundation/e/drive/providers/MeteredConnectionAllowedProvider.java b/app/src/main/java/foundation/e/drive/providers/MeteredConnectionAllowedProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..8dbba9f5c0e1fa4ad4e9671da17bfcfb24deecca
--- /dev/null
+++ b/app/src/main/java/foundation/e/drive/providers/MeteredConnectionAllowedProvider.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © Vincent Bourgmayer (/e/ foundation).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+package foundation.e.drive.providers;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * Allow user to define if eDrive can use Metered network or not
+ * @author vincent Bourgmayer
+ */
+public class MeteredConnectionAllowedProvider extends ContentProvider {
+    @Override
+    public boolean onCreate() {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] strings, @Nullable String s, @Nullable String[] strings1, @Nullable String s1) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues contentValues) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String s, @Nullable String[] strings) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues contentValues, @Nullable String s, @Nullable String[] strings) {
+        return 0;
+    }
+}
diff --git a/app/src/main/java/foundation/e/drive/services/ObserverService.java b/app/src/main/java/foundation/e/drive/services/ObserverService.java
index cdcbe8d5cfe031ae976a6001157fa5a20ef1174e..af672a3c3cf9e1c900fe2f78205f1e8037edaf46 100644
--- a/app/src/main/java/foundation/e/drive/services/ObserverService.java
+++ b/app/src/main/java/foundation/e/drive/services/ObserverService.java
@@ -136,7 +136,7 @@ public class ObserverService extends Service implements OnRemoteOperationListene
         }
 
         //check for the case where intent has been launched by initializerService
-        if (!CommonUtils.haveNetworkConnection(this)) {
+        if (!CommonUtils.haveNetworkConnection(this, mAccount)) {
             Log.w(TAG, "There is no Internet connexion.");
             return super.onStartCommand( intent, flags, startId );
         }
diff --git a/app/src/main/java/foundation/e/drive/services/SynchronizationService.java b/app/src/main/java/foundation/e/drive/services/SynchronizationService.java
index 928e12541369ec5aa78360e10825416bd42790bb..19073ef5e73542846f8cb76922adeaa207546a9f 100644
--- a/app/src/main/java/foundation/e/drive/services/SynchronizationService.java
+++ b/app/src/main/java/foundation/e/drive/services/SynchronizationService.java
@@ -118,7 +118,7 @@ public class SynchronizationService extends Service implements OnRemoteOperation
 
     private void startWorker(int threadIndex){
         if (syncedRequestQueue.isEmpty()) return;
-        if (!threadWorkingState[threadIndex] && CommonUtils.haveNetworkConnection(getApplicationContext())) { //check if the thread corresponding to threadIndex isn't already working
+        if (!threadWorkingState[threadIndex] && CommonUtils.haveNetworkConnection(getApplicationContext(), account)) { //check if the thread corresponding to threadIndex isn't already working
 
             final SyncRequest request = this.syncedRequestQueue.poll(); //return null if deque is empty
 
diff --git a/app/src/main/java/foundation/e/drive/utils/AppConstants.java b/app/src/main/java/foundation/e/drive/utils/AppConstants.java
index 63f00e488e3fc1c0d56650891354aac62757571f..d66429479e82651f4aceca379b293975c0f86baa 100644
--- a/app/src/main/java/foundation/e/drive/utils/AppConstants.java
+++ b/app/src/main/java/foundation/e/drive/utils/AppConstants.java
@@ -21,11 +21,11 @@ import foundation.e.drive.BuildConfig;
  */
 public abstract class AppConstants {
 
-    public static final String  MEDIASYNC_PROVIDER_AUTHORITY ="foundation.e.drive.providers.MediasSyncProvider";
-    public static final String  SETTINGSYNC_PROVIDER_AUTHORITY ="foundation.e.drive.providers.SettingsSyncProvider";
-
+    public static final String MEDIASYNC_PROVIDER_AUTHORITY = "foundation.e.drive.providers.MediasSyncProvider";
+    public static final String SETTINGSYNC_PROVIDER_AUTHORITY = "foundation.e.drive.providers.SettingsSyncProvider";
+    public static final String METERED_NETWORK_ALLOWED_AUTHORITY = "foundation.e.drive.providers.MeteredConnectionAllowedProvider";
     public static final String INITIALIZATION_HAS_BEEN_DONE ="initService_has_run";
-    public static final String INITIALFOLDERS_NUMBER="initial_folder_number";
+    public static final String INITIALFOLDERS_NUMBER = "initial_folder_number";
     public static final String APPLICATIONS_LIST_FILE_NAME = "packages_list.csv";
     public static final String APPLICATIONS_LIST_FILE_NAME_TMP = "tmp_packages_list.csv";
     public static final String SHARED_PREFERENCE_NAME ="preferences";
diff --git a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java
index f98d74962b53b61fd8e429ef4b9705e08cf485be..0c1bf7f1eb389436beef6d457668542de5c33995 100644
--- a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java
+++ b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java
@@ -51,6 +51,7 @@ import foundation.e.drive.work.FirstStartWorker;
 import foundation.e.drive.work.FullScanWorker;
 
 import static foundation.e.drive.utils.AppConstants.MEDIASYNC_PROVIDER_AUTHORITY;
+import static foundation.e.drive.utils.AppConstants.METERED_NETWORK_ALLOWED_AUTHORITY;
 import static foundation.e.drive.utils.AppConstants.SETTINGSYNC_PROVIDER_AUTHORITY;
 import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_ENABLE;
 import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_ID;
@@ -217,16 +218,19 @@ public abstract class CommonUtils {
      * @param context Activity or service which are calling this method
      * @return True if there is connection, false either
      */
-    public static boolean haveNetworkConnection(Context context) {
+    public static boolean haveNetworkConnection(Context context, Account account) {
         Log.i(TAG, "haveNetworkConnection()");
 
-        ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
-        NetworkCapabilities capabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());
+        final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
+        final NetworkCapabilities capabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());
+
+        final boolean meteredNetworkAllowed = ContentResolver.getSyncAutomatically(account, METERED_NETWORK_ALLOWED_AUTHORITY);
 
         if (capabilities != null
                 && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
                 && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-                && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)) {
+                && (capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
+                    || meteredNetworkAllowed)) {
             return true;
         }
         return false;
diff --git a/app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java b/app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java
index 8c1443e23312bee849959a772486d8077d388ebb..3459551a49e82d1ab35a5418a7325c03b499d686 100644
--- a/app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java
+++ b/app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java
@@ -55,17 +55,17 @@ public class CreateRemoteFolderWorker extends Worker {
     @Override
     public Result doWork() {
         final Context context = getApplicationContext();
-        if (!CommonUtils.haveNetworkConnection(context)) {
-            Log.e(TAG, "Can't create remote folder because there is no unmetered connexion");
-            return Result.retry();
-        }
-
         final Account account = getAccount();
         if (account == null) {
             Log.e(TAG, "Can't get valid account: stop everything");
             return Result.failure();
         }
 
+        if (!CommonUtils.haveNetworkConnection(context, account)) {
+            Log.e(TAG, "Can't create remote folder because there is no usable connection");
+            return Result.retry();
+        }
+
         final SyncedFolder syncedFolder = getSyncedFolderFromData();
         Log.d(TAG, "doWork() for :"+syncedFolder.getLocalFolder());
         final File folder = new File(syncedFolder.getLocalFolder() );