Ticket #26487: patch.diff

django/core/mail/backends/smtp.py

@@ -56 +56 @@
             })
         try:
             self.connection = connection_class(self.host, self.port, **connection_params)
+            self.connection.ehlo()
 
             # TLS/SSL are mutually exclusive, so only attempt TLS over
             # non-secure connections.
             if not self.use_ssl and self.use_tls:
-                self.connection.ehlo()
                 self.connection.starttls(keyfile=self.ssl_keyfile, certfile=self.ssl_certfile)
                 self.connection.ehlo()
             if self.username and self.password: