diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 93d7f55fb..9356efde4 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -549,7 +549,8 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
                 && (mCcView.length() == 0)
                 && (mBccView.length() == 0)
                 && (mSubjectView.length() == 0)
-                && isBodyEmpty();
+                && isBodyEmpty()
+                && mAttachments.isEmpty();
     }
 
     private boolean isBodyEmpty() {