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

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 50a6f86..6263662 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");
 
@@ -397,7 +397,7 @@ Done:
   if (fp != NULL)
     fclose (fp);
   if (hostportstr != NULL)
-    free (hostportstr);
+    mem_free (&hostportstr);
   if (session != NULL)
     smtp_destroy_session (session);
   if (authctx != NULL)