Switching to Mailbox mode (Again?)