improve e-mail format