diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index b1ad8dbdb1..7b00c10a0f 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1506,6 +1506,10 @@ public class ServiceSynchronize extends LifecycleService {
 
                             // There is no use in repeating
                             db.operation().deleteOperation(op.id);
+
+                            if (ex instanceof MessageRemovedException)
+                                db.message().deleteMessage(op.message);
+
                             continue;
                         } else if (ex instanceof MessagingException) {
                             // Socket timeout is a recoverable condition (send message)