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");
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)