- performance improvement: skip SEARCH command when mailbox is empty and SEARCH is called just after SELECT

1 files changed, 7 insertions, 0 deletions

diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 461beece6..ab37902ae 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1584,10 +1584,17 @@ class rcube_imap_generic
 
     function search($folder, $criteria, $return_uid=false)
     {
+        $old_sel = $this->selected;
+
 	    if (!$this->select($folder)) {
     		return false;
 	    }
 
+        // return empty result when folder is empty and we're just after SELECT
+        if ($old_sel != $folder && !$this->exists) {
+            return array();
+	    }
+
     	$data = '';
 	    $query = 'srch1 ' . ($return_uid ? 'UID ' : '') . 'SEARCH ' . chop($criteria);