Update BaseMailer.php
Revert "Update BaseMailer.php"

This reverts commit 50b8c75341aa20f2df6e52e4917f51aa3ab181a9.
Merge remote-tracking branch 'upstream/master' into translate-yii/grid