githubFork/roundcubemail.git

			@@ -5,7 +5,7 @@
			\| program/include/rcube_imap.php \|
			\| \|
			\| This file is part of the RoundCube Webmail client \|
			\| Copyright (C) 2005-2008, RoundCube Dev. - Switzerland \|
			\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
			\| Licensed under the GNU GPL \|
			\| \|
			\| PURPOSE: \|
			@@ -26,6 +26,7 @@
			*/
			require_once('lib/imap.inc');
			require_once('lib/mime.inc');
			require_once('lib/tnef_decoder.inc');


			/**
			@@ -35,7 +36,7 @@
			*
			* @package Mail
			* @author Thomas Bruederli <roundcube@gmail.com>
			* @version 1.40
			* @version 1.5
			* @link http://ilohamail.org
			*/
			class rcube_imap
			@@ -49,24 +50,28 @@
			var $page_size = 10;
			var $sort_field = 'date';
			var $sort_order = 'DESC';
			var $index_sort = true;
			var $delimiter = NULL;
			var $caching_enabled = FALSE;
			var $default_charset = 'ISO-8859-1';
			var $struct_charset = NULL;
			var $default_folders = array('INBOX');
			var $default_folders_lc = array('inbox');
			var $fetch_add_headers = '';
			var $cache = array();
			var $cache_keys = array();
			var $cache_changes = array();
			var $uid_id_map = array();
			var $msg_headers = array();
			var $capabilities = array();
			var $skip_deleted = FALSE;
			var $search_set = NULL;
			var $search_subject = '';
			var $search_string = '';
			var $search_charset = '';
			var $search_sort_field = '';
			var $debug_level = 1;
			var $error_code = 0;
			var $options = array('auth_method' => 'check');

			private $host, $user, $pass, $port, $ssl;


			/**
			@@ -77,17 +82,6 @@
			function __construct($db_conn)
			{
			$this->db = $db_conn;
			}


			/**
			* PHP 4 object constructor
			*
			* @see rcube_imap::__construct
			*/
			function rcube_imap($db_conn)
			{
			$this->__construct($db_conn);
			}


			@@ -107,26 +101,34 @@
			global $ICL_SSL, $ICL_PORT, $IMAP_USE_INTERNAL_DATE;

			// check for Open-SSL support in PHP build
			if ($use_ssl && in_array('openssl', get_loaded_extensions()))
			if ($use_ssl && extension_loaded('openssl'))
			$ICL_SSL = $use_ssl == 'imaps' ? 'ssl' : $use_ssl;
			else if ($use_ssl)
			{
			raise_error(array('code' => 403, 'type' => 'imap', 'file' => __FILE__,
			'message' => 'Open SSL not available;'), TRUE, FALSE);
			else if ($use_ssl) {
			raise_error(array('code' => 403, 'type' => 'imap',
			'file' => __FILE__, 'line' => __LINE__,
			'message' => "Open SSL not available"), TRUE, FALSE);
			$port = 143;
			}
			}

			$ICL_PORT = $port;
			$IMAP_USE_INTERNAL_DATE = false;

			$this->conn = iil_Connect($host, $user, $pass, array('imap' => 'check'));
			$this->host = $host;
			$this->user = $user;

			$attempt = 0;
			do {
			$data = rcmail::get_instance()->plugins->exec_hook('imap_connect', array('host' => $host, 'user' => $user, 'attempt' => ++$attempt));
			if (!empty($data['pass']))
			$pass = $data['pass'];

			$this->conn = iil_Connect($data['host'], $data['user'], $pass, $this->options);
			} while(!$this->conn && $data['retry']);

			$this->host = $data['host'];
			$this->user = $data['user'];
			$this->pass = $pass;
			$this->port = $port;
			$this->ssl = $use_ssl;

			// print trace mesages
			// print trace messages
			if ($this->conn && ($this->debug_level & 8))
			console($this->conn->message);

			@@ -134,23 +136,21 @@
			else if (!$this->conn && $GLOBALS['iil_error'])
			{
			$this->error_code = $GLOBALS['iil_errornum'];
			raise_error(array('code' => 403,
			'type' => 'imap',
			'message' => $GLOBALS['iil_error']), TRUE, FALSE);
			raise_error(array('code' => 403, 'type' => 'imap',
			'file' => __FILE__, 'line' => __LINE__,
			'message' => $GLOBALS['iil_error']), TRUE, FALSE);
			}

			// get server properties
			if ($this->conn)
			{
			$this->_parse_capability($this->conn->capability);

			if (!empty($this->conn->delimiter))
			$this->delimiter = $this->conn->delimiter;
			if (!empty($this->conn->rootdir))
			{
			$this->set_rootdir($this->conn->rootdir);
			$this->root_ns = ereg_replace('[\.\/]$', '', $this->conn->rootdir);
			$this->root_ns = preg_replace('/[.\/]$/', '', $this->conn->rootdir);
			}
			if (empty($this->delimiter))
			$this->get_hierarchy_delimiter();
			}

			return $this->conn ? TRUE : FALSE;
			@@ -180,8 +180,19 @@
			{
			$this->close();
			$this->connect($this->host, $this->user, $this->pass, $this->port, $this->ssl);

			// issue SELECT command to restore connection status
			if ($this->mailbox)
			iil_C_Select($this->conn, $this->mailbox);
			}

			/**
			* Set options to be used in iil_Connect()
			*/
			function set_options($opt)
			{
			$this->options = array_merge($this->options, (array)$opt);
			}

			/**
			* Set a root folder for the IMAP connection.
			@@ -194,10 +205,11 @@
			*/
			function set_rootdir($root)
			{
			if (ereg('[\.\/]$', $root)) //(substr($root, -1, 1)==='/')
			if (preg_match('/[.\/]$/', $root)) //(substr($root, -1, 1)==='/')
			$root = substr($root, 0, -1);

			$this->root_dir = $root;
			$this->options['rootdir'] = $root;

			if (empty($this->delimiter))
			$this->get_hierarchy_delimiter();
			@@ -229,15 +241,10 @@
			if (is_array($arr))
			{
			$this->default_folders = $arr;
			$this->default_folders_lc = array();

			// add inbox if not included
			if (!in_array_nocase('INBOX', $this->default_folders))
			array_unshift($this->default_folders, 'INBOX');

			// create a second list with lower cased names
			foreach ($this->default_folders as $mbox)
			$this->default_folders_lc[] = strtolower($mbox);
			}
			}

			@@ -252,7 +259,7 @@
			*/
			function set_mailbox($new_mbox)
			{
			$mailbox = $this->_mod_mailbox($new_mbox);
			$mailbox = $this->mod_mailbox($new_mbox);

			if ($this->mailbox == $mailbox)
			return;
			@@ -291,21 +298,22 @@
			/**
			* Save a set of message ids for future message listing methods
			*
			* @param array List of IMAP fields to search in
			* @param string Search string
			* @param array List of message ids or NULL if empty
			* @param string IMAP Search query
			* @param array List of message ids or NULL if empty
			* @param string Charset of search string
			* @param string Sorting field
			*/
			function set_search_set($subject, $str=null, $msgs=null, $charset=null)
			function set_search_set($str=null, $msgs=null, $charset=null, $sort_field=null)
			{
			if (is_array($subject) && $str == null && $msgs == null)
			list($subject, $str, $msgs, $charset) = $subject;
			if (is_array($str) && $msgs == null)
			list($str, $msgs, $charset, $sort_field) = $str;
			if ($msgs != null && !is_array($msgs))
			$msgs = split(',', $msgs);
			$msgs = explode(',', $msgs);

			$this->search_subject = $subject;
			$this->search_string = $str;
			$this->search_set = (array)$msgs;
			$this->search_set = $msgs;
			$this->search_charset = $charset;
			$this->search_sort_field = $sort_field;
			}


			@@ -315,7 +323,7 @@
			*/
			function get_search_set()
			{
			return array($this->search_subject, $this->search_string, $this->search_set, $this->search_charset);
			return array($this->search_string, $this->search_set, $this->search_charset, $this->search_sort_field);
			}


			@@ -327,7 +335,7 @@
			*/
			function get_mailbox_name()
			{
			return $this->conn ? $this->_mod_mailbox($this->mailbox, 'out') : '';
			return $this->conn ? $this->mod_mailbox($this->mailbox, 'out') : '';
			}


			@@ -340,8 +348,23 @@
			*/
			function get_capability($cap)
			{
			$cap = strtoupper($cap);
			return $this->capabilities[$cap];
			return iil_C_GetCapability($this->conn, strtoupper($cap));
			}


			/**
			* 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
			* @return mixed True if this flag is supported
			* @access public
			*/
			function check_permflag($flag)
			{
			$flag = strtoupper($flag);
			$imap_flag = $GLOBALS['IMAP_FLAGS'][$flag];
			return (in_array_nocase($imap_flag, $this->conn->permanentflags));
			}


			@@ -380,7 +403,7 @@

			foreach ($a_mboxes as $mbox_row)
			{
			$name = $this->_mod_mailbox($mbox_row, 'out');
			$name = $this->mod_mailbox($mbox_row, 'out');
			if (strlen($name))
			$a_out[] = $name;
			}
			@@ -403,7 +426,7 @@
			* @see rcube_imap::list_mailboxes()
			* @access private
			*/
			function _list_mailboxes($root='', $filter='*')
			private function _list_mailboxes($root='', $filter='*')
			{
			$a_defaults = $a_out = array();

			@@ -412,8 +435,16 @@
			if (is_array($a_mboxes))
			return $a_mboxes;

			// retrieve list of folders from IMAP server
			$a_folders = iil_C_ListSubscribed($this->conn, $this->_mod_mailbox($root), $filter);
			// Give plugins a chance to provide a list of mailboxes
			$data = rcmail::get_instance()->plugins->exec_hook('list_mailboxes',array('root'=>$root,'filter'=>$filter));
			if (isset($data['folders'])) {
			$a_folders = $data['folders'];
			}
			else{
			// retrieve list of folders from IMAP server
			$a_folders = iil_C_ListSubscribed($this->conn, $this->mod_mailbox($root), $filter);
			}


			if (!is_array($a_folders) \|\| !sizeof($a_folders))
			$a_folders = array();
			@@ -436,7 +467,7 @@
			*/
			function messagecount($mbox_name='', $mode='ALL', $force=FALSE)
			{
			$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
			return $this->_messagecount($mailbox, $mode, $force);
			}

			@@ -447,9 +478,8 @@
			* @access private
			* @see rcube_imap::messagecount()
			*/
			function _messagecount($mailbox='', $mode='ALL', $force=FALSE)
			private function _messagecount($mailbox='', $mode='ALL', $force=FALSE)
			{
			$a_mailbox_cache = FALSE;
			$mode = strtoupper($mode);

			if (empty($mailbox))
			@@ -465,7 +495,10 @@
			if (!$force && is_array($a_mailbox_cache[$mailbox]) && isset($a_mailbox_cache[$mailbox][$mode]))
			return $a_mailbox_cache[$mailbox][$mode];

			// RECENT count is fetched abit different
			if (!is_array($a_mailbox_cache[$mailbox]))
			$a_mailbox_cache[$mailbox] = array();

			// RECENT count is fetched a bit different
			if ($mode == 'RECENT')
			$count = iil_C_CheckForRecent($this->conn, $mailbox);

			@@ -480,26 +513,18 @@

			// get message count using SEARCH
			// not very performant but more precise (using UNDELETED)
			$count = 0;
			$index = $this->_search_index($mailbox, $search_str);
			if (is_array($index))
			{
			$str = implode(",", $index);
			if (!empty($str))
			$count = count($index);
			}
			$count = is_array($index) ? count($index) : 0;
			}
			else
			{
			else {
			if ($mode == 'UNSEEN')
			$count = iil_C_CountUnseen($this->conn, $mailbox);
			else
			else {
			$count = iil_C_CountMessages($this->conn, $mailbox);
			$_SESSION['maxuid'][$mailbox] = $count ? $this->_id2uid($count) : 0;
			}
			}

			if (!is_array($a_mailbox_cache[$mailbox]))
			$a_mailbox_cache[$mailbox] = array();

			$a_mailbox_cache[$mailbox][$mode] = (int)$count;

			// write back to cache
			@@ -517,13 +542,14 @@
			* @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
			* @return array Indexed array with message header objects
			* @access public
			*/
			function list_headers($mbox_name='', $page=NULL, $sort_field=NULL, $sort_order=NULL)
			function list_headers($mbox_name='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
			{
			$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			return $this->_list_headers($mailbox, $page, $sort_field, $sort_order);
			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
			return $this->_list_headers($mailbox, $page, $sort_field, $sort_order, false, $slice);
			}


			@@ -533,153 +559,233 @@
			* @access private
			* @see rcube_imap::list_headers
			*/
			function _list_headers($mailbox='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $recursive=FALSE)
			private function _list_headers($mailbox='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $recursive=FALSE, $slice=0)
			{
			if (!strlen($mailbox))
			return array();

			// use saved message set
			if ($this->search_string && $mailbox == $this->mailbox)
			return $this->_list_header_set($mailbox, $this->search_set, $page, $sort_field, $sort_order);
			return $this->_list_header_set($mailbox, $page, $sort_field, $sort_order, $slice);

			$this->_set_sort_order($sort_field, $sort_order);

			$max = $this->_messagecount($mailbox);
			$start_msg = ($this->list_page-1) * $this->page_size;

			list($begin, $end) = $this->_get_message_range($max, $page);

			// mailbox is empty
			if ($begin >= $end)
			return array();

			$headers_sorted = FALSE;
			$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);
			$headers_sorted = TRUE;
			$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);
			return $this->_list_headers($mailbox, $page, $this->sort_field, $this->sort_order, TRUE, $slice);
			}
			else

			// retrieve headers from IMAP
			$a_msg_headers = array();

			// use message index sort for sorting by Date (for better performance)
			if ($this->index_sort && $this->sort_field == 'date')
			{
			// retrieve headers from IMAP
			if ($this->get_capability('sort') && ($msg_index = iil_C_Sort($this->conn, $mailbox, $this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')))
			{
			$mymsgidx = array_slice ($msg_index, $begin, $end-$begin, true);
			$msgs = join(",", $mymsgidx);
			$headers_sorted = true;
			}
			else
			{
			$msgs = sprintf("%d:%d", $begin+1, $end);
			$msg_index = range($begin, $end);
			}
			if ($this->skip_deleted) {
			// @TODO: this could be cached
			if ($msg_index = $this->_search_index($mailbox, 'ALL UNDELETED')) {
			$max = max($msg_index);
			list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
			$msg_index = array_slice($msg_index, $begin, $end-$begin);
			}
			} else if ($max = iil_C_CountMessages($this->conn, $mailbox)) {
			list($begin, $end) = $this->_get_message_range($max, $page);
			$msg_index = range($begin+1, $end);
			} else
			$msg_index = array();

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

			// fetch reuested headers from server
			$a_msg_headers = array();
			$deleted_count = $this->_fetch_headers($mailbox, $msgs, $a_msg_headers, $cache_key);
			if ($this->sort_order == 'DESC' && $headers_sorted) {
			//since the sort order is not used in the iil_c_sort function we have to do it here
			$a_msg_headers = array_reverse($a_msg_headers);
			// fetch reqested headers from server
			if ($msg_index)
			$this->_fetch_headers($mailbox, join(",", $msg_index), $a_msg_headers, $cache_key);
			}
			// delete cached messages with a higher index than $max+1
			// Changed $max to $max+1 to fix this bug : #1484295
			$this->clear_message_cache($cache_key, $max + 1);
			// use SORT command
			else if ($this->get_capability('sort') && ($msg_index = iil_C_Sort($this->conn, $mailbox, $this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')))
			{
			list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
			$max = max($msg_index);
			$msg_index = array_slice($msg_index, $begin, $end-$begin);

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

			// kick child process to sync cache
			// ...
			// fetch reqested headers from server
			$this->_fetch_headers($mailbox, join(',', $msg_index), $a_msg_headers, $cache_key);
			}
			// fetch specified header for all messages and sort
			else if ($a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, "1:*", $this->sort_field, $this->skip_deleted))
			{
			asort($a_index); // ASC
			$msg_index = array_keys($a_index);
			$max = max($msg_index);
			list($begin, $end) = $this->_get_message_range(count($msg_index), $page);
			$msg_index = array_slice($msg_index, $begin, $end-$begin);

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

			// fetch reqested headers from server
			$this->_fetch_headers($mailbox, join(",", $msg_index), $a_msg_headers, $cache_key);
			}

			// delete cached messages with a higher index than $max+1
			// Changed $max to $max+1 to fix this bug : #1484295
			$this->clear_message_cache($cache_key, $max + 1);

			// kick child process to sync cache
			// ...

			// return empty array if no messages found
			if (!is_array($a_msg_headers) \|\| empty($a_msg_headers)) {
			if (!is_array($a_msg_headers) \|\| empty($a_msg_headers))
			return array();
			}

			// use this class for message sorting
			$sorter = new rcube_header_sorter();
			$sorter->set_sequence_numbers($msg_index);
			$sorter->sort_headers($a_msg_headers);

			// if not already sorted
			if (!$headers_sorted)
			{
			// use this class for message sorting
			$sorter = new rcube_header_sorter();
			$sorter->set_sequence_numbers($msg_index);
			$sorter->sort_headers($a_msg_headers);

			if ($this->sort_order == 'DESC')
			$a_msg_headers = array_reverse($a_msg_headers);
			}
			if ($this->sort_order == 'DESC')
			$a_msg_headers = array_reverse($a_msg_headers);

			return array_values($a_msg_headers);
			}



			/**
			* Public method for listing a specific set of headers
			* convert mailbox name with root dir first
			* Private method for listing a set of message headers (search results)
			*
			* @param string Mailbox/folder name
			* @param array List of message ids to list
			* @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
			* @return array Indexed array with message header objects
			* @access public
			*/
			function list_header_set($mbox_name='', $msgs, $page=NULL, $sort_field=NULL, $sort_order=NULL)
			{
			$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			return $this->_list_header_set($mailbox, $msgs, $page, $sort_field, $sort_order);
			}


			/**
			* Private method for listing a set of message headers
			*
			* @access private
			* @see rcube_imap::list_header_set()
			*/
			function _list_header_set($mailbox, $msgs, $page=NULL, $sort_field=NULL, $sort_order=NULL)
			private function _list_header_set($mailbox, $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
			{
			if (!strlen($mailbox) \|\| empty($msgs))
			if (!strlen($mailbox) \|\| empty($this->search_set))
			return array();

			// also accept a comma-separated list of message ids
			if (is_array ($msgs)) {
			$max = count ($msgs);
			$msgs = join (',', $msgs);
			} else {
			$max = count(split(',', $msgs));
			}
			$msgs = $this->search_set;
			$a_msg_headers = array();
			$page = $page ? $page : $this->list_page;
			$start_msg = ($page-1) * $this->page_size;

			$this->_set_sort_order($sort_field, $sort_order);

			$start_msg = ($this->list_page-1) * $this->page_size;
			// quickest method
			if ($this->index_sort && $this->search_sort_field == 'date' && $this->sort_field == 'date')
			{
			if ($sort_order == 'DESC')
			$msgs = array_reverse($msgs);

			// fetch reuested headers from server
			$a_msg_headers = array();
			$this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);
			// get messages uids for one page
			$msgs = array_slice(array_values($msgs), $start_msg, min(count($msgs)-$start_msg, $this->page_size));

			// return empty array if no messages found
			if (!is_array($a_msg_headers) \|\| empty($a_msg_headers))
			return array();
			if ($slice)
			$msgs = array_slice($msgs, -$slice, $slice);

			// if not already sorted
			$a_msg_headers = iil_SortHeaders($a_msg_headers, $this->sort_field, $this->sort_order);
			// fetch headers
			$this->_fetch_headers($mailbox, join(',',$msgs), $a_msg_headers, NULL);

			// only return the requested part of the set
			return array_slice(array_values($a_msg_headers), $start_msg, min($max-$start_msg, $this->page_size));
			// I didn't found in RFC that FETCH always returns messages sorted by index
			$sorter = new rcube_header_sorter();
			$sorter->set_sequence_numbers($msgs);
			$sorter->sort_headers($a_msg_headers);

			return array_values($a_msg_headers);
			}
			// sorted messages, so we can first slice array and then fetch only wanted headers
			if ($this->get_capability('sort') && (!$this->index_sort \|\| $this->sort_field != 'date')) // 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);

			// return empty array if no messages found
			if (empty($msgs))
			return array();

			if ($sort_order == 'DESC')
			$msgs = array_reverse($msgs);

			// get messages uids for one page
			$msgs = array_slice(array_values($msgs), $start_msg, min(count($msgs)-$start_msg, $this->page_size));

			if ($slice)
			$msgs = array_slice($msgs, -$slice, $slice);

			// fetch headers
			$this->_fetch_headers($mailbox, join(',',$msgs), $a_msg_headers, NULL);

			$sorter = new rcube_header_sorter();
			$sorter->set_sequence_numbers($msgs);
			$sorter->sort_headers($a_msg_headers);

			return array_values($a_msg_headers);
			}
			else { // SEARCH searching result, need sorting
			$cnt = count($msgs);
			// 300: experimantal value for best result
			if (($cnt > 300 && $cnt > $this->page_size) \|\| ($this->index_sort && $this->sort_field == 'date')) {
			// use memory less expensive (and quick) method for big result set
			$a_index = $this->message_index('', $this->sort_field, $this->sort_order);
			// get messages uids for one page...
			$msgs = array_slice($a_index, $start_msg, min($cnt-$start_msg, $this->page_size));
			if ($slice)
			$msgs = array_slice($msgs, -$slice, $slice);
			// ...and fetch headers
			$this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);

			// return empty array if no messages found
			if (!is_array($a_msg_headers) \|\| empty($a_msg_headers))
			return array();

			$sorter = new rcube_header_sorter();
			$sorter->set_sequence_numbers($msgs);
			$sorter->sort_headers($a_msg_headers);

			return array_values($a_msg_headers);
			}
			else {
			// for small result set we can fetch all messages headers
			$this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);

			// return empty array if no messages found
			if (!is_array($a_msg_headers) \|\| empty($a_msg_headers))
			return array();

			// if not already sorted
			$a_msg_headers = iil_SortHeaders($a_msg_headers, $this->sort_field, $this->sort_order);

			// only return the requested part of the set
			$a_msg_headers = array_slice(array_values($a_msg_headers), $start_msg, min($cnt-$start_msg, $this->page_size));
			if ($slice)
			$a_msg_headers = array_slice($a_msg_headers, -$slice, $slice);

			return $a_msg_headers;
			}
			}
			}


			@@ -691,9 +797,9 @@
			* @return array array with two values: first index, last index
			* @access private
			*/
			function _get_message_range($max, $page)
			private function _get_message_range($max, $page)
			{
			$start_msg = ($this->list_page-1) * $this->page_size;
			$start_msg = ($page-1) * $this->page_size;

			if ($page=='all')
			{
			@@ -718,7 +824,6 @@
			return array($begin, $end);
			}



			/**
			* Fetches message headers
			@@ -728,46 +833,65 @@
			* @param string Message index to fetch
			* @param array Reference to message headers array
			* @param array Array with cache index
			* @return int Number of deleted messages
			* @return int Messages count
			* @access private
			*/
			function _fetch_headers($mailbox, $msgs, &$a_msg_headers, $cache_key)
			private function _fetch_headers($mailbox, $msgs, &$a_msg_headers, $cache_key)
			{
			// cache is incomplete
			$cache_index = $this->get_message_cache_index($cache_key);

			// fetch reuested headers from server
			$a_header_index = iil_C_FetchHeaders($this->conn, $mailbox, $msgs);
			$deleted_count = 0;

			// fetch reqested headers from server
			$a_header_index = iil_C_FetchHeaders($this->conn, $mailbox, $msgs, false, false, $this->fetch_add_headers);

			if (!empty($a_header_index))
			{
			foreach ($a_header_index as $i => $headers)
			{
			if ($headers->deleted && $this->skip_deleted)
			{
			// delete from cache
			if ($cache_index[$headers->id] && $cache_index[$headers->id] == $headers->uid)
			$this->remove_message_cache($cache_key, $headers->id);
			// cache is incomplete
			$cache_index = $this->get_message_cache_index($cache_key);

			$deleted_count++;
			continue;
			}

			// add message to cache
			if ($this->caching_enabled && $cache_index[$headers->id] != $headers->uid)
			$this->add_message_cache($cache_key, $headers->id, $headers);
			foreach ($a_header_index as $i => $headers) {
			if ($this->caching_enabled && $cache_index[$headers->id] != $headers->uid) {
			// prevent index duplicates
			if ($cache_index[$headers->id]) {
			$this->remove_message_cache($cache_key, $headers->id, true);
			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));
			}

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

			return $deleted_count;

			return count($a_msg_headers);
			}


			/**
			* Return sorted array of message UIDs
			* Fetches IDS of pseudo recent messages.
			*
			* We compare the maximum UID to determine the number of
			* new messages because the RECENT flag is not reliable.
			*
			* @param string Mailbox/folder name
			* @return array List of recent message UIDs
			*/
			function recent_uids($mbox_name = null, $nofetch = false)
			{
			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
			$old_maxuid = intval($_SESSION['maxuid'][$mailbox]);

			// refresh message count -> will update $_SESSION['maxuid'][$mailbox]
			$this->messagecount($mbox_name, 'ALL', true);

			if ($_SESSION['maxuid'][$mailbox] > $old_maxuid) {
			$maxuid = max(1, $old_maxuid+1);
			return array_values((array)iil_C_FetchHeaderIndex($this->conn, $mailbox, "$maxuid:*", 'UID', $this->skip_deleted, true));
			}

			return array();
			}

			/**
			* Return sorted array of message IDs (not UIDs)
			*
			* @param string Mailbox to get index from
			* @param string Sort column
			@@ -778,17 +902,49 @@
			{
			$this->_set_sort_order($sort_field, $sort_order);

			$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
			$key = "{$mailbox}:{$this->sort_field}:{$this->sort_order}:{$this->search_string}.msgi";

			// we have a saved search result. get index from there
			// we have a saved search result, get index from there
			if (!isset($this->cache[$key]) && $this->search_string && $mailbox == $this->mailbox)
			{
			$this->cache[$key] = $a_msg_headers = array();
			$this->_fetch_headers($mailbox, join(',', $this->search_set), $a_msg_headers, NULL);
			$this->cache[$key] = array();

			// use message index sort for sorting by Date
			if ($this->index_sort && $this->sort_field == 'date')
			{
			$msgs = $this->search_set;

			if ($this->search_sort_field != 'date')
			sort($msgs);

			if ($this->sort_order == 'DESC')
			$this->cache[$key] = array_reverse($msgs);
			else
			$this->cache[$key] = $msgs;
			}
			// sort with SORT command
			else if ($this->get_capability('sort'))
			{
			if ($this->sort_field && $this->search_sort_field != $this->sort_field)
			$this->search('', $this->search_string, $this->search_charset, $this->sort_field);

			foreach (iil_SortHeaders($a_msg_headers, $this->sort_field, $this->sort_order) as $i => $msg)
			$this->cache[$key][] = $msg->uid;
			if ($this->sort_order == 'DESC')
			$this->cache[$key] = array_reverse($this->search_set);
			else
			$this->cache[$key] = $this->search_set;
			}
			else
			{
			$a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, join(',', $this->search_set), $this->sort_field, $this->skip_deleted);

			if ($this->sort_order=="ASC")
			asort($a_index);
			else if ($this->sort_order=="DESC")
			arsort($a_index);

			$this->cache[$key] = array_keys($a_index);
			}
			}

			// have stored it in RAM
			@@ -803,34 +959,41 @@
			if ($cache_status>0)
			{
			$a_index = $this->get_message_cache_index($cache_key, TRUE, $this->sort_field, $this->sort_order);
			return array_values($a_index);
			return array_keys($a_index);
			}

			// use message index sort for sorting by Date
			if ($this->index_sort && $this->sort_field == 'date')
			{
			if ($this->skip_deleted) {
			$a_index = $this->_search_index($mailbox, 'ALL');
			} else if ($max = $this->_messagecount($mailbox)) {
			$a_index = range(1, $max);
			}

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

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

			$this->cache[$key] = $a_index;

			}
			else
			{
			$a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, "1:$msg_count", $this->sort_field);
			$a_uids = iil_C_FetchUIDs($this->conn, $mailbox);

			$a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, "1:*", $this->sort_field, $this->skip_deleted);

			if ($this->sort_order=="ASC")
			asort($a_index);
			else if ($this->sort_order=="DESC")
			arsort($a_index);

			$i = 0;
			$this->cache[$key] = array();
			foreach ($a_index as $index => $value)
			$this->cache[$key][$i++] = $a_uids[$index];
			$this->cache[$key] = array_keys($a_index);
			}

			return $this->cache[$key];
			@@ -844,10 +1007,12 @@
			{
			$cache_key = $mailbox.'.msg';
			$cache_index = $this->get_message_cache_index($cache_key);
			$msg_count = $this->_messagecount($mailbox);

			// fetch complete message index
			$a_message_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, "1:$msg_count", 'UID');
			$a_message_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, "1:*", 'UID', $this->skip_deleted);

			if ($a_message_index === false)
			return false;

			foreach ($a_message_index as $id => $uid)
			{
			@@ -861,27 +1026,32 @@
			// message in cache but in wrong position
			if (in_array((string)$uid, $cache_index, TRUE))
			{
			unset($cache_index[$id]);
			unset($cache_index[$id]);
			}

			// other message at this position
			if (isset($cache_index[$id]))
			{
			$this->remove_message_cache($cache_key, $id);
			$for_remove[] = $cache_index[$id];
			unset($cache_index[$id]);
			}


			// fetch complete headers and add to cache
			$headers = iil_C_FetchHeader($this->conn, $mailbox, $id);
			$this->add_message_cache($cache_key, $headers->id, $headers);
			$for_update[] = $id;
			}

			// those ids that are still in cache_index have been deleted
			// clear 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);

			if (!empty($cache_index))
			{
			foreach ($cache_index as $id => $uid)
			$this->remove_message_cache($cache_key, $id);
			$this->remove_message_cache($cache_key, $cache_index);

			// fetch complete headers and add to cache
			if (!empty($for_update)) {
			if ($headers = iil_C_FetchHeader($this->conn, $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));
			}
			}

			@@ -890,42 +1060,51 @@
			* Invoke search request to IMAP server
			*
			* @param string mailbox name to search in
			* @param string search criteria (ALL, TO, FROM, SUBJECT, etc)
			* @param string search string
			* @param string search string charset
			* @param string header field to sort by
			* @return array search results as list of message ids
			* @access public
			*/
			function search($mbox_name='', $criteria='ALL', $str=NULL, $charset=NULL)
			function search($mbox_name='', $str=NULL, $charset=NULL, $sort_field=NULL)
			{
			$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			if (!$str)
			return false;

			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;

			// have an array of criterias => execute multiple searches
			if (is_array($criteria) && $str)
			{
			$results = array();
			foreach ($criteria as $crit)
			if ($search_result = $this->search($mbox_name, $crit, $str, $charset))
			$results = array_merge($results, $search_result);

			$results = array_unique($results);
			$this->set_search_set($criteria, $str, $results, $charset);
			return $results;
			}
			else if ($str && $criteria)
			{
			$search = (!empty($charset) ? "CHARSET $charset " : '') . sprintf("%s {%d}\r\n%s", $criteria, strlen($str), $str);
			$results = $this->_search_index($mailbox, $search);
			$results = $this->_search_index($mailbox, $str, $charset, $sort_field);

			// try search with ISO charset (should be supported by server)
			if (empty($results) && !empty($charset) && $charset!='ISO-8859-1')
			$results = $this->search($mbox_name, $criteria, rcube_charset_convert($str, $charset, 'ISO-8859-1'), 'ISO-8859-1');

			$this->set_search_set($criteria, $str, $results, $charset);
			return $results;
			// 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);
			}
			else
			return $this->_search_index($mailbox, $criteria);
			}

			$this->set_search_set($str, $results, $charset, $sort_field);

			return $results;
			}


			/**
			@@ -935,16 +1114,34 @@
			* @access private
			* @see rcube_imap::search()
			*/
			function _search_index($mailbox, $criteria='ALL')
			private function _search_index($mailbox, $criteria='ALL', $charset=NULL, $sort_field=NULL)
			{
			$a_messages = iil_C_Search($this->conn, $mailbox, $criteria);
			// clean message list (there might be some empty entries)
			if (is_array($a_messages))
			{
			foreach ($a_messages as $i => $val)
			if (empty($val))
			unset($a_messages[$i]);
			$orig_criteria = $criteria;

			if ($this->skip_deleted && !preg_match('/UNDELETED/', $criteria))
			$criteria = 'UNDELETED '.$criteria;

			if ($sort_field && $this->get_capability('sort') && (!$this->index_sort \|\| $sort_field != 'date')) {
			$charset = $charset ? $charset : $this->default_charset;
			$a_messages = iil_C_Sort($this->conn, $mailbox, $sort_field, $criteria, FALSE, $charset);
			}
			else {
			if ($orig_criteria == 'ALL') {
			$max = $this->_messagecount($mailbox);
			$a_messages = $max ? range(1, $max) : array();
			}
			else {
			$a_messages = iil_C_Search($this->conn, $mailbox, ($charset ? "CHARSET $charset " : '') . $criteria);

			// I didn't found that SEARCH always returns sorted IDs
			if ($this->index_sort && $this->sort_field == 'date')
			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);

			return $a_messages;
			}
			@@ -957,8 +1154,8 @@
			*/
			function refresh_search()
			{
			if (!empty($this->search_subject) && !empty($this->search_string))
			$this->search_set = $this->search('', $this->search_subject, $this->search_string, $this->search_charset);
			if (!empty($this->search_string))
			$this->search_set = $this->search('', $this->search_string, $this->search_charset, $this->search_sort_field);

			return $this->get_search_set();
			}
			@@ -984,18 +1181,19 @@
			* @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
			* @return object Message headers representation
			*/
			function get_headers($id, $mbox_name=NULL, $is_uid=TRUE)
			function get_headers($id, $mbox_name=NULL, $is_uid=TRUE, $bodystr=FALSE)
			{
			$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
			$uid = $is_uid ? $id : $this->_id2uid($id);

			// get cached headers
			if ($uid && ($headers = &$this->get_cached_message($mailbox.'.msg', $uid)))
			return $headers;

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

			// write headers cache
			if ($headers)
			@@ -1003,7 +1201,7 @@
			if ($headers->uid && $headers->id)
			$this->uid_id_map[$mailbox][$headers->uid] = $headers->id;

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

			return $headers;
			@@ -1015,31 +1213,46 @@
			* an object structure similar to the one generated by PEAR::Mail_mimeDecode
			*
			* @param int Message UID to fetch
			* @return object stdClass Message part tree or False on failure
			* @param string Message BODYSTRUCTURE string (optional)
			* @return object rcube_message_part Message part tree or False on failure
			*/
			function &get_structure($uid)
			function &get_structure($uid, $structure_str='')
			{
			$cache_key = $this->mailbox.'.msg';
			$headers = &$this->get_cached_message($cache_key, $uid, true);
			$headers = &$this->get_cached_message($cache_key, $uid);

			// return cached message structure
			if (is_object($headers) && is_object($headers->structure))
			if (is_object($headers) && is_object($headers->structure)) {
			return $headers->structure;

			// resolve message sequence number
			if (!($msg_id = $this->_uid2id($uid)))
			return FALSE;
			}

			$structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $msg_id);
			if (!$structure_str)
			$structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $uid, true);
			$structure = iml_GetRawStructureArray($structure_str);
			$struct = false;

			// parse structure and add headers
			if (!empty($structure))
			{
			$this->_msg_id = $msg_id;
			$headers = $this->get_headers($uid);

			$this->_msg_id = $headers->id;

			// set message charset from message headers
			if ($headers->charset)
			$this->struct_charset = $headers->charset;
			else
			$this->struct_charset = $this->_structure_charset($structure);

			// 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;
			}

			$struct = &$this->_structure_part($structure);
			$struct->headers = get_object_vars($headers);

			@@ -1053,9 +1266,9 @@

			// write structure to cache
			if ($this->caching_enabled)
			$this->add_message_cache($cache_key, $msg_id, $headers, $struct);
			$this->add_message_cache($cache_key, $this->_msg_id, $headers, $struct);
			}


			return $struct;
			}

			@@ -1065,18 +1278,18 @@
			*
			* @access private
			*/
			function &_structure_part($part, $count=0, $parent='')
			function &_structure_part($part, $count=0, $parent='', $mime_headers=null, $raw_headers=null)
			{
			$struct = new rcube_message_part;
			$struct->mime_id = empty($parent) ? (string)$count : "$parent.$count";


			// multipart
			if (is_array($part[0]))
			{
			$struct->ctype_primary = 'multipart';

			// find first non-array entry
			for ($i=1; count($part); $i++)
			for ($i=1; $i<count($part); $i++)
			if (!is_array($part[$i]))
			{
			$struct->ctype_secondary = strtolower($part[$i]);
			@@ -1085,15 +1298,45 @@

			$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;
			}
			}
			}

			// pre-fetch headers of all parts (in one command for better performance)
			// @TODO: we could do this before _structure_part() call, to fetch
			// headers for parts on all levels
			if ($mime_part_headers)
			$mime_part_headers = iil_C_FetchMIMEHeaders($this->conn, $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 = iil_C_FetchMIMEHeaders($this->conn, $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]) > 5)
			$struct->parts[] = $this->_structure_part($part[$i], ++$count, $struct->mime_id);

			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]);
			}

			return $struct;
			}




			// regular part
			$struct->ctype_primary = strtolower($part[0]);
			$struct->ctype_secondary = strtolower($part[1]);
			@@ -1151,62 +1394,167 @@
			if (empty($struct->disposition))
			$struct->disposition = 'inline';
			}

			// fetch message headers if message/rfc822 or named part (could contain Content-Location header)
			if ($struct->ctype_primary == 'message' \|\| ($struct->ctype_parameters['name'] && !$struct->content_id)) {
			if (empty($mime_headers))
			$mime_headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $struct->mime_id);
			$struct->headers = $this->_parse_headers($mime_headers) + $struct->headers;

			// fetch message headers if message/rfc822
			if ($struct->ctype_primary=='message')
			{
			$headers = iil_C_FetchPartBody($this->conn, $this->mailbox, $this->_msg_id, $struct->mime_id.'.HEADER');
			$struct->headers = $this->_parse_headers($headers);

			if (is_array($part[8]) && empty($struct->parts))
			// get real headers for message of type 'message/rfc822'
			if ($struct->mimetype == 'message/rfc822') {
			if (empty($raw_headers))
			$raw_headers = iil_C_FetchMIMEHeaders($this->conn, $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]);
			}
			}
			}

			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);
			}


			// normalize filename property
			if ($filename_mime = $struct->d_parameters['filename'] ? $struct->d_parameters['filename'] : $struct->ctype_parameters['name'])
			$struct->filename = rcube_imap::decode_mime_string($filename_mime, $this->default_charset);
			else if ($filename_encoded = $struct->d_parameters['filename'] ? $struct->d_parameters['filename'] : $struct->ctype_parameters['name*'])
			{
			// decode filename according to RFC 2231, Section 4
			list($filename_charset,, $filename_urlencoded) = split('\'', $filename_encoded);
			$struct->filename = rcube_charset_convert(urldecode($filename_urlencoded), $filename_charset);
			}
			else if (!empty($struct->headers['content-description']))
			$struct->filename = rcube_imap::decode_mime_string($struct->headers['content-description'], $this->default_charset);

			$this->_set_part_filename($struct, $mime_headers);

			return $struct;
			}



			/**
			* Return a flat array with references to all parts, indexed by part numbers
			*
			* @param object rcube_message_part Message body structure
			* @return Array with part number -> object pairs
			*/
			function get_mime_numbers(&$structure)
			{
			$a_parts = array();
			$this->_get_part_numbers($structure, $a_parts);
			return $a_parts;
			}


			/**
			* Helper method for recursive calls
			* Set attachment filename from message part structure
			*
			* @access private
			* @param object rcube_message_part Part object
			* @param string Part's raw headers
			*/
			function _get_part_numbers(&$part, &$a_parts)
			private function _set_part_filename(&$part, $headers=null)
			{
			if ($part->mime_id)
			$a_parts[$part->mime_id] = &$part;

			if (is_array($part->parts))
			for ($i=0; $i<count($part->parts); $i++)
			$this->_get_part_numbers($part->parts[$i], $a_parts);
			if (!empty($part->d_parameters['filename']))
			$filename_mime = $part->d_parameters['filename'];
			else if (!empty($part->d_parameters['filename*']))
			$filename_encoded = $part->d_parameters['filename*'];
			else if (!empty($part->ctype_parameters['name*']))
			$filename_encoded = $part->ctype_parameters['name*'];
			// RFC2231 value continuations
			// TODO: this should be rewrited to support RFC2231 4.1 combinations
			else if (!empty($part->d_parameters['filename*0'])) {
			$i = 0;
			while (isset($part->d_parameters['filename*'.$i])) {
			$filename_mime .= $part->d_parameters['filename*'.$i];
			$i++;
			}
			// some servers (eg. dovecot-1.x) have no support for parameter value continuations
			// we must fetch and parse headers "manually"
			if ($i<2) {
			if (!$headers)
			$headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $part->mime_id);
			$filename_mime = '';
			$i = 0;
			while (preg_match('/filename\'.$i.'\s=\s"([^"\n;]+)[";]*/', $headers, $matches)) {
			$filename_mime .= $matches[1];
			$i++;
			}
			}
			}

			else if (!empty($part->d_parameters['filename0'])) {
			$i = 0;
			while (isset($part->d_parameters['filename'.$i.''])) {
			$filename_encoded .= $part->d_parameters['filename'.$i.''];
			$i++;
			}
			if ($i<2) {
			if (!$headers)
			$headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $part->mime_id);
			$filename_encoded = '';
			$i = 0; $matches = array();
			while (preg_match('/filename\'.$i.'\\s=\s"([^"\n;]+)[";]/', $headers, $matches)) {
			$filename_encoded .= $matches[1];
			$i++;
			}
			}
			}
			else if (!empty($part->ctype_parameters['name*0'])) {
			$i = 0;
			while (isset($part->ctype_parameters['name*'.$i])) {
			$filename_mime .= $part->ctype_parameters['name*'.$i];
			$i++;
			}
			if ($i<2) {
			if (!$headers)
			$headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $part->mime_id);
			$filename_mime = '';
			$i = 0; $matches = array();
			while (preg_match('/\s+name\'.$i.'\s=\s"([^"\n;]+)[";]*/', $headers, $matches)) {
			$filename_mime .= $matches[1];
			$i++;
			}
			}
			}
			else if (!empty($part->ctype_parameters['name0'])) {
			$i = 0;
			while (isset($part->ctype_parameters['name'.$i.''])) {
			$filename_encoded .= $part->ctype_parameters['name'.$i.''];
			$i++;
			}
			if ($i<2) {
			if (!$headers)
			$headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, false, $part->mime_id);
			$filename_encoded = '';
			$i = 0; $matches = array();
			while (preg_match('/\s+name\'.$i.'\\s=\s"([^"\n;]+)[";]/', $headers, $matches)) {
			$filename_encoded .= $matches[1];
			$i++;
			}
			}
			}
			// read 'name' after rfc2231 parameters as it may contains truncated filename (from Thunderbird)
			else if (!empty($part->ctype_parameters['name']))
			$filename_mime = $part->ctype_parameters['name'];
			// Content-Disposition
			else if (!empty($part->headers['content-description']))
			$filename_mime = $part->headers['content-description'];
			else
			return;

			// decode filename
			if (!empty($filename_mime)) {
			$part->filename = rcube_imap::decode_mime_string($filename_mime,
			$part->charset ? $part->charset : $this->struct_charset ? $this->struct_charset :
			rc_detect_encoding($filename_mime, $this->default_charset));
			}
			else if (!empty($filename_encoded)) {
			// decode filename according to RFC 2231, Section 4
			if (preg_match("/^([^'])'[^']'(.*)$/", $filename_encoded, $fmatches)) {
			$filename_charset = $fmatches[1];
			$filename_encoded = $fmatches[2];
			}
			$part->filename = rcube_charset_convert(urldecode($filename_encoded), $filename_charset);
			}
			}


			/**
			* Get charset name from message structure (first part)
			*
			* @access private
			* @param array Message structure
			* @return string Charset name
			*/
			function _structure_charset($structure)
			{
			while (is_array($structure)) {
			if (is_array($structure[2]) && $structure[2][0] == 'charset')
			return $structure[2][1];
			$structure = $structure[0];
			}
			}


			/**
			* Fetch message body of a specific message from the server
			@@ -1215,18 +1563,20 @@
			* @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
			* @return string Message/part body if not printed
			*/
			function &get_message_part($uid, $part=1, $o_part=NULL, $print=NULL)
			function &get_message_part($uid, $part=1, $o_part=NULL, $print=NULL, $fp=NULL)
			{
			if (!($msg_id = $this->_uid2id($uid)))
			return FALSE;

			// get part encoding if not provided
			if (!is_object($o_part))
			{
			$structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $msg_id);
			$structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $uid, true);
			$structure = iml_GetRawStructureArray($structure_str);
			// error or message not found
			if (empty($structure))
			return false;

			$part_type = iml_GetPartTypeCode($structure, $part);
			$o_part = new rcube_message_part;
			$o_part->ctype_primary = $part_type==0 ? 'text' : ($part_type==2 ? 'message' : 'other');
			@@ -1236,37 +1586,23 @@

			// TODO: Add caching for message parts

			if ($print)
			{
			$mode = $o_part->encoding == 'base64' ? 3 : ($o_part->encoding == 'quoted-printable' ? 1 : 2);
			$body = iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part, $mode);

			// we have to decode the part manually before printing
			if ($mode == 1)
			{
			echo $this->mime_decode($body, $o_part->encoding);
			$body = true;
			}
			if (!$part) $part = 'TEXT';

			$body = iil_C_HandlePartBody($this->conn, $this->mailbox, $uid, true, $part,
			$o_part->encoding, $print, $fp);

			if ($fp \|\| $print)
			return true;

			// convert charset (if text or message part)
			if ($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;

			$body = rcube_charset_convert($body, $o_part->charset);
			}
			else
			{
			$body = iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part, 1);

			// decode part body
			if ($o_part->encoding)
			$body = $this->mime_decode($body, $o_part->encoding);

			// convert charset (if text or message part)
			if ($o_part->ctype_primary=='text' \|\| $o_part->ctype_primary=='message')
			{
			// assume default if no charset specified
			if (empty($o_part->charset))
			$o_part->charset = $this->default_charset;

			$body = rcube_charset_convert($body, $o_part->charset);
			}
			}


			return $body;
			}

			@@ -1280,7 +1616,9 @@
			*/
			function &get_body($uid, $part=1)
			{
			return $this->get_message_part($uid, $part);
			$headers = $this->get_headers($uid);
			return rcube_charset_convert($this->get_message_part($uid, $part, NULL),
			$headers->charset ? $headers->charset : $this->default_charset);
			}


			@@ -1292,13 +1630,19 @@
			*/
			function &get_raw_body($uid)
			{
			if (!($msg_id = $this->_uid2id($uid)))
			return FALSE;
			return iil_C_HandlePartBody($this->conn, $this->mailbox, $uid, true);
			}

			$body = iil_C_FetchPartHeader($this->conn, $this->mailbox, $msg_id, NULL);
			$body .= iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, NULL, 1);

			return $body;
			/**
			* Returns the message headers as string
			*
			* @param int Message UID
			* @return string Message headers string
			*/
			function &get_raw_headers($uid)
			{
			return iil_C_FetchPartHeader($this->conn, $this->mailbox, $uid, true);
			}


			@@ -1309,12 +1653,7 @@
			*/
			function print_raw_body($uid)
			{
			if (!($msg_id = $this->_uid2id($uid)))
			return FALSE;

			print iil_C_FetchPartHeader($this->conn, $this->mailbox, $msg_id, NULL);
			flush();
			iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, NULL, 2);
			iil_C_HandlePartBody($this->conn, $this->mailbox, $uid, true, NULL, NULL, true);
			}


			@@ -1323,74 +1662,83 @@
			*
			* @param mixed Message UIDs as array or as comma-separated string
			* @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
			* @return boolean True on success, False on failure
			*/
			function set_flag($uids, $flag)
			function set_flag($uids, $flag, $mbox_name=NULL, $skip_cache=false)
			{
			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;

			$flag = strtoupper($flag);
			$msg_ids = array();
			if (!is_array($uids))
			$uids = explode(',',$uids);

			foreach ($uids as $uid) {
			$msg_ids[$uid] = $this->_uid2id($uid);
			}

			if ($flag=='UNDELETED')
			$result = iil_C_Undelete($this->conn, $this->mailbox, join(',', array_values($msg_ids)));
			else if ($flag=='UNSEEN')
			$result = iil_C_Unseen($this->conn, $this->mailbox, join(',', array_values($msg_ids)));
			if (strpos($flag, 'UN') === 0)
			$result = iil_C_UnFlag($this->conn, $mailbox, join(',', $uids), substr($flag, 2));
			else
			$result = iil_C_Flag($this->conn, $this->mailbox, join(',', array_values($msg_ids)), $flag);
			$result = iil_C_Flag($this->conn, $mailbox, join(',', $uids), $flag);

			// reload message headers if cached
			$cache_key = $this->mailbox.'.msg';
			if ($this->caching_enabled)
			{
			foreach ($msg_ids as $uid => $id)
			{
			if ($cached_headers = $this->get_cached_message($cache_key, $uid))
			{
			$this->remove_message_cache($cache_key, $id);
			//$this->get_headers($uid);
			}
			}

			// close and re-open connection
			// this prevents connection problems with Courier
			$this->reconnect();
			if ($this->caching_enabled && !$skip_cache) {
			$cache_key = $mailbox.'.msg';
			$this->remove_message_cache($cache_key, $uids);
			}

			// set nr of messages that were flaged
			$count = count($msg_ids);
			$count = count($uids);

			// clear message count cache
			if ($result && $flag=='SEEN')
			$this->_set_messagecount($this->mailbox, 'UNSEEN', $count*(-1));
			$this->_set_messagecount($mailbox, 'UNSEEN', $count*(-1));
			else if ($result && $flag=='UNSEEN')
			$this->_set_messagecount($this->mailbox, 'UNSEEN', $count);
			$this->_set_messagecount($mailbox, 'UNSEEN', $count);
			else if ($result && $flag=='DELETED')
			$this->_set_messagecount($this->mailbox, 'ALL', $count*(-1));
			$this->_set_messagecount($mailbox, 'ALL', $count*(-1));

			return $result;
			}


			/**
			* Remove message flag for one or several messages
			*
			* @param mixed Message UIDs as array or as comma-separated string
			* @param string Flag to unset: SEEN, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
			* @param string Folder name
			* @return boolean True on success, False on failure
			* @see set_flag
			*/
			function unset_flag($uids, $flag, $mbox_name=NULL)
			{
			return $this->set_flag($uids, 'UN'.$flag, $mbox_name);
			}


			/**
			* Append a mail message (source) to a specific mailbox
			*
			* @param string Target mailbox
			* @param string Message source
			* @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
			*
			* @return boolean True on success, False on error
			*/
			function save_message($mbox_name, &$message)
			function save_message($mbox_name, &$message, $headers='', $is_file=false)
			{
			$mbox_name = stripslashes($mbox_name);
			$mailbox = $this->_mod_mailbox($mbox_name);
			$mailbox = $this->mod_mailbox($mbox_name);

			// make sure mailbox exists
			if (in_array($mailbox, $this->_list_mailboxes()))
			$saved = iil_C_Append($this->conn, $mailbox, $message);
			if (($mailbox == 'INBOX') \|\| in_array($mailbox, $this->_list_mailboxes())) {
			if ($is_file) {
			$separator = rcmail::get_instance()->config->header_delimiter();
			$saved = iil_C_AppendFromFile($this->conn, $mailbox, $message,
			$headers, $separator.$separator);
			}
			else
			$saved = iil_C_Append($this->conn, $mailbox, $message);
			}

			if ($saved)
			{
			@@ -1412,59 +1760,60 @@
			*/
			function move_message($uids, $to_mbox, $from_mbox='')
			{
			$to_mbox = stripslashes($to_mbox);
			$from_mbox = stripslashes($from_mbox);
			$to_mbox = $this->_mod_mailbox($to_mbox);
			$from_mbox = $from_mbox ? $this->_mod_mailbox($from_mbox) : $this->mailbox;
			$fbox = $from_mbox;
			$tbox = $to_mbox;
			$to_mbox = $this->mod_mailbox($to_mbox);
			$from_mbox = $from_mbox ? $this->mod_mailbox($from_mbox) : $this->mailbox;

			// make sure mailbox exists
			if (!in_array($to_mbox, $this->_list_mailboxes()))
			if ($to_mbox != 'INBOX' && !in_array($to_mbox, $this->_list_mailboxes()))
			{
			if (in_array($to_mbox, $this->default_folders))
			$this->create_mailbox($to_mbox, TRUE);
			if (in_array($tbox, $this->default_folders))
			$this->create_mailbox($tbox, TRUE);
			else
			return FALSE;
			}

			// convert the list of uids to array
			$a_uids = is_string($uids) ? explode(',', $uids) : (is_array($uids) ? $uids : NULL);


			// exit if no message uids are specified
			if (!is_array($a_uids))
			if (!is_array($a_uids) \|\| empty($a_uids))
			return false;

			// convert uids to message ids
			$a_mids = array();
			foreach ($a_uids as $uid)
			$a_mids[] = $this->_uid2id($uid, $from_mbox);
			// flag messages as read before moving them
			$config = rcmail::get_instance()->config;
			if ($config->get('read_when_deleted') && $tbox == $config->get('trash_mbox')) {
			// don't flush cache (4th argument)
			$this->set_flag($uids, 'SEEN', $fbox, true);
			}

			$iil_move = iil_C_Move($this->conn, join(',', $a_mids), $from_mbox, $to_mbox);
			// move messages
			$iil_move = iil_C_Move($this->conn, join(',', $a_uids), $from_mbox, $to_mbox);
			$moved = !($iil_move === false \|\| $iil_move < 0);

			// send expunge command in order to have the moved message
			// really deleted from the source mailbox
			if ($moved)
			{
			$this->_expunge($from_mbox, FALSE);
			if ($moved) {
			$this->_expunge($from_mbox, FALSE, $a_uids);
			$this->_clear_messagecount($from_mbox);
			$this->_clear_messagecount($to_mbox);
			}

			}
			// moving failed
			else if (rcmail::get_instance()->config->get('delete_always', false)) {
			return iil_C_Delete($this->conn, $from_mbox, join(',', $a_uids));
			}

			// remove message ids from search set
			if ($moved && $this->search_set && $from_mbox == $this->mailbox)
			if ($moved && $this->search_set && $from_mbox == $this->mailbox) {
			foreach ($a_uids as $uid)
			$a_mids[] = $this->_uid2id($uid, $from_mbox);
			$this->search_set = array_diff($this->search_set, $a_mids);
			}

			// update cached message headers
			$cache_key = $from_mbox.'.msg';
			if ($moved && ($a_cache_index = $this->get_message_cache_index($cache_key)))
			{
			$start_index = 100000;
			foreach ($a_uids as $uid)
			{
			if (($index = array_search($uid, $a_cache_index)) !== FALSE)
			$start_index = min($index, $start_index);
			}

			if ($moved && $start_index = $this->get_message_cache_index_min($cache_key, $a_uids)) {
			// clear cache from the lowest index on
			$this->clear_message_cache($cache_key, $start_index);
			}
			@@ -1482,47 +1831,36 @@
			*/
			function delete_message($uids, $mbox_name='')
			{
			$mbox_name = stripslashes($mbox_name);
			$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;

			// convert the list of uids to array
			$a_uids = is_string($uids) ? explode(',', $uids) : (is_array($uids) ? $uids : NULL);

			// exit if no message uids are specified
			if (!is_array($a_uids))
			if (!is_array($a_uids) \|\| empty($a_uids))
			return false;

			$deleted = iil_C_Delete($this->conn, $mailbox, join(',', $a_uids));

			// convert uids to message ids
			$a_mids = array();
			foreach ($a_uids as $uid)
			$a_mids[] = $this->_uid2id($uid, $mailbox);

			$deleted = iil_C_Delete($this->conn, $mailbox, join(',', $a_mids));

			// send expunge command in order to have the deleted message
			// really deleted from the mailbox
			if ($deleted)
			{
			$this->_expunge($mailbox, FALSE);
			$this->_expunge($mailbox, FALSE, $a_uids);
			$this->_clear_messagecount($mailbox);
			unset($this->uid_id_map[$mailbox]);
			}

			// remove message ids from search set
			if ($moved && $this->search_set && $mailbox == $this->mailbox)
			if ($deleted && $this->search_set && $mailbox == $this->mailbox) {
			foreach ($a_uids as $uid)
			$a_mids[] = $this->_uid2id($uid, $mailbox);
			$this->search_set = array_diff($this->search_set, $a_mids);
			}

			// remove deleted messages from cache
			$cache_key = $mailbox.'.msg';
			if ($deleted && ($a_cache_index = $this->get_message_cache_index($cache_key)))
			{
			$start_index = 100000;
			foreach ($a_uids as $uid)
			{
			if (($index = array_search($uid, $a_cache_index)) !== FALSE)
			$start_index = min($index, $start_index);
			}

			if ($deleted && $start_index = $this->get_message_cache_index_min($cache_key, $a_uids)) {
			// clear cache from the lowest index on
			$this->clear_message_cache($cache_key, $start_index);
			}
			@@ -1539,8 +1877,7 @@
			*/
			function clear_mailbox($mbox_name=NULL)
			{
			$mbox_name = stripslashes($mbox_name);
			$mailbox = !empty($mbox_name) ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			$mailbox = !empty($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
			$msg_count = $this->_messagecount($mailbox, 'ALL');

			if ($msg_count>0)
			@@ -1572,8 +1909,7 @@
			*/
			function expunge($mbox_name='', $clear_cache=TRUE)
			{
			$mbox_name = stripslashes($mbox_name);
			$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
			return $this->_expunge($mailbox, $clear_cache);
			}

			@@ -1582,11 +1918,20 @@
			* Send IMAP expunge command and clear cache
			*
			* @see rcube_imap::expunge()
			* @param string Mailbox name
			* @param boolean False if cache should not be cleared
			* @param string List of UIDs to remove, separated by comma
			* @return boolean True on success
			* @access private
			*/
			function _expunge($mailbox, $clear_cache=TRUE)
			private function _expunge($mailbox, $clear_cache=TRUE, $uids=NULL)
			{
			$result = iil_C_Expunge($this->conn, $mailbox);
			if ($uids && $this->get_capability('UIDPLUS'))
			$a_uids = is_array($uids) ? join(',', $uids) : $uids;
			else
			$a_uids = NULL;

			$result = iil_C_Expunge($this->conn, $mailbox, $a_uids);

			if ($result>=0 && $clear_cache)
			{
			@@ -1617,12 +1962,12 @@
			return $sa_unsubscribed;

			// retrieve list of folders from IMAP server
			$a_mboxes = iil_C_ListMailboxes($this->conn, $this->_mod_mailbox($root), '*');
			$a_mboxes = iil_C_ListMailboxes($this->conn, $this->mod_mailbox($root), '*');

			// modify names with root dir
			foreach ($a_mboxes as $mbox_name)
			{
			$name = $this->_mod_mailbox($mbox_name, 'out');
			$name = $this->mod_mailbox($mbox_name, 'out');
			if (strlen($name))
			$a_folders[] = $name;
			}
			@@ -1691,13 +2036,10 @@
			{
			$result = FALSE;

			// replace backslashes
			$name = preg_replace('/[\\\]+/', '-', $name);

			// reduce mailbox name to 100 chars
			$name = substr($name, 0, 100);

			$abs_name = $this->_mod_mailbox($name);
			$abs_name = $this->mod_mailbox($name);
			$a_mailbox_cache = $this->get_cache('mailboxes');

			if (strlen($abs_name) && (!is_array($a_mailbox_cache) \|\| !in_array($abs_name, $a_mailbox_cache)))
			@@ -1722,15 +2064,12 @@
			{
			$result = FALSE;

			// replace backslashes
			$name = preg_replace('/[\\\]+/', '-', $new_name);

			// encode mailbox name and reduce it to 100 chars
			$name = substr($new_name, 0, 100);

			// make absolute path
			$mailbox = $this->_mod_mailbox($mbox_name);
			$abs_name = $this->_mod_mailbox($name);
			$mailbox = $this->mod_mailbox($mbox_name);
			$abs_name = $this->mod_mailbox($name);

			// check if mailbox is subscribed
			$a_subscribed = $this->_list_mailboxes();
			@@ -1771,7 +2110,7 @@
			/**
			* Remove mailboxes from server
			*
			* @param string Mailbox name
			* @param string Mailbox name(s) string/array
			* @return boolean True on success
			*/
			function delete_mailbox($mbox_name)
			@@ -1783,21 +2122,23 @@
			else if (is_string($mbox_name) && strlen($mbox_name))
			$a_mboxes = explode(',', $mbox_name);

			$all_mboxes = iil_C_ListMailboxes($this->conn, $this->_mod_mailbox($root), '*');
			$all_mboxes = iil_C_ListMailboxes($this->conn, $this->mod_mailbox($root), '*');

			if (is_array($a_mboxes))
			foreach ($a_mboxes as $mbox_name)
			{
			$mailbox = $this->_mod_mailbox($mbox_name);
			$mailbox = $this->mod_mailbox($mbox_name);

			// unsubscribe mailbox before deleting
			iil_C_UnSubscribe($this->conn, $mailbox);

			// send delete command to server
			$result = iil_C_DeleteFolder($this->conn, $mailbox);
			if ($result>=0)
			if ($result >= 0) {
			$deleted = TRUE;

			$this->clear_message_cache($mailbox.'.msg');
			}

			foreach ($all_mboxes as $c_mbox)
			{
			$regex = preg_quote($mailbox . $this->delimiter, '/');
			@@ -1806,18 +2147,17 @@
			{
			iil_C_UnSubscribe($this->conn, $c_mbox);
			$result = iil_C_DeleteFolder($this->conn, $c_mbox);
			if ($result>=0)
			if ($result >= 0) {
			$deleted = TRUE;
			}
			$this->clear_message_cache($c_mbox.'.msg');
			}
			}
			}
			}

			// clear mailboxlist cache
			if ($deleted)
			{
			$this->clear_message_cache($mailbox.'.msg');
			$this->clear_cache('mailboxes');
			}

			return $deleted;
			}
			@@ -1828,16 +2168,16 @@
			*/
			function create_default_folders()
			{
			$a_folders = iil_C_ListMailboxes($this->conn, $this->_mod_mailbox(''), '*');
			$a_subscribed = iil_C_ListSubscribed($this->conn, $this->_mod_mailbox(''), '*');
			$a_folders = iil_C_ListMailboxes($this->conn, $this->mod_mailbox(''), '*');
			$a_subscribed = iil_C_ListSubscribed($this->conn, $this->mod_mailbox(''), '*');

			// create default folders if they do not exist
			foreach ($this->default_folders as $folder)
			{
			$abs_name = $this->_mod_mailbox($folder);
			if (!in_array_nocase($abs_name, $a_folders))
			$abs_name = $this->mod_mailbox($folder);
			if (!in_array($abs_name, $a_folders))
			$this->create_mailbox($folder, TRUE);
			else if (!in_array_nocase($abs_name, $a_subscribed))
			else if (!in_array($abs_name, $a_subscribed))
			$this->subscribe($folder);
			}
			}
			@@ -1864,11 +2204,10 @@
			*/
			function get_cache($key)
			{
			// read cache
			if (!isset($this->cache[$key]) && $this->caching_enabled)
			// read cache (if it was not read before)
			if (!count($this->cache) && $this->caching_enabled)
			{
			$cache_data = $this->_read_cache_record('IMAP.'.$key);
			$this->cache[$key] = strlen($cache_data) ? unserialize($cache_data) : FALSE;
			return $this->_read_cache_record($key);
			}

			return $this->cache[$key];
			@@ -1894,7 +2233,7 @@
			foreach ($this->cache as $key => $data)
			{
			if ($this->cache_changes[$key])
			$this->_write_cache_record('IMAP.'.$key, serialize($data));
			$this->_write_cache_record($key, serialize($data));
			}
			}
			}
			@@ -1904,10 +2243,13 @@
			*/
			function clear_cache($key=NULL)
			{
			if (!$this->caching_enabled)
			return;

			if ($key===NULL)
			{
			foreach ($this->cache as $key => $data)
			$this->_clear_cache_record('IMAP.'.$key);
			$this->_clear_cache_record($key);

			$this->cache = array();
			$this->cache_changed = FALSE;
			@@ -1915,7 +2257,7 @@
			}
			else
			{
			$this->_clear_cache_record('IMAP.'.$key);
			$this->_clear_cache_record($key);
			$this->cache_changes[$key] = FALSE;
			unset($this->cache[$key]);
			}
			@@ -1924,68 +2266,49 @@
			/**
			* @access private
			*/
			function _read_cache_record($key)
			private function _read_cache_record($key)
			{
			$cache_data = FALSE;

			if ($this->db)
			{
			// get cached data from DB
			$sql_result = $this->db->query(
			"SELECT cache_id, data
			"SELECT cache_id, data, cache_key
			FROM ".get_table_name('cache')."
			WHERE user_id=?
			AND cache_key=?",
			$_SESSION['user_id'],
			$key);
			AND cache_key LIKE 'IMAP.%'",
			$_SESSION['user_id']);

			if ($sql_arr = $this->db->fetch_assoc($sql_result))
			while ($sql_arr = $this->db->fetch_assoc($sql_result))
			{
			$cache_data = $sql_arr['data'];
			$this->cache_keys[$key] = $sql_arr['cache_id'];
			$sql_key = preg_replace('/^IMAP\./', '', $sql_arr['cache_key']);
			$this->cache_keys[$sql_key] = $sql_arr['cache_id'];
			if (!isset($this->cache[$sql_key]))
			$this->cache[$sql_key] = $sql_arr['data'] ? unserialize($sql_arr['data']) : FALSE;
			}
			}

			return $cache_data;
			return $this->cache[$key];
			}

			/**
			* @access private
			*/
			function _write_cache_record($key, $data)
			private function _write_cache_record($key, $data)
			{
			if (!$this->db)
			return FALSE;

			// check if we already have a cache entry for this key
			if (!isset($this->cache_keys[$key]))
			{
			$sql_result = $this->db->query(
			"SELECT cache_id
			FROM ".get_table_name('cache')."
			WHERE user_id=?
			AND cache_key=?",
			$_SESSION['user_id'],
			$key);

			if ($sql_arr = $this->db->fetch_assoc($sql_result))
			$this->cache_keys[$key] = $sql_arr['cache_id'];
			else
			$this->cache_keys[$key] = FALSE;
			}

			// update existing cache record
			if ($this->cache_keys[$key])
			{
			$this->db->query(
			"UPDATE ".get_table_name('cache')."
			SET created=".$this->db->now().",
			data=?
			SET created=". $this->db->now().", data=?
			WHERE user_id=?
			AND cache_key=?",
			$data,
			$_SESSION['user_id'],
			$key);
			'IMAP.'.$key);
			}
			// add new cache record
			else
			@@ -1995,22 +2318,36 @@
			(created, user_id, cache_key, data)
			VALUES (".$this->db->now().", ?, ?, ?)",
			$_SESSION['user_id'],
			$key,
			'IMAP.'.$key,
			$data);

			// get cache entry ID for this key
			$sql_result = $this->db->query(
			"SELECT cache_id
			FROM ".get_table_name('cache')."
			WHERE user_id=?
			AND cache_key=?",
			$_SESSION['user_id'],
			'IMAP.'.$key);

			if ($sql_arr = $this->db->fetch_assoc($sql_result))
			$this->cache_keys[$key] = $sql_arr['cache_id'];
			}
			}

			/**
			* @access private
			*/
			function _clear_cache_record($key)
			private function _clear_cache_record($key)
			{
			$this->db->query(
			"DELETE FROM ".get_table_name('cache')."
			WHERE user_id=?
			AND cache_key=?",
			$_SESSION['user_id'],
			$key);
			'IMAP.'.$key);

			unset($this->cache_keys[$key]);
			}


			@@ -2025,49 +2362,74 @@
			*
			* @param string Mailbox name
			* @param string Internal cache key
			* @return int -3 = off, -2 = incomplete, -1 = dirty
			* @return int Cache status: -3 = off, -2 = incomplete, -1 = dirty
			*/
			function check_cache_status($mailbox, $cache_key)
			{
			private function check_cache_status($mailbox, $cache_key)
			{
			if (!$this->caching_enabled)
			return -3;

			$cache_index = $this->get_message_cache_index($cache_key, TRUE);
			$cache_index = $this->get_message_cache_index($cache_key);
			$msg_count = $this->_messagecount($mailbox);
			$cache_count = count($cache_index);

			// console("Cache check: $msg_count !== ".count($cache_index));
			// empty mailbox
			if (!$msg_count)
			return $cache_count ? -2 : 1;

			if ($cache_count==$msg_count)
			{
			// get highest index
			$header = iil_C_FetchHeader($this->conn, $mailbox, "$msg_count");
			$cache_uid = array_pop($cache_index);
			// @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 = iil_C_FetchHeaderIndex($this->conn, $mailbox, "1:*", 'UID', $this->skip_deleted);

			if (sizeof($h_index) == $cache_count) {
			$cache_index = array_flip($cache_index);
			foreach ($h_index as $idx => $uid)
			unset($cache_index[$uid]);

			if (empty($cache_index))
			return 1;
			}
			return -2;
			} else {
			// get UID of message with highest index
			$uid = iil_C_ID2UID($this->conn, $mailbox, $msg_count);
			$cache_uid = array_pop($cache_index);

			// uids of highest message matches -> cache seems OK
			if ($cache_uid == $header->uid)
			return 1;

			// uids of highest message matches -> cache seems OK
			if ($cache_uid == $uid)
			return 1;
			}
			// cache is dirty
			return -1;
			}
			}
			// if cache count differs less than 10% report as dirty
			else if (abs($msg_count - $cache_count) < $msg_count/10)
			return -1;
			else
			return -2;
			}
			}

			/**
			* @access private
			*/
			function get_message_cache($key, $from, $to, $sort_field, $sort_order)
			private function get_message_cache($key, $from, $to, $sort_field, $sort_order)
			{
			$cache_key = "$key:$from:$to:$sort_field:$sort_order";
			$db_header_fields = array('idx', 'uid', 'subject', 'from', 'to', 'cc', 'date', 'size');

			if (!in_array($sort_field, $db_header_fields))
			$config = rcmail::get_instance()->config;

			// use idx sort for sorting by Date with index_sort=true or for unknown field
			if (($sort_field == 'date' && $this->index_sort)
			\|\| !in_array($sort_field, $db_header_fields)) {
			$sort_field = 'idx';
			}

			if ($this->caching_enabled && !isset($this->cache[$cache_key]))
			{
			@@ -2077,8 +2439,7 @@
			FROM ".get_table_name('messages')."
			WHERE user_id=?
			AND cache_key=?
			ORDER BY ".$this->db->quoteIdentifier($sort_field)." ".
			strtoupper($sort_order),
			ORDER BY ".$this->db->quoteIdentifier($sort_field)." ".strtoupper($sort_order),
			$from,
			$to-$from,
			$_SESSION['user_id'],
			@@ -2087,30 +2448,28 @@
			while ($sql_arr = $this->db->fetch_assoc($sql_result))
			{
			$uid = $sql_arr['uid'];
			$this->cache[$cache_key][$uid] = unserialize($sql_arr['headers']);

			$this->cache[$cache_key][$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] = iil_C_FetchHeader($this->conn, preg_replace('/.msg$/', '', $key), $uid, true);
			$this->cache[$cache_key][$uid] = iil_C_FetchHeader($this->conn, preg_replace('/.msg$/', '', $key), $uid, true, $this->fetch_add_headers);
			}
			}


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

			/**
			* @access private
			*/
			function &get_cached_message($key, $uid, $struct=false)
			private function &get_cached_message($key, $uid)
			{
			$internal_key = '__single_msg';

			if ($this->caching_enabled && (!isset($this->cache[$internal_key][$uid]) \|\|
			($struct && empty($this->cache[$internal_key][$uid]->structure))))
			if ($this->caching_enabled && !isset($this->cache[$internal_key][$uid]))
			{
			$sql_select = "idx, uid, headers" . ($struct ? ", structure" : '');
			$sql_result = $this->db->query(
			"SELECT $sql_select
			"SELECT idx, headers, structure
			FROM ".get_table_name('messages')."
			WHERE user_id=?
			AND cache_key=?
			@@ -2121,9 +2480,10 @@

			if ($sql_arr = $this->db->fetch_assoc($sql_result))
			{
			$this->cache[$internal_key][$uid] = unserialize($sql_arr['headers']);
			$this->uid_id_map[preg_replace('/\.msg$/', '', $key)][$uid] = $sql_arr['idx'];
			$this->cache[$internal_key][$uid] = $this->db->decode(unserialize($sql_arr['headers']));
			if (is_object($this->cache[$internal_key][$uid]) && !empty($sql_arr['structure']))
			$this->cache[$internal_key][$uid]->structure = unserialize($sql_arr['structure']);
			$this->cache[$internal_key][$uid]->structure = $this->db->decode(unserialize($sql_arr['structure']));
			}
			}

			@@ -2133,7 +2493,7 @@
			/**
			* @access private
			*/
			function get_message_cache_index($key, $force=FALSE, $sort_col='idx', $sort_order='ASC')
			private function get_message_cache_index($key, $force=FALSE, $sort_field='idx', $sort_order='ASC')
			{
			static $sa_message_index = array();

			@@ -2143,6 +2503,10 @@

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

			// use idx sort for sorting by Date with index_sort=true
			if ($sort_field == 'date' && $this->index_sort)
			$sort_field = 'idx';

			$sa_message_index[$key] = array();
			$sql_result = $this->db->query(
			@@ -2150,7 +2514,7 @@
			FROM ".get_table_name('messages')."
			WHERE user_id=?
			AND cache_key=?
			ORDER BY ".$this->db->quote_identifier($sort_col)." ".$sort_order,
			ORDER BY ".$this->db->quote_identifier($sort_field)." ".$sort_order,
			$_SESSION['user_id'],
			$key);

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


			// add to internal (fast) cache
			$this->cache['__single_msg'][$headers->uid] = $headers;
			$this->cache['__single_msg'][$headers->uid] = clone $headers;
			$this->cache['__single_msg'][$headers->uid]->structure = $struct;


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

			// check for an existing record (probly headers are cached but structure not)
			$sql_result = $this->db->query(
			if (!$force) {
			$sql_result = $this->db->query(
			"SELECT message_id
			FROM ".get_table_name('messages')."
			WHERE user_id=?
			AND cache_key=?
			AND uid=?
			AND del<>1",
			AND uid=?",
			$_SESSION['user_id'],
			$key,
			$headers->uid);
			if ($sql_arr = $this->db->fetch_assoc($sql_result))
			$message_id = $sql_arr['message_id'];
			}

			// update cache record
			if ($sql_arr = $this->db->fetch_assoc($sql_result))
			if ($message_id)
			{
			$this->db->query(
			"UPDATE ".get_table_name('messages')."
			SET idx=?, headers=?, structure=?
			WHERE message_id=?",
			$index,
			serialize($headers),
			is_object($struct) ? serialize($struct) : NULL,
			$sql_arr['message_id']
			serialize($this->db->encode(clone $headers)),
			is_object($struct) ? serialize($this->db->encode(clone $struct)) : NULL,
			$message_id
			);
			}
			else // insert new record
			@@ -2211,13 +2578,13 @@
			$key,
			$index,
			$headers->uid,
			(string)substr($this->decode_header($headers->subject, TRUE), 0, 128),
			(string)substr($this->decode_header($headers->from, TRUE), 0, 128),
			(string)substr($this->decode_header($headers->to, TRUE), 0, 128),
			(string)substr($this->decode_header($headers->cc, TRUE), 0, 128),
			(string)mb_substr($this->db->encode($this->decode_header($headers->subject, TRUE)), 0, 128),
			(string)mb_substr($this->db->encode($this->decode_header($headers->from, TRUE)), 0, 128),
			(string)mb_substr($this->db->encode($this->decode_header($headers->to, TRUE)), 0, 128),
			(string)mb_substr($this->db->encode($this->decode_header($headers->cc, TRUE)), 0, 128),
			(int)$headers->size,
			serialize($headers),
			is_object($struct) ? serialize($struct) : NULL
			serialize($this->db->encode(clone $headers)),
			is_object($struct) ? serialize($this->db->encode(clone $struct)) : NULL
			);
			}
			}
			@@ -2225,40 +2592,58 @@
			/**
			* @access private
			*/
			function remove_message_cache($key, $index)
			private function remove_message_cache($key, $ids, $idx=false)
			{
			if (!$this->caching_enabled)
			return;

			$this->db->query(
			"DELETE FROM ".get_table_name('messages')."
			WHERE user_id=?
			AND cache_key=?
			AND idx=?",
			WHERE user_id=?
			AND cache_key=?
			AND ".($idx ? "idx" : "uid")." IN (".$this->db->array2list($ids, 'integer').")",
			$_SESSION['user_id'],
			$key,
			$index);
			$key);
			}

			/**
			* @access private
			*/
			function clear_message_cache($key, $start_index=1)
			private function clear_message_cache($key, $start_index=1)
			{
			if (!$this->caching_enabled)
			return;

			$this->db->query(
			"DELETE FROM ".get_table_name('messages')."
			WHERE user_id=?
			AND cache_key=?
			AND idx>=?",
			$_SESSION['user_id'],
			$key,
			$start_index);
			WHERE user_id=?
			AND cache_key=?
			AND idx>=?",
			$_SESSION['user_id'], $key, $start_index);
			}

			/**
			* @access private
			*/
			private function get_message_cache_index_min($key, $uids=NULL)
			{
			if (!$this->caching_enabled)
			return;

			$sql_result = $this->db->query(
			"SELECT MIN(idx) AS minidx
			FROM ".get_table_name('messages')."
			WHERE user_id=?
			AND cache_key=?"
			.(!empty($uids) ? " AND uid IN (".$this->db->array2list($uids, 'integer').")" : ''),
			$_SESSION['user_id'],
			$key);

			if ($sql_arr = $this->db->fetch_assoc($sql_result))
			return $sql_arr['minidx'];
			else
			return 0;
			}


			/* --------------------------------
			@@ -2308,6 +2693,40 @@

			return $out;
			}


			/**
			* 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);

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

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

			return $tnef_parts;
			}


			/**
			@@ -2330,39 +2749,56 @@
			/**
			* Decode a mime-encoded string to internal charset
			*
			* @param string Header value
			* @param string Fallback charset if none specified
			* @param string $input Header value
			* @param string $fallback Fallback charset if none specified
			*
			* @return string Decoded string
			* @static
			*/
			function decode_mime_string($input, $fallback=null)
			public static function decode_mime_string($input, $fallback=null)
			{
			// Initialize variable
			$out = '';

			$pos = strpos($input, '=?');
			if ($pos !== false)
			{
			// rfc: all line breaks or other characters not found in the Base64 Alphabet must be ignored by decoding software
			// delete all blanks between MIME-lines, differently we can receive unnecessary blanks and broken utf-8 symbols
			$input = preg_replace("/\?=\s+=\?/", '?==?', $input);
			// Iterate instead of recursing, this way if there are too many values we don't have stack overflows
			// rfc: all line breaks or other characters not found
			// in the Base64 Alphabet must be ignored by decoding software
			// delete all blanks between MIME-lines, differently we can
			// receive unnecessary blanks and broken utf-8 symbols
			$input = preg_replace("/\?=\s+=\?/", '?==?', $input);

			$out = substr($input, 0, $pos);

			$end_cs_pos = strpos($input, "?", $pos+2);
			$end_en_pos = strpos($input, "?", $end_cs_pos+1);
			$end_pos = strpos($input, "?=", $end_en_pos+1);

			$encstr = substr($input, $pos+2, ($end_pos-$pos-2));
			$rest = substr($input, $end_pos+2);
			// Check if there is stuff to decode
			if (strpos($input, '=?') !== false) {
			// Loop through the string to decode all occurences of =? ?= into the variable $out
			while(($pos = strpos($input, '=?')) !== false) {
			// Append everything that is before the text to be decoded
			$out .= substr($input, 0, $pos);

			$out .= rcube_imap::_decode_mime_string_part($encstr);
			$out .= rcube_imap::decode_mime_string($rest, $fallback);
			// Get the location of the text to decode
			$end_cs_pos = strpos($input, "?", $pos+2);
			$end_en_pos = strpos($input, "?", $end_cs_pos+1);
			$end_pos = strpos($input, "?=", $end_en_pos+1);

			return $out;
			// Extract the encoded string
			$encstr = substr($input, $pos+2, ($end_pos-$pos-2));
			// Extract the remaining string
			$input = substr($input, $end_pos+2);

			// Decode the string fragement
			$out .= rcube_imap::_decode_mime_string_part($encstr);
			}


			// Deocde the rest (if any)
			if (strlen($input) != 0)
			$out .= rcube_imap::decode_mime_string($input, $fallback);

			// return the results
			return $out;
			}

			// no encoding information, use fallback
			return rcube_charset_convert($input, !empty($fallback) ? $fallback : 'ISO-8859-1');
			return rcube_charset_convert($input,
			!empty($fallback) ? $fallback : rcmail::get_instance()->config->get('default_charset', 'ISO-8859-1'));
			}


			@@ -2371,7 +2807,7 @@
			*
			* @access private
			*/
			function _decode_mime_string_part($str)
			private function _decode_mime_string_part($str)
			{
			$a = explode('?', $str);
			$count = count($a);
			@@ -2403,16 +2839,11 @@
			* @param string Input string
			* @param string Part encoding
			* @return string Decoded string
			* @access private
			*/
			function mime_decode($input, $encoding='7bit')
			{
			switch (strtolower($encoding))
			{
			case '7bit':
			return $input;
			break;

			case 'quoted-printable':
			return quoted_printable_decode($input);
			break;
			@@ -2420,7 +2851,15 @@
			case 'base64':
			return base64_decode($input);
			break;


			case 'x-uuencode':
			case 'x-uue':
			case 'uue':
			case 'uuencode':
			return convert_uudecode($input);
			break;

			case '7bit':
			default:
			return $input;
			}
			@@ -2428,7 +2867,7 @@


			/**
			* Convert body charset to UTF-8 according to the ctype_parameters
			* Convert body charset to RCMAIL_CHARSET according to the ctype_parameters
			*
			* @param string Part body to decode
			* @param string Charset to convert from
			@@ -2453,7 +2892,7 @@
			*/
			function get_id($uid, $mbox_name=NULL)
			{
			$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
			return $this->_uid2id($uid, $mailbox);
			}

			@@ -2467,38 +2906,43 @@
			*/
			function get_uid($id,$mbox_name=NULL)
			{
			$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
			$mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
			return $this->_id2uid($id, $mailbox);
			}


			/**
			* Modify folder name for input/output according to root dir and namespace
			*
			* @param string Folder name
			* @param string Mode
			* @return string Folder name
			*/
			function mod_mailbox($mbox_name, $mode='in')
			{
			if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) \|\| $mbox_name == 'INBOX')
			return $mbox_name;

			if (!empty($this->root_dir)) {
			if ($mode=='in')
			$mbox_name = $this->root_dir.$this->delimiter.$mbox_name;
			else if (!empty($mbox_name)) // $mode=='out'
			$mbox_name = substr($mbox_name, strlen($this->root_dir)+1);
			}

			return $mbox_name;
			}


			/* --------------------------------
			* private methods
			* --------------------------------*/


			/**
			* @access private
			*/
			function _mod_mailbox($mbox_name, $mode='in')
			{
			if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) \|\| $mbox_name == 'INBOX')
			return $mbox_name;

			if (!empty($this->root_dir) && $mode=='in')
			$mbox_name = $this->root_dir.$this->delimiter.$mbox_name;
			else if (strlen($this->root_dir) && $mode=='out')
			$mbox_name = substr($mbox_name, strlen($this->root_dir)+1);

			return $mbox_name;
			}

			/**
			* Validate the given input and save to local properties
			* @access private
			*/
			function _set_sort_order($sort_field, $sort_order)
			private function _set_sort_order($sort_field, $sort_order)
			{
			if ($sort_field != null)
			$this->sort_field = asciiwords($sort_field);
			@@ -2510,32 +2954,65 @@
			* Sort mailboxes first by default folders and then in alphabethical order
			* @access private
			*/
			function _sort_mailbox_list($a_folders)
			private function _sort_mailbox_list($a_folders)
			{
			$a_out = $a_defaults = array();
			$a_out = $a_defaults = $folders = array();

			$delimiter = $this->get_hierarchy_delimiter();

			// find default folders and skip folders starting with '.'
			foreach($a_folders as $i => $folder)
			foreach ($a_folders as $i => $folder)
			{
			if ($folder{0}=='.')
			continue;

			if (($p = array_search(strtolower($folder), $this->default_folders_lc)) !== false && !$a_defaults[$p])
			if (($p = array_search($folder, $this->default_folders)) !== false && !$a_defaults[$p])
			$a_defaults[$p] = $folder;
			else
			$a_out[] = $folder;
			$folders[$folder] = mb_strtolower(rcube_charset_convert($folder, 'UTF7-IMAP'));
			}

			natcasesort($a_out);
			// sort folders and place defaults on the top
			asort($folders, SORT_LOCALE_STRING);
			ksort($a_defaults);

			return array_merge($a_defaults, $a_out);
			$folders = array_merge($a_defaults, array_keys($folders));

			// finally we must rebuild the list to move
			// subfolders of default folders to their place...
			// ...also do this for the rest of folders because
			// asort() is not properly sorting case sensitive names
			while (list($key, $folder) = each($folders)) {
			// set the type of folder name variable (#1485527)
			$a_out[] = (string) $folder;
			unset($folders[$key]);
			$this->_rsort($folder, $delimiter, $folders, $a_out);
			}

			return $a_out;
			}


			/**
			* @access private
			*/
			function _uid2id($uid, $mbox_name=NULL)
			private function _rsort($folder, $delimiter, &$list, &$out)
			{
			while (list($key, $name) = each($list)) {
			if (strpos($name, $folder.$delimiter) === 0) {
			// set the type of folder name variable (#1485527)
			$out[] = (string) $name;
			unset($list[$key]);
			$this->_rsort($name, $delimiter, $list, $out);
			}
			}
			reset($list);
			}


			/**
			* @access private
			*/
			private function _uid2id($uid, $mbox_name=NULL)
			{
			if (!$mbox_name)
			$mbox_name = $this->mailbox;
			@@ -2549,51 +3026,18 @@
			/**
			* @access private
			*/
			function _id2uid($id, $mbox_name=NULL)
			private function _id2uid($id, $mbox_name=NULL)
			{
			if (!$mbox_name)
			$mbox_name = $this->mailbox;

			$index = array_flip((array)$this->uid_id_map[$mbox_name]);
			if (isset($index[$id]))
			$uid = $index[$id];
			else
			{
			$uid = iil_C_ID2UID($this->conn, $mbox_name, $id);
			$this->uid_id_map[$mbox_name][$uid] = $id;
			}

			if ($uid = array_search($id, (array)$this->uid_id_map[$mbox_name]))
			return $uid;

			$uid = iil_C_ID2UID($this->conn, $mbox_name, $id);
			$this->uid_id_map[$mbox_name][$uid] = $id;

			return $uid;
			}


			/**
			* Parse string or array of server capabilities and put them in internal array
			* @access private
			*/
			function _parse_capability($caps)
			{
			if (!is_array($caps))
			$cap_arr = explode(' ', $caps);
			else
			$cap_arr = $caps;

			foreach ($cap_arr as $cap)
			{
			if ($cap=='CAPABILITY')
			continue;

			if (strpos($cap, '=')>0)
			{
			list($key, $value) = explode('=', $cap);
			if (!is_array($this->capabilities[$key]))
			$this->capabilities[$key] = array();

			$this->capabilities[$key][] = $value;
			}
			else
			$this->capabilities[$cap] = TRUE;
			}
			}


			@@ -2601,26 +3045,23 @@
			* Subscribe/unsubscribe a list of mailboxes and update local cache
			* @access private
			*/
			function _change_subscription($a_mboxes, $mode)
			private function _change_subscription($a_mboxes, $mode)
			{
			$updated = FALSE;


			if (is_array($a_mboxes))
			foreach ($a_mboxes as $i => $mbox_name)
			{
			$mailbox = $this->_mod_mailbox($mbox_name);
			$mailbox = $this->mod_mailbox($mbox_name);
			$a_mboxes[$i] = $mailbox;

			if ($mode=='subscribe')
			$result = iil_C_Subscribe($this->conn, $mailbox);
			$updated = iil_C_Subscribe($this->conn, $mailbox);
			else if ($mode=='unsubscribe')
			$result = iil_C_UnSubscribe($this->conn, $mailbox);

			if ($result>=0)
			$updated = TRUE;
			$updated = iil_C_UnSubscribe($this->conn, $mailbox);
			}

			// get cached mailbox list

			// get cached mailbox list
			if ($updated)
			{
			$a_mailbox_cache = $this->get_cache('mailboxes');
			@@ -2632,7 +3073,7 @@
			$a_mailbox_cache = array_merge($a_mailbox_cache, $a_mboxes);
			else if ($mode=='unsubscribe')
			$a_mailbox_cache = array_diff($a_mailbox_cache, $a_mboxes);


			// write mailboxlist to cache
			$this->update_cache('mailboxes', $this->_sort_mailbox_list($a_mailbox_cache));
			}
			@@ -2645,7 +3086,7 @@
			* Increde/decrese messagecount for a specific mailbox
			* @access private
			*/
			function _set_messagecount($mbox_name, $mode, $increment)
			private function _set_messagecount($mbox_name, $mode, $increment)
			{
			$a_mailbox_cache = FALSE;
			$mailbox = $mbox_name ? $mbox_name : $this->mailbox;
			@@ -2674,7 +3115,7 @@
			* Remove messagecount of a specific mailbox from cache
			* @access private
			*/
			function _clear_messagecount($mbox_name='')
			private function _clear_messagecount($mbox_name='')
			{
			$a_mailbox_cache = FALSE;
			$mailbox = $mbox_name ? $mbox_name : $this->mailbox;
			@@ -2693,9 +3134,10 @@
			* Split RFC822 header string into an associative array
			* @access private
			*/
			function _parse_headers($headers)
			private function _parse_headers($headers)
			{
			$a_headers = array();
			$headers = preg_replace('/\r?\n(\t\| )+/', ' ', $headers);
			$lines = explode("\n", $headers);
			$c = count($lines);
			for ($i=0; $i<$c; $i++)
			@@ -2716,53 +3158,33 @@
			/**
			* @access private
			*/
			function _parse_address_list($str, $decode=true)
			private function _parse_address_list($str, $decode=true)
			{
			// remove any newlines and carriage returns before
			$a = $this->_explode_quoted_string('[,;]', preg_replace( "/[\r\n]/", " ", $str));
			$a = rcube_explode_quoted_string('[,;]', preg_replace( "/[\r\n]/", " ", $str));
			$result = array();


			foreach ($a as $key => $val)
			{
			$val = preg_replace("/([\"\w])</", "$1 <", $val);
			$sub_a = $this->_explode_quoted_string(' ', $decode ? $this->decode_header($val) : $val);
			$sub_a = rcube_explode_quoted_string(' ', $decode ? $this->decode_header($val) : $val);
			$result[$key]['name'] = '';

			foreach ($sub_a as $k => $v)
			{
			if (strpos($v, '@') > 0)
			$result[$key]['address'] = str_replace('<', '', str_replace('>', '', $v));
			// use angle brackets in regexp to not handle names with @ sign
			if (preg_match('/^<\S+@\S+>$/', $v))
			$result[$key]['address'] = trim($v, '<>');
			else
			$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']))
			$result[$key]['address'] = $result[$key]['name'];
			}

			return $result;
			}


			/**
			* @access private
			*/
			function _explode_quoted_string($delimiter, $string)
			{
			$result = array();
			$strlen = strlen($string);
			for ($q=$p=$i=0; $i < $strlen; $i++)
			{
			if ($string{$i} == "\"" && $string{$i-1} != "\\")
			$q = $q ? false : true;
			else if (!$q && preg_match("/$delimiter/", $string{$i}))
			{
			$result[] = substr($string, $p, $i - $p);
			$p = $i + 1;
			}
			}

			$result[] = substr($string, $p);
			return $result;
			}

			@@ -2789,6 +3211,13 @@
			var $d_parameters = array();
			var $ctype_parameters = array();

			function __clone()
			{
			if (isset($this->parts))
			foreach ($this->parts as $idx => $part)
			if (is_object($part))
			$this->parts[$idx] = clone $part;
			}
			}


			@@ -2809,7 +3238,7 @@
			*/
			function set_sequence_numbers($seqnums)
			{
			$this->sequence_numbers = $seqnums;
			$this->sequence_numbers = array_flip($seqnums);
			}

			/**
			@@ -2830,23 +3259,6 @@
			}

			/**
			* Get the position of a message sequence number in my sequence_numbers array
			*
			* @param int Message sequence number contained in sequence_numbers
			* @return int Position, -1 if not found
			*/
			function position_of($seqnum)
			{
			$c = count($this->sequence_numbers);
			for ($pos = 0; $pos <= $c; $pos++)
			{
			if ($this->sequence_numbers[$pos] == $seqnum)
			return $pos;
			}
			return -1;
			}

			/**
			* Sort method called by uasort()
			*/
			function compare_seqnums($a, $b)
			@@ -2856,79 +3268,10 @@
			$seqb = $b->id;

			// then find each sequence number in my ordered list
			$posa = $this->position_of($seqa);
			$posb = $this->position_of($seqb);
			$posa = isset($this->sequence_numbers[$seqa]) ? intval($this->sequence_numbers[$seqa]) : -1;
			$posb = isset($this->sequence_numbers[$seqb]) ? intval($this->sequence_numbers[$seqb]) : -1;

			// return the relative position as the comparison value
			$ret = $posa - $posb;
			return $ret;
			return $posa - $posb;
			}
			}


			/**
			* Add quoted-printable encoding to a given string
			*
			* @param string String to encode
			* @param int Add new line after this number of characters
			* @param boolean True if spaces should be converted into =20
			* @return string Encoded string
			*/
			function quoted_printable_encode($input, $line_max=76, $space_conv=false)
			{
			$hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
			$lines = preg_split("/(?:\r\n\|\r\|\n)/", $input);
			$eol = "\r\n";
			$escape = "=";
			$output = "";

			while( list(, $line) = each($lines))
			{
			//$line = rtrim($line); // remove trailing white space -> no =20\r\n necessary
			$linlen = strlen($line);
			$newline = "";
			for($i = 0; $i < $linlen; $i++)
			{
			$c = substr( $line, $i, 1 );
			$dec = ord( $c );
			if ( ( $i == 0 ) && ( $dec == 46 ) ) // convert first point in the line into =2E
			{
			$c = "=2E";
			}
			if ( $dec == 32 )
			{
			if ( $i == ( $linlen - 1 ) ) // convert space at eol only
			{
			$c = "=20";
			}
			else if ( $space_conv )
			{
			$c = "=20";
			}
			}
			else if ( ($dec == 61) \|\| ($dec < 32 ) \|\| ($dec > 126) ) // always encode "\t", which is not required
			{
			$h2 = floor($dec/16);
			$h1 = floor($dec%16);
			$c = $escape.$hex["$h2"].$hex["$h1"];
			}

			if ( (strlen($newline) + strlen($c)) >= $line_max ) // CRLF is not counted
			{
			$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
			$newline = "";
			// check if newline first character will be point or not
			if ( $dec == 46 )
			{
			$c = "=2E";
			}
			}
			$newline .= $c;
			} // end of for
			$output .= $newline.$eol;
			} // end of while

			return trim($output);
			}