From 3309dd5f7d0edb5954a828006b50be4dd516df3b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 20 Jun 2019 09:09:05 +0200
Subject: [PATCH] Skip ensuring uid on delete

---
 app/src/main/java/eu/faircode/email/Core.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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);