diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 1ad5ebd01..ac64c1a59 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -379,7 +379,7 @@ sub wrap_comment
             }
             else
             {
-                $wrappedcomment .= $table->render . "\n";
+                $wrappedcomment .= "<nowrap>\n" . $table->render . "\n<nowrap>\n";
                 $table = undef;
                 $tablen = undef;
             }
@@ -414,7 +414,7 @@ sub wrap_comment
             $wrappedcomment .= "\n";
         }
     }
-    $wrappedcomment .= $table->render if $table;
+    $wrappedcomment .= "<nowrap>\n" . $table->render . "\n<nowrap>" if $table;
     chomp $wrappedcomment;
     return $wrappedcomment;
 }