Fix typo and fixed mail helper