diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 0a51e086f6..ac28d027b0 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1500,7 +1500,15 @@ class Core {
 
             // https://tools.ietf.org/html/rfc6851
             if (!copy && canMove)
-                ifolder.moveMessages(map.keySet().toArray(new Message[0]), itarget);
+                try {
+                    ifolder.moveMessages(map.keySet().toArray(new Message[0]), itarget);
+                } catch (MessagingException ex) {
+                    if (!(map.size() == 1 &&
+                            ex.getCause() instanceof CommandFailedException &&
+                            ex.getCause().getMessage() != null &&
+                            ex.getCause().getMessage().contains("[EXPUNGEISSUED]")))
+                        throw ex;
+                }
             else
                 ifolder.copyMessages(map.keySet().toArray(new Message[0]), itarget);
         }