Merge pull request #636 from emmanuel-keller/1.5

Initial implementation of #626
Merge pull request #640 from emmanuel-keller/1.5

Mailbox crawler
Merge pull request #641 from emmanuel-keller/1.5

Fix compilation error