Improved Mail formatting.