From 7e194b5c981b5dfc0b3fe41a28f2214382059087 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 3 Feb 2020 19:29:36 +0100
Subject: [PATCH] Recheck exists after wait

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

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 00a7ff6991..b1e119be50 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1159,6 +1159,11 @@ class Core {
                     Log.w(ex);
                 }
             }
+
+            DB db = DB.getInstance(context);
+            message = db.message().getMessage(message.id);
+            if (message == null || message.uid != null)
+                return;
         }
 
         Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid));