diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 1c11d8fe8e..00fbf57eab 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -2190,8 +2190,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                             cowner.value.start();
 
                             db.operation().liveOperations(account.id).observe(cowner.value, new Observer<List<TupleOperationEx>>() {
-                                private DutyCycle dc = new DutyCycle(account.name + " operations");
-                                private List<Long> handling = new ArrayList<>();
+                                private final DutyCycle dc = new DutyCycle(account.name + " operations");
+                                private final List<Long> handling = new ArrayList<>();
                                 private final Map<TupleOperationEx.PartitionKey, List<TupleOperationEx>> partitions = new HashMap<>();
 
                                 private final PowerManager.WakeLock wlOperations = pm.newWakeLock(
@@ -2210,7 +2210,8 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                             added.get(op.folder).add(op);
                                         }
                                     }
-                                    handling = all;
+                                    handling.clear();
+                                    handling.addAll(all);
 
                                     if (empty_pool && istore instanceof IMAPStore) {
                                         getMainHandler().removeCallbacks(purge);