Added SMTP handling