diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index 7222cc4da..405cfd2b6 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -4917,6 +4917,12 @@ public class LocalStore extends Store implements Serializable
                 throw new RuntimeException(me);
             }
 
+            if (flag == Flag.X_DESTROYED && set) 
+            {
+                return;
+            }
+
+
             super.setFlag(flag, set);
             /*
              * Set the flags on the message.