diff --git a/template/en/custom/pages/previewcomment.html.tmpl b/template/en/custom/pages/previewcomment.html.tmpl
index d074df09d..4bbf47599 100644
--- a/template/en/custom/pages/previewcomment.html.tmpl
+++ b/template/en/custom/pages/previewcomment.html.tmpl
@@ -1,12 +1,14 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
-<html id="cmt">
+<html id="cmt" style="overflow: hidden">
 <script type="text/javascript">
-function resizeIframe() {
+function resizeIframe()
+{
     parent.document.getElementById('commentpreview').style.height = document.getElementById('cmt').scrollHeight + "px";
+    parent.document.getElementById('commentpreview').style.width = document.getElementById('cmt').scrollWidth + "px";
 }
 </script>
-<body onLoad="resizeIframe()" onResize="resizeIframe()" style="margin: 0; padding: 0">
+<body onLoad="resizeIframe()" onResize="resizeIframe()" style="margin: 0; padding: 0; overflow: hidden">
 <div class="bz_comment" style="border-style: dotted; border-width: 2px; border-color: #969696; background-color: #e8e8e8; padding: 5px">
 <p><pre>[%- cgi.param("comment") FILTER wrap_comment FILTER quoteUrls FILTER links_targetblank -%]</pre></p>
 </div>
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 53e1d9acd..8287cd8b4 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -197,6 +197,10 @@ TUI_hide_default('expert_fields');
   [% select_fields.${field.name} = field %]
 [% END %]
 
+<form name="commentpreviewform" style="display:none" target="commentpreview" method="POST" action="page.cgi?id=previewcomment.html">
+<input id="previewcommentvalue" type="hidden" name="comment" value="" />
+</form>
+
 <form name="Create" id="Create" method="post" action="post_bug.cgi"
       enctype="multipart/form-data" onsubmit="return Create_onsubmit()">
 <input type="hidden" name="product" value="[% product.name FILTER html %]">
@@ -527,24 +531,28 @@ TUI_hide_default('expert_fields');
         <br>
         <p style="text-align: left; margin-bottom: 0" id="showpreviewbtn"><a href="javascript:void showcommentpreview()">Preview</a></p>
         <div id="wrapcommentpreview" style="display: none">
-        <iframe name="commentpreview" id="commentpreview" style="height: auto; border-width: 0; width: 100%">
+        <iframe name="commentpreview" id="commentpreview" style="height: auto; border-width: 0; width: 100%; overflow: hidden">
         </iframe>
         <script>
         /*<!--*/
-        function hidepreview() {
-            document.getElementById('wrapcommentpreview').style.display='none';
-            document.getElementById('showpreviewbtn').style.display='';
-        }
-        function isIE()
+        function isIE() { return /msie/i.test(navigator.userAgent) && !/opera/i.test(navigator.userAgent); }
+        function findPos(obj) { var curtop = 0; if (obj.offsetParent) { do { curtop += obj.offsetTop; } while (obj = obj.offsetParent); return [curtop]; } }
+        function scrollDocTo(obj) { window.scroll(0,findPos(obj)); }
+        function scrTo(id) { scrollDocTo(document.getElementById(id)); }
+        function showcommentpreview()
         {
-            return /msie/i.test(navigator.userAgent) && !/opera/i.test(navigator.userAgent);
-        }
-        function showcommentpreview() {
             document.getElementById('wrapcommentpreview').style.width=(document.Create.comment.offsetWidth-10)+'px';
             document.getElementById('wrapcommentpreview').style.display=(isIE()?'inline-block':'table-cell');
-            window.frames['commentpreview'].location.replace('page.cgi?id=previewcomment.html&comment='+encodeURI(document.Create.comment.value).replace('#','%23'));
+            document.commentpreviewform.comment.value = document.Create.comment.value;
+            document.commentpreviewform.submit();
+            scrTo('commentpreview');
             document.getElementById('showpreviewbtn').style.display='none';
         }
+        function hidepreview()
+        {
+            document.getElementById('wrapcommentpreview').style.display='none';
+            document.getElementById('showpreviewbtn').style.display='';
+        }
         //-->
         </script>
         <p style="text-align: right; margin-bottom: 0"><a href="javascript:void showcommentpreview()">Update preview</a> &nbsp; <a href="javascript:void hidepreview()">Hide preview</a></p>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 2512796c4..0a79ca85c 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -40,10 +40,6 @@
 
   <script type="text/javascript">
   <!--
-  function isIE()
-  {
-      return /msie/i.test(navigator.userAgent) && !/opera/i.test(navigator.userAgent);
-  }
 
   /* Outputs a link to call replyToComment(); used to reduce HTML output */
   function addReplyLink(id, real_id) {
@@ -165,6 +161,10 @@
   //-->
   </script>
 
+<form name="commentpreviewform" style="display:none" target="commentpreview" method="POST" action="page.cgi?id=previewcomment.html">
+<input id="previewcommentvalue" type="hidden" name="comment" value="" />
+</form>
+
 <form name="changeform" method="post" action="process_bug.cgi" onsubmit="return changeform_onsubmit()">
 
   <input type="hidden" name="delta_ts" value="[% bug.delta_ts %]">
@@ -299,14 +299,22 @@
           </table>
         </td></tr>
         <tr><td id="wrapcommentpreview" style="display: none">
-        <iframe name="commentpreview" id="commentpreview" style="height: auto; border-width: 0; width: 100%">
+        <iframe name="commentpreview" id="commentpreview" style="height: auto; border-width: 0; width: 100%; overflow: hidden">
         </iframe>
         <script>
         /*<!--*/
-        function hidepreview() { document.getElementById('wrapcommentpreview').style.display='none' }
+        function isIE() { return /msie/i.test(navigator.userAgent) && !/opera/i.test(navigator.userAgent); }
         function findPos(obj) { var curtop = 0; if (obj.offsetParent) { do { curtop += obj.offsetTop; } while (obj = obj.offsetParent); return [curtop]; } }
         function scrollDocTo(obj) { window.scroll(0,findPos(obj)); }
         function scrTo(id) { scrollDocTo(document.getElementById(id)); }
+        function hidepreview() { document.getElementById('wrapcommentpreview').style.display='none'; }
+        function showcommentpreview()
+        {
+            document.getElementById('wrapcommentpreview').style.display=(isIE()?'inline-block':'table-cell');
+            document.commentpreviewform.comment.value = document.changeform.comment.value;
+            document.commentpreviewform.submit();
+            scrTo('commentpreview');
+        }
         //-->
         </script>
         <p style="text-align: right"><a href="javascript:void hidepreview()">Hide preview</a></p>
@@ -1212,7 +1220,7 @@
   [% IF user.id %]
     [% IF NOT nobr %]
     <div class="knob-buttons" style="text-align:right">
-      <input type="button" value="Preview" onclick="document.getElementById('wrapcommentpreview').style.display=(isIE()?'inline-block':'table-cell');window.frames['commentpreview'].location.replace('page.cgi?id=previewcomment.html&comment='+encodeURI(document.changeform.comment.value).replace('#','%23'));scrTo('commentpreview')">
+      <input type="button" value="Preview" onclick="showcommentpreview()">
       <input type="submit" value="Commit" id="commit[% id FILTER css_class_quote %]">
       [% IF bug.user.canmove %]
         <input type="submit" name="action" id="action[% id FILTER css_class_quote %]" value="[% Param("move-button-text") %]">
diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl
index 778d5d3e6..3684e14b9 100644
--- a/template/en/default/email/newchangedmail.txt.tmpl
+++ b/template/en/default/email/newchangedmail.txt.tmpl
@@ -152,7 +152,7 @@ body { font-size: 10pt; }
   [% ELSE %]
     [% wrapped_comment = comment.body FILTER wrap_comment %]
   [% END %]
-  <pre class="bz_comment_text" style="border-width: 0 0 1px 0; border-style: solid; border-color: #808080">
+  <pre style="border-width: 0 0 1px 0; border-style: solid; border-color: #808080; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap;">
 [%- wrapped_comment FILTER quoteUrls(bugid) FILTER absolute_uris -%]
   </pre>
   [% END %]
