Get correct unread count in VINBOX in MIMP

diff --git a/imp/lib/Mailbox.php b/imp/lib/Mailbox.php
index 48ed337..02c922c 100644 (file)
--- a/imp/lib/Mailbox.php
+++ b/imp/lib/Mailbox.php
@@ -374,9 +374,16 @@ class IMP_Mailbox
      */
     protected function _msgFlagSearch($type, $results, $uid)
     {
-        $count = $results == Horde_Imap_Client::SORT_RESULTS_COUNT;
+        $count = ($results == Horde_Imap_Client::SORT_RESULTS_COUNT);
 
         if ($this->_searchmbox || empty($this->_sorted)) {
+            if ($count &&
+                $this->_searchmbox &&
+                ($type == 'unseen') &&
+                $GLOBALS['injector']->getInstance('IMP_Search')->isVINBOXFolder($this->_mailbox)) {
+                return $this->getMessageCount();
+            }
+
             return $count ? 0 : array();
         }
 

diff --git a/imp/mailbox.php b/imp/mailbox.php
index 42dd0cc..3a03095 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -303,17 +303,10 @@ if ($preview_tooltip) {
     $strip_preview = $prefs->getValue('preview_strip_nl');
 }
 
-$vtrash = null;
-if ($search_mbox) {
-    $unread = 0;
-    if ($imp_search->isVINBOXFolder()) {
-        $unread = $imp_mailbox->getMessageCount();
-    } elseif ($imp_search->isVTrashFolder()) {
-        $vtrash = $imp_search->createSearchID($search_mbox);
-    }
-} else {
-    $unread = $imp_mailbox->unseenMessages(Horde_Imap_Client::SORT_RESULTS_COUNT);
-}
+$unread = $imp_mailbox->unseenMessages(Horde_Imap_Client::SORT_RESULTS_COUNT);
+$vtrash = $imp_search->isVTrashFolder()
+    ? $imp_search->createSearchID($search_mbox)
+    : null;
 
 horde::addInlineScript(array(
     'ImpMailbox.unread = ' . intval($unread)