X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=c77d4d26864863b36f7d26b05ba4176854c02a5a;hp=e8786d9672dc8d8e4593b2871069646939b1bd71;hb=98533911b5d5279b6f4574c66f77fbd6c772ac6f;hpb=2bffc6c0ec2984441f8f66e23af8d3215f7a6f84

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index e8786d9..c77d4d2 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -355,8 +355,8 @@ int mutt_libesmtp_invoke (address_t * from,       /* the sender */
     SMTPFAIL ("smtp_add_message");
 
   /*  Initialize envelope sender */
-  if (option (OPTENVFROM) && EnvFrom)
-    envfrom = EnvFrom->mailbox;
+  if (MTransport.use_envelope_fromoption && MTransport.envelope_from_address)
+    envfrom = MTransport.envelope_from_address->mailbox;
   if (!smtp_set_reverse_path (message, envfrom))
     SMTPFAIL ("smtp_set_reverse_path");
 
@@ -365,7 +365,7 @@ int mutt_libesmtp_invoke (address_t * from,       /* the sender */
   do_dsn_ret (message);
 
   /* set up 8bitmime flag */
-  if (eightbit && option (OPTUSE8BITMIME))
+  if (eightbit && MTransport.use_8bitmime)
     smtp_8bitmime_set_body (message, E8bitmime_8BITMIME);
 
   if ((fp = fopen (msg, "r")) == NULL)