diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index ba05ac799d..df9de76c00 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -181,12 +181,13 @@ class Core {
     static void processOperations(
             Context context,
             EntityAccount account, EntityFolder folder, List<TupleOperationEx> ops,
-            Store istore, Folder ifolder,
+            EmailService iservice, Folder ifolder,
             State state, long serial)
             throws JSONException, FolderClosedException {
         try {
             Log.i(folder.name + " start process");
 
+            Store istore = iservice.getStore();
             DB db = DB.getInstance(context);
 
             NotificationManager nm =
@@ -500,6 +501,7 @@ class Core {
                         for (TupleOperationEx s : similar.keySet())
                             ops.remove(s);
                     } catch (Throwable ex) {
+                        iservice.dump();
                         if (ex instanceof OperationCanceledException)
                             Log.i(folder.name, ex);
                         else
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index f1c63c6338..83043022cc 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1943,7 +1943,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                                             Core.processOperations(ServiceSynchronize.this,
                                                                     account, folder,
                                                                     partition,
-                                                                    iservice.getStore(), ifolder,
+                                                                    iservice, ifolder,
                                                                     state, serial);
 
                                                         } catch (Throwable ex) {