Index: /branches/release-41/lib/MT/CMS/Comment.pm
===================================================================
--- /branches/release-41/lib/MT/CMS/Comment.pm (revision 2643)
+++ /branches/release-41/lib/MT/CMS/Comment.pm (revision 2692)
@@ -1290,15 +1290,10 @@
     $param->{'comment'} = $comment;
 
-    require MT::Serialize;
-    my $ser   = MT::Serialize->new( $cfg->Serializer );
-    my $state = $comment->column_values;
-    $state->{static} = $q->param('static');
-    $param->{'comment_state'} = unpack 'H*', $ser->serialize( \$state );
-    $param->{'comment_is_static'} = 1;
-    $param->{'entry'} = $entry;
-    $param->{'current_timestamp'} = $ts;
-    $param->{'commenter'} = $app->user;
-    $param->{'blog_id'} = $parent->blog_id;
-    $param->{'blog'} = $parent->blog;
+    my $tmpl = $app->load_tmpl('include/comment_detail.tmpl');
+    my $ctx  = $tmpl->context;
+    $ctx->stash( 'comment', $comment );
+    $ctx->stash( 'entry',   $entry );
+    $ctx->stash( 'blog',    $parent->blog );
+    $param->{'preview_html'} = $tmpl->output;
 
     return $app->build_page( 'dialog/comment_reply.tmpl',
@@ -1767,4 +1762,5 @@
     $comment->blog_id( $entry->blog_id );
     $comment->entry_id( $entry->id );
+    $comment->parent_id( $parent->id );
     $comment->author( remove_html($nick) );
     $comment->email( remove_html( $app->user->email ) );
Index: /branches/release-41/tmpl/cms/include/comment_detail.tmpl
===================================================================
--- /branches/release-41/tmpl/cms/include/comment_detail.tmpl (revision 2613)
+++ /branches/release-41/tmpl/cms/include/comment_detail.tmpl (revision 2692)
@@ -4,10 +4,14 @@
             <div class="asset-meta">
                <span class="byline">
-                   <__trans phrase="By [_1]" params='<span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span><MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty>'>
-                   <MTCommentParent>
-                   <__trans phrase="replied to [_1]" params='<a href="#comment-<$MTCommentID$>"><MTCommentAuthor></a>'>
-                   </MTCommentParent>
-                   <__trans phrase="on [_1]" params='<a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>'>
-                   <MTIfCommentsAccepted> | <$MTCommentReplyToLink$></MTIfCommentsAccepted>
+                            <$mt:CommentAuthorIdentity$>
+        <mt:IfCommentParent>
+                            <__trans phrase="[_1] replied to <a href="[_2]">comment from [_3]</a>" params="<span class="vcard author"><$mt:CommentAuthorLink$></span>%%<mt:CommentParent><$mt:CommentLink$></mt:CommentParent>%%<mt:CommentParent><$mt:CommentAuthor$></mt:CommentParent>">
+        <mt:Else>
+                            <span class="vcard author"><$mt:CommentAuthorLink$></span>
+        </mt:IfCommentParent>
+                            | <a href="<$mt:CommentLink$>"><abbr class="published" title="<$mt:CommentDate format_name="iso8601"$>"><$mt:CommentDate$></abbr></a>
+        <mt:IfCommentsAccepted>
+                            | <$mt:CommentReplyToLink$>
+        </mt:IfCommentsAccepted>
                </span>
             </div>
Index: /branches/release-41/tmpl/cms/dialog/comment_reply.tmpl
===================================================================
--- /branches/release-41/tmpl/cms/dialog/comment_reply.tmpl (revision 1710)
+++ /branches/release-41/tmpl/cms/dialog/comment_reply.tmpl (revision 2692)
@@ -31,5 +31,5 @@
         <div class="intro"><__trans phrase="Preview of your comment"></div>
         <div id="reply-body">
-<$mt:include name="include/comment_detail.tmpl"$>
+            <mt:var name="preview_html">
         </div>
     </div>