diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 099aad78d7..6bf89b1082 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -157,18 +157,18 @@ class Core {
                     if (op.message != null)
                         message = db.message().getMessage(op.message);
 
-                    if (message == null &&
-                            !EntityOperation.FETCH.equals(op.name) &&
-                            !EntityOperation.SYNC.equals(op.name) &&
-                            !EntityOperation.SUBSCRIBE.equals(op.name))
-                        throw new MessageRemovedException();
-
                     JSONArray jargs = new JSONArray(op.args);
                     Map<EntityOperation, EntityMessage> similar = new HashMap<>();
 
                     try {
                         // Operations should use database transaction when needed
 
+                        if (message == null &&
+                                !EntityOperation.FETCH.equals(op.name) &&
+                                !EntityOperation.SYNC.equals(op.name) &&
+                                !EntityOperation.SUBSCRIBE.equals(op.name))
+                            throw new MessageRemovedException();
+
                         // Process similar operations
                         boolean skip = false;
                         for (int j = i + 1; j < ops.size(); j++) {