diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index f66df1b68..4d98ebee8 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -1251,7 +1251,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
         Attachment attachment = (Attachment) attachmentView.getTag();
         mAttachments.removeView(attachmentView);
         updateAttachmentContainer();
-        if (attachment.isSaved()) {
+        if (attachment.mMessageKey == mDraft.mId && attachment.isSaved()) {
             // The following async task for deleting attachments:
             // - can be started multiple times in parallel (to delete multiple attachments).
             // - need not be interrupted on activity exit, instead should run to completion.