Update Mailbox to 0.3.8
Merge pull request #5916 from dlackty/mailbox-038

Update Mailbox to 0.3.8