Mail Content Improve