Mail format and other corrections-improvements