- Applied fixes from trunk up to r6118

1 files changed, 2 insertions, 0 deletions

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 5e36f16c5..4e1d57155 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -1213,7 +1213,9 @@ class rcube_imap extends rcube_storage
         }
         // use message index sort as default sorting
         else if (!$sort_field) {
+            // use search result from count() if possible
             if ($this->options['skip_deleted'] && !empty($this->icache['undeleted_idx'])
+                && $this->icache['undeleted_idx']->get_parameters('ALL') !== null
                 && $this->icache['undeleted_idx']->get_parameters('MAILBOX') == $folder
             ) {
                 $index = $this->icache['undeleted_idx'];