Clean mail module source code
Fix bad comparison
Merge pull request #193 from GuillaumeGomez/master

Clean mail module source code