2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4bfdca03b8..96fb9b32fab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2001-10-18  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * mail/smtpmail.el (smtpmail-via-smtp): Use mail-envelope-from if set.
+
         * xml.el (xml-parse-tag): Use eq on char-after's return value.
 
 2001-10-18  Gerd Moellmann  <gerd@gnu.org>
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index f57d08707e3..50ff26f6f7e 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -468,7 +468,8 @@ This is relative to `smtpmail-queue-dir'.")
                      "")))
 ;             (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn)))
               (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
-                                                     user-mail-address
+                                                     (or mail-envelope-from
+                                                         user-mail-address)
                                                      size-part
                                                      body-part))