Index: roundcubemail/program/steps/settings/manage_folders.inc
===================================================================
--- roundcubemail/program/steps/settings/manage_folders.inc	(revision 2308)
+++ roundcubemail/program/steps/settings/manage_folders.inc	(working copy)
@@ -239,7 +239,7 @@
     $table->add_row(array('id' => 'rcmrow'.$idx, 'class' => join(' ', $classes)));
     
     $table->add('name', Q($display_folder));
-    $table->add('msgcount', ($folder['virtual'] ? '' : $IMAP->messagecount($folder['id'])));
+    $table->add('msgcount', ($folder['virtual'] ? '' : $IMAP->messagecount($folder['id']))); // XXX: Use THREADS or ALL?
     $table->add('subscribed', ($protected || $folder['virtual']) ? ($subscribed ? ' •' : ' ') :
         $checkbox_subscribe->show(($subscribed ? $folder_utf8 : ''), array('value' => $folder_utf8)));
     
Index: roundcubemail/program/steps/mail/rss.inc
===================================================================
--- roundcubemail/program/steps/mail/rss.inc	(revision 2308)
+++ roundcubemail/program/steps/mail/rss.inc	(working copy)
@@ -42,7 +42,7 @@
 $webmail_url .= '?_task=mail';
 
 $messagecount_unread = $IMAP->messagecount('INBOX', 'UNSEEN', TRUE);
-$messagecount = $IMAP->messagecount();
+$messagecount = $IMAP->messagecount(NULL, rcmail::get_instance()->config->get('message_threading',false)?'THREADS':'ALL');
 
 $sort_col = 'date';
 $sort_order = 'DESC';
Index: roundcubemail/program/steps/mail/list.inc
===================================================================
--- roundcubemail/program/steps/mail/list.inc	(revision 2308)
+++ roundcubemail/program/steps/mail/list.inc	(working copy)
@@ -52,11 +52,12 @@
 }
 			      
 
+$message_threading = rcmail::get_instance()->config->get('message_threading',false);
 // fetch message headers
-if ($IMAP->messagecount($mbox_name, 'ALL', !empty($_REQUEST['_refresh'])))
+if ($IMAP->messagecount($mbox_name, $message_threading?'THREADS':'ALL', !empty($_REQUEST['_refresh'])))
   $a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order);
 
-$count = $IMAP->messagecount($mbox_name);
+$count = $IMAP->messagecount($mbox_name, $message_threading?'THREADS':'ALL');
 $unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', !empty($_REQUEST['_refresh']));
 
 // update message count display
Index: roundcubemail/program/steps/mail/move_del.inc
===================================================================
--- roundcubemail/program/steps/mail/move_del.inc	(revision 2308)
+++ roundcubemail/program/steps/mail/move_del.inc	(working copy)
@@ -19,8 +19,9 @@
 
 */
 
+$message_threading = rcmail::get_instance()->config->get('message_threading',false);
 // count messages before changing anything
-$old_count = $IMAP->messagecount();
+$old_count = $IMAP->messagecount(NULL, $message_threading?'THREADS':'ALL');
 $old_pages = ceil($old_count / $IMAP->page_size);
 
 // move messages
@@ -71,7 +72,7 @@
     $_SESSION['search'][$search_request] = $IMAP->refresh_search();
 }
 
-$msg_count      = $IMAP->messagecount();
+$msg_count      = $IMAP->messagecount(NULL, $message_threading?'THREADS':'ALL');
 $pages          = ceil($msg_count / $IMAP->page_size);
 $nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page;
 $remaining      = $msg_count - $IMAP->page_size * ($IMAP->list_page - 1);
Index: roundcubemail/program/steps/mail/search.inc
===================================================================
--- roundcubemail/program/steps/mail/search.inc	(revision 2308)
+++ roundcubemail/program/steps/mail/search.inc	(working copy)
@@ -90,7 +90,7 @@
 
 // Get the headers
 $result_h = $IMAP->list_headers($mbox, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
-$count = $IMAP->messagecount();
+$count = $IMAP->messagecount(NULL, rcmail::get_instance()->config->get('message_threading',false)?'THREADS':'ALL');
 
 // save search results in session
 if (!is_array($_SESSION['search']))