Ensure that a statically-addressed email packet is returned even when a

dynamically-addressed email has also been sent. The mail_notifier
requires the return of a well-formed mail packet on exit.



The email address for the buildbot routine email may need changing prior to merging this commit.

This change has not been tested live. That will happen after the initial review and hand-back.