improved mail formatting