diff --git a/mu4e/mu4e-draft.el b/mu4e/mu4e-draft.el
index b0291c05..77a9a38e 100644
--- a/mu4e/mu4e-draft.el
+++ b/mu4e/mu4e-draft.el
@@ -350,11 +350,12 @@ address is set, use that, otherwise use the From address. Note,
 whatever was in the To: field before, goes to the Cc:-list (if
 we're doing a reply-to-all). Special case: if we were the sender
 of the original, we simple copy the list form the original."
-  (let ((reply-to
+  (let* ((reply-to
          (append
           (plist-get origmsg :to)
-          (or (plist-get origmsg :reply-to) (plist-get origmsg :from)))))
-    (cl-delete-duplicates reply-to :test #'mu4e~draft-address-cell-equal)
+          (or (plist-get origmsg :reply-to) (plist-get origmsg :from))))
+         (reply-to (cl-delete-duplicates reply-to
+                                         :test #'mu4e~draft-address-cell-equal)))
     (if mu4e-compose-dont-reply-to-self
         (cl-delete-if
          (lambda (to-cell)
diff --git a/mu4e/mu4e-server.el b/mu4e/mu4e-server.el
index 3aba27c8..f307d6e5 100644
--- a/mu4e/mu4e-server.el
+++ b/mu4e/mu4e-server.el
@@ -222,7 +222,7 @@ Checks whether the server process is live."
              '(run open listen connect stop)) t))
 
 (defsubst mu4e--server-eat-sexp-from-buf ()
-  "'Eat' the next s-expression from `mu4e--server-buf'.
+  "Eat the next s-expression from `mu4e--server-buf'.
 Note: this is a string, not an emacs-buffer. `mu4e--server-buf gets
 its contents from the mu-servers in the following form:
    <`mu4e--server-cookie-pre'><length-in-hex><`mu4e--server-cookie-post'>