From 375a97a724a5dada0605780977141382c3d0c05f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 4 May 2019 19:01:17 +0200
Subject: [PATCH] Prevent crash

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

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 2673e8c16e..5b15b28179 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -574,8 +574,12 @@ class Core {
         if (TextUtils.isEmpty(message.msgid))
             if (message.uid == null)
                 throw new IllegalArgumentException("Delete without ID");
-            else
-                imessages = new Message[]{ifolder.getMessageByUID(message.uid)};
+            else {
+                Message imessage = ifolder.getMessageByUID(message.uid);
+                if (imessage == null)
+                    throw new MessageRemovedException();
+                imessages = new Message[]{imessage};
+            }
         else
             imessages = ifolder.search(new MessageIDTerm(message.msgid));