changed mailer.php component
merge