diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 2dff71d5a..7ef8dd049 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -910,7 +910,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         boolean replyAfterQuote = false;
         String action = getIntent().getAction();
         if (mAccount.isReplyAfterQuote() &&
-                (ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action))) {
+                (ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action) ||
+                        ACTION_EDIT_DRAFT.equals(action))) {
             replyAfterQuote = true;
         }