Fix smtp client to respect $use_envelope_from option.

The code was only looking to see if $envelope_from_address had a
value, not if $use_envelope_from was set.

Add extra safety checks to make sure the mailbox value isn't NULL.

1 files changed, 2 insertions, 2 deletions

diff --git a/smtp.c b/smtp.c
index 391a905f..8837c7da 100644
--- a/smtp.c
+++ b/smtp.c
@@ -343,9 +343,9 @@ mutt_smtp_send (const ADDRESS* from, const ADDRESS* to, const ADDRESS* cc,
 
   /* it might be better to synthesize an envelope from from user and host
    * but this condition is most likely arrived at accidentally */
-  if (EnvFrom)
+  if (option (OPTENVFROM) && EnvFrom && EnvFrom->mailbox)
     envfrom = EnvFrom->mailbox;
-  else if (from)
+  else if (from && from->mailbox)
     envfrom = from->mailbox;
   else
   {