Index: /branches/release-30/lib/MT/App/Comments.pm
===================================================================
--- /branches/release-30/lib/MT/App/Comments.pm (revision 1186)
+++ /branches/release-30/lib/MT/App/Comments.pm (revision 1394)
@@ -994,5 +994,5 @@
         my $ctx = $tmpl->context;
         $tmpl->param(
-            { 'body_class' => 'mt-comment-confirmation', 'comment_link' => $comment_link } );
+            { 'body_class' => 'mt-comment-confirmation', 'comment_link' => $comment_link, 'comment_response_template' => 1, 'system_template' => 1 } );
         $ctx->stash('entry', $entry);
         $ctx->stash('comment', $comment);
@@ -1587,10 +1587,12 @@
         if ( $err eq 'pending' ) {
             $tmpl->context($ctx);
-            $tmpl->param('body_class', 'mt-comment-pending');
+            $tmpl->param(
+                { 'body_class' => 'mt-comment-pending', 'comment_response_template' => 1, 'system_template' => 1 } );
         }
         else {
             $ctx->stash( 'error_message', $err );
             $tmpl->context($ctx);
-            $tmpl->param('body_class', 'mt-comment-error');
+            $tmpl->param(
+                { 'body_class' => 'mt-comment-error', 'comment_response_template' => 1, 'system_template' => 1 } );
         }
     }
@@ -1608,5 +1610,6 @@
         }
         $tmpl->context($ctx);
-        $tmpl->param('body_class', 'mt-comment-preview');
+        $tmpl->param(
+            { 'body_class' => 'mt-comment-preview', 'comment_preview_template' => 1, 'system_template' => 1 } );
     }
     my %cond;
Index: /branches/release-30/lib/MT/WeblogPublisher.pm
===================================================================
--- /branches/release-30/lib/MT/WeblogPublisher.pm (revision 1379)
+++ /branches/release-30/lib/MT/WeblogPublisher.pm (revision 1394)
@@ -234,4 +234,5 @@
             entry_based     => 1,
             template_params => {
+                entry_archive     => 1,
                 main_template     => 1,
                 archive_template  => 1,