diff --git a/VERSION b/VERSION
index 91d4bc4f..94a0778c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-24 16:24:40) dev
+Version 2.00.0 (2012-08-24 16:36:11) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index edc1fb6a..a983869b 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1084,8 +1084,8 @@ class Auth(object):
         messages.is_empty = "Cannot be empty"
         messages.mismatched_password = "Password fields don't match"
         messages.verify_email = \
-            'Click on the link http://' + current.request.env.http_host + \
-            URL('default','user',args=['verify_email']) + \
+            'Click on the link ' + \
+            URL('default','user',args='verify_email',scheme=True) + \
             '/%(key)s to verify your email'
         messages.verify_email_subject = 'Email verification'
         messages.username_sent = 'Your username was emailed to you'
@@ -1096,8 +1096,8 @@ class Auth(object):
         messages.retrieve_password = 'Your password is: %(password)s'
         messages.retrieve_password_subject = 'Password retrieve'
         messages.reset_password = \
-            'Click on the link http://' + current.request.env.http_host + \
-            URL('default','user',args=['reset_password']) + \
+            'Click on the link ' + \
+            URL('default','user',args='reset_password',scheme=True) + \
             '/%(key)s to reset your password'
         messages.reset_password_subject = 'Password reset'
         messages.invalid_reset_password = 'Invalid reset password'