diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index f836ee18..beb73e3a 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -868,10 +868,10 @@ public class ServiceSynchronize extends LifecycleService {
                                 " args=" + op.args);
 
                         EntityMessage message = db.message().getMessage(op.message);
-                        if (message == null)
-                            throw new MessageRemovedException();
-
                         try {
+                            if (message == null)
+                                throw new MessageRemovedException();
+
                             db.message().setMessageError(message.id, null);
 
                             if (message.uid == null &&