Mailbox improvements
Merge pull request #964 from emmanuel-keller/1.5

Mailbox improvements