diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index ec1e4af2a1..855db4301f 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1116,7 +1116,7 @@ class Core {
         EntityAccount account = db.account().getAccount(folder.account);
 
         try {
-            if (removed) {
+            if (removed && BuildConfig.DEBUG) {
                 db.message().deleteMessage(folder.id, uid);
                 throw new MessageRemovedException("removed uid=" + uid);
             }