Add Mailbox
Merge pull request #5834 from dlackty/mailbox

Add Mailbox