Motm 792 dev

Reverted changes in EmaiService.php.