SMTP support fix