diff --git a/VERSION b/VERSION
index 0e6dd552..60814979 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.4.6-stable+timestamp.2013.04.21.19.50.11
+Version 2.4.6-stable+timestamp.2013.04.23.23.20.31
diff --git a/gluon/tools.py b/gluon/tools.py
index 7aa93b91..f20444f1 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -686,9 +686,9 @@ class Mail(object):
                 else:
                     server = smtplib.SMTP(*smtp_args)
                 if self.settings.tls and not self.settings.ssl:
-                    server.ehlo()
+                    server.ehlo(self.settings.hostname)
                     server.starttls()
-                    server.ehlo()
+                    server.ehlo(self.settings.hostname)
                 if self.settings.login:
                     server.login(*self.settings.login.split(':', 1))
                 result = server.sendmail(