moved SMTP changes into new PR