6 files changed, 34 insertions, 7 deletions
diff --git a/skins/standard/IE-fixes.css b/skins/standard/IE-fixes.css
index b0f34141d..bfd525ba2 100755
--- a/skins/standard/IE-fixes.css
+++ b/skins/standard/IE-fixes.css
@@ -13,6 +13,11 @@
   * Contributor(s): Marc Schumann <wurblzap@gmail.com>
   */
 
+.bz_comment_text, .uneditable_textarea {
+     white-space: pre;
+     word-wrap: break-word;
+}
+
 #footer #useful-links li {
     padding-bottom: 0.8ex;
 }
diff --git a/skins/standard/global.css b/skins/standard/global.css
index edf542510..423e398b4 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -243,6 +243,22 @@ div#docslinks {
     margin-bottom: 2em;
 }
 
+/* The rules for these classes make international text wrap correctly,
+   even for languages like Japanese that have no spaces. */
+.bz_comment_text, .uneditable_textarea {
+     font-family: monospace;
+    /* Note that these must all be on separate lines or they stop
+       working in Konqueror. */
+     white-space: pre-wrap;      /* CSS 3 & 2.1 */
+     white-space: -moz-pre-wrap; /* Gecko */
+     white-space: -pre-wrap;     /* Opera 4-6 */
+     white-space: -o-pre-wrap;   /* Opera 7 */
+}
+
+.bz_comment_text {
+     width: 50em;
+}
+
 .bz_first_comment {
 }
 
@@ -257,6 +273,8 @@ div#docslinks {
 
 span.quote {
     color: #65379c;
+    /* Make quoted text not wrap. */
+    white-space: pre;
 }
 
 table#flags th,
@@ -318,8 +336,7 @@ dl dl > dt {
 
 /* For bug fields */
 .uneditable_textarea {
-    white-space: pre;
-    font-family: monospace;
+    width: 30em;
 }
 
 div.user_match {
diff --git a/template/en/default/attachment/midair.html.tmpl b/template/en/default/attachment/midair.html.tmpl
index 8cde9f2f5..f0883b55b 100644
--- a/template/en/default/attachment/midair.html.tmpl
+++ b/template/en/default/attachment/midair.html.tmpl
@@ -50,7 +50,9 @@
 [% IF cgi.param("comment") %]
 <p>
   Your comment was:<br>
-  <blockquote><pre>[% cgi.param("comment") FILTER wrap_comment FILTER html %]</pre></blockquote>
+  <blockquote><pre class="bz_comment_text">
+    [% cgi.param("comment") FILTER wrap_comment FILTER html %]
+  </pre></blockquote>
 </p>
 [% END %]
 
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 1fc5d46d3..da3fe3a9d 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -216,7 +216,8 @@
 [% ELSE %]
     [% wrapped_comment = comment.body FILTER wrap_comment %]
 [% END %]
-<pre[% ' id="comment_text_' _ count _ '"' IF mode == "edit" %]>
+<pre class="bz_comment_text" 
+     [% ' id="comment_text_' _ count _ '"' IF mode == "edit" %]>
   [%- wrapped_comment FILTER quoteUrls(bug.bug_id) -%]
 </pre>
     </div>
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index 31dbc7b3c..d7e980e8c 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -66,7 +66,9 @@
 [% IF cgi.param("comment") %]
 <p>
   Your comment was:<br>
-  <blockquote><pre>[% cgi.param("comment") FILTER wrap_comment FILTER html %]</pre></blockquote>
+  <blockquote><pre class="bz_comment_text">
+    [% cgi.param("comment") FILTER wrap_comment FILTER html %]
+  </pre></blockquote>
 </p>
 [% END %]
 
diff --git a/template/en/default/pages/linked.html.tmpl b/template/en/default/pages/linked.html.tmpl
index a5e40d122..52b1735f6 100644
--- a/template/en/default/pages/linked.html.tmpl
+++ b/template/en/default/pages/linked.html.tmpl
@@ -30,7 +30,7 @@
 <hr>
 
 <p>
-<pre>
+<pre class="bz_comment_text">
 [%- cgi.param("text") FILTER wrap_comment FILTER quoteUrls FILTER html -%]
 </pre>
 </p>
@@ -45,7 +45,7 @@
 <hr>
 
 <p>
-<pre>
+<pre class="bz_comment_text">
 [%- cgi.param("text") FILTER wrap_comment FILTER quoteUrls -%]
 </pre>
 </p>