No OneTemporary
Actions

Size

80 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CHANGELOG b/CHANGELOG
	index a23a22115..a0cab461d 100644
	--- a/CHANGELOG
	+++ b/CHANGELOG
	@@ -1,203 +1,206 @@
	CHANGELOG RoundCube Webmail
	---------------------------

	+2006/05/01
	+----------
	+- Pimped search function
	- Applied prev/next patch by Leonard Bouchet
	- Applied patches by Mark Bucciarelli
	- Applied patch for requesting receipts by Salvatore Ansani
	- Integrated GoogieSpell as suggested by phil (styling is not perfect yet, localization is missing)


	2006/04/13
	----------
	- Added Slovenian localization
	- Updated Portuguese localization
	- Fixed parent.location problem for compose-links
	- Added sort order saving patch by Jacob Brunson
	- Added gzip compression support


	2006/04/02
	----------
	- Added Lithuanian localization
	- Improved search function
	- Added version string as template object
	- Load host-specific configuration file (see config/main.inc.php)
	- New config parameter adding domain to user names for login
	- Strip tags on _auth, _action, _task parameters
	- Corrected labels for next/previous page buttons in address book


	2006/03/23
	----------
	- Auto-detect mail header delimiters
	- Regard daylight savings
	- Localized quota display
	- Started implementing search function


	2006/03/20
	----------
	- Avoid error message when saving an unchanged identity (Bug #1429510)
	- Fixed hard-coded cols selection for sent folder (Bug #1354586)
	- Enable some HTML links for use with "open in new window" or "save target"
	- Check meta-key instead of ctrl on Macs
	- Ignore double clicks when holding down a modifier key
	- Fixed reloading of the login page
	- Fixed typo in compose template (Bug #1446852)
	- Added compose button to message read step (Request #1433288)
	- New config parameter for persistent database connections (Bug #1431817)


	2006/03/14
	----------
	- Don't remove internal HTML tags in plaintext messages
	- Improved error handling in DB connection failure


	2006/02/22
	----------
	- Updated localizations
	- Fixed bug #1435989


	2006/02/19
	----------
	- Updated localizations
	- Applied patch of Anders Karlsson
	- Applied patch of Jacob Brunson
	- Applied patch for virtuser_query by Robin Elfrink
	- Added support for References header (patch by Auke)
	- Added support for mbstring module by Tadashi Jokagi
	- Added function for automatic remove of slashes on GET and POST vars
	if magic_quotes is enabled


	2006/02/05
	----------
	- Added Slovak, Hungarian, Bosnian and Croation translation
	- Fixed bug when inserting signatures with !?&
	- Chopping message headers before inserting into the message cache table
	(to avoid bugs in Postgres)
	- Allow one-char domains in e-mail addresses
	- Make product name in page title configurable
	- Make username available as skin object
	- Added session_write_close() in rcube_db class destructor to avoid problems
	in PHP 5.0.5
	- Use move_uploaded_file() instead of copy() for a more secure handling of
	uploaded attachments
	- Additional config parameter to show/hide deleted messages
	- Added periodic request for checking new mails (Request #1307821)
	- Added EXPUNGE command
	- Optimized loading time for mail interface
	- Changed to full UTF-8 support
	- Additional timezones (Patch #1389912)
	- Added LDAP public search (experimental)
	- Applied patch for correct ctrl/shift behavior for message selection (Bug #1326364)
	- Casting to strings when adding empty headers to message cache (Bug #1406026)
	- Skip sender-address as recipient when Reply-to-all
	- Fixes in utf8-class
	- Added patch for Quota display by Aury Fink Filho <nuny@aury.com.br>
	- Added garbage collector for message cache
	- Added patches for BCC headers


	2005/12/16
	----------
	- Added Turkish and Simplified Chinese translation
	- Use virtusertable to resolve e-mail addresses at login
	- Configurable mail_domain used to compose correct e-mail addresses
	on first login


	2005/12/03
	----------
	- Added Finnish, Romanian, Polish, Czech, British, Norwegian, Greek, Russian,
	Estonian and Chinese translation
	- Get IMAP server capabilities in array
	- Check for NAMESPACE capability before sending command
	- Set default user language from config 'locale_string'
	- Added sorting patch for message list
	- Make default sort col/order configurable
	- Fixed XSS in address book and identities
	- Added more XSS protection (Bug #1308236)
	- Added tab indexes for compose form
	- Added 'changed' col to contacts table
	- Support for 160-bit session hashes
	- Added input check for contacts and identities (Patch #1346523)
	- Added messages/warning to compose step (Patch #1323895)
	- Added favicon to the default skin
	- Fixed Bug #1334337 as far as possible
	- Added Reply-To-All functionality (Request #1326395, Patch #1349777)
	- Redesign of client side AJAX code (enable multi threading)
	- Added keep-alive signal every minute
	- Make logs dir configurable
	- Added support for SMTPS
	- Decode attachment file names
	- Make delimiter for message headers configurable
	- Add generic footer to sent messages
	- Choose the rigt identity when replying
	- Remove signature when replying (Request #1333167)
	- Signatures for each identity
	- Select charset when composing message
	- Complete re-design of the caching mechanism


	2005/08/11
	----------
	- Write list header to client even if list is empty
	- Add functions "select all", "select none" to message list
	- Improved filter for HTML messages to remove potentially malicious tags
	(script, iframe, object) and event handlers.
	- Buttons for next/previous message in view mode
	- Add new created contact to list and show confirmation status
	- Added folder management (subscribe/create/delete)
	- Log message sending (SMTP log)
	- Grant access for Camino browser
	- Added German translation


	2005/10/20
	----------
	- Added Swedish, Latvian, Portuguese and Catalan translation
	- Make SMTP auth method configurable
	- Make mailboxlist scrollable (Bug #1326372)
	- Fixed SSL support
	- Improved support for Courier IMAP (root folder and delimiter issues)
	- Moved taskbar from bottom to top
	- Added 'session_lifetime' parameter
	- Fixed wrong unread count when deleting message (Bug #1332434)
	- Srip tags when creating a new folder (Bug #1332084)
	- Translate HTML tags in message headers (Bug #1330134)
	- Correction in German translation (Bug #1329434)
	- Display folder names with special chars correctly (Bug #1330157)


	2005/10/07
	----------
	- Added French, Italian, Spanish, Danish, Dutch translation
	- Clarified license (Bug #1305966)
	- Fixed PHP warnings (Bug #1299403)
	- Fixed english translation (Bug #1295406)
	- Fixed bug #1290833: Last character of email not seen
	- Fixed bug #1292199 when creating new user
	- Allow more browsers (Bug #1285101)
	- Added setting for showing pretty dates
	- Added support for SQLite database
	- Make use of message caching configurable
	- Also add attachments when forwarding a message
	- Long folder names will not flow over message list (Bug #1267232)
	- Show nested mailboxes hieracically
	- Enable IMAPS by host


	2005/08/20
	----------
	- Improved cacheing of mailbox messagecount
	- Fixed javascript bug when creating a new message folder
	- Fixed javascript bugs #1260990 and #1260992: folder selection
	- Make Trash folder configurable
	- Auto create folders Inbox, Sent and Trash (if configured)
	- Support for IMAP root folder
	- Added support fot text/enriched messages
	- Make list of special mailboxes configurable

	diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
	index 5450f07e7..30e6eb8d2 100644
	--- a/program/include/rcube_imap.inc
	+++ b/program/include/rcube_imap.inc
	@@ -1,2087 +1,2087 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_imap.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| IMAP wrapper that implements the Iloha IMAP Library (IIL) \|
	\| See http://ilohamail.org/ for details \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/


	/**
	* Obtain classes from the Iloha IMAP library
	*/
	require_once('lib/imap.inc');
	require_once('lib/mime.inc');
	require_once('lib/utf7.inc');


	/**
	* Interface class for accessing an IMAP server
	*
	* This is a wrapper that implements the Iloha IMAP Library (IIL)
	*
	* @package RoundCube Webmail
	* @author Thomas Bruederli <roundcube@gmail.com>
	* @version 1.22
	* @link http://ilohamail.org
	*/
	class rcube_imap
	{
	var $db;
	var $conn;
	var $root_ns = '';
	var $root_dir = '';
	var $mailbox = 'INBOX';
	var $list_page = 1;
	var $page_size = 10;
	var $sort_field = 'date';
	var $sort_order = 'DESC';
	var $delimiter = NULL;
	var $caching_enabled = FALSE;
	var $default_folders = array('inbox', 'drafts', 'sent', 'junk', 'trash');
	var $cache = array();
	var $cache_keys = array();
	- var $cache_changes = array();
	+ var $cache_changes = array();
	var $uid_id_map = array();
	var $msg_headers = array();
	var $capabilities = array();
	var $skip_deleted = FALSE;
	var $debug_level = 1;


	/**
	* Object constructor
	*
	* @param object Database connection
	*/
	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);
	}


	/**
	* Connect to an IMAP server
	*
	* @param string Host to connect
	* @param string Username for IMAP account
	* @param string Password for IMAP account
	* @param number Port to connect to
	* @param boolean Use SSL connection
	* @return boolean TRUE on success, FALSE on failure
	* @access public
	*/
	function connect($host, $user, $pass, $port=143, $use_ssl=FALSE)
	{
	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()))
	$ICL_SSL = TRUE;
	else if ($use_ssl)
	{
	raise_error(array('code' => 403, 'type' => 'imap', 'file' => __FILE__,
	'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;
	$this->pass = $pass;
	$this->port = $port;
	$this->ssl = $use_ssl;

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

	// write error log
	else if (!$this->conn && $GLOBALS['iil_error'])
	{
	raise_error(array('code' => 403,
	'type' => 'imap',
	'message' => $GLOBALS['iil_error']), TRUE, FALSE);
	}

	// get account namespace
	if ($this->conn)
	{
	$this->_parse_capability($this->conn->capability);
	iil_C_NameSpace($this->conn);

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

	return $this->conn ? TRUE : FALSE;
	}


	/**
	* Close IMAP connection
	* Usually done on script shutdown
	*
	* @access public
	*/
	function close()
	{
	if ($this->conn)
	iil_Close($this->conn);
	}


	/**
	* Close IMAP connection and re-connect
	* This is used to avoid some strange socket errors when talking to Courier IMAP
	*
	* @access public
	*/
	function reconnect()
	{
	$this->close();
	$this->connect($this->host, $this->user, $this->pass, $this->port, $this->ssl);
	}


	/**
	* Set a root folder for the IMAP connection.
	*
	* Only folders within this root folder will be displayed
	* and all folder paths will be translated using this folder name
	*
	* @param string Root folder
	* @access public
	*/
	function set_rootdir($root)
	{
	if (ereg('[\.\/]$', $root)) //(substr($root, -1, 1)==='/')
	$root = substr($root, 0, -1);

	$this->root_dir = $root;

	if (empty($this->delimiter))
	$this->get_hierarchy_delimiter();
	}


	/**
	* This list of folders will be listed above all other folders
	*
	* @param array Indexed list of folder names
	* @access public
	*/
	function set_default_mailboxes($arr)
	{
	if (is_array($arr))
	{
	$this->default_folders = array();

	// add mailbox names lower case
	foreach ($arr as $mbox)
	$this->default_folders[] = strtolower($mbox);

	// add inbox if not included
	if (!in_array('inbox', $this->default_folders))
	array_unshift($arr, 'inbox');
	}
	}


	/**
	* Set internal mailbox reference.
	*
	* All operations will be perfomed on this mailbox/folder
	*
	* @param string Mailbox/Folder name
	* @access public
	*/
	function set_mailbox($mbox)
	{
	$mailbox = $this->_mod_mailbox($mbox);

	if ($this->mailbox == $mailbox)
	return;

	$this->mailbox = $mailbox;

	// clear messagecount cache for this mailbox
	$this->_clear_messagecount($mailbox);
	}


	/**
	* Set internal list page
	*
	* @param number Page number to list
	* @access public
	*/
	function set_page($page)
	{
	$this->list_page = (int)$page;
	}


	/**
	* Set internal page size
	*
	* @param number Number of messages to display on one page
	* @access public
	*/
	function set_pagesize($size)
	{
	$this->page_size = (int)$size;
	}


	/**
	* Returns the currently used mailbox name
	*
	* @return string Name of the mailbox/folder
	* @access public
	*/
	function get_mailbox_name()
	{
	return $this->conn ? $this->_mod_mailbox($this->mailbox, 'out') : '';
	}


	/**
	* Returns the IMAP server's capability
	*
	* @param string Capability name
	* @return mixed Capability value or TRUE if supported, FALSE if not
	* @access public
	*/
	function get_capability($cap)
	{
	$cap = strtoupper($cap);
	return $this->capabilities[$cap];
	}


	/**
	* Returns the delimiter that is used by the IMAP server for folder separation
	*
	* @return string Delimiter string
	* @access public
	*/
	function get_hierarchy_delimiter()
	{
	if ($this->conn && empty($this->delimiter))
	$this->delimiter = iil_C_GetHierarchyDelimiter($this->conn);

	if (empty($this->delimiter))
	$this->delimiter = '/';

	return $this->delimiter;
	}


	/**
	* Public method for mailbox listing.
	*
	* Converts mailbox name with root dir first
	*
	* @param string Optional root folder
	* @param string Optional filter for mailbox listing
	* @return array List of mailboxes/folders
	* @access public
	*/
	function list_mailboxes($root='', $filter='*')
	{
	$a_out = array();
	$a_mboxes = $this->_list_mailboxes($root, $filter);

	foreach ($a_mboxes as $mbox)
	{
	$name = $this->_mod_mailbox($mbox, 'out');
	if (strlen($name))
	$a_out[] = $name;
	}

	// sort mailboxes
	$a_out = $this->_sort_mailbox_list($a_out);

	return $a_out;
	}


	/**
	* Private method for mailbox listing
	*
	* @return array List of mailboxes/folders
	* @access private
	* @see rcube_imap::list_mailboxes
	*/
	function _list_mailboxes($root='', $filter='*')
	{
	$a_defaults = $a_out = array();

	// get cached folder list
	$a_mboxes = $this->get_cache('mailboxes');
	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);

	if (!is_array($a_folders) \|\| !sizeof($a_folders))
	$a_folders = array();

	// create INBOX if it does not exist
	if (!in_array_nocase('INBOX', $a_folders))
	{
	$this->create_mailbox('INBOX', TRUE);
	array_unshift($a_folders, 'INBOX');
	}

	$a_mailbox_cache = array();

	// write mailboxlist to cache
	$this->update_cache('mailboxes', $a_folders);

	return $a_folders;
	}


	/**
	* Get message count for a specific mailbox
	*
	* @param string Mailbox/folder name
	* @param string Mode for count [ALL\|UNSEEN\|RECENT]
	* @param boolean Force reading from server and update cache
	* @return number Number of messages
	* @access public
	*/
	function messagecount($mbox='', $mode='ALL', $force=FALSE)
	{
	$mailbox = $mbox ? $this->_mod_mailbox($mbox) : $this->mailbox;
	return $this->_messagecount($mailbox, $mode, $force);
	}


	/**
	* Private method for getting nr of messages
	*
	* @access private
	* @see rcube_imap::messagecount
	*/
	function _messagecount($mailbox='', $mode='ALL', $force=FALSE)
	{
	$a_mailbox_cache = FALSE;
	$mode = strtoupper($mode);

	if (empty($mailbox))
	$mailbox = $this->mailbox;

	$a_mailbox_cache = $this->get_cache('messagecount');

	// return cached value
	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 ($mode == 'RECENT')
	$count = iil_C_CheckForRecent($this->conn, $mailbox);

	// use SEARCH for message counting
	else if ($this->skip_deleted)
	{
	$search_str = "ALL UNDELETED";

	// get message count and store in cache
	if ($mode == 'UNSEEN')
	$search_str .= " UNSEEN";

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

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

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

	// write back to cache
	$this->update_cache('messagecount', $a_mailbox_cache);

	return (int)$count;
	}


	/**
	* Public method for listing headers
	* convert mailbox name with root dir first
	*
	* @param string Mailbox/folder name
	* @param number Current page to list
	* @param string Header field to sort by
	* @param string Sort order [ASC\|DESC]
	* @return array Indexed array with message header objects
	* @access public
	*/
	function list_headers($mbox='', $page=NULL, $sort_field=NULL, $sort_order=NULL)
	{
	$mailbox = $mbox ? $this->_mod_mailbox($mbox) : $this->mailbox;
	return $this->_list_headers($mailbox, $page, $sort_field, $sort_order);
	}


	/**
	* Private method for listing message headers
	*
	* @access private
	* @see rcube_imap::list_headers
	*/
	function _list_headers($mailbox='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $recursive=FALSE)
	{
	if (!strlen($mailbox))
	return array();

	if ($sort_field!=NULL)
	$this->sort_field = $sort_field;
	if ($sort_order!=NULL)
	$this->sort_order = strtoupper($sort_order);

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

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

	/*
	if ($page=='all')
	{
	$begin = 0;
	$end = $max;
	}
	else if (!$this->get_capability('sort') && $this->sort_order=='DESC')
	{
	$begin = $max - $this->page_size - $start_msg;
	$end = $max - $start_msg;
	}
	else
	{
	$begin = $start_msg;
	$end = $start_msg + $this->page_size;
	}

	if ($begin < 0) $begin = 0;
	if ($end < 0) $end = $max;
	if ($end > $max) $end = $max;
	*/

	//console("fetch headers $start_msg to ".($start_msg+$this->page_size)." (msg $begin to $end)");

	$headers_sorted = FALSE;
	$cache_key = $mailbox.'.msg';
	$cache_status = $this->check_cache_status($mailbox, $cache_key);

	//console("Cache status = $cache_status");

	// cache is OK, we can get all messages from local cache
	if ($cache_status>0)
	{
	$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;
	}
	else
	{
	// retrieve headers from IMAP
	if ($this->get_capability('sort') && ($msg_index = iil_C_Sort($this->conn, $mailbox, $this->sort_field, $this->skip_deleted ? 'UNDELETED' : '')))
	{
	//console("$mailbox: ".join(',', $msg_index));

	$msgs = $msg_index[$begin];
	for ($i=$begin+1; $i < $end; $i++)
	$msgs = $msgs.','.$msg_index[$i];

	$sorted = TRUE;
	}
	else
	{
	$msgs = sprintf("%d:%d", $begin+1, $end);
	$sorted = FALSE;
	}


	// cache is dirty, sync it
	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);
	}


	// fetch reuested headers from server
	$a_msg_headers = array();
	$deleted_count = $this->_fetch_headers($mailbox, $msgs, $a_msg_headers, $cache_key);

	// delete cached messages with a higher index than $max
	$this->clear_message_cache($cache_key, $max);


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

	}


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


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


	if (!$headers_sorted && $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
	*
	* @param string Mailbox/folder name
	* @param array List of message ids to list
	* @param number Current page to list
	* @param string Header field to sort by
	* @param string Sort order [ASC\|DESC]
	* @return array Indexed array with message header objects
	* @access public
	*/
	function list_header_set($mbox='', $msgs, $page=NULL, $sort_field=NULL, $sort_order=NULL)
	{
	$mailbox = $mbox ? $this->_mod_mailbox($mbox) : $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)
	{
	// also accept a comma-separated list of message ids
	if (is_string($msgs))
	$msgs = split(',', $msgs);

	if (!strlen($mailbox) \|\| empty($msgs))
	return array();

	if ($sort_field!=NULL)
	$this->sort_field = $sort_field;
	if ($sort_order!=NULL)
	$this->sort_order = strtoupper($sort_order);

	$max = count($msgs);
	$start_msg = ($this->list_page-1) * $this->page_size;

	// fetch reuested headers from server
	$a_msg_headers = array();
	$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
	return array_slice(array_values($a_msg_headers), $start_msg, min($max-$start_msg, $this->page_size));
	}


	/**
	* Helper function to get first and last index of the requested set
	*
	* @param number message count
	* @param mixed page number to show, or string 'all'
	* @return array array with two values: first index, last index
	* @access private
	*/
	function _get_message_range($max, $page)
	{
	$start_msg = ($this->list_page-1) * $this->page_size;

	if ($page=='all')
	{
	$begin = 0;
	$end = $max;
	}
	else if ($this->sort_order=='DESC')
	{
	$begin = $max - $this->page_size - $start_msg;
	$end = $max - $start_msg;
	}
	else
	{
	$begin = $start_msg;
	$end = $start_msg + $this->page_size;
	}

	if ($begin < 0) $begin = 0;
	if ($end < 0) $end = $max;
	if ($end > $max) $end = $max;

	return array($begin, $end);
	}



	/**
	* Fetches message headers
	* Used for loop
	*
	* @param string Mailbox name
	* @param string Message index to fetch
	* @param array Reference to message headers array
	* @param array Array with cache index
	* @return number Number of deleted messages
	* @access 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;

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

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

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

	return $deleted_count;
	}


	// return sorted array of message UIDs
	function message_index($mbox='', $sort_field=NULL, $sort_order=NULL)
	{
	if ($sort_field!=NULL)
	$this->sort_field = $sort_field;
	if ($sort_order!=NULL)
	$this->sort_order = strtoupper($sort_order);

	$mailbox = $mbox ? $this->_mod_mailbox($mbox) : $this->mailbox;
	$key = "$mbox:".$this->sort_field.":".$this->sort_order.".msgi";

	// have stored it in RAM
	if (isset($this->cache[$key]))
	return $this->cache[$key];

	// check local cache
	$cache_key = $mailbox.'.msg';
	$cache_status = $this->check_cache_status($mailbox, $cache_key);

	// cache is OK
	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);
	}


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

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

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


	function sync_header_index($mailbox)
	{
	$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');

	foreach ($a_message_index as $id => $uid)
	{
	// message in cache at correct position
	if ($cache_index[$id] == $uid)
	{
	// console("$id / $uid: OK");
	unset($cache_index[$id]);
	continue;
	}

	// message in cache but in wrong position
	if (in_array((string)$uid, $cache_index, TRUE))
	{
	// console("$id / $uid: Moved");
	unset($cache_index[$id]);
	}

	// other message at this position
	if (isset($cache_index[$id]))
	{
	// console("$id / $uid: Delete");
	$this->remove_message_cache($cache_key, $id);
	unset($cache_index[$id]);
	}


	// console("$id / $uid: Add");

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

	// those ids that are still in cache_index have been deleted
	if (!empty($cache_index))
	{
	foreach ($cache_index as $id => $uid)
	$this->remove_message_cache($cache_key, $id);
	}
	}


	/**
	* 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
	* @return array search results as list of message ids
	* @access public
	*/
	function search($mbox='', $criteria='ALL', $str=NULL)
	{
	$mailbox = $mbox ? $this->_mod_mailbox($mbox) : $this->mailbox;
	if ($str && $criteria)
	{
	- $criteria .= " \"$str\"";
	+ $criteria .= ' CHARSET UTF-8 "'.UTF7EncodeString($str).'"';
	return $this->_search_index($mailbox, $criteria);
	}
	else
	return $this->_search_index($mailbox, $criteria);
	}


	/**
	* Private search method
	*
	* @return array search results as list of message ids
	* @access private
	* @see rcube_imap::search()
	*/
	function _search_index($mailbox, $criteria='ALL')
	{
	$a_messages = iil_C_Search($this->conn, $mailbox, $criteria);

	// clean message list (there might be some empty entries)
	foreach ($a_messages as $i => $val)
	if (empty($val))
	unset($a_messages[$i]);

	return $a_messages;
	}


	function get_headers($id, $mbox=NULL, $is_uid=TRUE)
	{
	$mailbox = $mbox ? $this->_mod_mailbox($mbox) : $this->mailbox;

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

	$msg_id = $is_uid ? $this->_uid2id($id) : $id;
	$headers = iil_C_FetchHeader($this->conn, $mailbox, $msg_id);

	// write headers cache
	if ($headers)
	$this->add_message_cache($mailbox.'.msg', $msg_id, $headers);

	return $headers;
	}


	function get_body($uid, $part=1)
	{
	if (!($msg_id = $this->_uid2id($uid)))
	return FALSE;

	$structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $msg_id);
	$structure = iml_GetRawStructureArray($structure_str);
	$body = iil_C_FetchPartBody($this->conn, $this->mailbox, $msg_id, $part);

	$encoding = iml_GetPartEncodingCode($structure, $part);

	if ($encoding==3) $body = $this->mime_decode($body, 'base64');
	else if ($encoding==4) $body = $this->mime_decode($body, 'quoted-printable');

	return $body;
	}


	function get_raw_body($uid)
	{
	if (!($msg_id = $this->_uid2id($uid)))
	return FALSE;

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


	// set message flag to one or several messages
	// possible flags are: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT
	function set_flag($uids, $flag)
	{
	$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)));
	else
	$result = iil_C_Flag($this->conn, $this->mailbox, join(',', array_values($msg_ids)), $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();
	}

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

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

	return $result;
	}


	// append a mail message (source) to a specific mailbox
	function save_message($mbox, $message)
	{
	$mailbox = $this->_mod_mailbox($mbox);

	// make sure mailbox exists
	if (in_array($mailbox, $this->_list_mailboxes()))
	$saved = iil_C_Append($this->conn, $mailbox, $message);

	if ($saved)
	{
	// increase messagecount of the target mailbox
	$this->_set_messagecount($mailbox, 'ALL', 1);
	}

	return $saved;
	}


	// move a message from one mailbox to another
	function move_message($uids, $to_mbox, $from_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 (in_array(strtolower($to_mbox), $this->default_folders))
	$this->create_mailbox($to_mbox, 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))
	return false;

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

	$moved = iil_C_Move($this->conn, join(',', $a_mids), $from_mbox, $to_mbox);

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

	// 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)
	{
	$index = array_search($uid, $a_cache_index);
	$start_index = min($index, $start_index);
	}

	// clear cache from the lowest index on
	$this->clear_message_cache($cache_key, $start_index);
	}

	return $moved;
	}


	// mark messages as deleted and expunge mailbox
	function delete_message($uids, $mbox='')
	{
	$mailbox = $mbox ? $this->_mod_mailbox($mbox) : $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))
	return false;


	// 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->_clear_messagecount($mailbox);
	}

	// 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)
	{
	$index = array_search($uid, $a_cache_index);
	$start_index = min($index, $start_index);
	}

	// clear cache from the lowest index on
	$this->clear_message_cache($cache_key, $start_index);
	}

	return $deleted;
	}


	// clear all messages in a specific mailbox
	function clear_mailbox($mbox=NULL)
	{
	$mailbox = !empty($mbox) ? $this->_mod_mailbox($mbox) : $this->mailbox;
	$msg_count = $this->_messagecount($mailbox, 'ALL');

	if ($msg_count>0)
	{
	$cleared = iil_C_ClearFolder($this->conn, $mailbox);

	// make sure the message count cache is cleared as well
	if ($cleared)
	{
	$this->clear_message_cache($mailbox.'.msg');
	$a_mailbox_cache = $this->get_cache('messagecount');
	unset($a_mailbox_cache[$mailbox]);
	$this->update_cache('messagecount', $a_mailbox_cache);
	}

	return $cleared;
	}
	else
	return 0;
	}


	// send IMAP expunge command and clear cache
	function expunge($mbox='', $clear_cache=TRUE)
	{
	$mailbox = $mbox ? $this->_mod_mailbox($mbox) : $this->mailbox;
	return $this->_expunge($mailbox, $clear_cache);
	}


	// send IMAP expunge command and clear cache
	function _expunge($mailbox, $clear_cache=TRUE)
	{
	$result = iil_C_Expunge($this->conn, $mailbox);

	if ($result>=0 && $clear_cache)
	{
	//$this->clear_message_cache($mailbox.'.msg');
	$this->_clear_messagecount($mailbox);
	}

	return $result;
	}


	/* --------------------------------
	* folder managment
	* --------------------------------*/


	// return an array with all folders available in IMAP server
	function list_unsubscribed($root='')
	{
	static $sa_unsubscribed;

	if (is_array($sa_unsubscribed))
	return $sa_unsubscribed;

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

	// modify names with root dir
	foreach ($a_mboxes as $mbox)
	{
	$name = $this->_mod_mailbox($mbox, 'out');
	if (strlen($name))
	$a_folders[] = $name;
	}

	// filter folders and sort them
	$sa_unsubscribed = $this->_sort_mailbox_list($a_folders);
	return $sa_unsubscribed;
	}


	/**
	* Get quota
	* added by Nuny
	*/
	function get_quota()
	{
	if ($this->get_capability('QUOTA'))
	{
	$result = iil_C_GetQuota($this->conn);
	if ($result["total"])
	return sprintf("%.2fMB / %.2fMB (%.0f%%)", $result["used"] / 1000.0, $result["total"] / 1000.0, $result["percent"]);
	}

	return FALSE;
	}


	// subscribe to a specific mailbox(es)
	function subscribe($mbox, $mode='subscribe')
	{
	if (is_array($mbox))
	$a_mboxes = $mbox;
	else if (is_string($mbox) && strlen($mbox))
	$a_mboxes = explode(',', $mbox);

	// let this common function do the main work
	return $this->_change_subscription($a_mboxes, 'subscribe');
	}


	// unsubscribe mailboxes
	function unsubscribe($mbox)
	{
	if (is_array($mbox))
	$a_mboxes = $mbox;
	else if (is_string($mbox) && strlen($mbox))
	$a_mboxes = explode(',', $mbox);

	// let this common function do the main work
	return $this->_change_subscription($a_mboxes, 'unsubscribe');
	}


	// create a new mailbox on the server and register it in local cache
	function create_mailbox($name, $subscribe=FALSE)
	{
	$result = FALSE;

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

	$name_enc = UTF7EncodeString($name);

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

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

	if (strlen($abs_name) && (!is_array($a_mailbox_cache) \|\| !in_array($abs_name, $a_mailbox_cache)))
	$result = iil_C_CreateFolder($this->conn, $abs_name);

	// update mailboxlist cache
	if ($result && $subscribe)
	$this->subscribe($name_enc);

	return $result ? $name : FALSE;
	}


	// set a new name to an existing mailbox
	function rename_mailbox($mbox, $new_name)
	{
	// not implemented yet
	}


	// remove mailboxes from server
	function delete_mailbox($mbox)
	{
	$deleted = FALSE;

	if (is_array($mbox))
	$a_mboxes = $mbox;
	else if (is_string($mbox) && strlen($mbox))
	$a_mboxes = explode(',', $mbox);

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

	// 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)
	$deleted = TRUE;
	}

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

	return $deleted;
	}




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


	function set_caching($set)
	{
	if ($set && is_object($this->db))
	$this->caching_enabled = TRUE;
	else
	$this->caching_enabled = FALSE;
	}


	function get_cache($key)
	{
	// read cache
	if (!isset($this->cache[$key]) && $this->caching_enabled)
	{
	$cache_data = $this->_read_cache_record('IMAP.'.$key);
	$this->cache[$key] = strlen($cache_data) ? unserialize($cache_data) : FALSE;
	}

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


	function update_cache($key, $data)
	{
	$this->cache[$key] = $data;
	$this->cache_changed = TRUE;
	$this->cache_changes[$key] = TRUE;
	}


	function write_cache()
	{
	if ($this->caching_enabled && $this->cache_changed)
	{
	foreach ($this->cache as $key => $data)
	{
	if ($this->cache_changes[$key])
	$this->_write_cache_record('IMAP.'.$key, serialize($data));
	}
	}
	}


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

	$this->cache = array();
	$this->cache_changed = FALSE;
	$this->cache_changes = array();
	}
	else
	{
	$this->_clear_cache_record('IMAP.'.$key);
	$this->cache_changes[$key] = FALSE;
	unset($this->cache[$key]);
	}
	}



	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
	FROM ".get_table_name('cache')."
	WHERE user_id=?
	AND cache_key=?",
	$_SESSION['user_id'],
	$key);

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

	return $cache_data;
	}


	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=now(),
	data=?
	WHERE user_id=?
	AND cache_key=?",
	$data,
	$_SESSION['user_id'],
	$key);
	}
	// add new cache record
	else
	{
	$this->db->query(
	"INSERT INTO ".get_table_name('cache')."
	(created, user_id, cache_key, data)
	VALUES (now(), ?, ?, ?)",
	$_SESSION['user_id'],
	$key,
	$data);
	}
	}


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



	/* --------------------------------
	* message caching methods
	* --------------------------------*/


	// checks if the cache is up-to-date
	// return: -3 = off, -2 = incomplete, -1 = dirty
	function check_cache_status($mailbox, $cache_key)
	{
	if (!$this->caching_enabled)
	return -3;

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

	// console("Cache check: $msg_count !== ".count($cache_index));

	if ($cache_count==$msg_count)
	{
	// get highest index
	$header = iil_C_FetchHeader($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;

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



	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))
	$sort_field = 'idx';

	if ($this->caching_enabled && !isset($this->cache[$cache_key]))
	{
	$this->cache[$cache_key] = array();
	$sql_result = $this->db->limitquery(
	"SELECT idx, uid, headers
	FROM ".get_table_name('messages')."
	WHERE user_id=?
	AND cache_key=?
	ORDER BY ".$this->db->quoteIdentifier($sort_field)." ".
	strtoupper($sort_order),
	$from,
	$to-$from,
	$_SESSION['user_id'],
	$key);

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

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


	function get_cached_message($key, $uid, $body=FALSE)
	{
	if (!$this->caching_enabled)
	return FALSE;

	$internal_key = '__single_msg';
	if ($this->caching_enabled && (!isset($this->cache[$internal_key][$uid]) \|\| $body))
	{
	$sql_select = "idx, uid, headers";
	if ($body)
	$sql_select .= ", body";

	$sql_result = $this->db->query(
	"SELECT $sql_select
	FROM ".get_table_name('messages')."
	WHERE user_id=?
	AND cache_key=?
	AND uid=?",
	$_SESSION['user_id'],
	$key,
	$uid);

	if ($sql_arr = $this->db->fetch_assoc($sql_result))
	{
	$headers = unserialize($sql_arr['headers']);
	if (is_object($headers) && !empty($sql_arr['body']))
	$headers->body = $sql_arr['body'];

	$this->cache[$internal_key][$uid] = $headers;
	}
	}

	return $this->cache[$internal_key][$uid];
	}


	function get_message_cache_index($key, $force=FALSE, $sort_col='idx', $sort_order='ASC')
	{
	static $sa_message_index = array();

	// empty key -> empty array
	if (empty($key))
	return array();

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

	$sa_message_index[$key] = array();
	$sql_result = $this->db->query(
	"SELECT idx, uid
	FROM ".get_table_name('messages')."
	WHERE user_id=?
	AND cache_key=?
	ORDER BY ".$this->db->quote_identifier($sort_col)." ".$sort_order,
	$_SESSION['user_id'],
	$key);

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

	return $sa_message_index[$key];
	}


	function add_message_cache($key, $index, $headers)
	{
	if (!$key \|\| !is_object($headers) \|\| empty($headers->uid))
	return;

	$this->db->query(
	"INSERT INTO ".get_table_name('messages')."
	(user_id, del, cache_key, created, idx, uid, subject, ".$this->db->quoteIdentifier('from').", ".$this->db->quoteIdentifier('to').", cc, date, size, headers)
	VALUES (?, 0, ?, now(), ?, ?, ?, ?, ?, ?, ".$this->db->fromunixtime($headers->timestamp).", ?, ?)",
	$_SESSION['user_id'],
	$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),
	(int)$headers->size,
	serialize($headers));
	}


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


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




	/* --------------------------------
	* encoding/decoding methods
	* --------------------------------*/


	function decode_address_list($input, $max=NULL)
	{
	$a = $this->_parse_address_list($input);
	$out = array();

	if (!is_array($a))
	return $out;

	$c = count($a);
	$j = 0;

	foreach ($a as $val)
	{
	$j++;
	$address = $val['address'];
	$name = preg_replace(array('/^[\'"]/', '/[\'"]$/'), '', trim($val['name']));
	$string = $name!==$address ? sprintf('%s <%s>', strpos($name, ',')!==FALSE ? '"'.$name.'"' : $name, $address) : $address;

	$out[$j] = array('name' => $name,
	'mailto' => $address,
	'string' => $string);

	if ($max && $j==$max)
	break;
	}

	return $out;
	}


	function decode_header($input, $remove_quotes=FALSE)
	{
	$str = $this->decode_mime_string((string)$input);
	if ($str{0}=='"' && $remove_quotes)
	{
	$str = str_replace('"', '', $str);
	}

	return $str;
	}


	function decode_mime_string($input)
	{
	$out = '';

	$pos = strpos($input, '=?');
	if ($pos !== false)
	{
	$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);

	$out .= rcube_imap::_decode_mime_string_part($encstr);
	$out .= rcube_imap::decode_mime_string($rest);

	return $out;
	}
	else
	return $input;
	}


	function _decode_mime_string_part($str)
	{
	$a = explode('?', $str);
	$count = count($a);

	// should be in format "charset?encoding?base64_string"
	if ($count >= 3)
	{
	for ($i=2; $i<$count; $i++)
	$rest.=$a[$i];

	if (($a[1]=="B")\|\|($a[1]=="b"))
	$rest = base64_decode($rest);
	else if (($a[1]=="Q")\|\|($a[1]=="q"))
	{
	$rest = str_replace("_", " ", $rest);
	$rest = quoted_printable_decode($rest);
	}

	return rcube_charset_convert($rest, $a[0]);
	}
	else
	return $str; // we dont' know what to do with this
	}


	function mime_decode($input, $encoding='7bit')
	{
	switch (strtolower($encoding))
	{
	case '7bit':
	return $input;
	break;

	case 'quoted-printable':
	return quoted_printable_decode($input);
	break;

	case 'base64':
	return base64_decode($input);
	break;

	default:
	return $input;
	}
	}


	function mime_encode($input, $encoding='7bit')
	{
	switch ($encoding)
	{
	case 'quoted-printable':
	return quoted_printable_encode($input);
	break;

	case 'base64':
	return base64_encode($input);
	break;

	default:
	return $input;
	}
	}


	// convert body chars according to the ctype_parameters
	function charset_decode($body, $ctype_param)
	{
	if (is_array($ctype_param) && !empty($ctype_param['charset']))
	return rcube_charset_convert($body, $ctype_param['charset']);

	return $body;
	}



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


	function _mod_mailbox($mbox, $mode='in')
	{
	if ((!empty($this->root_ns) && $this->root_ns == $mbox) \|\| ($mbox == 'INBOX' && $mode == 'in'))
	return $mbox;

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

	return $mbox;
	}


	// sort mailboxes first by default folders and then in alphabethical order
	function _sort_mailbox_list($a_folders)
	{
	$a_out = $a_defaults = array();

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

	if (($p = array_search(strtolower($folder), $this->default_folders))!==FALSE)
	$a_defaults[$p] = $folder;
	else
	$a_out[] = $folder;
	}

	sort($a_out);
	ksort($a_defaults);

	return array_merge($a_defaults, $a_out);
	}

	function get_id($uid)
	{
	return $this->_uid2id($uid);
	}

	function get_uid($id)
	{
	return $this->_id2uid($id);
	}

	function _uid2id($uid, $mbox=NULL)
	{
	if (!$mbox)
	$mbox = $this->mailbox;

	if (!isset($this->uid_id_map[$mbox][$uid]))
	$this->uid_id_map[$mbox][$uid] = iil_C_UID2ID($this->conn, $mbox, $uid);

	return $this->uid_id_map[$mbox][$uid];
	}

	function _id2uid($id, $mbox=NULL)
	{
	if (!$mbox)
	$mbox = $this->mailbox;

	return iil_C_ID2UID($this->conn, $mbox, $id);
	}


	// parse string or array of server capabilities and put them in internal array
	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;
	}
	}


	// subscribe/unsubscribe a list of mailboxes and update local cache
	function _change_subscription($a_mboxes, $mode)
	{
	$updated = FALSE;

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

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

	if ($result>=0)
	$updated = TRUE;
	}

	// get cached mailbox list
	if ($updated)
	{
	$a_mailbox_cache = $this->get_cache('mailboxes');
	if (!is_array($a_mailbox_cache))
	return $updated;

	// modify cached list
	if ($mode=='subscribe')
	$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));
	}

	return $updated;
	}


	// increde/decrese messagecount for a specific mailbox
	function _set_messagecount($mbox, $mode, $increment)
	{
	$a_mailbox_cache = FALSE;
	$mailbox = $mbox ? $mbox : $this->mailbox;
	$mode = strtoupper($mode);

	$a_mailbox_cache = $this->get_cache('messagecount');

	if (!is_array($a_mailbox_cache[$mailbox]) \|\| !isset($a_mailbox_cache[$mailbox][$mode]) \|\| !is_numeric($increment))
	return FALSE;

	// add incremental value to messagecount
	$a_mailbox_cache[$mailbox][$mode] += $increment;

	// there's something wrong, delete from cache
	if ($a_mailbox_cache[$mailbox][$mode] < 0)
	unset($a_mailbox_cache[$mailbox][$mode]);

	// write back to cache
	$this->update_cache('messagecount', $a_mailbox_cache);

	return TRUE;
	}


	// remove messagecount of a specific mailbox from cache
	function _clear_messagecount($mbox='')
	{
	$a_mailbox_cache = FALSE;
	$mailbox = $mbox ? $mbox : $this->mailbox;

	$a_mailbox_cache = $this->get_cache('messagecount');

	if (is_array($a_mailbox_cache[$mailbox]))
	{
	unset($a_mailbox_cache[$mailbox]);
	$this->update_cache('messagecount', $a_mailbox_cache);
	}
	}


	function _parse_address_list($str)
	{
	$a = $this->_explode_quoted_string(',', $str);
	$result = array();

	foreach ($a as $key => $val)
	{
	$val = str_replace("\"<", "\" <", $val);
	$sub_a = $this->_explode_quoted_string(' ', $val);

	foreach ($sub_a as $k => $v)
	{
	if ((strpos($v, '@') > 0) && (strpos($v, '.') > 0))
	$result[$key]['address'] = str_replace('<', '', str_replace('>', '', $v));
	else
	$result[$key]['name'] .= (empty($result[$key]['name'])?'':' ').str_replace("\"",'',stripslashes($v));
	}

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

	$result[$key]['name'] = $this->decode_header($result[$key]['name']);
	}

	return $result;
	}


	function _explode_quoted_string($delimiter, $string)
	{
	$quotes = explode("\"", $string);
	foreach ($quotes as $key => $val)
	if (($key % 2) == 1)
	$quotes[$key] = str_replace($delimiter, "_!@!_", $quotes[$key]);

	$string = implode("\"", $quotes);

	$result = explode($delimiter, $string);
	foreach ($result as $key => $val)
	$result[$key] = str_replace("_!@!_", $delimiter, $result[$key]);

	return $result;
	}
	}





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

	?>
	\ No newline at end of file
	diff --git a/skins/default/images/icons/reset.gif b/skins/default/images/icons/reset.gif
	index 1bdbc5b2a..a9a53d569 100644
	Binary files a/skins/default/images/icons/reset.gif and b/skins/default/images/icons/reset.gif differ
	diff --git a/skins/default/images/searchfield.gif b/skins/default/images/searchfield.gif
	new file mode 100644
	index 000000000..b1dc9389e
	Binary files /dev/null and b/skins/default/images/searchfield.gif differ
	diff --git a/skins/default/mail.css b/skins/default/mail.css
	index 8cfb954b1..6d1d221ee 100644
	--- a/skins/default/mail.css
	+++ b/skins/default/mail.css
	@@ -1,815 +1,830 @@
	/*** RoundCube\|Mail mail task styles ***/


	#messagetoolbar
	{
	position: absolute;
	top: 45px;
	left: 200px;
	right: 250px;
	height: 35px;
	white-space: nowrap;
	/* border: 1px solid #cccccc; */
	}

	#messagetoolbar a
	{
	padding-right: 10px;
	}

	#messagetoolbar select
	{
	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
	font-size: 11px;
	color: #333333;
	}

	#messagetoolbar select.mboxlist
	{
	position: absolute;
	left: 375px;
	top: 10px;
	}

	#messagetoolbar select.mboxlist option
	{
	padding-left: 15px;
	}

	#messagetoolbar select.mboxlist option[value="0"]
	{
	padding-left: 2px;
	}

	#listcontrols
	{
	position: absolute;
	left: 200px;
	bottom: 20px;
	height: 16px;
	width: 500px;
	font-size: 11px;
	}

	#listcontrols a,
	#listcontrols a:active,
	#listcontrols a:visited,
	#mailboxcontrols a,
	#mailboxcontrols a:active,
	#mailboxcontrols a:visited
	{
	color: #999999;
	font-size: 11px;
	text-decoration: none;
	}

	#listcontrols a.active,
	#listcontrols a.active:active,
	#listcontrols a.active:visited,
	#mailboxcontrols a.active,
	#mailboxcontrols a.active:active,
	#mailboxcontrols a.active:visited
	{
	color: #CC0000;
	}

	#listcontrols a.active:hover,
	#mailboxcontrols a.active:hover
	{
	text-decoration: underline;
	}

	#messagecountbar
	{
	position: absolute;
	bottom: 16px;
	right: 40px;
	width: 300px;
	height: 20px;
	text-align: right;
	white-space: nowrap;
	}

	#messagecountbar span
	{
	font-size: 11px;
	color: #333333;
	}

	#messagepartcontainer
	{
	position: absolute;
	top: 80px;
	left: 20px;
	right: 20px;
	bottom: 20px;
	}

	#mailcontframe
	{
	position: absolute;
	top: 85px;
	left: 200px;
	right: 40px;
	bottom: 40px;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	overflow: auto;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
	height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
	}


	#messagepartframe
	{
	border: 1px solid #999999;
	background-color: #F9F9F9;
	}


	#partheader
	{
	position: absolute;
	top: 10px;
	left: 220px;
	height: 40px;
	}

	#partheader table td
	{
	padding-left: 2px;
	padding-right: 4px;
	vertical-align: middle;
	font-size: 11px;
	}

	#partheader table td.title
	{
	color: #666666;
	font-weight: bold;
	}

	#rcmdraglayer
	{
	width: 300px;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	padding-left: 8px;
	padding-right: 8px;
	padding-top: 3px;
	padding-bottom: 3px;
	font-size: 11px;
	opacity: 0.6;
	-moz-opacity: 0.6;
	}


	/** mailbox list styles */

	#mailboxlist-header
	{
	position: absolute;
	top: 85px;
	left: 20px;
	width: 140px !important;
	/* width: 162px; */
	height: 13px;
	padding: 3px 10px 2px 10px;
	background-color: #EBEBEB;
	background-image: url(images/listheader_aqua.gif);
	border: 1px solid #CCCCCC;
	color: #333333;
	font-size: 11px;
	font-weight: bold;
	}

	#mailboxlist-container
	{
	position: absolute;
	top: 105px;
	left: 20px;
	width: 160px;
	bottom: 40px;
	border: 1px solid #CCCCCC;
	background-color: #F9F9F9;
	overflow: auto;
	/* css hack for IE */
	height: expression((parseInt(document.documentElement.clientHeight)-145)+'px');
	}

	#mailboxlist
	{
	width: 100%;
	height: auto;
	margin: 0px;
	padding: 0px;
	list-style-image: none;
	list-style-type: none;
	overflow: hidden;
	white-space: nowrap;
	}

	#mailboxlist li
	{
	/* height: 18px; */
	font-size: 11px;
	background: url(images/icons/folder-closed.png) no-repeat;
	background-position: 10px 1px;
	border-bottom: 1px solid #EBEBEB;
	/* IE 5.5 margin-left: -16px; */
	}

	#mailboxlist li.inbox
	{
	background-image: url(images/icons/folder-inbox.png);
	}

	#mailboxlist li.sent
	{
	background-image: url(images/icons/folder-sent.png);
	}

	#mailboxlist li.junk
	{
	background-image: url(images/icons/folder-junk.png);
	}

	#mailboxlist li.trash
	{
	background-image: url(images/icons/folder-trash.png);
	}

	#mailboxlist li a
	{
	display: block;
	padding-left: 32px;
	padding-top: 2px;
	padding-bottom: 2px;
	text-decoration: none;
	}

	#mailboxlist li, #mailboxlist li.unread
	{
	/* background-image: url(images/mailbox_list.gif); */
	}

	#mailboxlist li.unread
	{
	font-weight: bold;
	}

	#mailboxlist li.selected
	{
	background-color: #929292;
	border-bottom: 1px solid #898989;
	}

	#mailboxlist li.selected a
	{
	color: #FFF;
	font-weight: bold;
	}


	/* styles for nested folders */
	#mailboxlist ul {
	list-style: none;
	padding: 0;
	margin:0;
	border-top: 1px solid #EBEBEB;
	}

	#mailboxlist ul li {
	padding-left: 15px;
	background-position: 25px 1px;
	}

	#mailboxlist li.selected li {
	background-color: #F9F9F9;
	}

	#mailboxlist li.unread li {
	font-weight: normal;
	}

	#mailboxlist li.unread li.unread {
	font-weight: bold;
	}

	#mailboxlist li.selected li a{
	color: black;
	font-weight: normal;
	}


	#mailboxcontrols
	{
	position: absolute;
	left: 20px;
	width: 160px;
	bottom: 20px;
	height: 16px;
	overflow: hidden;
	font-size: 11px;
	}


	/** message list styles */

	body.messagelist
	{
	margin: 0px;
	background-color: #F9F9F9;
	}

	#messagelist
	{
	width: 100%;
	display: table;
	table-layout: fixed;
	/* css hack for IE */
	width: expression(document.getElementById('mailcontframe').clientWidth);
	}

	#messagelist thead tr td
	{
	height: 20px;
	padding-top: 0px;
	padding-bottom: 0px;
	padding-left: 2px;
	padding-right: 4px;
	vertical-align: middle;
	border-bottom: 1px solid #999999;
	color: #333333;
	background-color: #EBEBEB;
	background-image: url(images/listheader_aqua.gif);
	font-size: 11px;
	font-weight: bold;
	}

	#messagelist thead tr td.sortedASC,
	#messagelist thead tr td.sortedDESC
	{
	background-image: url(images/listheader_dark.gif);
	}

	#messagelist thead tr td.sortedASC a
	{
	background: url(images/sort_asc.gif) top right no-repeat;
	}

	#messagelist thead tr td.sortedDESC a
	{
	background: url(images/sort_desc.gif) top right no-repeat;
	}

	#messagelist thead tr td a,
	#messagelist thead tr td a:hover
	{
	display: block;
	width: auto !important;
	width: 100%;
	color: #333333;
	text-decoration: none;
	}

	#messagelist tbody tr td
	{
	height: 16px !important;
	height: 20px;
	padding: 2px;
	padding-right: 4px;
	font-size: 11px;
	overflow: hidden;
	white-space: nowrap;
	text-overflow: ellipsis;
	border-bottom: 1px solid #EBEBEB;
	cursor: pointer;
	}

	#messagelist col
	{
	display: table-column;
	text-align: left;
	}

	#messagelist tr td.icon
	{
	width: 16px;
	}

	#messagelist tr td.subject
	{
	overflow: hidden;
	}

	#messagelist tr td.size
	{
	width: 60px;
	text-align: right;
	}

	#messagelist tr td.from,
	#messagelist tr td.to
	{
	width: 180px;
	}

	#messagelist tr td.date
	{
	width: 110px;
	}

	#messagelist tr.message
	{
	background-color: #FFFFFF;
	}

	/*
	#messagelist tr.odd
	{
	background-color: #F9F9F9;
	}
	*/

	#messagelist tr.unread
	{
	font-weight: bold;
	background-color: #FFFFFF;
	}

	#messagelist tr.selected td
	{
	font-weight: bold;
	color: #FFFFFF;
	background-color: #CC3333;
	}

	#messagelist tr.focused td
	{
	border-bottom: thin dotted;
	border-top: thin dotted;
	}

	#messagelist tr.selected td a.rcmContactAddress
	{
	color: #FFFFFF;
	}

	#messagelist tr.deleted td,
	#messagelist tr.deleted td a
	{
	color: #CCCCCC;
	}

	#quicksearchbar
	{
	position: absolute;
	top: 60px;
	right: 40px;
	- width: 200px;
	+ width: 182px;
	height: 20px;
	text-align: right;
	+ background: url('images/searchfield.gif') top left no-repeat;
	}

	#quicksearchbar a
	{
	+ position: absolute;
	+ top: 3px;
	+ right: 4px;
	text-decoration: none;
	- padding-left: 5px;
	}

	#quicksearchbar img
	{
	vertical-align: middle;
	}

	#quicksearchbox
	{
	- width: 150px;
	- border: 1px solid #999999;
	+ position: absolute;
	+ top: 2px;
	+ left: 20px;
	+ width: 140px;
	+ font-size: 11px;
	+ padding: 0px;
	+ border: none;
	}


	+/\/
	+html>body*#quicksearchbar { background-image: none; }
	+html>body*#quicksearchbar a { top: 5px; }
	+html>body*#quicksearchbar #quicksearchbox { width: 180px; top:0px; right: 1px; left: auto; }
	+/**/
	+
	+
	#rcversion
	{
	position: absolute;
	top: 67px;
	left: 20px;
	width: 160px;
	text-align: center;

	font-weight: normal;
	font-size: x-small;
	font-variant: small-caps;

	color: #999999;
	/*border: 1px solid #308014;
	background-color: #b4eeb4;*/
	}

	/** message view styles */


	#messageframe
	{
	position: absolute;
	top: 85px;
	left: 200px;
	right: 40px;
	bottom: 40px;
	border: 1px solid #cccccc;
	background-color: #FFFFFF;
	overflow: auto;
	/* css hack for IE */
	/* margin-bottom: 10px; */
	width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
	height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
	}

	table.headers-table
	{
	width: 100%;
	background-color: #EBEBEB;
	table-layout: fixed;

	}

	table.headers-table tr td
	{
	font-size: 11px;
	border-bottom:1px solid #FFFFFF;
	}

	table.headers-table td.header-title
	{
	width: 80px;
	color: #666666;
	font-weight: bold;
	text-align: right;
	white-space: nowrap;
	padding-right: 4px;
	}

	table.headers-table tr td.subject
	{
	width: 95%;
	font-weight: bold;
	}

	#attachment-list
	{
	margin: 0px;
	padding: 0px 0px 0px 68px;
	height: 18px;
	list-style-image: none;
	list-style-type: none;
	background-color: #DFDFDF;
	background: url(images/icons/attachment.png) no-repeat #DFDFDF;
	background-position: 52px 1px;
	border-bottom: 1px solid #FFFFFF;
	}

	#attachment-list li
	{
	/* display: block; */
	float: left;
	height: 18px;
	font-size: 11px;
	padding: 2px 10px 0px 10px;
	}

	#attachment-list li a
	{
	text-decoration: none;
	}

	#attachment-list li a:hover
	{
	text-decoration: underline;
	}

	#messagebody
	{
	min-height: 300px;
	padding-top: 10px;
	padding-bottom: 10px;
	background-color: #FFFFFF;
	}

	div.message-part
	{
	padding: 8px;
	padding-top: 10px;
	overflow: hidden;
	}

	div.message-part a
	{
	color: #0000CC;
	}

	div.message-part pre
	{
	margin: 0px;
	padding: 0px;
	}


	#remote-objects-message
	{
	display: none;
	height: 20px;
	min-height: 20px;
	margin: 8px 8px 0px 8px;
	padding: 10px 10px 6px 46px;
	}

	#remote-objects-message a
	{
	color: #666666;
	padding-left: 10px;
	}

	#remote-objects-message a:hover
	{
	color: #333333;
	}


	/** message compose styles */

	#priority-selector
	{
	position: absolute;
	left: 180px;
	top: 10px;
	}

	#receipt-selector
	{
	position: absolute;
	left: 350px;
	top: 10px;
	}

	#compose-container
	{
	position: absolute;
	top: 90px;
	left: 200px;
	right: 40px;
	bottom: 40px;
	padding: 0px;
	margin: 0px;
	/* css hack for IE */
	width: expression(document.documentElement.clientWidth-240);
	height: expression((parseInt(document.documentElement.clientHeight)-130)+'px');
	}

	/*
	#compose-headers
	{
	position: absolute;
	top: 70px;
	left: 200px;
	height: 84px;
	border-top: 1px solid #cccccc;
	overflow: auto;
	}

	#compose-headers td
	{
	padding-top: 1px;
	padding-bottom: 1px;
	border-right: 1px solid #cccccc;
	border-bottom: 1px solid #cccccc;
	}
	*/

	#compose-headers
	{
	width: 100%;
	}

	/*
	#compose-headers td
	{
	width: 100%;
	}
	*/

	#compose-headers td.top
	{
	vertical-align: top;
	}

	#compose-headers td.title,
	#compose-subject td.title
	{
	width: 80px !important;
	color: #666666;
	font-size: 11px;
	font-weight: bold;
	padding-right: 10px;
	white-space: nowrap;
	}

	#compose-headers td.add-button
	{
	width: 40px !important;
	text-align: right;
	vertical-align: bottom;
	}

	#compose-headers td.add-button a
	{
	color: #666666;
	font-size: 11px;
	text-decoration: none;
	}

	#compose-headers td textarea
	{
	width: 100%;
	height: 40px;
	}

	#compose-headers td input
	{
	width: 100%;
	}

	#compose-cc,
	#compose-bcc,
	#compose-replyto
	{
	display: none;
	}

	#compose-body
	{
	margin-top: 5px;
	margin-bottom: 5px;
	width: 99% !important;
	width: 95%;
	height: 90%;
	min-height: 300px;
	font-size: 9pt;
	font-family: "Courier New", Courier, monospace;
	}

	#compose-attachments
	{
	position: absolute;
	top: 100px;
	left: 20px;
	width: 160px;
	}

	#compose-attachments ul
	{
	margin: 0px;
	padding: 0px;
	border: 1px solid #CCCCCC;
	background-color: #F9F9F9;
	list-style-image: none;
	list-style-type: none;
	}

	#compose-attachments ul li
	{
	height: 18px;
	font-size: 11px;
	padding-left: 26px;
	padding-top: 2px;
	padding-right: 4px;
	background: url(images/icons/attachment.png) no-repeat;
	background-position: 4px 1px;
	border-bottom: 1px solid #EBEBEB;
	white-space: nowrap;
	overflow: hidden;
	}

	#attachment-form
	{
	position: absolute;
	top: 150px;
	left: 20px;
	z-index: 200;
	padding: 8px;
	visibility: hidden;
	border: 1px solid #CCCCCC;
	background-color: #F9F9F9;
	}

	#attachment-form input.button
	{
	margin-top: 8px;
	}

	#rcmquotadisplay
	{
	color: #999999;
	font-size: 11px;
	}
	diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
	index 7cb7efc12..e866baa07 100644
	--- a/skins/default/templates/mail.html
	+++ b/skins/default/templates/mail.html
	@@ -1,63 +1,63 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	<link rel="stylesheet" type="text/css" href="/mail.css" />
	</head>
	<body>

	<roundcube:include file="/includes/taskbar.html" />
	<roundcube:include file="/includes/header.html" />

	<div id="messagetoolbar">
	<roundcube:button command="compose" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
	<roundcube:button command="reply" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
	<roundcube:button command="reply-all" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
	<roundcube:button command="forward" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
	<roundcube:button command="delete" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
	<roundcube:button command="print" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
	</div>

	<div id="quicksearchbar">
	-<roundcube:object name="searchform" id="quicksearchbox" /><roundcube:button command="reset-search" image="/images/icons/reset.gif" title="resetsearch" />
	+<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
	</div>

	<div id="messagecountbar">
	<roundcube:button command="previouspage" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
	<roundcube:object name="messageCountDisplay" />
	<roundcube:button command="nextpage" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
	</div>

	<div id="mailboxlist-header"><roundcube:label name="mailboxlist" /></div>
	<div id="mailboxlist-container"><roundcube:object name="mailboxlist" id="mailboxlist" maxlength="16" /></div>

	<div id="mailboxcontrols">
	<roundcube:label name="folder" />:
	<roundcube:button command="expunge" label="compact" classAct="active" />
	<roundcube:button command="purge" label="empty" classAct="active" />
	</div>


	<div id="mailcontframe">
	<roundcube:object name="messages"
	id="messagelist"
	cellspacing="0"
	summary="Message list"
	messageIcon="/images/icons/dot.png"
	unreadIcon="/images/icons/unread.png"
	deletedIcon="/images/icons/folder-trash.png"
	repliedIcon="/images/icons/replied.png"
	attachmentIcon="/images/icons/attachment.png" />
	</div>

	<div id="listcontrols">
	<roundcube:label name="select" />:
	<roundcube:button command="select-all" label="all" classAct="active" />
	<roundcube:button command="select-all" prop="unread" label="unread" classAct="active" />
	<roundcube:button command="select-none" label="none" classAct="active" />
	<roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" />
	</div>

	</body>
	</html>

File Metadata

Mime Type: text/x-diff
Expires: Fri, Aug 21, 2:08 AM (1 d, 19 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1272946
Default Alt Text: (80 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions