Update Mailbox to 0.3.7
Merge pull request #5893 from dlackty/mailbox-037

Update Mailbox to 0.3.7