Added SMTPSettings, corrected fill()