A minor stylistic fix and cleanup of mail deliveries.
Merge pull request #15085 from zuhao/refactor_actionmailer_log_subscriber_test

A minor stylistic fix and cleanup of mail deliveries.