Updated Mails layout