diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index dc2999b91b..ec2e6634fd 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -293,7 +293,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                             try {
                                 db.beginTransaction();
 
-                                EntityOperation.sync(context, fid);
+                                EntityOperation.sync(context, fid, true);
 
                                 db.setTransactionSuccessful();
 
diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index ece98382d7..47f6021e9c 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -87,7 +87,7 @@ public class EntityOperation {
         queue(context, db, message, name, jargs);
     }
 
-    static void sync(Context context, long fid) {
+    static void sync(Context context, long fid, boolean foreground) {
         DB db = DB.getInstance(context);
         if (db.operation().getOperationCount(fid, EntityOperation.SYNC) == 0) {
 
@@ -112,10 +112,10 @@ public class EntityOperation {
 
             if (account == null) // Outbox
                 ServiceSend.start(context);
-            else if (!"connected".equals(account.state))
+            else if (foreground && !"connected".equals(account.state))
                 ServiceUI.process(context, fid);
 
-            Log.i("Queued sync folder=" + folder);
+            Log.i("Queued sync folder=" + folder + " foreground=" + foreground);
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 6bb54df008..b1fe80fbb6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -250,7 +250,7 @@ public class FragmentFolder extends FragmentBase {
 
                         db.message().deleteMessagesBefore(id, keep_time, true);
 
-                        EntityOperation.sync(context, folder.id);
+                        EntityOperation.sync(context, folder.id, true);
                     }
 
                     db.setTransactionSuccessful();
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index fde8b8813b..96f487bf3d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -299,7 +299,7 @@ public class FragmentFolders extends FragmentBase {
                         // Unified inbox
                         List<EntityFolder> folders = db.folder().getFoldersSynchronizingUnified();
                         for (EntityFolder folder : folders)
-                            EntityOperation.sync(context, folder.id);
+                            EntityOperation.sync(context, folder.id, true);
                     } else {
                         // Folder list
                         EntityAccount account = db.account().getAccount(aid);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index dc5e7d41e8..7c6dc97ba0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -508,11 +508,11 @@ public class FragmentMessages extends FragmentBase {
                     if (fid < 0) {
                         List<EntityFolder> folders = db.folder().getFoldersSynchronizingUnified();
                         for (EntityFolder folder : folders)
-                            EntityOperation.sync(context, folder.id);
+                            EntityOperation.sync(context, folder.id, true);
                     } else {
                         EntityFolder folder = db.folder().getFolder(fid);
                         if (folder != null)
-                            EntityOperation.sync(context, folder.id);
+                            EntityOperation.sync(context, folder.id, true);
                     }
 
                     db.setTransactionSuccessful();
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 2743b3da27..67bb375c0e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -49,7 +49,6 @@ import android.widget.TimePicker;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.List;
 import java.util.Objects;
 
 import androidx.annotation.NonNull;
@@ -260,25 +259,6 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
 
                     int[] values = getResources().getIntArray(R.array.downloadValues);
                     prefs.edit().putInt("download", values[position]).apply();
-
-                    Boolean metered = Helper.isMetered(getContext(), true);
-                    if (metered != null && metered)
-                        new SimpleTask<Void>() {
-                            @Override
-                            protected Void onExecute(Context context, Bundle args) {
-                                DB db = DB.getInstance(context);
-                                List<EntityFolder> folders = db.folder().getSynchronizingFolders();
-                                for (EntityFolder folder : folders)
-                                    EntityOperation.sync(context, folder.id);
-                                return null;
-                            }
-
-                            @Override
-                            protected void onException(Bundle args, Throwable ex) {
-                                Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
-
-                            }
-                        }.execute(FragmentOptions.this, new Bundle(), "download:sync");
                 }
             }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 802135e93f..5d533bcb7b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -399,21 +399,5 @@ public class FragmentSetup extends FragmentBase {
         tvPermissionsDone.setTextColor(has ? textColorPrimary : colorWarning);
         tvPermissionsDone.setCompoundDrawablesWithIntrinsicBounds(has ? check : null, null, null, null);
         btnPermissions.setEnabled(!has);
-
-        if (has && !init)
-            new SimpleTask<Void>() {
-                @Override
-                protected Void onExecute(Context context, Bundle args) {
-                    DB db = DB.getInstance(context);
-                    for (EntityFolder folder : db.folder().getSynchronizingFolders())
-                        EntityOperation.sync(context, folder.id);
-                    return null;
-                }
-
-                @Override
-                protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
-                }
-            }.execute(FragmentSetup.this, new Bundle(), "setup:sync");
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 650d0a5e10..5c4abd0440 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -581,7 +581,7 @@ public class ServiceSynchronize extends LifecycleService {
                             idler.start();
                             idlers.add(idler);
 
-                            EntityOperation.sync(this, folder.id);
+                            EntityOperation.sync(this, folder.id, false);
                         } else
                             folders.put(folder, null);
 
@@ -722,7 +722,7 @@ public class ServiceSynchronize extends LifecycleService {
                                         if (!folders.get(folder).isOpen())
                                             throw new FolderClosedException(folders.get(folder));
                                     } else
-                                        EntityOperation.sync(this, folder.id);
+                                        EntityOperation.sync(this, folder.id, false);
 
                             // Successfully connected: reset back off time
                             backoff = CONNECT_BACKOFF_START;