Add SMTP support and use name vs. fqdn