diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index b5906385df..a38cb35467 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -94,7 +94,9 @@ public class EntityOperation {
 
     void cleanup(Context context) {
         DB db = DB.getInstance(context);
-        db.message().setMessageUiHide(message, false);
+
+        if (message != null)
+            db.message().setMessageUiHide(message, false);
 
         if (EntityOperation.MOVE.equals(name) ||
                 EntityOperation.ADD.equals(name) ||