diff -ur ./cgi/actions.py /usr/lib/python2.3/site-packages/roundup/cgi/actions.py
--- ./cgi/actions.py	2005-02-15 23:37:37.000000000 +0000
+++ /usr/lib/python2.3/site-packages/roundup/cgi/actions.py	2005-12-15 14:04:41.143693616 +0000
@@ -812,9 +812,10 @@
         # send the email
         tracker_name = self.db.config.TRACKER_NAME
         tracker_email = self.db.config.TRACKER_EMAIL
-        subject = 'Complete your registration to %s -- key %s'%(tracker_name,
+        if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']:
+            subject = 'Complete your registration to %s -- key %s'%(tracker_name,
                                                                   otk)
-        body = """To complete your registration of the user "%(name)s" with
+            body = """To complete your registration of the user "%(name)s" with
 %(tracker)s, please do one of the following:
 
 - send a reply to %(tracker_email)s and maintain the subject line as is (the
@@ -826,8 +827,17 @@
 
 """ % {'name': user_props['username'], 'tracker': tracker_name,
         'url': self.base, 'otk': otk, 'tracker_email': tracker_email}
+        else:
+            subject = 'Complete your registration to %s'%(tracker_name)
+            body = """To complete your registration of the user "%(name)s" with
+%(tracker)s, please visit the following URL:
+
+%(url)s?@action=confrego&otk=%(otk)s
+
+""" % {'name': user_props['username'], 'tracker': tracker_name,
+        'url': self.base, 'otk': otk}
         if not self.client.standard_message([user_props['address']], subject,
-                body, (tracker_name, tracker_email)):
+                body):
             return
 
         # commit changes to the database
diff -ur ./configuration.py /usr/lib/python2.3/site-packages/roundup/configuration.py
--- ./configuration.py	2005-02-14 02:55:30.000000000 +0000
+++ /usr/lib/python2.3/site-packages/roundup/configuration.py	2005-12-15 14:05:00.854697088 +0000
@@ -448,6 +448,8 @@
         (BooleanOption, "instant_registration", "no",
             "Register new users instantly, or require confirmation via\n"
             "email?"),
+        (BooleanOption, "email_registration_confirmation", "yes",
+            "Offer registration confirmation by email or only through the web?"),
     )),
     ("tracker", (
         (Option, "name", "Roundup issue tracker",
diff -ur ./mailgw.py /usr/lib/python2.3/site-packages/roundup/mailgw.py
--- ./mailgw.py	2005-02-15 23:19:24.000000000 +0000
+++ /usr/lib/python2.3/site-packages/roundup/mailgw.py	2005-12-15 14:15:55.111234976 +0000
@@ -629,8 +629,11 @@
             if classname is None:
                 # no classname, check if this a registration confirmation email
                 # or fallback on the default class
-                otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
-                otk = otk_re.search(m.group('title'))
+                if self.db.config['EMAIL_REGISTRATION_CONFIRMATION']:
+                    otk_re = re.compile('-- key (?P<otk>[a-zA-Z0-9]{32})')
+                    otk = otk_re.search(m.group('title'))
+                else:
+                    otk = None
                 if otk:
                     self.db.confirm_registration(otk.group('otk'))
                     subject = 'Your registration to %s is complete' % \