SMTP mailer improvements