Bug 301946: fix sender address errors sending emails

Fix failure to send emails for some users, with the error message:
"The server did not accept the sender address ..."

Thanks to Laurent Montel for identifying the problem and providing a
fix.

Backport of f4ea2ad3 (master).