All main repo side updates to make things use the Mailer