diff --git a/mozilla/webtools/bugzilla/css/global.css b/mozilla/webtools/bugzilla/css/global.css
index 47a1558d653..aecfb16586d 100644
--- a/mozilla/webtools/bugzilla/css/global.css
+++ b/mozilla/webtools/bugzilla/css/global.css
@@ -171,5 +171,11 @@
 .bz_disabled { color: #a0a0a0 ; }
 
 .bz_comment { background-color: #e0e0e0; }
+.bz_comment_hilite pre
+{
+    background-color: lightgreen;
+    margin: 0;
+    padding: 1em 0;
+}
 
 table#flags th, table#flags td { vertical-align: baseline; text-align: left; }
diff --git a/mozilla/webtools/bugzilla/show_bug.cgi b/mozilla/webtools/bugzilla/show_bug.cgi
index 7a568e3f54e..4803ff67bde 100755
--- a/mozilla/webtools/bugzilla/show_bug.cgi
+++ b/mozilla/webtools/bugzilla/show_bug.cgi
@@ -59,6 +59,7 @@ my $format = GetFormat("bug/show", scalar $cgi->param('format'),
 GetVersionTable();
 
 my @bugs = ();
+my %marks;
 
 if ($single) {
     my $id = $cgi->param('id');
@@ -66,6 +67,17 @@ if ($single) {
     # probably move into Bug.pm at some point
     ValidateBugID($id);
     push @bugs, new Bugzilla::Bug($id, $userid);
+    if (defined $cgi->param('mark')) {
+        foreach my $range (split ',', $cgi->param('mark')) {
+            if ($range =~ /^(\d+)-(\d+)$/) {
+               foreach my $i ($1..$2) {
+                   $marks{$i} = 1;
+               }
+            } elsif ($range =~ /^(\d+)$/) {
+               $marks{$1} = 1;
+            }
+        }
+    }
 } else {
     foreach my $id ($cgi->param('id')) {
         my $bug = new Bugzilla::Bug($id, $userid);
@@ -80,6 +92,7 @@ eval {
 };
 
 $vars->{'bugs'} = \@bugs;
+$vars->{'marks'} = \%marks;
 
 # Next bug in list (if there is one)
 my @bug_list;
diff --git a/mozilla/webtools/bugzilla/skins/standard/global.css b/mozilla/webtools/bugzilla/skins/standard/global.css
index 47a1558d653..aecfb16586d 100644
--- a/mozilla/webtools/bugzilla/skins/standard/global.css
+++ b/mozilla/webtools/bugzilla/skins/standard/global.css
@@ -171,5 +171,11 @@
 .bz_disabled { color: #a0a0a0 ; }
 
 .bz_comment { background-color: #e0e0e0; }
+.bz_comment_hilite pre
+{
+    background-color: lightgreen;
+    margin: 0;
+    padding: 1em 0;
+}
 
 table#flags th, table#flags td { vertical-align: baseline; text-align: left; }
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/comments.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/comments.html.tmpl
index a2ef46a8af3..2015d3abd4d 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/comments.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/comments.html.tmpl
@@ -43,7 +43,8 @@
 
 [% BLOCK a_comment %]
   [% IF NOT comment.isprivate || isinsider %]
-    <div [% "class=\"bz_private\"" IF comment.isprivate %]>
+    <div [% "class=\"bz_private\" " IF comment.isprivate %]
+         [% "class=\"bz_comment_hilite\" " IF marks.$count %]>
       [% IF count > 0 %]
         <br>
         <span class="bz_comment">