diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 311cf4fd1b..caefc13fa4 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -267,6 +267,12 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                 drawerLayout.closeDrawer(drawerContainer);
                 onMenuSetup();
             }
+        }, new Runnable() {
+            @Override
+            public void run() {
+                drawerLayout.closeDrawer(drawerContainer);
+                onReset();
+            }
         }));
 
         madapter.set(menus);
@@ -985,6 +991,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         Helper.view(this, this, getIntentOtherApps());
     }
 
+    private void onReset() {
+        ServiceSynchronize.reset(this);
+    }
+
     private void onDebugInfo() {
         new SimpleTask<Long>() {
             @Override
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 4e52558d0c..818f12d5d6 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -452,6 +452,8 @@ 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();
@@ -464,11 +466,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
                                 if (folder.account != null) {
                                     EntityAccount account = db.account().getAccount(folder.account);
-                                    if (account != null && !"connected".equals(account.state)) {
-                                        ServiceSynchronize.reset(context);
-                                        // Causes rollback
-                                        throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
-                                    }
+                                    if (account != null && !"connected".equals(account.state))
+                                        now = false;
                                 }
 
                                 db.setTransactionSuccessful();
@@ -477,6 +476,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                 db.endTransaction();
                             }
 
+                            if (!now)
+                                throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
+
                             return null;
                         }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 68c55f552d..fc80ef569f 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();
@@ -329,11 +331,8 @@ public class FragmentFolders extends FragmentBase {
 
                             if (folder.account != null) {
                                 EntityAccount account = db.account().getAccount(folder.account);
-                                if (account != null && !"connected".equals(account.state)) {
-                                    ServiceSynchronize.reset(context);
-                                    // Causes rollback
-                                    throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
-                                }
+                                if (account != null && !"connected".equals(account.state))
+                                    now = false;
                             }
                         }
                     } else {
@@ -351,6 +350,9 @@ public class FragmentFolders extends FragmentBase {
                     db.endTransaction();
                 }
 
+                if (!now)
+                    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 3f3919088e..597dd4fadf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -652,6 +652,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();
@@ -670,11 +672,8 @@ public class FragmentMessages extends FragmentBase {
 
                         if (folder.account != null) {
                             EntityAccount account = db.account().getAccount(folder.account);
-                            if (account != null && !"connected".equals(account.state)) {
-                                ServiceSynchronize.reset(context);
-                                // Causes rollback
-                                throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
-                            }
+                            if (account != null && !"connected".equals(account.state))
+                                now = false;
                         }
                     }
 
@@ -683,6 +682,9 @@ public class FragmentMessages extends FragmentBase {
                     db.endTransaction();
                 }
 
+                if (!now)
+                    throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
+
                 return null;
             }