diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 1d685162cf..303025a253 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -432,11 +432,23 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                             if (!Helper.getNetworkState(context).isSuitable())
                                 throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
 
+                            boolean now = true;
+
                             DB db = DB.getInstance(context);
                             try {
                                 db.beginTransaction();
 
-                                EntityOperation.sync(context, fid, true);
+                                EntityFolder folder = db.folder().getFolder(fid);
+                                if (folder == null)
+                                    return null;
+
+                                EntityOperation.sync(context, folder.id, true);
+
+                                if (folder.account != null) {
+                                    EntityAccount account = db.account().getAccount(folder.account);
+                                    if (account != null && !"connected".equals(account.state))
+                                        now = false;
+                                }
 
                                 db.setTransactionSuccessful();
 
@@ -444,6 +456,11 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                 db.endTransaction();
                             }
 
+                            if (!now) {
+                                ServiceSynchronize.reset(context);
+                                throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
+                            }
+
                             return null;
                         }
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 644556aeac..1c9c79c16c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2169,7 +2169,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             return null;
                         db.message().deleteMessage(id);
 
-                        EntityOperation.sync(context, message.folder, true);
+                        EntityOperation.sync(context, message.folder, false);
 
                         db.setTransactionSuccessful();
                     } finally {
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 3da331e79c..84427f2d65 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -252,7 +252,7 @@ public class FragmentFolder extends FragmentBase {
 
                         db.message().deleteMessagesBefore(id, keep_time);
 
-                        EntityOperation.sync(context, folder.id, true);
+                        EntityOperation.sync(context, folder.id, false);
                     }
 
                     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 6595998851..960bdd57da 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -317,6 +317,8 @@ public class FragmentFolders extends FragmentBase {
                 if (!Helper.getNetworkState(context).isSuitable())
                     throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
 
+                boolean now = true;
+
                 DB db = DB.getInstance(context);
                 try {
                     db.beginTransaction();
@@ -324,8 +326,15 @@ public class FragmentFolders extends FragmentBase {
                     if (aid < 0) {
                         // Unified inbox
                         List<EntityFolder> folders = db.folder().getFoldersSynchronizingUnified();
-                        for (EntityFolder folder : folders)
+                        for (EntityFolder folder : folders) {
                             EntityOperation.sync(context, folder.id, true);
+
+                            if (folder.account != null) {
+                                EntityAccount account = db.account().getAccount(folder.account);
+                                if (account != null && !"connected".equals(account.state))
+                                    now = false;
+                            }
+                        }
                     } else {
                         // Folder list
                         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -341,6 +350,11 @@ public class FragmentFolders extends FragmentBase {
                     db.endTransaction();
                 }
 
+                if (!now) {
+                    ServiceSynchronize.reset(context);
+                    throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
+                }
+
                 return null;
             }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 15c01d8a9b..8362db0b2f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -630,6 +630,8 @@ public class FragmentMessages extends FragmentBase {
                 if (!Helper.getNetworkState(context).isSuitable())
                     throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
 
+                boolean now = true;
+
                 DB db = DB.getInstance(context);
                 try {
                     db.beginTransaction();
@@ -642,14 +644,27 @@ public class FragmentMessages extends FragmentBase {
                         if (folder != null)
                             folders.add(folder);
                     }
-                    for (EntityFolder folder : folders)
+
+                    for (EntityFolder folder : folders) {
                         EntityOperation.sync(context, folder.id, true);
 
+                        if (folder.account != null) {
+                            EntityAccount account = db.account().getAccount(folder.account);
+                            if (account != null && !"connected".equals(account.state))
+                                now = false;
+                        }
+                    }
+
                     db.setTransactionSuccessful();
                 } finally {
                     db.endTransaction();
                 }
 
+                if (!now) {
+                    ServiceSynchronize.reset(context);
+                    throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
+                }
+
                 return null;
             }
 
@@ -1732,7 +1747,7 @@ public class FragmentMessages extends FragmentBase {
 
                         boolean refreshing = false;
                         for (TupleFolderEx folder : folders)
-                            if (folder.sync_state != null) {
+                            if (folder.sync_state != null && (folder.account == null || "connected".equals(folder.accountState))) {
                                 refreshing = true;
                                 break;
                             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b6c4d29d8..545a28ef57 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -371,6 +371,7 @@
     <string name="title_no_stream">An outdated app sent a file path instead of a file stream</string>
     <string name="title_no_contacts">Contact picker not available</string>
     <string name="title_no_internet">No or no suitable internet connection</string>
+    <string name="title_no_connection">Synchronization will be performed on next account connection</string>
     <string name="title_no_folder">Folder does not exist</string>
     <string name="title_accross_remark">Messages moved across accounts will be downloaded again resulting in extra data usage</string>
     <string name="title_raw_saved">Raw message saved</string>