diff --git a/mu/mu-cmd.c b/mu/mu-cmd.c
index 612eaf98..b1c2d393 100644
--- a/mu/mu-cmd.c
+++ b/mu/mu-cmd.c
@@ -367,7 +367,7 @@ mu_cmd_remove (MuStore *store, MuConfig *opts, GError **err)
 	g_return_val_if_fail (opts->cmd == MU_CONFIG_CMD_REMOVE,
 			      MU_ERROR_INTERNAL);
 
-	/* note: params[0] will be 'add' */
+	/* note: params[0] will be 'remove' */
 	if (!opts->params[0] || !opts->params[1]) {
 		g_warning ("usage: mu remove <file> [<files>]");
 		mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS,
diff --git a/mu4e/mu4e-draft.el b/mu4e/mu4e-draft.el
index 4305c7e9..571524d3 100644
--- a/mu4e/mu4e-draft.el
+++ b/mu4e/mu4e-draft.el
@@ -102,7 +102,7 @@ e-mail addresses. If LST is nil, returns nil."
 	(let ((name (car addrcell))
 	       (email (cdr addrcell)))
 	  (if name
-	    (format "\"%s\" <%s>" name email)
+	    (format "%s <%s>" (rfc822-quoteit name) email)
 	    (format "%s" email))))
       lst ", ")))
 
diff --git a/mu4e/mu4e-utils.el b/mu4e/mu4e-utils.el
index 0eaab14e..d888d32a 100644
--- a/mu4e/mu4e-utils.el
+++ b/mu4e/mu4e-utils.el
@@ -553,13 +553,14 @@ process."
 
 (defun mu4e~rfc822-phrase-type (ph)
   "Return either atom, quoted-string, a corner-case or nil. This
-  checks for quotes around the phrase first
+   checks for empty string first. Then quotes around the phrase 
    (returning 'rfc822-quoted-string). Then whether there is a quote
    inside the phrase (returning 'rfc822-containing-quote).
    The reverse of the RFC atext definition is then tested.
    If it matches, nil is returned, if not, it is an 'rfc822-atom, which
    is returned."
      (cond
+       ((= (length ph) 0) 'rfc822-empty)
        ((= (aref ph 0) ?\")
 	 (if (string-match "\"\\([^\"\\\n]\\|\\\\.\\|\\\\\n\\)*\"" ph)
 	   'rfc822-quoted-string