Refactored mailbox options