Consider failed search as not found on deleting message

app/src/main/java/eu/faircode/email/Core.java

@@ -1228,7 +1228,8 @@ class Core {
                     }
             }
 
-            if (!TextUtils.isEmpty(message.msgid) && !deleted) {
+            if (!TextUtils.isEmpty(message.msgid) && !deleted)
+                try {
                     Message[] imessages = ifolder.search(new MessageIDTerm(message.msgid));
                     if (imessages == null)
                         Log.w(folder.name + " search for msgid=" + message.msgid + " returned null");
@@ -1238,12 +1239,16 @@ class Core {
                             Log.i(folder.name + " deleting uid=" + muid);
                             try {
                                 iexisting.setFlag(Flags.Flag.DELETED, true);
+                                deleted = true;
                             } catch (MessageRemovedException ignored) {
                                 Log.w(folder.name + " existing gone uid=" + muid);
                             }
                         }
+                } catch (MessagingException ex) {
+                    Log.w(ex);
                 }
 
+            if (deleted)
                 ifolder.expunge();
 
             db.message().deleteMessage(message.id);