Refactoring

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

@@ -485,11 +485,7 @@ class Core {
                                 db.operation().deleteOperation(op.id);
 
                                 // Cleanup messages
-                                if (message != null &&
+                                if (message != null && MessageHelper.isRemoved(ex))
-                                        (ex instanceof MessageRemovedException ||
-                                                ex instanceof MessageRemovedIOException ||
-                                                ex.getCause() instanceof MessageRemovedException ||
-                                                ex.getCause() instanceof MessageRemovedIOException))
                                     db.message().deleteMessage(message.id);
 
                                 db.setTransactionSuccessful();

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

@@ -2389,6 +2389,16 @@ public class MessageHelper {
         return email;
     }
 
+    static boolean isRemoved(Throwable ex) {
+        while (ex != null) {
+            if (ex instanceof MessageRemovedException ||
+                    ex instanceof MessageRemovedIOException)
+                return true;
+            ex = ex.getCause();
+        }
+        return false;
+    }
+
     static boolean equalEmail(Address a1, Address a2) {
         String email1 = ((InternetAddress) a1).getAddress();
         String email2 = ((InternetAddress) a2).getAddress();