diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 5b2c3ca456..b85872bc7f 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -193,7 +193,8 @@ class Core {
                                     EntityOperation next = ops.get(j);
                                     if (next.message != null &&
                                             next.message.equals(op.message) &&
-                                            EntityOperation.ADD.equals(next.name)) {
+                                            (EntityOperation.ADD.equals(next.name) ||
+                                                    EntityOperation.DELETE.equals(next.name))) {
                                         squash = true;
                                         break;
                                     }
@@ -315,6 +316,8 @@ class Core {
             return;
         if (EntityOperation.ADD.equals(op.name))
             return;
+        if (EntityOperation.DELETE.equals(op.name) && !TextUtils.isEmpty(message.msgid))
+            return;
 
         Log.i(folder.name + " ensure uid op=" + op.name + " msgid=" + message.msgid);