What's coming in 2.1 - Improved mailbox management