Formatting fixes for mailbox