Added SMTP mail to 2.9