diff --git a/js/bug.js b/js/bug.js
index 940107f1f..b71f83b94 100644
--- a/js/bug.js
+++ b/js/bug.js
@@ -187,6 +187,7 @@ function replyToComment(num, id)
         /* make sure we split on all newlines -- IE or Moz use \r and \n
          * respectively.
          */
+        text = text.replace(/^\s*\n/, '')
         text = text.replace(/\s*$/, '')
         text = text.replace(/(Created attachment.*?\[details\])\s*?\[Online-view\]/, '$1');
         text = text.split(/\r|\n/);
diff --git a/skins/standard/comments.css b/skins/standard/comments.css
index 3ccfa53cf..8e3bdd68f 100644
--- a/skins/standard/comments.css
+++ b/skins/standard/comments.css
@@ -5,7 +5,7 @@
 .bz_comment_user, .bz_comment_time,
 .bz_comment_number, .bz_private_checkbox,
 .bz_comment_actions { margin: 0 .5em; white-space: nowrap; }
-.bz_comment_avatar { display: block; float: right; margin: -8px 8px 0; }
+.bz_comment_avatar { display: block; float: right; margin: -8px 8px 0 0; }
 
 .bz_comment_user, .bz_comment_time, .bz_comment_user_images,
 .bz_comment_worktime, .bz_comment_unmark_wtonly { float: left; }
diff --git a/skins/standard/global.css b/skins/standard/global.css
index ae109de5f..e3faf9dae 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -296,7 +296,7 @@ div#docslinks {
 }
 
 .bz_comment_text, #comment_textarea {
-    width: 50em;
+    width: 60em;
 }
 
 .bz_comment_text {
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index b542284bb..828c49f35 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -55,7 +55,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
 [% ELSE %]
   <html>
   <head>
-  <link href="skins/standard/create_attachment.css" rel="stylesheet" type="text/css">
+  <link href="skins/standard/create_attachment.css" rel="stylesheet" type="text/css" />
   <script src="js/attachment.js" type="text/javascript"></script>
   </head>
   <body onload="[% onload FILTER html %]">
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 8d3fa686d..76a0e1ed2 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -175,18 +175,18 @@
 
     <div class="bz_comment_text[% " collapsed" IF wt_only %][% " bz_fullscreen_comment" IF user.settings.comment_width.value == 'on' %]" id="comment_text_[% comment.id %]">
       [%# FIXME: Mozilla skin is hardcoded :-( %]
-      [% IF show_avatars == 2 %]
-      <span class="bz_comment_avatar">
-        <a href="[% Param("user_mailto") %][% comment.author.email | html %]"
-          title="[% comment.author.identity | html %]">
-          <img src="[% comment.author.gravatar_url('s=80') | html %]"
-            onerror="this.style.display='none'" />
-        </a>
+      [%- IF show_avatars == 2 -%]
+      <span class="bz_comment_avatar">[%- -%]
+        <a href="[% Param("user_mailto") %][% comment.author.email | html %]"[%- -%]
+          title="[% comment.author.identity | html %]">[%- -%]
+          <img src="[% comment.author.gravatar_url('s=80') | html %]"[%- -%]
+            onerror="this.style.display='none'" />[%- -%]
+        </a>[%- -%]
       </span>
-      [% END %]
+      [%- END -%]
       [%- comment.body_full({ wrap => 1, wo_preview => (user.settings.preview_long_comments.value == 'off') }) -%]
     </div>
-    [% IF !wt_only && Param('gravatar_url') && user.settings.skin.value != 'Mozilla' %]
+    [% IF show_avatars == 2 %]
     <div style="clear: both"></div>
     [% END %]
   </div>
