diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 2f2d1c7f9..3e1374bdd 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1053,17 +1053,16 @@ sub update
         # FIXME It'd be nice to track this in the bug activity.
     }
 
-    # Save edited comment
+    # Save changed comments
     foreach my $edited_comment (@{$self->{edited_comments} || []})
     {
         my $c_comment = Bugzilla::Comment->new($edited_comment->{comment_id});
-        if (!$c_comment->is_private || ($c_comment->is_private && $user->is_insider))
+        if (!$c_comment->is_private || $user->is_insider)
         {
             $dbh->do("UPDATE longdescs SET thetext = ? WHERE comment_id = ?",
                      undef, $edited_comment->{thetext}, $edited_comment->{comment_id});
             $edited_comment->{bug_id} = $self->bug_id;
             $edited_comment->{who} ||= $user->id;
-            $edited_comment->{bug_when} = $delta_ts if !$edited_comment->{bug_when} || $edited_comment->{bug_when} gt $delta_ts;
             my $columns = join(',', keys %$edited_comment);
             my @values  = values %$edited_comment;
             my $qmarks  = join(',', ('?') x @values);
diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl
index 417436999..ead5daa7b 100644
--- a/template/en/default/bug/activity/table.html.tmpl
+++ b/template/en/default/bug/activity/table.html.tmpl
@@ -80,7 +80,7 @@
                 Attachment #[% change.attachid %]</a>
               [% END %]
               [% IF change.fieldname == 'longdesc' %]
-              <a href="show_bug.cgi?id=[% bug.bug_id%]#[% change.comment_id FILTER html %]">
+              <a href="show_bug.cgi?id=[% bug.bug_id%]#ci[% change.comment_id FILTER html %]">
               [% END%]
               [%+ field_descs.${change.fieldname} || Bugzilla.get_field(change.fieldname).description FILTER html %]
               [% IF ${change.fieldname} == 'longdesc' %]
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 5f9cda01b..4fff9c1d2 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -117,10 +117,10 @@
         [% END %]
 
         <a name="[% comment.bug_when FILTER timestamp %]"></a>
+        <a name="ci[% comment.comment_id FILTER html %]"></a>
         [% IF NOT wt_only %]
         <span class="bz_comment_number">
           [% IF comment.author.id == user.id %]
-          <a name="[% comment.comment_id FILTER html %]"></a>
           [<a href="#" onclick="showEditComment([% comment.id %]); return false;">Edit Comment</a>]
           [% END %]
           <a name="c[% comment.count %]"
diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl
index 30c24b2d3..cba117fa0 100644
--- a/template/en/default/email/newchangedmail.txt.tmpl
+++ b/template/en/default/email/newchangedmail.txt.tmpl
@@ -218,7 +218,7 @@ body { font-family: Segoe UI, sans-serif; }
   [%# ------ What Removed Added ------ %]
   <tr class="n"><td>
   [% IF d.fieldname == 'longdesc' %]
-  <a href="[% urlbase %]show_bug.cgi?id=[% d.bug_id %]#[% d.comment_id %]">
+  <a href="[% urlbase %]show_bug.cgi?id=[% d.bug_id %]#ci[% d.comment_id %]">
   [% END %]
   [% d.fielddesc %]
   [% IF d.fieldname == 'longdesc' %]