diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 71a5d79dfd..1110607376 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -409,6 +409,7 @@ class Core {
 
                         if (op.tries >= TOTAL_RETRY_MAX) {
                             // Giving up
+                            op.cleanup(context);
                             db.operation().deleteOperation(op.id);
                             ops.remove(op);
                             continue;