Change mail manager
Merge pull request #801 from loiccouturier/master

Change mail manager API