Improve mail formatter