diff --git a/mozilla/webtools/bugzilla/bug_form.pl b/mozilla/webtools/bugzilla/bug_form.pl
index 4ca7f43c5f9..bac65d14c2e 100644
--- a/mozilla/webtools/bugzilla/bug_form.pl
+++ b/mozilla/webtools/bugzilla/bug_form.pl
@@ -71,7 +71,7 @@ sub quoteUrls {
 
     my @things;
     while ($text =~ s%((mailto:)?([\w\.\-\+\=]+\@[\w\-]+(?:\.[\w\-]+)+)\b|
-                       (\b((?:$protocol):\S+[\w/])))%"##$count##"%exo) {
+                    (\b((?:$protocol):[^ \t\n<>"]+[\w/])))%"##$count##"%exo) {
         my $item = $&;
 
         $item = value_quote($item);