Updated mail format