Improve mail formatting