[fix] Mail helper is not synced with email validation
correction
Correcting unit tests
correcting comment
Merge pull request #4899 from infograf768/mailhelper

[fix] Mail helper is not synced with email validation