Pretty emails

Reformatted the emails so the printing is a bit more consistent. 

All tests pass.