diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 0655ce776e..c5ff9a38d5 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -970,14 +970,18 @@ class Core {
             db.message().setMessageUid(message.id, null);
 
             // Some providers do not list the new message yet
-            Long found = findUid(ifolder, message.msgid, true);
-            if (found != null)
-                if (newuid == null)
-                    newuid = found;
-                else if (!newuid.equals(found)) {
-                    Log.w(folder.name + " Added=" + newuid + " found=" + found);
-                    newuid = Math.max(newuid, found);
-                }
+            try {
+                Long found = findUid(ifolder, message.msgid, true);
+                if (found != null)
+                    if (newuid == null)
+                        newuid = found;
+                    else if (!newuid.equals(found)) {
+                        Log.w(folder.name + " Added=" + newuid + " found=" + found);
+                        newuid = Math.max(newuid, found);
+                    }
+            } catch (MessagingException ex) {
+                Log.w(ex);
+            }
 
             if (newuid != null && (message.uid == null || newuid > message.uid))
                 try {