Fix mail format