diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 070a4b06e..711288efd 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -2296,7 +2296,10 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
                  * We're saving a previously saved draft, so update the new message's uid
                  * to the old message's uid.
                  */
-                message.setUid(mMessageReference.uid);
+                if (mMessageReference != null)
+                {
+                    message.setUid(mMessageReference.uid);
+                }
             }
 
             String k9identity = Utility.base64Encode("" + mMessageContentView.getText().toString().length());