diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index fdd9c70542..7ecbf66e81 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -294,6 +294,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                             if (!prefs.getBoolean("enabled", true))
                                 throw new IllegalStateException(context.getString(R.string.title_sync_disabled));
 
+                            boolean internet = (Helper.isMetered(context, true) != null);
+
                             DB db = DB.getInstance(context);
                             try {
                                 db.beginTransaction();
@@ -301,13 +303,14 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                 boolean now;
                                 if (aid < 0) {
                                     // outbox
-                                    now = ("connected".equals(folder.state));
+                                    now = (internet && "connected".equals(folder.state));
                                     EntityOperation.sync(db, fid);
                                 } else {
-                                    now = true;
-                                    if ("connected".equals(db.account().getAccount(aid).state))
+                                    if (!internet || "connected".equals(db.account().getAccount(aid).state)) {
+                                        now = internet;
                                         EntityOperation.sync(db, fid);
-                                    else {
+                                    } else {
+                                        now = true;
                                         db.folder().setFolderSyncState(folder.id, "requested");
                                         ServiceSynchronize.sync(context, fid);
                                     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 7c7091aa8a..804e18782a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -495,6 +495,8 @@ public class FragmentMessages extends FragmentBase {
                 if (!prefs.getBoolean("enabled", true))
                     throw new IllegalStateException(context.getString(R.string.title_sync_disabled));
 
+                boolean internet = (Helper.isMetered(context, true) != null);
+
                 DB db = DB.getInstance(context);
                 try {
                     db.beginTransaction();
@@ -513,14 +515,15 @@ public class FragmentMessages extends FragmentBase {
                     boolean now = false;
                     for (EntityFolder folder : folders)
                         if (folder.account == null) { // outbox
-                            now = ("connected".equals(folder.state));
+                            now = (internet && "connected".equals(folder.state));
                             EntityOperation.sync(db, folder.id);
                         } else {
-                            now = true;
                             EntityAccount account = db.account().getAccount(folder.account);
-                            if ("connected".equals(account.state))
+                            if (!internet || "connected".equals(account.state)) {
+                                now = internet;
                                 EntityOperation.sync(db, folder.id);
-                            else {
+                            } else {
+                                now = true;
                                 db.folder().setFolderSyncState(folder.id, "requested");
                                 ServiceSynchronize.sync(context, folder.id);
                             }