diff --git a/plone/app/discussion/browser/javascripts/moderation.js b/plone/app/discussion/browser/javascripts/moderation.js
new file mode 100644
index 0000000..817ac71
--- /dev/null
+++ b/plone/app/discussion/browser/javascripts/moderation.js
@@ -0,0 +1,21 @@
+jq(document).ready(function() {
+
+    /*****************************************************************
+     * Check all checkboxes.
+     *****************************************************************/
+	jq("input[name='check_all']").click(function(){
+	      if(jq(this).val()==0){
+	        jq(this).parents("table")
+	               .find("input:checkbox")
+	               .attr("checked","checked")
+	               .val("1");
+	      }
+	      else{
+	        jq(this).parents("table")
+	               .find("input:checkbox")
+	               .attr("checked","")
+	               .val("0");
+	      }
+    });
+
+ });
\ No newline at end of file
diff --git a/plone/app/discussion/browser/moderation.pt b/plone/app/discussion/browser/moderation.pt
index 3d5ee72..9fda7ce 100644
--- a/plone/app/discussion/browser/moderation.pt
+++ b/plone/app/discussion/browser/moderation.pt
@@ -19,15 +19,8 @@
         $.post(target, params, function(data) {
             $(row).fadeOut("normal", function() {
                 $(this).remove();
-                if($('#review-comments tbody tr').length == 0) {
-                    $('#comments-help').fadeOut();
-                    $('#review-comments').fadeOut("normal", function() {
-                        $('#no-comments-message').fadeIn();
-                    });
-                }
             });
         });
-
     });
 });})(jQuery);
 </script>
@@ -92,19 +85,7 @@
         <table id="review-comments" class="listing" style="width: 100%" tal:condition="items">
             <thead>
                 <tr>
-                  <th colspan="7" class="nosort"
-                      i18n:translate="label_select_all">
-                    Select:
-                    <a tal:attributes="href string:#"
-                       id="foldercontents-selectall"
-                       i18n:name="label_link_all"
-                       i18n:translate="label_all">
-                      All
-                    </a>
-                  </th>
-                </tr>
-                <tr>
-                    <th class="nosort"> </th>
+                    <th class="nosort"><input name="check_all" type="checkbox" value="0" /></th>
                     <th i18n:translate="heading_author">Commenter</th>
                     <th i18n:translate="heading_date">Date</th>
                     <th i18n:translate="heading_context">In Response To</th>
@@ -143,7 +124,7 @@
                         </td>
 
                         <td tal:content="structure python:view.cook(item.Description)" />
-                        <td style="width: 11em">
+                        <td style="width: 11em;">
                             <form action=""
                                   class="background-form"
                                   method="post"
diff --git a/plone/app/discussion/profiles/default/jsregistry.xml b/plone/app/discussion/profiles/default/jsregistry.xml
index b77f5dc..8082ab0 100644
--- a/plone/app/discussion/profiles/default/jsregistry.xml
+++ b/plone/app/discussion/profiles/default/jsregistry.xml
@@ -3,6 +3,11 @@
  <javascript
      id="++resource++plone.app.discussion.javascripts/reply_to_comment_form.js"
      cacheable="False" compression="safe" cookable="False"
-     enabled="True" expression=""  inline="False"
+     enabled="True" expression="" inline="False"
 	 />
+ <javascript
+     id="++resource++plone.app.discussion.javascripts/moderation.js"
+     cacheable="False" compression="safe" cookable="False"
+     enabled="True" expression="" inline="False"
+     />
 </object>