From 8fe7eaf2effa46134ea6d1923eb0864c9859d309 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 9 Oct 2019 16:11:35 +0200
Subject: [PATCH] Prevent crash

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

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 93238b3412..cf382ff141 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -774,13 +774,14 @@ class Core {
         // Get source messages
         Map<Message, EntityMessage> map = new HashMap<>();
         for (EntityMessage message : messages)
-            try {
-                Message imessage = ifolder.getMessageByUID(message.uid);
-                if (imessage != null)
-                    map.put(imessage, message);
-            } catch (MessagingException ex) {
-                Log.w(ex);
-            }
+            if (message.uid != null)
+                try {
+                    Message imessage = ifolder.getMessageByUID(message.uid);
+                    if (imessage != null)
+                        map.put(imessage, message);
+                } catch (MessagingException ex) {
+                    Log.w(ex);
+                }
 
         // Some providers do not support the COPY operation for drafts
         boolean draft = (EntityFolder.DRAFTS.equals(folder.type) || EntityFolder.DRAFTS.equals(target.type));