Merge pull request #638 from emmanuel-keller/master

Initial implementation of #626
Merge remote-tracking branch 'upstream/master'
Merge pull request #645 from emmanuel-keller/master

Mailbox crawler
Merge remote-tracking branch 'upstream/master'