diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 7cd803fe6..97e239d3c 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -518,7 +518,7 @@ TUI_hide_default('expert_fields');
         function showcommentpreview() {
             document.getElementById('wrapcommentpreview').style.width=(document.Create.comment.offsetWidth-10)+'px';
             document.getElementById('wrapcommentpreview').style.display='table-cell';
-            window.frames['commentpreview'].location.replace('page.cgi?id=previewcomment.html&comment='+encodeURI(document.Create.comment.value));
+            window.frames['commentpreview'].location.replace('page.cgi?id=previewcomment.html&comment='+encodeURI(document.Create.comment.value).replace('#','%23'));
             document.getElementById('showpreviewbtn').style.display='none';
         }
         //-->
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index f4f86e349..f26b9db8e 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -1208,7 +1208,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='table-cell';window.frames['commentpreview'].location.replace('page.cgi?id=previewcomment.html&comment='+encodeURI(document.changeform.comment.value));scrTo('commentpreview')">
+      <input type="button" value="Preview" onclick="document.getElementById('wrapcommentpreview').style.display='table-cell';window.frames['commentpreview'].location.replace('page.cgi?id=previewcomment.html&comment='+encodeURI(document.changeform.comment.value).replace('#','%23'));scrTo('commentpreview')">
       <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 85fcb33b5..0cd3dbeb8 100644
--- a/template/en/default/email/newchangedmail.txt.tmpl
+++ b/template/en/default/email/newchangedmail.txt.tmpl
@@ -100,7 +100,8 @@ Content-Transfer-Encoding: quoted-printable
 [% FILTER quoted_printable %]
 <style>
 <!--
-.difft { border-width: 0 0 1px 0; border-style: solid; border-color: #808080 }
+body { font-size: 10pt; }
+.difft { font-size: 10pt; border-width: 0 0 1px 0; border-style: solid; border-color: #808080 }
 .difft td { border-width: 0 0 1px 0; border-style: solid; border-color: #808080 }
 .difft tr.n td { border-width: 0; }
 /*-->*/