diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index fa36aedd44..af9afb93ec 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1480,11 +1480,12 @@ class Core {
         if (imessages == null || imessages.length == 0)
             EntityOperation.queue(context, message, EntityOperation.ADD);
         else {
-            if (imessages.length > 1)
-                Log.e(folder.name + " exists messages=" + imessages.length);
-            for (int i = 0; i < imessages.length; i++) {
-                long uid = ifolder.getUID(imessages[i]);
+            if (imessages.length == 1) {
+                long uid = ifolder.getUID(imessages[0]);
                 EntityOperation.queue(context, folder, EntityOperation.FETCH, uid);
+            } else {
+                Log.e(folder.name + " EXISTS messages=" + imessages.length);
+                EntityOperation.sync(context, folder.id, false);
             }
         }
     }