X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmessage.el;h=a17617d2960c28c397c97ce7efe7cb0e2af057c7;hb=bd281c33591086cd286aeccaebc71da28164eb5b;hp=595b6fe6dfb0af82e5bfd1e9f5b6f89c03616917;hpb=c2c5996c0ef915518c40b04096d143bb1a8f926d;p=gnus

diff --git a/lisp/message.el b/lisp/message.el
index 595b6fe6d..a17617d29 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -384,10 +384,9 @@ always query the user whether to use the value.  If it is the symbol
 		 (const use)
 		 (const ask)))
 
-;; stuff relating to broken sendmail in MMDF
 (defcustom message-sendmail-f-is-evil nil
-  "*Non-nil means that \"-f username\" should not be added to the sendmail
-command line, because it is even more evil than leaving it out."
+  "*Non-nil means that \"-f username\" should not be added to the sendmail command line.
+Doing so would be even more evil than leaving it out."
   :group 'message-sending
   :type 'boolean)
 
@@ -2215,11 +2214,7 @@ the user from the mailer."
 		     ;; But some systems are more broken with -f, so
 		     ;; we'll let users override this.
 		     (if (null message-sendmail-f-is-evil)
-			 (list "-f"
-			       (if (null user-mail-address)
-				   (user-login-name)
-				 (user-mail-address))
-			       ))
+			 (list "-f" (message-make-address)))
 		     ;; These mean "report errors by mail"
 		     ;; and "deliver in background".
 		     (if (null message-interactive) '("-oem" "-odb"))