Offer TLS and SMTP AUTH with new features and no patch conflicts
