Update Mailbox to 0.3.12_141007
Merge pull request #6547 from dlackty/mailbox-0312

Update Mailbox to 0.3.12_141007