Also remove the Sender SMTP field to improve compliance with RFC2822 that specifies (section 3.6.2):
* ''If the originator of the message can be indicated by a single mailbox and the author and transmitter are identical, the "Sender:" field SHOULD NOT be used.''