diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 63e52b8a5f..9efa55f3f2 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -773,15 +773,15 @@ public class ServiceSynchronize extends LifecycleService {
                         if (message == null)
                             throw new MessageRemovedException();
 
-                        if (message.uid == null &&
-                                (EntityOperation.SEEN.equals(op.name) ||
-                                        EntityOperation.DELETE.equals(op.name) ||
-                                        EntityOperation.MOVE.equals(op.name)))
-                            throw new IllegalArgumentException(op.name + " without uid");
-
                         try {
                             db.message().setMessageError(message.id, null);
 
+                            if (message.uid == null &&
+                                    (EntityOperation.SEEN.equals(op.name) ||
+                                            EntityOperation.DELETE.equals(op.name) ||
+                                            EntityOperation.MOVE.equals(op.name)))
+                                throw new IllegalArgumentException(op.name + " without uid");
+
                             JSONArray jargs = new JSONArray(op.args);
 
                             if (EntityOperation.SEEN.equals(op.name))