diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index a145d4c2df..bbe1a5b9fc 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -801,7 +801,7 @@ class Core {
                     Log.e(ex);
                 }
 
-            throw new IllegalArgumentException("Message not found for " + op.name + " folder=" + folder.name);
+            throw new OperationCanceledException("Message not found for " + op.name + " folder=" + folder.name);
         }
 
         db.message().setMessageUid(message.id, message.uid);