mailbox fixes