diff --git a/js/bug.js b/js/bug.js
index df7520fc8..491d872ae 100644
--- a/js/bug.js
+++ b/js/bug.js
@@ -28,7 +28,7 @@ function toggle_comment_display(comment_id)
 function toggle_all_comments(action, num_comments)
 {
     var parent = document.getElementById('comments');
-    var pre = parent.getElementsByTagName('pre');
+    var pre = parent.getElementsByTagName('div');
     for (var i = 0; i < pre.length; i++)
         if (pre[i].id.substr(0, 13) == 'comment_text_')
             showhide_comment(pre[i].id.substr(13), action != 'collapse');
diff --git a/skins/standard/comments.css b/skins/standard/comments.css
index 93543c7f1..6ffc61a2d 100644
--- a/skins/standard/comments.css
+++ b/skins/standard/comments.css
@@ -21,4 +21,6 @@
 
 .bz_comment .attachment_image { max-width: 50em; margin: 10px 0px 0px 0px; }
 
-.bz_comment_text.bz_fullscreen_comment { min-width: 50em; width: 100%; word-break: break-all; }
+.bz_comment_text.bz_fullscreen_comment { min-width: 50em; width: 100%; word-wrap: break-word; }
+
+#comments > table, .bz_section_additional_comments > table { table-layout: fixed; }
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 451707441..5e5ac91f3 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -43,7 +43,7 @@
 [% Hook.process("aftercomments") %]
 
 </td>
-<td>
+<td width="200">
   [% IF mode == "edit" %]
     <script type="text/javascript">
       addActionLinks([% json(comment_indexes(comments)) %]);
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 580d3350e..f0d7a7580 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -989,13 +989,14 @@ document.changeform = document.[% cfname %];
         <label for="cmt_worktime">Worktime only</label>
 
       <!-- This table keeps the submit button aligned with the box. -->
-      <table><tr><td>
+      <table[% ' width="100%"' IF user.settings.comment_width.value == 'on' %]><tr><td>
         [% INCLUDE global/textarea.html.tmpl
                    name      = 'comment'
                    id        = 'comment_textarea'
                    minrows   = 10
                    maxrows   = 25
                    cols      = constants.COMMENT_COLS
+                   style     = (user.settings.comment_width.value == 'on' ? 'width: 100%' : '')
         %]
         [% Hook.process("after_comment_textarea", 'bug/edit.html.tmpl') %]
         <br />
@@ -1012,7 +1013,7 @@ document.changeform = document.[% cfname %];
             </td>
           </tr>
         </table>
-      </td></tr></table>
+      </td>[% '<td width="200"></td>' IF user.settings.comment_width.value == 'on' %]</tr></table>
 
     [%# For logged-out users %]
     [% ELSE %]