githubFork/roundcubemail.git

			@@ -4,8 +4,8 @@
			+-----------------------------------------------------------------------+
			\| program/include/rcube_imap.php \|
			\| \|
			\| This file is part of the RoundCube Webmail client \|
			\| Copyright (C) 2005-2010, RoundCube Dev. - Switzerland \|
			\| This file is part of the Roundcube Webmail client \|
			\| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland \|
			\| Licensed under the GNU GPL \|
			\| \|
			\| PURPOSE: \|
			@@ -40,8 +40,20 @@
			public $delimiter = NULL;
			public $threading = false;
			public $fetch_add_headers = '';
			public $conn; // rcube_imap_generic object
			public $get_all_headers = false;

			/**
			* Instance of rcube_imap_generic
			*
			* @var rcube_imap_generic
			*/
			public $conn;

			/**
			* Instance of rcube_mdb2
			*
			* @var rcube_mdb2
			*/
			private $db;
			private $root_ns = '';
			private $mailbox = 'INBOX';
			@@ -62,9 +74,33 @@
			private $search_charset = '';
			private $search_sort_field = '';
			private $search_threads = false;
			private $search_sorted = false;
			private $db_header_fields = array('idx', 'uid', 'subject', 'from', 'to', 'cc', 'date', 'size');
			private $options = array('auth_method' => 'check');
			private $host, $user, $pass, $port, $ssl;

			/**
			* All (additional) headers used (in any way) by Roundcube
			* Not listed here: DATE, FROM, TO, SUBJECT, CONTENT-TYPE, LIST-POST
			* (used for messages listing) are hardcoded in rcube_imap_generic::fetchHeaders()
			*
			* @var array
			* @see rcube_imap::fetch_add_headers
			*/
			private $all_headers = array(
			'REPLY-TO',
			'IN-REPLY-TO',
			'CC',
			'BCC',
			'MESSAGE-ID',
			'CONTENT-TRANSFER-ENCODING',
			'REFERENCES',
			'X-PRIORITY',
			'X-DRAFT-INFO',
			'MAIL-FOLLOWUP-TO',
			'MAIL-REPLY-TO',
			'RETURN-PATH',
			);


			/**
			@@ -82,11 +118,11 @@
			/**
			* Connect to an IMAP server
			*
			* @param string Host to connect
			* @param string Username for IMAP account
			* @param string Password for IMAP account
			* @param number Port to connect to
			* @param string SSL schema (either ssl or tls) or null if plain connection
			* @param string $host Host to connect
			* @param string $user Username for IMAP account
			* @param string $pass Password for IMAP account
			* @param integer $port Port to connect to
			* @param string $use_ssl SSL schema (either ssl or tls) or null if plain connection
			* @return boolean TRUE on success, FALSE on failure
			* @access public
			*/
			@@ -138,9 +174,10 @@
			// write error log
			else if ($this->conn->error) {
			$this->error_code = $this->conn->errornum;
			raise_error(array('code' => 403, 'type' => 'imap',
			'file' => __FILE__, 'line' => __LINE__,
			'message' => $this->conn->error), true, false);
			if ($pass && $user)
			raise_error(array('code' => 403, 'type' => 'imap',
			'file' => __FILE__, 'line' => __LINE__,
			'message' => $this->conn->error), true, false);
			}

			return false;
			@@ -155,8 +192,7 @@
			*/
			function close()
			{
			if ($this->conn && $this->conn->connected())
			$this->conn->close();
			$this->conn->close();
			$this->write_cache();
			}

			@@ -179,6 +215,8 @@

			/**
			* Set options to be used in rcube_imap_generic::connect()
			*
			* @param array $opt Options array
			*/
			function set_options($opt)
			{
			@@ -191,7 +229,7 @@
			* Only folders within this root folder will be displayed
			* and all folder paths will be translated using this folder name
			*
			* @param string Root folder
			* @param string $root Root folder
			* @access public
			*/
			function set_rootdir($root)
			@@ -212,7 +250,7 @@
			*
			* This will be used for message decoding if a charset specification is not available
			*
			* @param string Charset string
			* @param string $cs Charset string
			* @access public
			*/
			function set_charset($cs)
			@@ -224,7 +262,7 @@
			/**
			* This list of folders will be listed above all other folders
			*
			* @param array Indexed list of folder names
			* @param array $arr Indexed list of folder names
			* @access public
			*/
			function set_default_mailboxes($arr)
			@@ -244,7 +282,7 @@
			*
			* All operations will be perfomed on this mailbox/folder
			*
			* @param string Mailbox/Folder name
			* @param string $new_mbox Mailbox/Folder name
			* @access public
			*/
			function set_mailbox($new_mbox)
			@@ -264,7 +302,7 @@
			/**
			* Set internal list page
			*
			* @param number Page number to list
			* @param number $page Page number to list
			* @access public
			*/
			function set_page($page)
			@@ -276,7 +314,7 @@
			/**
			* Set internal page size
			*
			* @param number Number of messages to display on one page
			* @param number $size Number of messages to display on one page
			* @access public
			*/
			function set_pagesize($size)
			@@ -292,12 +330,15 @@
			* @param array List of message ids or NULL if empty
			* @param string Charset of search string
			* @param string Sorting field
			* @param string True if set is sorted (SORT was used for searching)
			*/
			function set_search_set($str=null, $msgs=null, $charset=null, $sort_field=null, $threads=false)
			function set_search_set($str=null, $msgs=null, $charset=null, $sort_field=null, $threads=false, $sorted=false)
			{
			if (is_array($str) && $msgs == null)
			list($str, $msgs, $charset, $sort_field, $threads) = $str;
			if ($msgs != null && !is_array($msgs))
			if ($msgs === false)
			$msgs = array();
			else if ($msgs != null && !is_array($msgs))
			$msgs = explode(',', $msgs);

			$this->search_string = $str;
			@@ -305,6 +346,7 @@
			$this->search_charset = $charset;
			$this->search_sort_field = $sort_field;
			$this->search_threads = $threads;
			$this->search_sorted = $sorted;
			}


			@@ -319,6 +361,7 @@
			$this->search_charset,
			$this->search_sort_field,
			$this->search_threads,
			$this->search_sorted,
			);
			}

			@@ -338,7 +381,7 @@
			/**
			* Returns the IMAP server's capability
			*
			* @param string Capability name
			* @param string $cap Capability name
			* @return mixed Capability value or TRUE if supported, FALSE if not
			* @access public
			*/
			@@ -351,7 +394,7 @@
			/**
			* Sets threading flag to the best supported THREAD algorithm
			*
			* @param boolean TRUE to enable and FALSE
			* @param boolean $enable TRUE to enable and FALSE
			* @return string Algorithm or false if THREAD is not supported
			* @access public
			*/
			@@ -376,7 +419,7 @@
			* Checks the PERMANENTFLAGS capability of the current mailbox
			* and returns true if the given flag is supported by the IMAP server
			*
			* @param string Permanentflag name
			* @param string $flag Permanentflag name
			* @return mixed True if this flag is supported
			* @access public
			*/
			@@ -409,11 +452,11 @@
			/**
			* Get message count for a specific mailbox
			*
			* @param string Mailbox/folder name
			* @param string Mode for count [ALL\|THREADS\|UNSEEN\|RECENT]
			* @param boolean Force reading from server and update cache
			* @param boolean Enables storing folder status info (max UID/count),
			* required for mailbox_status()
			* @param string $mbox_name Mailbox/folder name
			* @param string $mode Mode for count [ALL\|THREADS\|UNSEEN\|RECENT]
			* @param boolean $force Force reading from server and update cache
			* @param boolean $status Enables storing folder status info (max UID/count),
			* required for mailbox_status()
			* @return int Number of messages
			* @access public
			*/
			@@ -427,6 +470,12 @@
			/**
			* Private method for getting nr of messages
			*
			* @param string $mailbox Mailbox name
			* @param string $mode Mode for count [ALL\|THREADS\|UNSEEN\|RECENT]
			* @param boolean $force Force reading from server and update cache
			* @param boolean $status Enables storing folder status info (max UID/count),
			* required for mailbox_status()
			* @return int Number of messages
			* @access private
			* @see rcube_imap::messagecount()
			*/
			@@ -472,14 +521,9 @@
			// get message count and store in cache
			if ($mode == 'UNSEEN')
			$search_str .= " UNSEEN";

			// get message count using SEARCH
			// not very performant but more precise (using UNDELETED)
			// disable THREADS for this request
			$threads = $this->threading;
			$this->threading = false;
			$index = $this->_search_index($mailbox, $search_str);
			$this->threading = $threads;
			$index = $this->conn->search($mailbox, $search_str);

			$count = is_array($index) ? count($index) : 0;

			@@ -512,6 +556,8 @@
			/**
			* Private method for getting nr of threads
			*
			* @param string $mailbox
			* @param int $msg_count
			* @access private
			* @see rcube_imap::messagecount()
			*/
			@@ -533,11 +579,11 @@
			* Public method for listing headers
			* convert mailbox name with root dir first
			*
			* @param string Mailbox/folder name
			* @param int Current page to list
			* @param string Header field to sort by
			* @param string Sort order [ASC\|DESC]
			* @param boolean Number of slice items to extract from result array
			* @param string $mbox_name Mailbox/folder name
			* @param int $page Current page to list
			* @param string $sort_field Header field to sort by
			* @param string $sort_order Sort order [ASC\|DESC]
			* @param int $slice Number of slice items to extract from result array
			* @return array Indexed array with message header objects
			* @access public
			*/
			@@ -551,6 +597,12 @@
			/**
			* Private method for listing message headers
			*
			* @param string $mailbox Mailbox name
			* @param int $page Current page to list
			* @param string $sort_field Header field to sort by
			* @param string $sort_order Sort order [ASC\|DESC]
			* @param int $slice Number of slice items to extract from result array
			* @return array Indexed array with message header objects
			* @access private
			* @see rcube_imap::list_headers
			*/
			@@ -570,22 +622,24 @@

			$page = $page ? $page : $this->list_page;
			$cache_key = $mailbox.'.msg';
			$cache_status = $this->check_cache_status($mailbox, $cache_key);

			// cache is OK, we can get all messages from local cache
			if ($cache_status>0) {
			$start_msg = ($page-1) * $this->page_size;
			$a_msg_headers = $this->get_message_cache($cache_key, $start_msg,
			$start_msg+$this->page_size, $this->sort_field, $this->sort_order);
			$result = array_values($a_msg_headers);
			if ($slice)
			$result = array_slice($result, -$slice, $slice);
			return $result;
			}
			// cache is dirty, sync it
			else if ($this->caching_enabled && $cache_status==-1 && !$recursive) {
			$this->sync_header_index($mailbox);
			return $this->_list_headers($mailbox, $page, $this->sort_field, $this->sort_order, true, $slice);
			if ($this->caching_enabled) {
			// cache is OK, we can get messages from local cache
			// (assume cache is in sync when in recursive mode)
			if ($recursive \|\| $this->check_cache_status($mailbox, $cache_key)>0) {
			$start_msg = ($page-1) * $this->page_size;
			$a_msg_headers = $this->get_message_cache($cache_key, $start_msg,
			$start_msg+$this->page_size, $this->sort_field, $this->sort_order);
			$result = array_values($a_msg_headers);
			if ($slice)
			$result = array_slice($result, -$slice, $slice);
			return $result;
			}
			// cache is incomplete, sync it (all messages in the folder)
			else if (!$recursive) {
			$this->sync_header_index($mailbox);
			return $this->_list_headers($mailbox, $page, $this->sort_field, $this->sort_order, true, $slice);
			}
			}

			// retrieve headers from IMAP
			@@ -608,7 +662,7 @@
			else
			$msg_index = array();

			if ($slice)
			if ($slice && $msg_index)
			$msg_index = array_slice($msg_index, ($this->sort_order == 'DESC' ? 0 : -$slice), $slice);

			// fetch reqested headers from server
			@@ -616,8 +670,11 @@
			$this->_fetch_headers($mailbox, join(",", $msg_index), $a_msg_headers, $cache_key);
			}
			// use SORT command
			else if ($this->get_capability('SORT')) {
			if ($msg_index = $this->conn->sort($mailbox, $this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')) {
			else if ($this->get_capability('SORT') &&
			// Courier-IMAP provides SORT capability but allows to disable it by admin (#1486959)
			($msg_index = $this->conn->sort($mailbox, $this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')) !== false
			) {
			if (!empty($msg_index)) {
			list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
			$max = max($msg_index);
			$msg_index = array_slice($msg_index, $begin, $end-$begin);
			@@ -670,6 +727,13 @@
			/**
			* Private method for listing message headers using threads
			*
			* @param string $mailbox Mailbox/folder name
			* @param int $page Current page to list
			* @param string $sort_field Header field to sort by
			* @param string $sort_order Sort order [ASC\|DESC]
			* @param boolean $recursive
			* @param int $slice Number of slice items to extract from result array
			* @return array Indexed array with message header objects
			* @access private
			* @see rcube_imap::list_headers
			*/
			@@ -697,7 +761,7 @@
			/**
			* Private method for fetching threads data
			*
			* @param string Mailbox/folder name
			* @param string $mailbox Mailbox/folder name
			* @return array Array with thread data
			* @access private
			*/
			@@ -726,6 +790,13 @@
			/**
			* Private method for fetching threaded messages headers
			*
			* @param string $mailbox Mailbox name
			* @param string $thread_tree
			* @param int $msg_depth
			* @param boolean $has_children
			* @param int $msg_index
			* @param int $page
			* @param int $slice
			* @access private
			*/
			private function _fetch_thread_headers($mailbox, $thread_tree, $msg_depth, $has_children, $msg_index, $page, $slice=0)
			@@ -773,9 +844,9 @@
			* Private method for setting threaded messages flags:
			* depth, has_children and unread_children
			*
			* @param array Reference to headers array indexed by message ID
			* @param array Array of messages depth indexed by message ID
			* @param array Array of messages children flags indexed by message ID
			* @param array $headers Reference to headers array indexed by message ID
			* @param array $msg_depth Array of messages depth indexed by message ID
			* @param array $msg_children Array of messages children flags indexed by message ID
			* @return array Message headers array indexed by message ID
			* @access private
			*/
			@@ -804,11 +875,11 @@
			/**
			* Private method for listing a set of message headers (search results)
			*
			* @param string Mailbox/folder name
			* @param int Current page to list
			* @param string Header field to sort by
			* @param string Sort order [ASC\|DESC]
			* @param boolean Number of slice items to extract from result array
			* @param string $mailbox Mailbox/folder name
			* @param int $page Current page to list
			* @param string $sort_field Header field to sort by
			* @param string $sort_order Sort order [ASC\|DESC]
			* @param int $slice Number of slice items to extract from result array
			* @return array Indexed array with message header objects
			* @access private
			* @see rcube_imap::list_header_set()
			@@ -823,8 +894,11 @@
			return $this->_list_thread_header_set($mailbox, $page, $sort_field, $sort_order, $slice);

			// search set is threaded, we need a new one
			if ($this->search_threads)
			if ($this->search_threads) {
			if (empty($this->search_set['tree']))
			return array();
			$this->search('', $this->search_string, $this->search_charset, $sort_field);
			}

			$msgs = $this->search_set;
			$a_msg_headers = array();
			@@ -856,7 +930,7 @@
			}

			// sorted messages, so we can first slice array and then fetch only wanted headers
			if ($this->get_capability('SORT')) { // SORT searching result
			if ($this->search_sorted) { // SORT searching result
			// reset search set if sorting field has been changed
			if ($this->sort_field && $this->search_sort_field != $this->sort_field)
			$msgs = $this->search('', $this->search_string, $this->search_charset, $this->sort_field);
			@@ -934,11 +1008,11 @@
			/**
			* Private method for listing a set of threaded message headers (search results)
			*
			* @param string Mailbox/folder name
			* @param int Current page to list
			* @param string Header field to sort by
			* @param string Sort order [ASC\|DESC]
			* @param boolean Number of slice items to extract from result array
			* @param string $mailbox Mailbox/folder name
			* @param int $page Current page to list
			* @param string $sort_field Header field to sort by
			* @param string $sort_order Sort order [ASC\|DESC]
			* @param int $slice Number of slice items to extract from result array
			* @return array Indexed array with message header objects
			* @access private
			* @see rcube_imap::list_header_set()
			@@ -946,8 +1020,15 @@
			private function _list_thread_header_set($mailbox, $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
			{
			// update search_set if previous data was fetched with disabled threading
			if (!$this->search_threads)
			if (!$this->search_threads) {
			if (empty($this->search_set))
			return array();
			$this->search('', $this->search_string, $this->search_charset, $sort_field);
			}

			// empty result
			if (empty($this->search_set['tree']))
			return array();

			$thread_tree = $this->search_set['tree'];
			$msg_depth = $this->search_set['depth'];
			@@ -969,8 +1050,8 @@
			/**
			* Helper function to get first and last index of the requested set
			*
			* @param int message count
			* @param mixed page number to show, or string 'all'
			* @param int $max message count
			* @param mixed $page page number to show, or string 'all'
			* @return array array with two values: first index, last index
			* @access private
			*/
			@@ -1006,7 +1087,7 @@
			* @param string Mailbox name
			* @param string Message index to fetch
			* @param array Reference to message headers array
			* @param array Array with cache index
			* @param string Cache index string
			* @return int Messages count
			* @access private
			*/
			@@ -1014,27 +1095,48 @@
			{
			// fetch reqested headers from server
			$a_header_index = $this->conn->fetchHeaders(
			$mailbox, $msgs, false, false, $this->fetch_add_headers);
			$mailbox, $msgs, false, false, $this->get_fetch_headers());

			if (empty($a_header_index))
			return 0;

			// cache is incomplete
			$cache_index = $this->get_message_cache_index($cache_key);

			foreach ($a_header_index as $i => $headers) {
			if ($this->caching_enabled && $cache_index[$headers->id] != $headers->uid) {
			// prevent index duplicates
			$a_msg_headers[$headers->uid] = $headers;
			}

			// Update cache
			if ($this->caching_enabled && $cache_key) {
			// cache is incomplete?
			$cache_index = $this->get_message_cache_index($cache_key);

			foreach ($a_header_index as $headers) {
			// message in cache
			if ($cache_index[$headers->id] == $headers->uid) {
			unset($cache_index[$headers->id]);
			continue;
			}
			// wrong UID at this position
			if ($cache_index[$headers->id]) {
			$this->remove_message_cache($cache_key, $headers->id, true);
			$for_remove[] = $cache_index[$headers->id];
			unset($cache_index[$headers->id]);
			}
			// add message to cache
			$this->add_message_cache($cache_key, $headers->id, $headers, NULL,
			!in_array($headers->uid, $cache_index));
			}
			// message UID in cache but at wrong position
			if (is_int($key = array_search($headers->uid, $cache_index))) {
			$for_remove[] = $cache_index[$key];
			unset($cache_index[$key]);
			}

			$a_msg_headers[$headers->uid] = $headers;
			$for_create[] = $headers->uid;
			}

			if ($for_remove)
			$this->remove_message_cache($cache_key, $for_remove);

			// add messages to cache
			foreach ((array)$for_create as $uid) {
			$headers = $a_msg_headers[$uid];
			$this->add_message_cache($cache_key, $headers->id, $headers, NULL, true);
			}
			}

			return count($a_msg_headers);
			@@ -1047,7 +1149,7 @@
			* We compare the maximum UID to determine the number of
			* new messages because the RECENT flag is not reliable.
			*
			* @param string Mailbox/folder name
			* @param string $mbox_name Mailbox/folder name
			* @return int Folder status
			*/
			function mailbox_status($mbox_name = null)
			@@ -1079,9 +1181,9 @@
			* Stores folder statistic data in session
			* @TODO: move to separate DB table (cache?)
			*
			* @param string Mailbox name
			* @param string Data name
			* @param mixed Data value
			* @param string $mbox_name Mailbox name
			* @param string $name Data name
			* @param mixed $data Data value
			*/
			private function set_folder_stats($mbox_name, $name, $data)
			{
			@@ -1092,7 +1194,7 @@
			/**
			* Gets folder statistic data
			*
			* @param string Mailbox name
			* @param string $mbox_name Mailbox name
			* @return array Stats data
			*/
			private function get_folder_stats($mbox_name)
			@@ -1107,9 +1209,9 @@
			/**
			* Return sorted array of message IDs (not UIDs)
			*
			* @param string Mailbox to get index from
			* @param string Sort column
			* @param string Sort order [ASC, DESC]
			* @param string $mbox_name Mailbox to get index from
			* @param string $sort_field Sort column
			* @param string $sort_order Sort order [ASC, DESC]
			* @return array Indexed array with message ids
			*/
			function message_index($mbox_name='', $sort_field=NULL, $sort_order=NULL)
			@@ -1138,7 +1240,7 @@
			$this->cache[$key] = $msgs;
			}
			// sort with SORT command
			else if ($this->get_capability('SORT')) {
			else if ($this->search_sorted) {
			if ($this->sort_field && $this->search_sort_field != $this->sort_field)
			$this->search('', $this->search_string, $this->search_charset, $this->sort_field);

			@@ -1176,7 +1278,7 @@
			// cache is OK
			if ($cache_status>0) {
			$a_index = $this->get_message_cache_index($cache_key,
			true, $this->sort_field, $this->sort_order);
			$this->sort_field, $this->sort_order);
			return array_keys($a_index);
			}

			@@ -1188,20 +1290,20 @@
			$a_index = range(1, $max);
			}

			if ($this->sort_order == 'DESC')
			if ($a_index !== false && $this->sort_order == 'DESC')
			$a_index = array_reverse($a_index);

			$this->cache[$key] = $a_index;
			}
			// fetch complete message index
			else if ($this->get_capability('SORT')) {
			if ($a_index = $this->conn->sort($mailbox,
			$this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')) {
			if ($this->sort_order == 'DESC')
			$a_index = array_reverse($a_index);
			else if ($this->get_capability('SORT') &&
			($a_index = $this->conn->sort($mailbox,
			$this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')) !== false
			) {
			if ($this->sort_order == 'DESC')
			$a_index = array_reverse($a_index);

			$this->cache[$key] = $a_index;
			}
			$this->cache[$key] = $a_index;
			}
			else if ($a_index = $this->conn->fetchHeaderIndex(
			$mailbox, "1:*", $this->sort_field, $this->skip_deleted)) {
			@@ -1213,16 +1315,16 @@
			$this->cache[$key] = array_keys($a_index);
			}

			return $this->cache[$key];
			return $this->cache[$key] !== false ? $this->cache[$key] : array();
			}


			/**
			* Return sorted array of threaded message IDs (not UIDs)
			*
			* @param string Mailbox to get index from
			* @param string Sort column
			* @param string Sort order [ASC, DESC]
			* @param string $mbox_name Mailbox to get index from
			* @param string $sort_field Sort column
			* @param string $sort_order Sort order [ASC, DESC]
			* @return array Indexed array with message IDs
			*/
			function thread_index($mbox_name='', $sort_field=NULL, $sort_order=NULL)
			@@ -1250,7 +1352,7 @@

			// cache is OK
			if ($cache_status>0) {
			$a_index = $this->get_message_cache_index($cache_key, true, $this->sort_field, $this->sort_order);
			$a_index = $this->get_message_cache_index($cache_key, $this->sort_field, $this->sort_order);
			return array_keys($a_index);
			}
			*/
			@@ -1266,10 +1368,10 @@
			/**
			* Return array of threaded messages (all, not only roots)
			*
			* @param string Mailbox to get index from
			* @param array Threaded messages array (see _fetch_threads())
			* @param array Message IDs if we know what we need (e.g. search result)
			* for better performance
			* @param string $mailbox Mailbox to get index from
			* @param array $thread_tree Threaded messages array (see _fetch_threads())
			* @param array $ids Message IDs if we know what we need (e.g. search result)
			* for better performance
			* @return array Indexed array with message IDs
			*
			* @access private
			@@ -1288,8 +1390,10 @@
			$all_ids = array();
			foreach($msg_index as $root) {
			$all_ids[] = $root;
			if (!empty($thread_tree[$root]))
			$all_ids = array_merge($all_ids, array_keys_recursive($thread_tree[$root]));
			if (!empty($thread_tree[$root])) {
			foreach (array_keys_recursive($thread_tree[$root]) as $val)
			$all_ids[] = $val;
			}
			}

			return $all_ids;
			@@ -1297,29 +1401,55 @@


			/**
			* @param string $mailbox Mailbox name
			* @access private
			*/
			private function sync_header_index($mailbox)
			{
			$cache_key = $mailbox.'.msg';
			$cache_index = $this->get_message_cache_index($cache_key);
			$chunk_size = 1000;

			// cache is empty, get all messages
			if (is_array($cache_index) && empty($cache_index)) {
			$max = $this->_messagecount($mailbox);
			// syncing a big folder maybe slow
			@set_time_limit(0);
			$start = 1;
			$end = min($chunk_size, $max);
			while (true) {
			// do this in loop to save memory (1000 msgs ~= 10 MB)
			if ($headers = $this->conn->fetchHeaders($mailbox,
			"$start:$end", false, false, $this->get_fetch_headers())
			) {
			foreach ($headers as $header) {
			$this->add_message_cache($cache_key, $header->id, $header, NULL, true);
			}
			}
			if ($end - $start < $chunk_size - 1)
			break;

			$end = min($end+$chunk_size, $max);
			$start += $chunk_size;
			}
			return;
			}

			// fetch complete message index
			$a_message_index = $this->conn->fetchHeaderIndex($mailbox, "1:*", 'UID', $this->skip_deleted);
			if (isset($this->icache['folder_index']))
			$a_message_index = &$this->icache['folder_index'];
			else
			$a_message_index = $this->conn->fetchHeaderIndex($mailbox, "1:*", 'UID', $this->skip_deleted);

			if ($a_message_index === false)
			return false;
			if ($a_message_index === false \|\| $cache_index === null)
			return;

			// compare cache index with real index
			foreach ($a_message_index as $id => $uid) {
			// message in cache at correct position
			if ($cache_index[$id] == $uid) {
			unset($cache_index[$id]);
			continue;
			}

			// message in cache but in wrong position
			if (in_array((string)$uid, $cache_index, true)) {
			unset($cache_index[$id]);
			}

			// other message at this position
			@@ -1328,10 +1458,16 @@
			unset($cache_index[$id]);
			}

			// message in cache but at wrong position
			if (is_int($key = array_search($uid, $cache_index))) {
			$for_remove[] = $uid;
			unset($cache_index[$key]);
			}

			$for_update[] = $id;
			}

			// clear messages at wrong positions and those deleted that are still in cache_index
			// remove messages at wrong positions and those deleted that are still in cache_index
			if (!empty($for_remove))
			$cache_index = array_merge($cache_index, $for_remove);

			@@ -1340,11 +1476,17 @@

			// fetch complete headers and add to cache
			if (!empty($for_update)) {
			if ($headers = $this->conn->fetchHeader($mailbox,
			join(',', $for_update), false, $this->fetch_add_headers)) {
			foreach ($headers as $header) {
			$this->add_message_cache($cache_key, $header->id, $header, NULL,
			in_array($header->uid, (array)$for_remove));
			// syncing a big folder maybe slow
			@set_time_limit(0);
			// To save memory do this in chunks
			$for_update = array_chunk($for_update, $chunk_size);
			foreach ($for_update as $uids) {
			if ($headers = $this->conn->fetchHeaders($mailbox,
			$uids, false, false, $this->get_fetch_headers())
			) {
			foreach ($headers as $header) {
			$this->add_message_cache($cache_key, $header->id, $header, NULL, true);
			}
			}
			}
			}
			@@ -1354,10 +1496,10 @@
			/**
			* Invoke search request to IMAP server
			*
			* @param string mailbox name to search in
			* @param string search string
			* @param string search string charset
			* @param string header field to sort by
			* @param string $mbox_name mailbox name to search in
			* @param string $str search string
			* @param string $charset search string charset
			* @param string $sort_field header field to sort by
			* @return array search results as list of message ids
			* @access public
			*/
			@@ -1370,33 +1512,8 @@

			$results = $this->_search_index($mailbox, $str, $charset, $sort_field);

			// try search with US-ASCII charset (should be supported by server)
			// only if UTF-8 search is not supported
			if (empty($results) && !is_array($results) && !empty($charset) && $charset != 'US-ASCII')
			{
			// convert strings to US_ASCII
			if(preg_match_all('/\{([0-9]+)\}\r\n/', $str, $matches, PREG_OFFSET_CAPTURE)) {
			$last = 0; $res = '';
			foreach($matches[1] as $m)
			{
			$string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n
			$string = substr($str, $string_offset - 1, $m[0]);
			$string = rcube_charset_convert($string, $charset, 'US-ASCII');
			if (!$string)
			continue;
			$res .= sprintf("%s{%d}\r\n%s", substr($str, $last, $m[1] - $last - 1), strlen($string), $string);
			$last = $m[0] + $string_offset - 1;
			}
			if ($last < strlen($str))
			$res .= substr($str, $last, strlen($str)-$last);
			}
			else // strings for conversion not found
			$res = $str;

			$results = $this->search($mbox_name, $res, NULL, $sort_field);
			}

			$this->set_search_set($str, $results, $charset, $sort_field, (bool)$this->threading);
			$this->set_search_set($str, $results, $charset, $sort_field, (bool)$this->threading,
			$this->threading \|\| $this->search_sorted ? true : false);

			return $results;
			}
			@@ -1405,6 +1522,10 @@
			/**
			* Private search method
			*
			* @param string $mailbox Mailbox name
			* @param string $criteria Search criteria
			* @param string $charset Charset
			* @param string $sort_field Sorting field
			* @return array search results as list of message ids
			* @access private
			* @see rcube_imap::search()
			@@ -1417,44 +1538,61 @@
			$criteria = 'UNDELETED '.$criteria;

			if ($this->threading) {
			list ($thread_tree, $msg_depth, $has_children) = $this->conn->thread(
			$mailbox, $this->threading, $criteria, $charset);
			$a_messages = $this->conn->thread($mailbox, $this->threading, $criteria, $charset);

			$a_messages = array(
			'tree' => $thread_tree,
			'depth' => $msg_depth,
			'children' => $has_children
			);
			// Error, try with US-ASCII (RFC5256: SORT/THREAD must support US-ASCII and UTF-8,
			// but I've seen that Courier doesn't support UTF-8)
			if ($a_messages === false && $charset && $charset != 'US-ASCII')
			$a_messages = $this->conn->thread($mailbox, $this->threading,
			$this->convert_criteria($criteria, $charset), 'US-ASCII');

			if ($a_messages !== false) {
			list ($thread_tree, $msg_depth, $has_children) = $a_messages;
			$a_messages = array(
			'tree' => $thread_tree,
			'depth' => $msg_depth,
			'children' => $has_children
			);
			}

			return $a_messages;
			}
			else if ($sort_field && $this->get_capability('SORT')) {

			if ($sort_field && $this->get_capability('SORT')) {
			$charset = $charset ? $charset : $this->default_charset;
			$a_messages = $this->conn->sort($mailbox, $sort_field, $criteria, false, $charset);

			if (!$a_messages)
			return array();
			// Error, try with US-ASCII (RFC5256: SORT/THREAD must support US-ASCII and UTF-8,
			// but I've seen that Courier doesn't support UTF-8)
			if ($a_messages === false && $charset && $charset != 'US-ASCII')
			$a_messages = $this->conn->sort($mailbox, $sort_field,
			$this->convert_criteria($criteria, $charset), false, 'US-ASCII');

			if ($a_messages !== false) {
			$this->search_sorted = true;
			return $a_messages;
			}
			}

			if ($orig_criteria == 'ALL') {
			$max = $this->_messagecount($mailbox);
			$a_messages = $max ? range(1, $max) : array();
			}
			else {
			if ($orig_criteria == 'ALL') {
			$max = $this->_messagecount($mailbox);
			$a_messages = $max ? range(1, $max) : array();
			}
			else {
			$a_messages = $this->conn->search($mailbox,
			($charset ? "CHARSET $charset " : '') . $criteria);

			// Error, try with US-ASCII (some servers may support only US-ASCII)
			if ($a_messages === false && $charset && $charset != 'US-ASCII')
			$a_messages = $this->conn->search($mailbox,
			($charset ? "CHARSET $charset " : '') . $criteria);
			'CHARSET US-ASCII ' . $this->convert_criteria($criteria, $charset));

			if (!$a_messages)
			return array();

			// I didn't found that SEARCH always returns sorted IDs
			if (!$this->sort_field)
			// I didn't found that SEARCH should return sorted IDs
			if (is_array($a_messages) && !$this->sort_field)
			sort($a_messages);
			}
			}

			// update messagecount cache ?
			// $a_mailbox_cache = get_cache('messagecount');
			// $a_mailbox_cache[$mailbox][$criteria] = sizeof($a_messages);
			// $this->update_cache('messagecount', $a_mailbox_cache);
			$this->search_sorted = false;

			return $a_messages;
			}
			@@ -1464,9 +1602,9 @@
			* Direct (real and simple) SEARCH request to IMAP server,
			* without result sorting and caching
			*
			* @param string Mailbox name to search in
			* @param string Search string
			* @param boolean True if UIDs should be returned
			* @param string $mbox_name Mailbox name to search in
			* @param string $str Search string
			* @param boolean $ret_uid True if UIDs should be returned
			* @return array Search results as list of message IDs or UIDs
			* @access public
			*/
			@@ -1482,11 +1620,44 @@


			/**
			* Converts charset of search criteria string
			*
			* @param string $str Search string
			* @param string $charset Original charset
			* @param string $dest_charset Destination charset (default US-ASCII)
			* @return string Search string
			* @access private
			*/
			private function convert_criteria($str, $charset, $dest_charset='US-ASCII')
			{
			// convert strings to US_ASCII
			if (preg_match_all('/\{([0-9]+)\}\r\n/', $str, $matches, PREG_OFFSET_CAPTURE)) {
			$last = 0; $res = '';
			foreach ($matches[1] as $m) {
			$string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n
			$string = substr($str, $string_offset - 1, $m[0]);
			$string = rcube_charset_convert($string, $charset, $dest_charset);
			if (!$string)
			continue;
			$res .= sprintf("%s{%d}\r\n%s", substr($str, $last, $m[1] - $last - 1), strlen($string), $string);
			$last = $m[0] + $string_offset - 1;
			}
			if ($last < strlen($str))
			$res .= substr($str, $last, strlen($str)-$last);
			}
			else // strings for conversion not found
			$res = $str;

			return $res;
			}


			/**
			* Sort thread
			*
			* @param string Mailbox name
			* @param array Unsorted thread tree (rcube_imap_generic::thread() result)
			* @param array Message IDs if we know what we need (e.g. search result)
			* @param string $mailbox Mailbox name
			* @param array $thread_tree Unsorted thread tree (rcube_imap_generic::thread() result)
			* @param array $ids Message IDs if we know what we need (e.g. search result)
			* @return array Sorted roots IDs
			* @access private
			*/
			@@ -1502,10 +1673,10 @@
			// here we'll implement REFS sorting, for performance reason
			else { // ($sort_field == 'date' && $this->threading != 'REFS')
			// use SORT command
			if ($this->get_capability('SORT')) {
			$a_index = $this->conn->sort($mailbox, $this->sort_field,
			!empty($ids) ? $ids : ($this->skip_deleted ? 'UNDELETED' : ''));

			if ($this->get_capability('SORT') &&
			($a_index = $this->conn->sort($mailbox, $this->sort_field,
			!empty($ids) ? $ids : ($this->skip_deleted ? 'UNDELETED' : ''))) !== false
			) {
			// return unsorted tree if we've got no index data
			if (!$a_index)
			return array_keys((array)$thread_tree);
			@@ -1531,8 +1702,8 @@
			/**
			* THREAD=REFS sorting implementation
			*
			* @param array Thread tree array (message identifiers as keys)
			* @param array Array of sorted message identifiers
			* @param array $tree Thread tree array (message identifiers as keys)
			* @param array $index Array of sorted message identifiers
			* @return array Array of sorted roots messages
			* @access private
			*/
			@@ -1583,7 +1754,7 @@
			{
			if (!empty($this->search_string))
			$this->search_set = $this->search('', $this->search_string, $this->search_charset,
			$this->search_sort_field, $this->search_threads);
			$this->search_sort_field, $this->search_threads, $this->search_sorted);

			return $this->get_search_set();
			}
			@@ -1592,6 +1763,7 @@
			/**
			* Check if the given message ID is part of the current search set
			*
			* @param string $msgid Message id
			* @return boolean True on match or if no search request is stored
			*/
			function in_searchset($msgid)
			@@ -1610,10 +1782,10 @@
			/**
			* Return message headers object of a specific message
			*
			* @param int Message ID
			* @param string Mailbox to read from
			* @param boolean True if $id is the message UID
			* @param boolean True if we need also BODYSTRUCTURE in headers
			* @param int $id Message ID
			* @param string $mbox_name Mailbox to read from
			* @param boolean $is_uid True if $id is the message UID
			* @param boolean $bodystr True if we need also BODYSTRUCTURE in headers
			* @return object Message headers representation
			*/
			function get_headers($id, $mbox_name=NULL, $is_uid=true, $bodystr=false)
			@@ -1626,14 +1798,14 @@
			return $headers;

			$headers = $this->conn->fetchHeader(
			$mailbox, $id, $is_uid, $bodystr, $this->fetch_add_headers);
			$mailbox, $id, $is_uid, $bodystr, $this->get_fetch_headers());

			// write headers cache
			if ($headers) {
			if ($headers->uid && $headers->id)
			$this->uid_id_map[$mailbox][$headers->uid] = $headers->id;

			$this->add_message_cache($mailbox.'.msg', $headers->id, $headers, NULL);
			$this->add_message_cache($mailbox.'.msg', $headers->id, $headers, NULL, false, true);
			}

			return $headers;
			@@ -1644,8 +1816,8 @@
			* Fetch body structure from the IMAP server and build
			* an object structure similar to the one generated by PEAR::Mail_mimeDecode
			*
			* @param int Message UID to fetch
			* @param string Message BODYSTRUCTURE string (optional)
			* @param int $uid Message UID to fetch
			* @param string $structure_str Message BODYSTRUCTURE string (optional)
			* @return object rcube_message_part Message part tree or False on failure
			*/
			function &get_structure($uid, $structure_str='')
			@@ -1675,14 +1847,22 @@
			else
			$this->struct_charset = $this->_structure_charset($structure);

			$headers->ctype = strtolower($headers->ctype);

			// Here we can recognize malformed BODYSTRUCTURE and
			// 1. [@TODO] parse the message in other way to create our own message structure
			// 2. or just show the raw message body.
			// Example of structure for malformed MIME message:
			// ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 2154 70 NIL NIL NIL)
			if ($headers->ctype && $headers->ctype != 'text/plain'
			&& $structure[0] == 'text' && $structure[1] == 'plain') {
			return false;
			// ("text" "plain" NIL NIL NIL "7bit" 2154 70 NIL NIL NIL)
			if ($headers->ctype && !is_array($structure[0]) && $headers->ctype != 'text/plain'
			&& strtolower($structure[0].'/'.$structure[1]) == 'text/plain') {
			// we can handle single-part messages, by simple fix in structure (#1486898)
			if (preg_match('/^(text\|application)\/(.*)/', $headers->ctype, $m)) {
			$structure[0] = $m[1];
			$structure[1] = $m[2];
			}
			else
			return false;
			}

			$struct = &$this->_structure_part($structure);
			@@ -1697,7 +1877,8 @@

			// write structure to cache
			if ($this->caching_enabled)
			$this->add_message_cache($cache_key, $this->_msg_id, $headers, $struct);
			$this->add_message_cache($cache_key, $this->_msg_id, $headers, $struct,
			$this->icache['message.id'][$uid], true);
			}

			return $struct;
			@@ -1707,9 +1888,12 @@
			/**
			* Build message part object
			*
			* @param array $part
			* @param int $count
			* @param string $parent
			* @access private
			*/
			function &_structure_part($part, $count=0, $parent='', $mime_headers=null, $raw_headers=null)
			function &_structure_part($part, $count=0, $parent='', $mime_headers=null)
			{
			$struct = new rcube_message_part;
			$struct->mime_id = empty($parent) ? (string)$count : "$parent.$count";
			@@ -1717,6 +1901,18 @@
			// multipart
			if (is_array($part[0])) {
			$struct->ctype_primary = 'multipart';

			/* RFC3501: BODYSTRUCTURE fields of multipart part
			part1 array
			part2 array
			part3 array
			....
			1. subtype
			2. parameters (optional)
			3. description (optional)
			4. language (optional)
			5. location (optional)
			*/

			// find first non-array entry
			for ($i=1; $i<count($part); $i++) {
			@@ -1729,19 +1925,18 @@
			$struct->mimetype = 'multipart/'.$struct->ctype_secondary;

			// build parts list for headers pre-fetching
			for ($i=0, $count=0; $i<count($part); $i++) {
			if (is_array($part[$i]) && count($part[$i]) > 3) {
			// fetch message headers if message/rfc822
			// or named part (could contain Content-Location header)
			if (!is_array($part[$i][0])) {
			$tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
			if (strtolower($part[$i][0]) == 'message' && strtolower($part[$i][1]) == 'rfc822') {
			$raw_part_headers[] = $tmp_part_id;
			$mime_part_headers[] = $tmp_part_id;
			}
			else if (in_array('name', (array)$part[$i][2]) && (empty($part[$i][3]) \|\| $part[$i][3]=='NIL')) {
			$mime_part_headers[] = $tmp_part_id;
			}
			for ($i=0; $i<count($part); $i++) {
			if (!is_array($part[$i]))
			break;
			// fetch message headers if message/rfc822
			// or named part (could contain Content-Location header)
			if (!is_array($part[$i][0])) {
			$tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
			if (strtolower($part[$i][0]) == 'message' && strtolower($part[$i][1]) == 'rfc822') {
			$mime_part_headers[] = $tmp_part_id;
			}
			else if (in_array('name', (array)$part[$i][2]) && (empty($part[$i][3]) \|\| $part[$i][3]=='NIL')) {
			$mime_part_headers[] = $tmp_part_id;
			}
			}
			}
			@@ -1753,22 +1948,39 @@
			$mime_part_headers = $this->conn->fetchMIMEHeaders($this->mailbox,
			$this->_msg_id, $mime_part_headers);
			}
			// we'll need a real content-type of message/rfc822 part
			if ($raw_part_headers) {
			$raw_part_headers = $this->conn->fetchMIMEHeaders($this->mailbox,
			$this->_msg_id, $raw_part_headers, false);
			}

			$struct->parts = array();
			for ($i=0, $count=0; $i<count($part); $i++) {
			if (is_array($part[$i]) && count($part[$i]) > 3) {
			$tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
			$struct->parts[] = $this->_structure_part($part[$i], ++$count, $struct->mime_id,
			$mime_part_headers[$tmp_part_id], $raw_part_headers[$tmp_part_id]);
			}
			if (!is_array($part[$i]))
			break;
			$tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
			$struct->parts[] = $this->_structure_part($part[$i], ++$count, $struct->mime_id,
			$mime_part_headers[$tmp_part_id]);
			}

			return $struct;
			}

			/* RFC3501: BODYSTRUCTURE fields of non-multipart part
			0. type
			1. subtype
			2. parameters
			3. id
			4. description
			5. encoding
			6. size
			-- text
			7. lines
			-- message/rfc822
			7. envelope structure
			8. body structure
			9. lines
			--
			x. md5 (optional)
			x. disposition (optional)
			x. language (optional)
			x. location (optional)
			*/

			// regular part
			$struct->ctype_primary = strtolower($part[0]);
			@@ -1796,9 +2008,11 @@
			$struct->size = intval($part[6]);

			// read part disposition
			$di = count($part) - 2;
			if ((is_array($part[$di]) && count($part[$di]) == 2 && is_array($part[$di][1])) \|\|
			(is_array($part[--$di]) && count($part[$di]) == 2)) {
			$di = 8;
			if ($struct->ctype_primary == 'text') $di += 1;
			else if ($struct->mimetype == 'message/rfc822') $di += 3;

			if (is_array($part[$di]) && count($part[$di]) == 2) {
			$struct->disposition = strtolower($part[$di][0]);

			if (is_array($part[$di][1]))
			@@ -1806,12 +2020,14 @@
			$struct->d_parameters[strtolower($part[$di][1][$n])] = $part[$di][1][$n+1];
			}

			// get child parts
			// get message/rfc822's child-parts
			if (is_array($part[8]) && $di != 8) {
			$struct->parts = array();
			for ($i=0, $count=0; $i<count($part[8]); $i++)
			if (is_array($part[8][$i]) && count($part[8][$i]) > 5)
			$struct->parts[] = $this->_structure_part($part[8][$i], ++$count, $struct->mime_id);
			for ($i=0, $count=0; $i<count($part[8]); $i++) {
			if (!is_array($part[8][$i]))
			break;
			$struct->parts[] = $this->_structure_part($part[8][$i], ++$count, $struct->mime_id);
			}
			}

			// get part ID
			@@ -1831,24 +2047,24 @@
			}
			$struct->headers = $this->_parse_headers($mime_headers) + $struct->headers;

			// get real headers for message of type 'message/rfc822'
			// get real content-type of message/rfc822
			if ($struct->mimetype == 'message/rfc822') {
			if (empty($raw_headers)) {
			$raw_headers = $this->conn->fetchMIMEHeaders(
			$this->mailbox, $this->_msg_id, (array)$struct->mime_id, false);
			}
			$struct->real_headers = $this->_parse_headers($raw_headers);

			// get real content-type of message/rfc822
			if (preg_match('/^([a-z0-9_\/-]+)/i', $struct->real_headers['content-type'], $matches)) {
			$struct->real_mimetype = strtolower($matches[1]);
			// single-part
			if (!is_array($part[8][0]))
			$struct->real_mimetype = strtolower($part[8][0] . '/' . $part[8][1]);
			// multi-part
			else {
			for ($n=0; $n<count($part[8]); $n++)
			if (!is_array($part[8][$n]))
			break;
			$struct->real_mimetype = 'multipart/' . strtolower($part[8][$n]);
			}
			}
			}

			if ($struct->ctype_primary=='message') {
			if (is_array($part[8]) && $di != 8 && empty($struct->parts))
			$struct->parts[] = $this->_structure_part($part[8], ++$count, $struct->mime_id);
			if ($struct->ctype_primary == 'message' && empty($struct->parts)) {
			if (is_array($part[8]) && $di != 8)
			$struct->parts[] = $this->_structure_part($part[8], ++$count, $struct->mime_id);
			}
			}

			// normalize filename property
			@@ -1862,8 +2078,8 @@
			* Set attachment filename from message part structure
			*
			* @access private
			* @param object rcube_message_part Part object
			* @param string Part's raw headers
			* @param rcube_message_part $part Part object
			* @param string $headers Part's raw headers
			*/
			private function _set_part_filename(&$part, $headers=null)
			{
			@@ -1983,7 +2199,7 @@
			* Get charset name from message structure (first part)
			*
			* @access private
			* @param array Message structure
			* @param array $structure Message structure
			* @return string Charset name
			*/
			function _structure_charset($structure)
			@@ -1999,11 +2215,11 @@
			/**
			* Fetch message body of a specific message from the server
			*
			* @param int Message UID
			* @param string Part number
			* @param object rcube_message_part Part object created by get_structure()
			* @param mixed True to print part, ressource to write part contents in
			* @param resource File pointer to save the message part
			* @param int $uid Message UID
			* @param string $part Part number
			* @param rcube_message_part $o_part Part object created by get_structure()
			* @param mixed $print True to print part, ressource to write part contents in
			* @param resource $fp File pointer to save the message part
			* @return string Message/part body if not printed
			*/
			function &get_message_part($uid, $part=1, $o_part=NULL, $print=NULL, $fp=NULL)
			@@ -2034,7 +2250,7 @@
			return true;

			// convert charset (if text or message part)
			if ($o_part->ctype_primary=='text' \|\| $o_part->ctype_primary=='message') {
			if ($body && ($o_part->ctype_primary == 'text' \|\| $o_part->ctype_primary == 'message')) {
			// assume default if no charset specified
			if (empty($o_part->charset) \|\| strtolower($o_part->charset) == 'us-ascii')
			$o_part->charset = $this->default_charset;
			@@ -2049,8 +2265,8 @@
			/**
			* Fetch message body of a specific message from the server
			*
			* @param int Message UID
			* @return string Message/part body
			* @param int $uid Message UID
			* @return string $part Message/part body
			* @see rcube_imap::get_message_part()
			*/
			function &get_body($uid, $part=1)
			@@ -2064,7 +2280,7 @@
			/**
			* Returns the whole message source as string
			*
			* @param int Message UID
			* @param int $uid Message UID
			* @return string Message source string
			*/
			function &get_raw_body($uid)
			@@ -2076,7 +2292,7 @@
			/**
			* Returns the message headers as string
			*
			* @param int Message UID
			* @param int $uid Message UID
			* @return string Message headers string
			*/
			function &get_raw_headers($uid)
			@@ -2088,7 +2304,7 @@
			/**
			* Sends the whole message source to stdout
			*
			* @param int Message UID
			* @param int $uid Message UID
			*/
			function print_raw_body($uid)
			{
			@@ -2099,10 +2315,10 @@
			/**
			* Set message flag to one or several messages
			*
			* @param mixed Message UIDs as array or comma-separated string, or '*'
			* @param string Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
			* @param string Folder name
			* @param boolean True to skip message cache clean up
			* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
			* @param string $flag Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
			* @param string $mbox_name Folder name
			* @param boolean $skip_cache True to skip message cache clean up
			* @return int Number of flagged messages, -1 on failure
			*/
			function set_flag($uids, $flag, $mbox_name=NULL, $skip_cache=false)
			@@ -2142,9 +2358,9 @@
			/**
			* Remove message flag for one or several messages
			*
			* @param mixed Message UIDs as array or comma-separated string, or '*'
			* @param string Flag to unset: SEEN, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
			* @param string Folder name
			* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
			* @param string $flag Flag to unset: SEEN, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
			* @param string $mbox_name Folder name
			* @return int Number of flagged messages, -1 on failure
			* @see set_flag
			*/
			@@ -2157,10 +2373,10 @@
			/**
			* Append a mail message (source) to a specific mailbox
			*
			* @param string Target mailbox
			* @param string The message source string or filename
			* @param string Headers string if $message contains only the body
			* @param boolean True if $message is a filename
			* @param string $mbox_name Target mailbox
			* @param string $message The message source string or filename
			* @param string $headers Headers string if $message contains only the body
			* @param boolean $is_file True if $message is a filename
			*
			* @return boolean True on success, False on error
			*/
			@@ -2170,11 +2386,8 @@

			// make sure mailbox exists
			if ($this->mailbox_exists($mbox_name, true)) {
			if ($is_file) {
			$separator = rcmail::get_instance()->config->header_delimiter();
			$saved = $this->conn->appendFromFile($mailbox, $message,
			$headers, $separator.$separator);
			}
			if ($is_file)
			$saved = $this->conn->appendFromFile($mailbox, $message, $headers);
			else
			$saved = $this->conn->append($mailbox, $message);
			}
			@@ -2191,9 +2404,9 @@
			/**
			* Move a message from one mailbox to another
			*
			* @param mixed Message UIDs as array or comma-separated string, or '*'
			* @param string Target mailbox
			* @param string Source mailbox
			* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
			* @param string $to_mbox Target mailbox
			* @param string $from_mbox Source mailbox
			* @return boolean True on success, False on error
			*/
			function move_message($uids, $to_mbox, $from_mbox='')
			@@ -2272,9 +2485,9 @@
			/**
			* Copy a message from one mailbox to another
			*
			* @param mixed Message UIDs as array or comma-separated string, or '*'
			* @param string Target mailbox
			* @param string Source mailbox
			* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
			* @param string $to_mbox Target mailbox
			* @param string $from_mbox Source mailbox
			* @return boolean True on success, False on error
			*/
			function copy_message($uids, $to_mbox, $from_mbox='')
			@@ -2313,8 +2526,8 @@
			/**
			* Mark messages as deleted and expunge mailbox
			*
			* @param mixed Message UIDs as array or comma-separated string, or '*'
			* @param string Source mailbox
			* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
			* @param string $mbox_name Source mailbox
			* @return boolean True on success, False on error
			*/
			function delete_message($uids, $mbox_name='')
			@@ -2367,7 +2580,7 @@
			/**
			* Clear all messages in a specific mailbox
			*
			* @param string Mailbox name
			* @param string $mbox_name Mailbox name
			* @return int Above 0 on success
			*/
			function clear_mailbox($mbox_name=NULL)
			@@ -2396,8 +2609,8 @@
			/**
			* Send IMAP expunge command and clear cache
			*
			* @param string Mailbox name
			* @param boolean False if cache should not be cleared
			* @param string $mbox_name Mailbox name
			* @param boolean $clear_cache False if cache should not be cleared
			* @return boolean True on success
			*/
			function expunge($mbox_name='', $clear_cache=true)
			@@ -2410,9 +2623,9 @@
			/**
			* Send IMAP expunge command and clear cache
			*
			* @param string Mailbox name
			* @param boolean False if cache should not be cleared
			* @param mixed Message UIDs as array or comma-separated string, or '*'
			* @param string $mailbox Mailbox name
			* @param boolean $clear_cache False if cache should not be cleared
			* @param mixed $uids Message UIDs as array or comma-separated string, or '*'
			* @return boolean True on success
			* @access private
			* @see rcube_imap::expunge()
			@@ -2438,8 +2651,8 @@
			/**
			* Parse message UIDs input
			*
			* @param mixed UIDs array or comma-separated list or '' or '1:'
			* @param string Mailbox name
			* @param mixed $uids UIDs array or comma-separated list or '' or '1:'
			* @param string $mailbox Mailbox name
			* @return array Two elements array with UIDs converted to list and ALL flag
			* @access private
			*/
			@@ -2481,8 +2694,8 @@
			/**
			* Translate UID to message ID
			*
			* @param int Message UID
			* @param string Mailbox name
			* @param int $uid Message UID
			* @param string $mbox_name Mailbox name
			* @return int Message ID
			*/
			function get_id($uid, $mbox_name=NULL)
			@@ -2495,8 +2708,8 @@
			/**
			* Translate message number to UID
			*
			* @param int Message ID
			* @param string Mailbox name
			* @param int $id Message ID
			* @param string $mbox_name Mailbox name
			* @return int Message UID
			*/
			function get_uid($id,$mbox_name=NULL)
			@@ -2516,8 +2729,8 @@
			*
			* Converts mailbox name with root dir first
			*
			* @param string Optional root folder
			* @param string Optional filter for mailbox listing
			* @param string $root Optional root folder
			* @param string $filter Optional filter for mailbox listing
			* @return array List of mailboxes/folders
			* @access public
			*/
			@@ -2546,6 +2759,8 @@
			/**
			* Private method for mailbox listing
			*
			* @param string $root Optional root folder
			* @param string $filter Optional filter for mailbox listing
			* @return array List of mailboxes/folders
			* @see rcube_imap::list_mailboxes()
			* @access private
			@@ -2560,7 +2775,7 @@
			$a_defaults = $a_out = array();

			// Give plugins a chance to provide a list of mailboxes
			$data = rcmail::get_instance()->plugins->exec_hook('list_mailboxes',
			$data = rcmail::get_instance()->plugins->exec_hook('mailboxes_list',
			array('root' => $root, 'filter' => $filter, 'mode' => 'LSUB'));

			if (isset($data['folders'])) {
			@@ -2584,14 +2799,14 @@
			/**
			* Get a list of all folders available on the IMAP server
			*
			* @param string IMAP root dir
			* @param string Optional filter for mailbox listing
			* @param string $root IMAP root dir
			* @param string $filter Optional filter for mailbox listing
			* @return array Indexed array with folder names
			*/
			function list_unsubscribed($root='', $filter='*')
			{
			// Give plugins a chance to provide a list of mailboxes
			$data = rcmail::get_instance()->plugins->exec_hook('list_mailboxes',
			$data = rcmail::get_instance()->plugins->exec_hook('mailboxes_list',
			array('root' => $root, 'filter' => $filter, 'mode' => 'LIST'));

			if (isset($data['folders'])) {
			@@ -2601,7 +2816,7 @@
			// retrieve list of folders from IMAP server
			$a_mboxes = $this->conn->listMailboxes($this->mod_mailbox($root), $filter);
			}


			$a_folders = array();
			if (!is_array($a_mboxes))
			$a_mboxes = array();
			@@ -2641,7 +2856,7 @@
			/**
			* Subscribe to a specific mailbox(es)
			*
			* @param array Mailbox name(s)
			* @param array $a_mboxes Mailbox name(s)
			* @return boolean True on success
			*/
			function subscribe($a_mboxes)
			@@ -2657,7 +2872,7 @@
			/**
			* Unsubscribe mailboxes
			*
			* @param array Mailbox name(s)
			* @param array $a_mboxes Mailbox name(s)
			* @return boolean True on success
			*/
			function unsubscribe($a_mboxes)
			@@ -2673,8 +2888,8 @@
			/**
			* Create a new mailbox on the server and register it in local cache
			*
			* @param string New mailbox name (as utf-7 string)
			* @param boolean True if the new mailbox should be subscribed
			* @param string $name New mailbox name (as utf-7 string)
			* @param boolean $subscribe True if the new mailbox should be subscribed
			* @param string Name of the created mailbox, false on error
			*/
			function create_mailbox($name, $subscribe=false)
			@@ -2697,8 +2912,8 @@
			/**
			* Set a new name to an existing mailbox
			*
			* @param string Mailbox to rename (as utf-7 string)
			* @param string New mailbox name (as utf-7 string)
			* @param string $mbox_name Mailbox to rename (as utf-7 string)
			* @param string $new_name New mailbox name (as utf-7 string)
			* @return string Name of the renames mailbox, False on error
			*/
			function rename_mailbox($mbox_name, $new_name)
			@@ -2750,7 +2965,7 @@
			/**
			* Remove mailboxes from server
			*
			* @param string Mailbox name(s) string/array
			* @param string\|array $mbox_name sMailbox name(s) string/array
			* @return boolean True on success
			*/
			function delete_mailbox($mbox_name)
			@@ -2817,8 +3032,8 @@
			/**
			* Checks if folder exists and is subscribed
			*
			* @param string Folder name
			* @param boolean Enable subscription checking
			* @param string $mbox_name Folder name
			* @param boolean $subscription Enable subscription checking
			* @return boolean TRUE or FALSE
			*/
			function mailbox_exists($mbox_name, $subscription=false)
			@@ -2851,8 +3066,8 @@
			/**
			* Modify folder name for input/output according to root dir and namespace
			*
			* @param string Folder name
			* @param string Mode
			* @param string $mbox_name Folder name
			* @param string $mode Mode
			* @return string Folder name
			*/
			function mod_mailbox($mbox_name, $mode='in')
			@@ -2871,11 +3086,31 @@
			}


			/**
			* Get message header names for rcube_imap_generic::fetchHeader(s)
			*
			* @return string Space-separated list of header names
			*/
			private function get_fetch_headers()
			{
			$headers = explode(' ', $this->fetch_add_headers);
			$headers = array_map('strtoupper', $headers);

			if ($this->caching_enabled \|\| $this->get_all_headers)
			$headers = array_merge($headers, $this->all_headers);

			return implode(' ', array_unique($headers));
			}


			/* --------------------------------
			* internal caching methods
			* --------------------------------*/

			/**
			* Enable or disable caching
			*
			* @param boolean $set Flag
			* @access public
			*/
			function set_caching($set)
			@@ -2887,6 +3122,10 @@
			}

			/**
			* Returns cached value
			*
			* @param string $key Cache key
			* @return mixed
			* @access public
			*/
			function get_cache($key)
			@@ -2900,6 +3139,10 @@
			}

			/**
			* Update cache
			*
			* @param string $key Cache key
			* @param mixed $data Data
			* @access private
			*/
			private function update_cache($key, $data)
			@@ -2910,6 +3153,8 @@
			}

			/**
			* Writes the cache
			*
			* @access private
			*/
			private function write_cache()
			@@ -2923,6 +3168,9 @@
			}

			/**
			* Clears the cache.
			*
			* @param string $key Cache key
			* @access public
			*/
			function clear_cache($key=NULL)
			@@ -2946,6 +3194,10 @@
			}

			/**
			* Returns cached entry
			*
			* @param string $key Cache key
			* @return mixed Cached value
			* @access private
			*/
			private function _read_cache_record($key)
			@@ -2971,6 +3223,10 @@
			}

			/**
			* Writes single cache record
			*
			* @param string $key Cache key
			* @param mxied $data Cache value
			* @access private
			*/
			private function _write_cache_record($key, $data)
			@@ -3014,6 +3270,9 @@
			}

			/**
			* Clears cache for single record
			*
			* @param string $ket Cache key
			* @access private
			*/
			private function _clear_cache_record($key)
			@@ -3037,8 +3296,8 @@
			/**
			* Checks if the cache is up-to-date
			*
			* @param string Mailbox name
			* @param string Internal cache key
			* @param string $mailbox Mailbox name
			* @param string $cache_key Internal cache key
			* @return int Cache status: -3 = off, -2 = incomplete, -1 = dirty, 1 = OK
			*/
			private function check_cache_status($mailbox, $cache_key)
			@@ -3054,15 +3313,12 @@
			if (!$msg_count)
			return $cache_count ? -2 : 1;

			// @TODO: We've got one big performance problem in cache status checking method
			// E.g. mailbox contains 1000 messages, in cache table we've got first 100
			// of them. Now if we want to display only that 100 (which we've got)
			// check_cache_status returns 'incomplete' and messages are fetched
			// from IMAP instead of DB.

			if ($cache_count==$msg_count) {
			if ($this->skip_deleted) {
			$h_index = $this->conn->fetchHeaderIndex($mailbox, "1:*", 'UID', $this->skip_deleted);

			// Save index in internal cache, will be used when syncing the cache
			$this->icache['folder_index'] = $h_index;

			if (empty($h_index))
			return -2;
			@@ -3077,8 +3333,8 @@
			}
			return -2;
			} else {
			// get UID of message with highest index
			$uid = $this->conn->ID2UID($mailbox, $msg_count);
			// get UID of the message with highest index
			$uid = $this->_id2uid($msg_count, $mailbox);
			$cache_uid = array_pop($cache_index);

			// uids of highest message matches -> cache seems OK
			@@ -3096,20 +3352,26 @@
			}

			/**
			* @param string $key Cache key
			* @param string $from
			* @param string $to
			* @param string $sort_field
			* @param string $sort_order
			* @access private
			*/
			private function get_message_cache($key, $from, $to, $sort_field, $sort_order)
			{
			$cache_key = "$key:$from:$to:$sort_field:$sort_order";
			if (!$this->caching_enabled)
			return NULL;

			// use idx sort as default sorting
			if (!$sort_field \|\| !in_array($sort_field, $this->db_header_fields)) {
			$sort_field = 'idx';
			}

			if ($this->caching_enabled && !isset($this->cache[$cache_key])) {
			$this->cache[$cache_key] = array();
			$sql_result = $this->db->limitquery(
			$result = array();

			$sql_result = $this->db->limitquery(
			"SELECT idx, uid, headers".
			" FROM ".get_table_name('messages').
			" WHERE user_id=?".
			@@ -3120,21 +3382,23 @@
			$_SESSION['user_id'],
			$key);

			while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
			$uid = $sql_arr['uid'];
			$this->cache[$cache_key][$uid] = $this->db->decode(unserialize($sql_arr['headers']));
			while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
			$uid = intval($sql_arr['uid']);
			$result[$uid] = $this->db->decode(unserialize($sql_arr['headers']));

			// featch headers if unserialize failed
			if (empty($this->cache[$cache_key][$uid]))
			$this->cache[$cache_key][$uid] = $this->conn->fetchHeader(
			preg_replace('/.msg$/', '', $key), $uid, true, $this->fetch_add_headers);
			}
			// featch headers if unserialize failed
			if (empty($result[$uid]))
			$result[$uid] = $this->conn->fetchHeader(
			preg_replace('/.msg$/', '', $key), $uid, true, false, $this->get_fetch_headers());
			}

			return $this->cache[$cache_key];
			return $result;
			}

			/**
			* @param string $key Cache key
			* @param int $uid User id
			* @return mixed
			* @access private
			*/
			private function &get_cached_message($key, $uid)
			@@ -3143,7 +3407,7 @@

			if ($this->caching_enabled && !isset($this->icache[$internal_key][$uid])) {
			$sql_result = $this->db->query(
			"SELECT idx, headers, structure".
			"SELECT idx, headers, structure, message_id".
			" FROM ".get_table_name('messages').
			" WHERE user_id=?".
			" AND cache_key=?".
			@@ -3153,8 +3417,10 @@
			$uid);

			if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
			$this->uid_id_map[preg_replace('/\.msg$/', '', $key)][$uid] = $sql_arr['idx'];
			$this->icache['message.id'][$uid] = intval($sql_arr['message_id']);
			$this->uid_id_map[preg_replace('/\.msg$/', '', $key)][$uid] = intval($sql_arr['idx']);
			$this->icache[$internal_key][$uid] = $this->db->decode(unserialize($sql_arr['headers']));

			if (is_object($this->icache[$internal_key][$uid]) && !empty($sql_arr['structure']))
			$this->icache[$internal_key][$uid]->structure = $this->db->decode(unserialize($sql_arr['structure']));
			}
			@@ -3164,24 +3430,36 @@
			}

			/**
			* @param string $key Cache key
			* @param boolean $force Force flag
			* @param string $sort_field
			* @param string $sort_order
			* @access private
			*/
			private function get_message_cache_index($key, $force=false, $sort_field='idx', $sort_order='ASC')
			private function get_message_cache_index($key, $sort_field='idx', $sort_order='ASC')
			{
			static $sa_message_index = array();

			// empty key -> empty array
			if (!$this->caching_enabled \|\| empty($key))
			return array();

			if (!empty($sa_message_index[$key]) && !$force)
			return $sa_message_index[$key];
			return NULL;

			// use idx sort as default
			if (!$sort_field \|\| !in_array($sort_field, $this->db_header_fields))
			$sort_field = 'idx';

			$sa_message_index[$key] = array();
			$ord = $sort_field . $sort_order;

			if (array_key_exists('index', $this->icache)
			&& $this->icache['index']['key'] == $key
			&& $this->icache['index']['ord'] == $ord
			) {
			return $this->icache['index']['result'];
			}

			$this->icache['index'] = array(
			'result' => array(),
			'ord' => $ord,
			'key' => $key,
			);

			$sql_result = $this->db->query(
			"SELECT idx, uid".
			" FROM ".get_table_name('messages').
			@@ -3192,29 +3470,35 @@
			$key);

			while ($sql_arr = $this->db->fetch_assoc($sql_result))
			$sa_message_index[$key][$sql_arr['idx']] = $sql_arr['uid'];
			$this->icache['index']['result'][$sql_arr['idx']] = intval($sql_arr['uid']);

			return $sa_message_index[$key];
			return $this->icache['index']['result'];
			}

			/**
			* @access private
			*/
			private function add_message_cache($key, $index, $headers, $struct=null, $force=false)
			private function add_message_cache($key, $index, $headers, $struct=null, $force=false, $internal_cache=false)
			{
			if (empty($key) \|\| !is_object($headers) \|\| empty($headers->uid))
			return;

			// add to internal (fast) cache
			$this->icache['message'][$headers->uid] = clone $headers;
			$this->icache['message'][$headers->uid]->structure = $struct;
			if ($internal_cache) {
			$this->icache['message'][$headers->uid] = clone $headers;
			$this->icache['message'][$headers->uid]->structure = $struct;
			}

			// no further caching
			if (!$this->caching_enabled)
			return;

			// known message id
			if (is_int($force) && $force > 0) {
			$message_id = $force;
			}
			// check for an existing record (probably headers are cached but structure not)
			if (!$force) {
			else if (!$force) {
			$sql_result = $this->db->query(
			"SELECT message_id".
			" FROM ".get_table_name('messages').
			@@ -3263,6 +3547,8 @@
			is_object($struct) ? serialize($this->db->encode(clone $struct)) : NULL
			);
			}

			unset($this->icache['index']);
			}

			/**
			@@ -3280,9 +3566,13 @@
			" AND ".($idx ? "idx" : "uid")." IN (".$this->db->array2list($ids, 'integer').")",
			$_SESSION['user_id'],
			$key);

			unset($this->icache['index']);
			}

			/**
			* @param string $key Cache key
			* @param int $start_index Start index
			* @access private
			*/
			private function clear_message_cache($key, $start_index=1)
			@@ -3296,6 +3586,8 @@
			" AND cache_key=?".
			" AND idx>=?",
			$_SESSION['user_id'], $key, $start_index);

			unset($this->icache['index']);
			}

			/**
			@@ -3336,9 +3628,9 @@
			/**
			* Split an address list into a structured array list
			*
			* @param string Input string
			* @param int List only this number of addresses
			* @param boolean Decode address strings
			* @param string $input Input string
			* @param int $max List only this number of addresses
			* @param boolean $decode Decode address strings
			* @return array Indexed list of addresses
			*/
			function decode_address_list($input, $max=null, $decode=true)
			@@ -3359,8 +3651,8 @@
			$address = trim($val['address']);
			$name = trim($val['name']);

			if (preg_match('/^[\'"]/', $name) && preg_match('/[\'"]$/', $name))
			$name = preg_replace(array('/^[\'"]/', '/[\'"]$/'), '', $name);
			if ($name && preg_match('/^[\'"]/', $name) && preg_match('/[\'"]$/', $name))
			$name = trim($name, '\'"');

			if ($name && $address && $name != $address)
			$string = sprintf('%s <%s>', preg_match("/$special_chars/", $name) ? '"'.addcslashes($name, '"').'"' : $name, $address);
			@@ -3369,7 +3661,8 @@
			else if ($name)
			$string = $name;

			$out[$j] = array('name' => $name,
			$out[$j] = array(
			'name' => $name,
			'mailto' => $address,
			'string' => $string
			);
			@@ -3383,53 +3676,16 @@


			/**
			* Decode a Microsoft Outlook TNEF part (winmail.dat)
			*
			* @param object rcube_message_part Message part to decode
			* @param string UID of the message
			* @return array List of rcube_message_parts extracted from windmail.dat
			*/
			function tnef_decode(&$part, $uid)
			{
			if (!isset($part->body))
			$part->body = $this->get_message_part($uid, $part->mime_id, $part);

			require_once('lib/tnef_decoder.inc');

			$pid = 0;
			$tnef_parts = array();
			$tnef_arr = tnef_decode($part->body);

			foreach ($tnef_arr as $winatt) {
			$tpart = new rcube_message_part;
			$tpart->filename = trim($winatt['name']);
			$tpart->encoding = 'stream';
			$tpart->ctype_primary = trim(strtolower($winatt['type0']));
			$tpart->ctype_secondary = trim(strtolower($winatt['type1']));
			$tpart->mimetype = $tpart->ctype_primary . '/' . $tpart->ctype_secondary;
			$tpart->mime_id = "winmail." . $part->mime_id . ".$pid";
			$tpart->size = $winatt['size'];
			$tpart->body = $winatt['stream'];

			$tnef_parts[] = $tpart;
			$pid++;
			}

			return $tnef_parts;
			}


			/**
			* Decode a message header value
			*
			* @param string Header value
			* @param boolean Remove quotes if necessary
			* @param string $input Header value
			* @param boolean $remove_quotas Remove quotes if necessary
			* @return string Decoded string
			*/
			function decode_header($input, $remove_quotes=false)
			{
			$str = rcube_imap::decode_mime_string((string)$input, $this->default_charset);
			if ($str{0}=='"' && $remove_quotes)
			if ($str[0] == '"' && $remove_quotes)
			$str = str_replace('"', '', $str);

			return $str;
			@@ -3495,6 +3751,8 @@
			/**
			* Decode a part of a mime-encoded string
			*
			* @param string $str String to decode
			* @return string Decoded string
			* @access private
			*/
			private function _decode_mime_string_part($str)
			@@ -3525,8 +3783,8 @@
			/**
			* Decode a mime part
			*
			* @param string Input string
			* @param string Part encoding
			* @param string $input Input string
			* @param string $encoding Part encoding
			* @return string Decoded string
			*/
			function mime_decode($input, $encoding='7bit')
			@@ -3551,8 +3809,8 @@
			/**
			* Convert body charset to RCMAIL_CHARSET according to the ctype_parameters
			*
			* @param string Part body to decode
			* @param string Charset to convert from
			* @param string $body Part body to decode
			* @param string $ctype_param Charset to convert from
			* @return string Content converted to internal charset
			*/
			function charset_decode($body, $ctype_param)
			@@ -3571,6 +3829,9 @@

			/**
			* Validate the given input and save to local properties
			*
			* @param string $sort_field Sort column
			* @param string $sort_order Sort order
			* @access private
			*/
			private function _set_sort_order($sort_field, $sort_order)
			@@ -3583,6 +3844,8 @@

			/**
			* Sort mailboxes first by default folders and then in alphabethical order
			*
			* @param array $a_folders Mailboxes list
			* @access private
			*/
			private function _sort_mailbox_list($a_folders)
			@@ -3640,6 +3903,9 @@


			/**
			* @param int $uid User id
			* @param string $mbox_name Mailbox name
			* @return int
			* @access private
			*/
			private function _uid2id($uid, $mbox_name=NULL)
			@@ -3654,6 +3920,9 @@
			}

			/**
			* @param int $id Id
			* @param string $mbox_name Mailbox name
			* @return int
			* @access private
			*/
			private function _id2uid($id, $mbox_name=NULL)
			@@ -3803,9 +4072,9 @@
			$result[$key]['name'] .= (empty($result[$key]['name'])?'':' ').str_replace("\"",'',stripslashes($v));
			}

			if (empty($result[$key]['name']))
			$result[$key]['name'] = $result[$key]['address'];
			elseif (empty($result[$key]['address']))
			// if (empty($result[$key]['name']))
			// $result[$key]['name'] = $result[$key]['address'];
			if (empty($result[$key]['address']))
			$result[$key]['address'] = $result[$key]['name'];
			}

			@@ -3858,7 +4127,7 @@
			/**
			* Set the predetermined sort order.
			*
			* @param array Numerically indexed array of IMAP message sequence numbers
			* @param array $seqnums Numerically indexed array of IMAP message sequence numbers
			*/
			function set_sequence_numbers($seqnums)
			{
			@@ -3868,7 +4137,7 @@
			/**
			* Sort the array of header objects
			*
			* @param array Array of rcube_mail_header objects indexed by UID
			* @param array $headers Array of rcube_mail_header objects indexed by UID
			*/
			function sort_headers(&$headers)
			{
			@@ -3884,6 +4153,9 @@

			/**
			* Sort method called by uasort()
			*
			* @param rcube_mail_header $a
			* @param rcube_mail_header $b
			*/
			function compare_seqnums($a, $b)
			{