diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index af0c3dabe..9dee1005f 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -84,6 +84,7 @@ use File::Basename;
     LIST_OF_BUGS
 
     COMMENT_COLS
+    MAX_TABLE_COLS
     MAX_COMMENT_LENGTH
 
     CMT_NORMAL
@@ -273,6 +274,7 @@ use constant LIST_OF_BUGS => 1;
 
 # The column length for displayed (and wrapped) bug comments.
 use constant COMMENT_COLS => 80;
+use constant MAX_TABLE_COLS => 200;
 # Used in _check_comment(). Gives the max length allowed for a comment.
 use constant MAX_COMMENT_LENGTH => 65535;
 
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 377d16f8f..ec693729f 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -388,7 +388,7 @@ sub wrap_comment
             if ($line !~ /^>/so)
             {
                 my $n = scalar($line =~ s/(\t+)/$1/gso);
-                if ($n > 1 && length($line) < 200)
+                if ($n > 1 && length($line) < MAX_TABLE_COLS)
                 {
                     # Table
                     $table = Text::TabularDisplay::Utf8->new;