Backported r5820 and r5842

thomascube

2012-01-29 ee9ee7f66fae218afe24942166ba833eb490ada3

 program/include/rcube_imap_generic.php

@@ -1557,6 +1557,11 @@
        }

        if (!$this->select($mailbox)) {
        }

        // RFC 5957: SORT=DISPLAY
        if (($field == 'FROM' || $field == 'TO') && $this->getCapability('SORT=DISPLAY')) {
            $field = 'DISPLAY' . $field;
            return null;
        }