Index: /branches/release-33/lib/MT/CMS/Comment.pm
===================================================================
--- /branches/release-33/lib/MT/CMS/Comment.pm (revision 1642)
+++ /branches/release-33/lib/MT/CMS/Comment.pm (revision 1710)
@@ -1261,13 +1261,4 @@
       unless $comment;
 
-    my $cmt_tmpl =
-      $app->model('template')->load( { identifier => 'comment_detail' } );
-    my $tmpl_name = $cmt_tmpl->name;
-    require MT::Template;
-    my $tmpl = MT::Template->new(
-        type   => 'scalarref',
-        source => \"<\$MTInclude module=\"$tmpl_name\"\$>",
-    );
-    my $ctx = $tmpl->context;
     ## Set timestamp as we would usually do in ObjectDriver.
     my @ts = MT::Util::offset_time_list( time, $entry->blog_id );
@@ -1276,5 +1267,5 @@
     $comment->created_on($ts);
     $comment->commenter_id( $app->user->id );
-    $ctx->stash( 'comment', $comment );
+    $param->{'comment'} = $comment;
 
     require MT::Serialize;
@@ -1282,19 +1273,14 @@
     my $state = $comment->column_values;
     $state->{static} = $q->param('static');
-    $ctx->stash( 'comment_state', unpack 'H*', $ser->serialize( \$state ) );
-    $ctx->stash( 'comment_is_static', 1 );
-    $ctx->stash( 'entry',             $entry );
-    $ctx->{current_timestamp} = $ts;
-    $ctx->stash( 'commenter', $app->user );
-    $ctx->stash( 'blog_id',   $parent->blog_id );
-    $ctx->stash( 'blog',      $parent->blog );
-    my %cond;
-    my $html = $tmpl->build( $ctx, \%cond );
+    $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;
+
     return $app->build_page( 'dialog/comment_reply.tmpl',
-        { %$param, error => $tmpl->errstr } )
-      unless defined $html;
-
-    return $app->build_page( 'dialog/comment_reply.tmpl',
-        { %$param, text => $q->param('text'), preview_html => $html } );
+        { %$param, text => $q->param('text') } );
 }
 
Index: /branches/release-33/tmpl/cms/include/comment_detail.tmpl
===================================================================
--- /branches/release-33/tmpl/cms/include/comment_detail.tmpl (revision 1710)
+++ /branches/release-33/tmpl/cms/include/comment_detail.tmpl (revision 1710)
@@ -0,0 +1,19 @@
+<div class="comment" id="comment-<$MTCommentID$>">
+    <div class="inner">
+        <div class="comment-header">
+            <div class="asset-meta">
+               <span class="byline">
+                   <__trans phrase="By"> <span class="vcard author"><$MTCommentAuthorLink default_name="Anonymous" show_email="0"$></span><MTIfNonEmpty tag="CommentAuthorIdentity"><$MTCommentAuthorIdentity$></MTIfNonEmpty>
+                   <MTCommentParent>
+                   <__trans phrase="replied to"> <a href="#comment-<$MTCommentID$>"><MTCommentAuthor></a>
+                   </MTCommentParent>
+                   <__trans phrase="on"> <a href="#comment-<$MTCommentID$>"><abbr class="published" title="<$MTCommentDate format_name="iso8601"$>"><$MTCommentDate$></abbr></a>
+                   <MTIfCommentsAccepted> | <$MTCommentReplyLink$></MTIfCommentsAccepted>
+               </span>
+            </div>
+        </div>
+        <div class="comment-content">
+            <$MTCommentBody$>
+        </div>
+    </div>
+</div>
Index: /branches/release-33/tmpl/cms/dialog/comment_reply.tmpl
===================================================================
--- /branches/release-33/tmpl/cms/dialog/comment_reply.tmpl (revision 1309)
+++ /branches/release-33/tmpl/cms/dialog/comment_reply.tmpl (revision 1710)
@@ -31,5 +31,5 @@
         <div class="intro"><__trans phrase="Preview of your comment"></div>
         <div id="reply-body">
-            <$mt:var name="preview_html"$>
+<$mt:include name="include/comment_detail.tmpl"$>
         </div>
     </div>