overhauled mails to new layout