Improved mail format for messages