Improved search function

git-svn-id: https://svn.roundcube.net/trunk@175 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 1 insertions, 3 deletions

diff --git a/roundcubemail/program/include/rcube_imap.inc b/roundcubemail/program/include/rcube_imap.inc
index ebca1ddaa..f515b446d 100644
--- a/roundcubemail/program/include/rcube_imap.inc
+++ b/roundcubemail/program/include/rcube_imap.inc
@@ -629,8 +629,6 @@ class rcube_imap
 
     $max = count($msgs);
     $start_msg = ($this->list_page-1) * $this->page_size;
-    
-    list($begin, $end) = $this->_get_message_range($max, $page);
 
     // fetch reuested headers from server
     $a_msg_headers = array();
@@ -644,7 +642,7 @@ class rcube_imap
     $a_msg_headers = iil_SortHeaders($a_msg_headers, $this->sort_field, $this->sort_order);
 
 	// only return the requested part of the set
-	return array_slice(array_values($a_msg_headers), $begin, min($max, $this->page_size));
+	return array_slice(array_values($a_msg_headers), $start_msg, min($max-$start_msg, $this->page_size));
     }