Now we don't have the version comment on its own line if we received
with TLS. The code's a bit uglier (because of the repeated
${if def:tls_cipher ...}) but the output is much neater.
${if def:sender_helo_name \
{(helo=$sender_helo_name)\n\t}}}}\
by $primary_hostname \
${if def:sender_helo_name \
{(helo=$sender_helo_name)\n\t}}}}\
by $primary_hostname \
+ (Exim $version_number)\
+ ${if def:tls_cipher {\n\t} { }}\
${if def:received_protocol \
{with $received_protocol \
${if def:received_protocol \
{with $received_protocol \
- ${if def:tls_cipher {(cipher=$tls_cipher)\n\t}}}}\
- (Exim $version_number)\n\t\
+ ${if def:tls_cipher {(cipher=$tls_cipher)}}}}\n\t\
${if def:sender_address \
{(envelope-from <$sender_address>\
${if def:authenticated_id \
${if def:sender_address \
{(envelope-from <$sender_address>\
${if def:authenticated_id \