Added fields and (hopefully) support for SMTPauth