diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 5eef492079..c50e69c8e2 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -515,6 +515,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                 List<EntityOperation> ops = db.operation().getOperations(EntityOperation.SYNC);
                                 for (EntityOperation op : ops)
                                     db.folder().setFolderSyncState(op.folder, null);
+
+                                MessageClassifier.save(ServiceSynchronize.this);
                             } else {
                                 // Yield update notifications/widgets
                                 try {
@@ -735,17 +737,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
 
         liveAccountNetworkState.postDestroy();
 
-        executor.submit(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    MessageClassifier.save(ServiceSynchronize.this);
-                } catch (Throwable ex) {
-                    Log.e(ex);
-                }
-            }
-        });
-
         TTSHelper.shutdown();
 
         try {