diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index 309f390e7c..631cb3a999 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -453,8 +453,10 @@ public class EntityOperation {
             try {
                 JSONArray jargs = new JSONArray(args);
                 long tmpid = jargs.optLong(2, -1);
-                if (tmpid > 0)
-                    db.message().deleteMessage(tmpid);
+                if (tmpid < 0)
+                    return;
+
+                db.message().deleteMessage(tmpid);
             } catch (JSONException ex) {
                 Log.e(ex);
             }