Add smtp_envelope_to if present