diff --git a/mozilla/webtools/bugzilla/bug_form.pl b/mozilla/webtools/bugzilla/bug_form.pl
index e6b59e05105..8d7a2b02ef5 100644
--- a/mozilla/webtools/bugzilla/bug_form.pl
+++ b/mozilla/webtools/bugzilla/bug_form.pl
@@ -58,7 +58,6 @@ sub show_bug {
     my $vars = $::vars;
     
     $vars->{'GetBugLink'} = \&GetBugLink;
-    $vars->{'quoteUrls'} = \&quoteUrls,
     $vars->{'lsearch'} = \&lsearch,
     $vars->{'header_done'} = (@_),
 
diff --git a/mozilla/webtools/bugzilla/globals.pl b/mozilla/webtools/bugzilla/globals.pl
index 3edcab46040..4570a565808 100644
--- a/mozilla/webtools/bugzilla/globals.pl
+++ b/mozilla/webtools/bugzilla/globals.pl
@@ -1545,6 +1545,9 @@ $::vars =
     # Generic linear search function
     'lsearch' => \&Bugzilla::Util::lsearch ,
 
+    # quoteUrls - autolinkifies text
+    'quoteUrls' => \&quoteUrls ,
+    
     # UserInGroup - you probably want to cache this
     'UserInGroup' => \&UserInGroup ,
 
diff --git a/mozilla/webtools/bugzilla/long_list.cgi b/mozilla/webtools/bugzilla/long_list.cgi
index eba09469975..6acee0332aa 100755
--- a/mozilla/webtools/bugzilla/long_list.cgi
+++ b/mozilla/webtools/bugzilla/long_list.cgi
@@ -98,7 +98,6 @@ $vars->{'bugs'} = \@bugs;
 
 $vars->{'use_keywords'} = 1 if (@::legal_keywords);
 
-$vars->{'quoteUrls'} = \&quoteUrls;
 $vars->{'str2time'} = \&str2time;
 
 # Work out a sensible filename for Content-Disposition.
diff --git a/mozilla/webtools/bugzilla/page.cgi b/mozilla/webtools/bugzilla/page.cgi
index af0903c3005..960774cc4b8 100755
--- a/mozilla/webtools/bugzilla/page.cgi
+++ b/mozilla/webtools/bugzilla/page.cgi
@@ -39,11 +39,14 @@ ConnectToDatabase();
 
 quietly_check_login();
 
-if (defined $::FORM{'id'}) {
+if ($::FORM{'id'}) {
+    # Remove all dodgy chars, and split into name and ctype.
     $::FORM{'id'} =~ s/[^\w\-\.]//g;
-    $::FORM{'id'} =~ /(.*)(\.(.*))?/;
+    $::FORM{'id'} =~ /(.*)\.(.*)/;
 
-    my $format = GetFormat($1, undef, $3);
+    my $format = GetFormat($1, undef, $2);
+    
+    $vars->{'form'} = \%::FORM; 
     
     print "Content-Type: $format->{'ctype'}\n\n";
 
diff --git a/mozilla/webtools/bugzilla/process_bug.cgi b/mozilla/webtools/bugzilla/process_bug.cgi
index be661c629b9..f62285ffbb2 100755
--- a/mozilla/webtools/bugzilla/process_bug.cgi
+++ b/mozilla/webtools/bugzilla/process_bug.cgi
@@ -1089,7 +1089,6 @@ foreach my $id (@idlist) {
         $vars->{'mform'} = \%::MFORM;
         
         $vars->{'bug_id'} = $id;
-        $vars->{'quoteUrls'} = \&quoteUrls;
         
         SendSQL("UNLOCK TABLES");
         
diff --git a/mozilla/webtools/bugzilla/template/en/default/pages/linked.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/pages/linked.html.tmpl
new file mode 100644
index 00000000000..8c854e2bd8a
--- /dev/null
+++ b/mozilla/webtools/bugzilla/template/en/default/pages/linked.html.tmpl
@@ -0,0 +1,43 @@
+<!-- 1.0@bugzilla.org -->
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Stefan Seifert <nine@detonation.org>
+  #                 Gervase Markham <gerv@gerv.net>
+  #%]
+
+[% INCLUDE global/header.html.tmpl title = "Your Linkified Text" %]
+
+<p>
+  Copy and paste the text below:
+</p>
+
+<p>
+  <tt>
+    [% quoteUrls(form.text) FILTER html %]
+  </tt>
+</p>
+
+<p>
+  It will end up looking like this:
+</p>
+
+<p>
+  [% quoteUrls(form.text) %]
+</p>
+
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/pages/linkify.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/pages/linkify.html.tmpl
new file mode 100644
index 00000000000..57f455dd289
--- /dev/null
+++ b/mozilla/webtools/bugzilla/template/en/default/pages/linkify.html.tmpl
@@ -0,0 +1,38 @@
+<!-- 1.0@bugzilla.org -->
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Stefan Seifert <nine@detonation.org>
+  #                 Gervase Markham <gerv@gerv.net>
+  #%]
+
+[% INCLUDE global/header.html.tmpl title = "Linkify Text" %]
+
+<p>
+  If you enter some text, this form will return it marked up like a 
+  standard Bugzilla comment. That is, valid bug numbers, URLs, email addresses
+  and so on will be replaced with appropriate HTML links.
+</p>
+
+<form action="page.cgi" method="post">
+  <textarea cols="80" rows="20" name="text"></textarea>
+  <br>    
+  <input type="hidden" name="id" value="linked.html">
+  <input value="Linkify" type="submit">
+</form>
+
+[% INCLUDE global/footer.html.tmpl %]