diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 129e14ce5..d9f3f370f 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -601,6 +601,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     public void onPause()
     {
         super.onPause();
+        saveIfNeeded();
         MessagingController.getInstance(getApplication()).removeListener(mListener);
     }
 
@@ -616,6 +617,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     protected void onSaveInstanceState(Bundle outState)
     {
         super.onSaveInstanceState(outState);
+        saveIfNeeded();
         ArrayList<Uri> attachments = new ArrayList<Uri>();
         for (int i = 0, count = mAttachments.getChildCount(); i < count; i++)
         {