--- gnus/lisp/message.el	Sat Mar  1 15:28:48 2003
+++ message.el	Sun Mar  2 17:28:12 2003
@@ -3559,7 +3559,7 @@
 			;; But some systems are more broken with -f, so
 			;; we'll let users override this.
 			(if (null message-sendmail-f-is-evil)
-			    (list "-f" (message-sendmail-envelope-from)))
+			    (list "-f" (message-make-address)))
 			;; These mean "report errors by mail"
 			;; and "deliver in background".
 			(if (null message-interactive) '("-oem" "-odb"))