diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index d9e8cf7bd3..fbb04c3d00 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1360,7 +1360,7 @@ public class ServiceSynchronize extends LifecycleService {
                             if (ex instanceof SendFailedException)
                                 reportError(null, folder.name, ex);
 
-                            if (message != null)
+                            if (message != null && !(ex instanceof MessageRemovedException))
                                 db.message().setMessageError(message.id, Helper.formatThrowable(ex));
 
                             if (ex instanceof MessageRemovedException ||