Small improvements to admin mailer