diff --git a/CHANGELOG b/CHANGELOG
index 9759bf7ab..26b946aff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix date sorting problem with Courier IMAP server (#1486065)
 - Unselect pressed buttons on mouse up (#1485987)
 - Don't set php_value error_log in .htaccess but mention in INSTALL (#1485924)
 - Fix too small status/flag/attachment columns in Safari 4 (#1486063)
diff --git a/program/lib/imap.inc b/program/lib/imap.inc
index f06767570..ce778b2b7 100644
--- a/program/lib/imap.inc
+++ b/program/lib/imap.inc
@@ -988,7 +988,7 @@ function iil_C_FetchHeaderIndex(&$conn, $mailbox, $message_set, $index_field='',
 			}
 
 			if ($mode == 1) {
-				if (preg_match('/BODY\[HEADER\.FIELDS \((DATE|FROM|REPLY-TO|SENDER|TO|SUBJECT)\)\] (.*)/', $line, $matches)) {
+				if (preg_match('/BODY\[HEADER\.FIELDS \("?(DATE|FROM|REPLY-TO|SENDER|TO|SUBJECT)"?\)\] (.*)/', $line, $matches)) {
 					$value = preg_replace(array('/^"*[a-z]+:/i', '/\s+$/sm'), array('', ''), $matches[2]);
 					$value = trim($value);
 					if ($index_field == 'DATE') {