{with $received_protocol \
${if def:tls_cipher {(cipher=$tls_cipher)}}}}\n\t\
${if def:sender_address \
- {(envelope-from <$sender_address>\
+ {(envelope-from $sender_address\
${if def:authenticated_id \
{; auth=$authenticated_id}})\n\t}}\
id $message_exim_id\