[Jaws_Mail]: Fixed for last commit