diff --git a/mu4e/mu4e-draft.el b/mu4e/mu4e-draft.el
index b884c090..c41e38d1 100644
--- a/mu4e/mu4e-draft.el
+++ b/mu4e/mu4e-draft.el
@@ -231,7 +231,7 @@ based on `user-full-name' and `user-mail-address'; if the latter is
 nil, function returns nil."
   (when user-mail-address
     (if user-full-name
-      (format "%s <%s>" user-full-name user-mail-address)
+      (format "%s <%s>" (mu4e~rfc822-quoteit user-full-name) user-mail-address)
       (format "%s" user-mail-address))))
 
 
diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el
index 84ba88fe..b57974da 100644
--- a/mu4e/mu4e-vars.el
+++ b/mu4e/mu4e-vars.el
@@ -747,10 +747,10 @@ Note, `:sortable' does not work for custom header fields.")
 	     (+ (length (mu4e-message-field msg :to))
 	       (length (mu4e-message-field msg :cc))))))))
 "A list of custom (user-defined) headers. The format is similar
-to `mu4e-header-info', but addds a :function property, which should
-point to a function that takes a message p-list as argument, and
-returns a string. See the default value of `mu4e-header-info-custom
-for an example.")
+to `mu4e-header-info', but adds a :function property, which
+should point to a function that takes a message p-list as
+argument, and returns a string. See the default value of
+`mu4e-header-info-custom for an example.")
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;