Pull from willover repo, and customise SMTP settings [BugzID: 1336]