diff --git a/mu4e/mu4e-draft.el b/mu4e/mu4e-draft.el
index 2513cbc4..151dc1f3 100644
--- a/mu4e/mu4e-draft.el
+++ b/mu4e/mu4e-draft.el
@@ -280,7 +280,7 @@ You can append flags."
   "Create a draft message as a reply to original message
 ORIGMSG. Replying-to-self is a special; in that case, the To and Cc
 fields will be the same as in the original."
-  (let* ((reply-to-self (mu4e-message-contact-field-matches-me msg :from))
+  (let* ((reply-to-self (mu4e-message-contact-field-matches-me origmsg :from))
 	  (recipnum
 	     (+ (length (mu4e~draft-create-to-lst origmsg))
 	       (length (mu4e~draft-create-cc-lst origmsg t))))
@@ -297,8 +297,10 @@ fields will be the same as in the original."
       (if reply-to-self
 	;; When we're replying to ourselves, simply keep the same headers.
 	(concat
-	  (mu4e~draft-header "To" (mu4e-message-field :to origmsg))
-	  (mu4e~draft-header "Cc" (mu4e-message-field :cc origmsg))) 
+	  (mu4e~draft-header "To" (mu4e~draft-recipients-list-to-string
+				    (mu4e-message-field origmsg :to)))
+	  (mu4e~draft-header "Cc" (mu4e~draft-recipients-list-to-string
+				    (mu4e-message-field origmsg :cc)))) 
 	
 	;; if there's no-one in To, copy the CC-list
 	(if (zerop (length (mu4e~draft-create-to-lst origmsg)))
diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index 89be960e..55ed6fd8 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -2983,6 +2983,11 @@ opens inside a webbrowser. You can influence the browser with
 @section Writing messages
 
 @enumerate
+@item @emph{What's the deal with replies to messages I wrote myself?} Like
+many other mail-clients, @t{mu4e} treats replies to messages you wrote
+yourself as special -- these message keep the same @t{To:} and @t{Cc:} as the
+original message. This is to ease the common case of following up to a message
+you wrote earlier.
 @item @emph{How can I automatically set the @t{From:}-address for a
 reply-message, based on some field in the original?} See @ref{Compose hooks}.
 @item @emph{And what about customizable folders for draft messages, sent