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.
Merge branch 'tickets/DM-1480'