diff --git a/app/src/main/java/eu/faircode/email/AdapterOperation.java b/app/src/main/java/eu/faircode/email/AdapterOperation.java
index 6b432994dc..05f3c929da 100644
--- a/app/src/main/java/eu/faircode/email/AdapterOperation.java
+++ b/app/src/main/java/eu/faircode/email/AdapterOperation.java
@@ -229,7 +229,11 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
                                 return null;
 
                             db.operation().deleteOperation(operation.id);
+
                             db.folder().setFolderError(operation.folder, null);
+                            if (operation.message != null)
+                                db.message().setMessageError(operation.message, null);
+
                             return null;
                         }