diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index e13a3a4658..71a1607c12 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -267,12 +267,6 @@ 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);
@@ -990,10 +984,6 @@ 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 818f12d5d6..4e52558d0c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -452,8 +452,6 @@ 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();
@@ -466,8 +464,11 @@ 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))
-                                        now = false;
+                                    if (account != null && !"connected".equals(account.state)) {
+                                        ServiceSynchronize.reset(context);
+                                        // Causes rollback
+                                        throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
+                                    }
                                 }
 
                                 db.setTransactionSuccessful();
@@ -476,9 +477,6 @@ 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 fc80ef569f..68c55f552d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -317,8 +317,6 @@ 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();
@@ -331,8 +329,11 @@ public class FragmentFolders extends FragmentBase {
 
                             if (folder.account != null) {
                                 EntityAccount account = db.account().getAccount(folder.account);
-                                if (account != null && !"connected".equals(account.state))
-                                    now = false;
+                                if (account != null && !"connected".equals(account.state)) {
+                                    ServiceSynchronize.reset(context);
+                                    // Causes rollback
+                                    throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
+                                }
                             }
                         }
                     } else {
@@ -350,9 +351,6 @@ 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 597dd4fadf..3f3919088e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -652,8 +652,6 @@ 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();
@@ -672,8 +670,11 @@ public class FragmentMessages extends FragmentBase {
 
                         if (folder.account != null) {
                             EntityAccount account = db.account().getAccount(folder.account);
-                            if (account != null && !"connected".equals(account.state))
-                                now = false;
+                            if (account != null && !"connected".equals(account.state)) {
+                                ServiceSynchronize.reset(context);
+                                // Causes rollback
+                                throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
+                            }
                         }
                     }
 
@@ -682,9 +683,6 @@ public class FragmentMessages extends FragmentBase {
                     db.endTransaction();
                 }
 
-                if (!now)
-                    throw new IllegalArgumentException(context.getString(R.string.title_no_connection));
-
                 return null;
             }