updated mailbox layout