diff --git a/mozilla/webtools/bugzilla/Bugzilla/Util.pm b/mozilla/webtools/bugzilla/Bugzilla/Util.pm
index d1a52a5fc35..b5e99bf691d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Util.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Util.pm
@@ -214,7 +214,7 @@ sub url_quote {
 
 sub css_class_quote {
     my ($toencode) = (@_);
-    $toencode =~ s/ /_/g;
+    $toencode =~ s#[ /]#_#g;
     $toencode =~ s/([^a-zA-Z0-9_\-.])/uc sprintf("&#x%x;",ord($1))/eg;
     return $toencode;
 }
@@ -733,7 +733,7 @@ Quotes characters so that they may be included as part of a url.
 =item C<css_class_quote($val)>
 
 Quotes characters so that they may be used as CSS class names. Spaces
-are replaced by underscores.
+and forward slashes are replaced by underscores.
 
 =item C<xml_quote($val)>
 
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/list.html.tmpl
index bd597e48b58..6453b4e685a 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/list.html.tmpl
@@ -65,7 +65,11 @@ function toggle_display(link) {
       [% IF attachment.isobsolete %]
         [% obsolete_attachments = obsolete_attachments + 1 %]
       [% END %]
-      <tr class="[% "bz_private" IF attachment.isprivate %]
+      <tr class="[% "bz_contenttype_" _ attachment.contenttype
+                     FILTER css_class_quote UNLESS attachment.isurl %]
+                 [% " bz_patch" IF attachment.ispatch %]
+                 [% " bz_url" IF attachment.isurl %]
+                 [% " bz_private" IF attachment.isprivate %]
                  [% " bz_tr_obsolete bz_default_hidden" 
                      IF attachment.isobsolete %]">
         <td valign="top">