- Applied some fixes from trunk up to r5280

alecpl

2011-09-27 5f47eda94b64b21b48ce95e329993c3ed50ef6db

 program/include/rcube_imap.php

@@ -3806,7 +3806,7 @@
            // @TODO: Honor MAXSIZE and DEPTH options
            foreach ($queries as $attrib => $entry)
                if ($result = $this->conn->getAnnotation($mailbox, $entry, $attrib))
                    $res = array_merge($res, $result);
                    $res = array_merge_recursive($res, $result);

            return $res;
        }