diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index d4d0f834c..0734261e2 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -211,6 +211,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
        try {
            Intent i = new Intent(context, MessageCompose.class);
            i.putExtra(EXTRA_ACCOUNT, account);
+           i.putExtra(EXTRA_FOLDER, account.getDraftsFolderName());
            context.startActivity(i);
        } catch (ActivityNotFoundException anfe) {
            // Swallow it - this is usually a race condition, especially under automated test.
@@ -1239,7 +1240,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
         setNewMessageFocus();
         
         mSourceMessageProcessed = true;
-        mDraftNeedsSaving = false;
+        mDraftNeedsSaving = mFolder != null && !mFolder.equals(mAccount.getDraftsFolderName());
     }
 
     /**