Refactor to unify more of the code paths for different message types
Add more space to email templates