Ticket #1483855: bincimap_search_fix.diff

program/include/rcube_imap.inc

@@ -859 +859 @@
   function search($mbox_name='', $criteria='ALL', $str=NULL)
     {
     $mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
-    if ($str && $criteria)
-      {
-      $criteria = 'CHARSET UTF-8 '.$criteria.' "'.UTF7EncodeString($str).'"';
-      return $this->_search_index($mailbox, $criteria);
-      }
-    else
-      return $this->_search_index($mailbox, $criteria);
-    }    
 
+    if ($str && $criteria) 
+    {
+      $searchstring  = 'CHARSET UTF-8 '.$criteria.' "'.UTF7EncodeString($str).'"';
+    }
+    
+    $messages = $this->_search_index($mailbox, $searchstring);
 
+    if ($messages == false) 
+    {
+      $searchstring = $criteria.' "'.$str.'"';
+      $messages = $this->_search_index($mailbox, $searchstring);
+    }
+
+    return $messages;
+
+    }
+
   /**
    * Private search method
    *