Index: /branches/release-29/lib/MT/App/CMS.pm
===================================================================
--- /branches/release-29/lib/MT/App/CMS.pm (revision 1334)
+++ /branches/release-29/lib/MT/App/CMS.pm (revision 1339)
@@ -11191,4 +11191,23 @@
     };
 
+    my %terms;
+    my $filter_col = $app->param('filter');
+    if ( $filter_col && ( my $val = $app->param('filter_val') ) ) {
+        if ( $filter_col eq 'status' ) {
+            if ( $val eq 'approved' ) {
+                $terms{junk_status} = 1;
+            }
+            elsif ( $val eq 'pending' ) {
+                $terms{junk_status} = 0;
+            }
+            elsif ( $val eq 'junk' ) {
+                $terms{junk_status} = -1;
+            }
+            else {
+                $terms{junk_status} = [ 0, 1 ];
+            }
+        }
+    }
+
     my %param;
     my $blog_id = $app->param('blog_id');
@@ -11212,4 +11231,5 @@
             args   => { sort => 'created_on', direction => 'descend' },
             params => \%param,
+            terms    => \%terms,
         }
     );
Index: /branches/release-29/tmpl/cms/list_comment.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/list_comment.tmpl (revision 1309)
+++ /branches/release-29/tmpl/cms/list_comment.tmpl (revision 1339)
@@ -113,12 +113,6 @@
     var fld = getByID('filter-col');
     if (fld) {
-        if (choice == 'newentry')
+        if (choice == 'status')
             fld.selectedIndex = 0;
-        else if (choice == 'oldentry')
-            fld.selectedIndex = 1;
-        else if (choice == 'status')
-            fld.selectedIndex = 2;
-        else if (choice == 'commenter')
-            fld.selectedIndex = 3;
         col_span = getByID("filter-text-col");
         if (fld.selectedIndex > -1 && col_span)
@@ -179,5 +173,5 @@
                         <__trans phrase="[_1] on entries created more than [_2] days ago" params="<$mt:var name="object_label_plural"$>%%<mt:var name="filter_val">">
                         <mt:else>
-                        <__trans phrase="[_1] where [_2] [_3]" params='<$mt:var name="object_label_plural"$>%%<span id="filter-text-col">&nbsp;</span>%%<span id="filter-text-val"></span>'>
+                        <__trans phrase="[_1] where [_2] is [_3]" params='<$mt:var name="object_label_plural"$>%%<span id="filter-text-col">&nbsp;</span>%%<span id="filter-text-val"></span>'>
                         </mt:if>
                     </mt:if>
@@ -185,4 +179,18 @@
                 <a href="<mt:var name="script_url">?__mode=<mt:var name="mode"><mt:if name="blog_id">&amp;blog_id=<mt:var name="blog_id"></mt:if><mt:if name="is_power_edit">&amp;is_power_edit=1</mt:if>">[ <__trans phrase="Remove filter"> ]</a>
                 </mt:if>
+        <div id="filter-select" class="page-title" style="display: none">
+            <!-- start filter form -->
+                <select id="filter-col" name="filter" onchange="setFilterCol(this.options[this.selectedIndex].value);enableFilterButton(this)">
+                    <option value="status"><__trans phrase="status"></option>
+                </select>
+                <__trans phrase="is">
+                <span id="filter-status" style="display: none">
+                    <select id="status-val" name="filter_val" onchange="enableFilterButton()">
+                        <option value="approved"><__trans phrase="approved"></option>
+                        <option value="pending"><__trans phrase="pending"></option>
+                        <option value="junk"><__trans phrase="spam"></option>
+                    </select>
+                </span>
+        </div>
             </mt:unless>
                 </div>
Index: /branches/release-29/tmpl/cms/edit_comment.tmpl
===================================================================
--- /branches/release-29/tmpl/cms/edit_comment.tmpl (revision 1212)
+++ /branches/release-29/tmpl/cms/edit_comment.tmpl (revision 1339)
@@ -109,5 +109,5 @@
         </mt:if>
         </mt:if>
-        <a title="<__trans phrase="View all comments with this status">" href="<mt:var name="script_url">?__mode=list_comments&amp;blog_id=<mt:var name="blog_id">&amp;<mt:if name="is_junk">tab=junk<mt:else>filter=status&amp;filter_val=<mt:if name="comment_approved">approved</mt:if><mt:if name="comment_pending">pending</mt:if></mt:if>"><img alt="" src="<mt:var name="static_uri">images/filter.gif" width="8" height="8" border="0" /></a>
+        <a title="<__trans phrase="View all comments with this status">" href="<mt:var name="script_url">?__mode=list_comments&amp;blog_id=<mt:var name="blog_id">&amp;filter=status&amp;filter_val=<mt:if name="comment_approved">approved</mt:if><mt:if name="comment_pending">pending</mt:if><mt:if name="is_junk">junk</mt:if>"><img alt="" src="<mt:var name="static_uri">images/filter.gif" width="8" height="8" border="0" /></a>
 
         <mt:if name="junk_log_loop">