Mailer fixes

:fork_and_knife: A bunch of minor fixes for our mailers. Read the commits for more details :smile: