X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=mutt_libesmtp.c;h=41da0e75908f9ffe5f91c1acc6370c35ee1c0299;hb=4711a1a970ba7dda6eaf71f16fdfd74f90d02bb8;hp=50a6f867882803ad240045e97141151ec11b9356;hpb=40dd9fd7dc4b67d43d056aef865b79624ac6bc70;p=apps%2Fmadmutt.git

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 50a6f86..41da0e7 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -358,8 +358,8 @@ int mutt_libesmtp_invoke (ADDRESS * from,       /* the sender */
     SMTPFAIL ("smtp_add_message");
 
   /*  Initialize envelope sender */
-  if (SmtpEnvFrom && *SmtpEnvFrom)
-    envfrom = SmtpEnvFrom;
+  if (option (OPTENVFROM) && EnvFrom)
+    envfrom = EnvFrom->mailbox;
   if (!smtp_set_reverse_path (message, envfrom))
     SMTPFAIL ("smtp_set_reverse_path");