diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index f604af658a..eb06732118 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -958,6 +958,10 @@ class Core {
             message.ui_flagged = false;
         message.ui_hide = false;
 
+        // Prevent deleting message from inbox
+        if (message.uidl == null)
+            message.uidl = message.msgid;
+
         db.message().updateMessage(message);
     }