more SMTP changes