No OneTemporary
Actions

Size

919 KB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
	index 850b2ba6c..9e3a25ef7 100644
	--- a/config/main.inc.php.dist
	+++ b/config/main.inc.php.dist
	@@ -1,416 +1,422 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| Main configuration file \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	+-----------------------------------------------------------------------+

	*/

	$rcmail_config = array();


	// system error reporting: 1 = log; 2 = report (not implemented yet), 4 = show, 8 = trace
	$rcmail_config['debug_level'] = 1;

	// log driver: 'syslog' or 'file'.
	$rcmail_config['log_driver'] = 'file';

	// Syslog ident string to use, if using the 'syslog' log driver.
	$rcmail_config['syslog_id'] = 'roundcube';

	// Syslog facility to use, if using the 'syslog' log driver.
	// For possible values see installer or http://php.net/manual/en/function.openlog.php
	$rcmail_config['syslog_facility'] = LOG_USER;

	// use this folder to store log files (must be writeable for apache user)
	// This is used by the 'file' log driver.
	$rcmail_config['log_dir'] = 'logs/';

	// use this folder to store temp files (must be writeable for apache user)
	$rcmail_config['temp_dir'] = 'temp/';

	+// use this folder to search for plugin sources
	+$rcmail_config['plugins_dir'] = 'plugins/';
	+
	+// List of active plugins. Add the name of a directory found in 'plugins_dir'
	+$rcmail_config['plugins'] = array();
	+
	// enable caching of messages and mailbox data in the local database.
	// this is recommended if the IMAP server does not run on the same machine
	$rcmail_config['enable_caching'] = TRUE;

	// lifetime of message cache
	// possible units: s, m, h, d, w
	$rcmail_config['message_cache_lifetime'] = '10d';

	// automatically create a new RoundCube user when log-in the first time.
	// a new user will be created once the IMAP login succeeds.
	// set to false if only registered users can use this service
	$rcmail_config['auto_create_user'] = TRUE;

	// the mail host chosen to perform the log-in
	// leave blank to show a textbox at login, give a list of hosts
	// to display a pulldown menu or set one host as string.
	// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
	$rcmail_config['default_host'] = '';

	// TCP port used for IMAP connections
	$rcmail_config['default_port'] = 143;

	// IMAP auth type. Can be "auth" (CRAM-MD5), "plain" (PLAIN) or "check" to auto detect.
	// Optional, defaults to "check"
	$rcmail_config['imap_auth_type'] = null;

	// If you know your imap's root directory and its folder delimiter,
	// you can specify them here. Otherwise they will be determined automatically.
	$rcmail_config['imap_root'] = null;
	$rcmail_config['imap_delimiter'] = null;

	// Automatically add this domain to user names for login
	// Only for IMAP servers that require full e-mail addresses for login
	// Specify an array with 'host' => 'domain' values to support multiple hosts
	$rcmail_config['username_domain'] = '';

	// This domain will be used to form e-mail addresses of new users
	// Specify an array with 'host' => 'domain' values to support multiple hosts
	$rcmail_config['mail_domain'] = '';

	// Path to a virtuser table file to resolve user names and e-mail addresses
	$rcmail_config['virtuser_file'] = '';

	// Query to resolve user names and e-mail addresses from the database
	// %u will be replaced with the current username for login.
	// The query should select the user's e-mail address as first col
	$rcmail_config['virtuser_query'] = '';

	// use this host for sending mails.
	// to use SSL connection, set ssl://smtp.host.com
	// if left blank, the PHP mail() function is used
	$rcmail_config['smtp_server'] = '';

	// SMTP port (default is 25; 465 for SSL)
	$rcmail_config['smtp_port'] = 25;

	// SMTP username (if required) if you use %u as the username RoundCube
	// will use the current username for login
	$rcmail_config['smtp_user'] = '';

	// SMTP password (if required) if you use %p as the password RoundCube
	// will use the current user's password for login
	$rcmail_config['smtp_pass'] = '';

	// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
	// best server supported one)
	$rcmail_config['smtp_auth_type'] = '';

	// SMTP HELO host
	// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages
	// Leave this blank and you will get the server variable 'server_name' or
	// localhost if that isn't defined.
	$rcmail_config['smtp_helo_host'] = '';

	// Log sent messages
	$rcmail_config['smtp_log'] = TRUE;

	// How many seconds must pass between emails sent by a user
	$rcmail_config['sendmail_delay'] = 0;

	// These cols are shown in the message list. Available cols are:
	// subject, from, to, cc, replyto, date, size, flag, attachment
	$rcmail_config['list_cols'] = array('subject', 'from', 'date', 'size', 'flag', 'attachment');

	// Includes should be interpreted as PHP files
	$rcmail_config['skin_include_php'] = FALSE;

	// Session lifetime in minutes
	// must be greater than 'keep_alive'/60
	$rcmail_config['session_lifetime'] = 10;

	// check client IP in session athorization
	$rcmail_config['ip_check'] = false;

	// Use an additional frequently changing cookie to athenticate user sessions.
	// There have been problems reported with this feature.
	$rcmail_config['double_auth'] = false;

	// this key is used to encrypt the users imap password which is stored
	// in the session record (and the client cookie if remember password is enabled).
	// please provide a string of exactly 24 chars.
	$rcmail_config['des_key'] = 'rcmail-!24ByteDESkey*Str';

	// the default locale setting (leave empty for auto-detection)
	// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR
	$rcmail_config['language'] = null;

	// use this format for short date display
	$rcmail_config['date_short'] = 'D H:i';

	// use this format for detailed date/time formatting
	$rcmail_config['date_long'] = 'd.m.Y H:i';

	// use this format for today's date display
	$rcmail_config['date_today'] = 'H:i';

	// add this user-agent to message headers when sending
	-$rcmail_config['useragent'] = 'RoundCube Webmail/0.2-beta';
	+$rcmail_config['useragent'] = 'RoundCube Webmail/0.3-beta';

	// use this name to compose page titles
	$rcmail_config['product_name'] = 'RoundCube Webmail';

	// store draft message is this mailbox
	// leave blank if draft messages should not be stored
	$rcmail_config['drafts_mbox'] = 'Drafts';

	// store spam messages in this mailbox
	$rcmail_config['junk_mbox'] = 'Junk';

	// store sent message is this mailbox
	// leave blank if sent messages should not be stored
	$rcmail_config['sent_mbox'] = 'Sent';

	// move messages to this folder when deleting them
	// leave blank if they should be deleted directly
	$rcmail_config['trash_mbox'] = 'Trash';

	// display these folders separately in the mailbox list.
	// these folders will also be displayed with localized names
	$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');

	// automatically create the above listed default folders on login
	$rcmail_config['create_default_folders'] = FALSE;

	// protect the default folders from renames, deletes, and subscription changes
	$rcmail_config['protect_default_folders'] = TRUE;

	// if in your system 0 quota means no limit set this option to TRUE
	$rcmail_config['quota_zero_as_unlimited'] = FALSE;

	// Behavior if a received message requests a message delivery notification (read receipt)
	// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask)
	$rcmail_config['mdn_requests'] = 0;

	// Use this charset as fallback for message decoding
	$rcmail_config['default_charset'] = 'ISO-8859-1';

	// Make use of the built-in spell checker. It is based on GoogieSpell.
	// Since Google only accepts connections over https your PHP installatation
	// requires to be compiled with Open SSL support
	$rcmail_config['enable_spellcheck'] = TRUE;

	// Set the spell checking engine. 'googie' is the default. 'pspell' is also available,
	// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here.
	$rcmail_config['spellcheck_engine'] = 'googie';

	// For a locally installed Nox Spell Server, please specify the URI to call it.
	// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72
	// Leave empty to use the Google spell checking service, what means
	// that the message content will be sent to Google in order to check spelling
	$rcmail_config['spellcheck_uri'] = '';

	// These languages can be selected for spell checking.
	// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch');
	// Leave empty for default set of Google spell check languages, should be defined
	// when using local Pspell extension
	$rcmail_config['spellcheck_languages'] = NULL;

	// path to a text file which will be added to each sent message
	// paths are relative to the RoundCube root folder
	$rcmail_config['generic_message_footer'] = '';

	// add a received header to outgoing mails containing the creators IP and hostname
	$rcmail_config['http_received_header'] = false;

	// this string is used as a delimiter for message headers when sending
	// leave empty for auto-detection
	$rcmail_config['mail_header_delimiter'] = NULL;

	// session domain: .example.org
	$rcmail_config['session_domain'] = '';

	// This indicates which type of address book to use. Possible choises:
	// 'sql' (default) and 'ldap'.
	// If set to 'ldap' then it will look at using the first writable LDAP
	// address book as the primary address book and it will not display the
	// SQL address book in the 'Address Book' view.
	$rcmail_config['address_book_type'] = 'sql';

	// In order to enable public ldap search, configure an array like the Verisign
	// example further below. if you would like to test, simply uncomment the example.
	$rcmail_config['ldap_public'] = array();

	//
	// If you are going to use LDAP for individual address books, you will need to
	// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it.
	//
	// The recommended directory structure for LDAP is to store all the address book entries
	// under the users main entry, e.g.:
	//
	// o=root
	// ou=people
	// uid=user@domain
	// mail=contact@contactdomain
	//
	// So the base_dn would be uid=%fu,ou=people,o=root
	// The bind_dn would be the same as based_dn or some super user login.
	/*
	* example config for Verisign directory
	*
	$rcmail_config['ldap_public']['Verisign'] = array(
	'name' => 'Verisign.com',
	'hosts' => array('directory.verisign.com'),
	'port' => 389,
	'use_tls' => false,
	'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
	// %fu - The full username provided, assumes the username is an email
	// address, uses the username_domain value if not an email address.
	// %u - The username prior to the '@'.
	// %d - The domain name after the '@'.
	'base_dn' => '',
	'bind_dn' => '',
	'bind_pass' => '',
	'writable' => false, // Indicates if we can write to the LDAP directory or not.
	// If writable is true then these fields need to be populated:
	// LDAP_Object_Classes, required_fields, LDAP_rdn
	'LDAP_Object_Classes' => array("top", "inetOrgPerson"), // To create a new contact these are the object classes to specify (or any other classes you wish to use).
	'required_fields' => array("cn", "sn", "mail"), // The required fields needed to build a new contact as required by the object classes (can include additional fields not required by the object classes).
	'LDAP_rdn' => 'mail', // The RDN field that is used for new entries, this field needs to be one of the search_fields, the base of base_dn is appended to the RDN to insert into the LDAP directory.
	'ldap_version' => 3, // using LDAPv3
	'search_fields' => array('mail', 'cn'), // fields to search in
	'name_field' => 'cn', // this field represents the contact's name
	'email_field' => 'mail', // this field represents the contact's e-mail
	'surname_field' => 'sn', // this field represents the contact's last name
	'firstname_field' => 'gn', // this field represents the contact's first name
	'sort' => 'cn', // The field to sort the listing by.
	'scope' => 'sub', // search mode: sub\|base\|list
	'filter' => '', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
	'fuzzy_search' => true); // server allows wildcard search
	*/

	// An ordered array of the ids of the addressbooks that should be searched
	// when populating address autocomplete fields server-side. ex: array('sql','Verisign');
	$rcmail_config['autocomplete_addressbooks'] = array('sql');

	// don't allow these settings to be overriden by the user
	$rcmail_config['dont_override'] = array();

	// Set identities access level:
	// 0 - many identities with possibility to edit all params
	// 1 - many identities with possibility to edit all params but not email address
	// 2 - one identity with possibility to edit all params
	// 3 - one identity with possibility to edit all params but not email address
	$rcmail_config['identities_level'] = 0;

	// try to load host-specific configuration
	// see http://trac.roundcube.net/wiki/Howto_Config for more details
	$rcmail_config['include_host_config'] = false;

	// don't let users set pagesize to more than this value if set
	$rcmail_config['max_pagesize'] = 200;

	// mime magic database
	$rcmail_config['mime_magic'] = '/usr/share/misc/magic';

	// default sort col
	$rcmail_config['message_sort_col'] = 'date';

	// default sort order
	$rcmail_config['message_sort_order'] = 'DESC';

	// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA.
	// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING!
	$rcmail_config['enable_installer'] = false;

	// Log successful logins
	$rcmail_config['log_logins'] = false;

	/**
	* 'Delete always'
	* This setting reflects if mail should be always marked as deleted,
	* even if moving to "Trash" fails. This is necessary in some setups
	* because a) people may not have a Trash folder or b) they are over
	* quota (and Trash is included in the quota).
	*
	* This is a failover setting for iil_C_Move when a message is moved
	* to the Trash.
	*/
	$rcmail_config['delete_always'] = false;

	// Minimal value of user's 'keep_alive' setting (in seconds)
	// Must be less than 'session_lifetime'
	$rcmail_config['min_keep_alive'] = 60;

	/*** these settings can be overwritten by user's preferences ***/

	// skin name: folder from skins/
	$rcmail_config['skin'] = 'default';

	// show up to X items in list view
	$rcmail_config['pagesize'] = 40;

	// use this timezone to display date/time
	$rcmail_config['timezone'] = 'auto';

	// is daylight saving On?
	$rcmail_config['dst_active'] = (bool)date('I');

	// prefer displaying HTML messages
	$rcmail_config['prefer_html'] = TRUE;

	// display remote inline images
	// 0 - Never, always ask
	// 1 - Ask if sender is not in address book
	// 2 - Always show inline images
	$rcmail_config['show_images'] = 0;

	// compose html formatted messages by default
	$rcmail_config['htmleditor'] = FALSE;

	// show pretty dates as standard
	$rcmail_config['prettydate'] = TRUE;

	// save compose message every 300 seconds (5min)
	$rcmail_config['draft_autosave'] = 300;

	// default setting if preview pane is enabled
	$rcmail_config['preview_pane'] = FALSE;

	// focus new window if new message arrives
	$rcmail_config['focus_on_new_message'] = true;

	// Clear Trash on logout
	$rcmail_config['logout_purge'] = FALSE;

	// Compact INBOX on logout
	$rcmail_config['logout_expunge'] = FALSE;

	// Display attached images below the message body
	$rcmail_config['inline_images'] = TRUE;

	// Encoding of long/non-ascii attachment names:
	// 0 - Full RFC 2231 compatible
	// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default)
	// 2 - Full 2047 compatible
	$rcmail_config['mime_param_folding'] = 0;

	// Set TRUE if deleted messages should not be displayed
	// This will make the application run slower
	$rcmail_config['skip_deleted'] = FALSE;

	// Set true to Mark deleted messages as read as well as deleted
	// False means that a message's read status is not affected by marking it as deleted
	$rcmail_config['read_when_deleted'] = TRUE;

	// When a Trash folder is not present and a message is deleted, flag
	// the message for deletion rather than deleting it immediately. Setting this to
	// false causes deleted messages to be permanantly removed if there is no Trash folder
	$rcmail_config['flag_for_deletion'] = FALSE;

	// Default interval for keep-alive/check-recent requests (in seconds)
	// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime'
	$rcmail_config['keep_alive'] = 60;

	// If true all folders will be checked for recent messages
	$rcmail_config['check_all_folders'] = FALSE;

	// end of config file
	?>
	diff --git a/index.php b/index.php
	index 172d57c88..7c2d23032 100644
	--- a/index.php
	+++ b/index.php
	@@ -1,235 +1,261 @@
	<?php
	/*
	+-------------------------------------------------------------------------+
	\| RoundCube Webmail IMAP Client \|
	- \| Version 0.2-20080829 \|
	+ \| Version 0.3-20090419 \|
	\| \|
	\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
	\| \|
	\| This program is free software; you can redistribute it and/or modify \|
	\| it under the terms of the GNU General Public License version 2 \|
	\| as published by the Free Software Foundation. \|
	\| \|
	\| This program is distributed in the hope that it will be useful, \|
	\| but WITHOUT ANY WARRANTY; without even the implied warranty of \|
	\| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \|
	\| GNU General Public License for more details. \|
	\| \|
	\| You should have received a copy of the GNU General Public License along \|
	\| with this program; if not, write to the Free Software Foundation, Inc., \|
	\| 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \|
	\| \|
	+-------------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-------------------------------------------------------------------------+

	$Id$

	*/

	// include environment
	require_once 'program/include/iniset.php';

	// init application and start session with requested task
	$RCMAIL = rcmail::get_instance();

	// init output class
	$OUTPUT = !empty($_REQUEST['_remote']) ? $RCMAIL->init_json() : $RCMAIL->load_gui(!empty($_REQUEST['_framed']));

	+// init plugin API
	+$RCMAIL->plugins->init();
	+
	// set output buffering
	if ($RCMAIL->action != 'get' && $RCMAIL->action != 'viewsource') {
	// use gzip compression if supported
	if (function_exists('ob_gzhandler')
	&& !ini_get('zlib.output_compression')
	&& ini_get('output_handler') != 'ob_gzhandler') {
	ob_start('ob_gzhandler');
	}
	else {
	ob_start();
	}
	}

	// check if config files had errors
	if ($err_str = $RCMAIL->config->get_error()) {
	raise_error(array(
	'code' => 601,
	'type' => 'php',
	'message' => $err_str), false, true);
	}

	// check DB connections and exit on failure
	if ($err_str = $DB->is_error()) {
	raise_error(array(
	'code' => 603,
	'type' => 'db',
	'message' => $err_str), FALSE, TRUE);
	}

	// error steps
	if ($RCMAIL->action=='error' && !empty($_GET['_code'])) {
	raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
	}

	+
	+// trigger startup plugin hook
	+$startup = $RCMAIL->plugins->exec_hook('startup', array('task' => $RCMAIL->task, 'action' => $RCMAIL->action));
	+$RCMAIL->set_task($startup['task']);
	+$RCMAIL->action = $startup['action'];
	+
	+
	// try to log in
	if ($RCMAIL->action=='login' && $RCMAIL->task=='mail') {
	// purge the session in case of new login when a session already exists
	- $RCMAIL->kill_session();
	-
	- // set IMAP host
	- $host = $RCMAIL->autoselect_host();
	+ $RCMAIL->kill_session();

	+ $auth = $RCMAIL->plugins->exec_hook('authenticate', array(
	+ 'host' => $RCMAIL->autoselect_host(),
	+ 'user' => trim(get_input_value('_user', RCUBE_INPUT_POST)),
	+ )) + array('pass' => get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'));
	+
	// check if client supports cookies
	if (empty($_COOKIE)) {
	$OUTPUT->show_message("cookiesdisabled", 'warning');
	}
	- else if ($_SESSION['temp'] && !empty($_POST['_user']) && !empty($_POST['_pass']) &&
	- $RCMAIL->login(trim(get_input_value('_user', RCUBE_INPUT_POST), ' '),
	- get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'), $host)) {
	+ else if ($_SESSION['temp'] && !empty($auth['user']) && !empty($auth['host']) && isset($auth['pass']) &&
	+ $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) {
	// create new session ID
	unset($_SESSION['temp']);
	rcube_sess_regenerate_id();

	// send auth cookie if necessary
	$RCMAIL->authenticate_session();

	// log successful login
	if ($RCMAIL->config->get('log_logins')) {
	write_log('userlogins', sprintf('Successful login for %s (id %d) from %s',
	$RCMAIL->user->get_username(),
	$RCMAIL->user->ID,
	$_SERVER['REMOTE_ADDR']));
	}
	+
	+ // restore original request parameters
	+ $query = array();
	+ if ($url = get_input_value('_url', RCUBE_INPUT_POST))
	+ parse_str($url, $query);
	+
	+ // allow plugins to control the redirect url after login success
	+ $redir = $RCMAIL->plugins->exec_hook('login_after', $query + array('task' => $RCMAIL->task));
	+ unset($redir['abort']);

	// send redirect
	- $OUTPUT->redirect();
	+ $OUTPUT->redirect($redir);
	}
	else {
	$OUTPUT->show_message($IMAP->error_code < -1 ? 'imaperror' : 'loginfailed', 'warning');
	+ $RCMAIL->plugins->exec_hook('login_failed', array('code' => $IMAP->error_code, 'host' => $auth['host'], 'user' => $auth['user']));
	$RCMAIL->kill_session();
	}
	}

	// end session
	else if (($RCMAIL->task=='logout' \|\| $RCMAIL->action=='logout') && isset($_SESSION['user_id'])) {
	$OUTPUT->show_message('loggedout');
	$RCMAIL->logout_actions();
	$RCMAIL->kill_session();
	}

	// check session and auth cookie
	else if ($RCMAIL->action != 'login' && $_SESSION['user_id'] && $RCMAIL->action != 'send') {
	if (!$RCMAIL->authenticate_session()) {
	$OUTPUT->show_message('sessionerror', 'error');
	$RCMAIL->kill_session();
	}
	}


	// check client X-header to verify request origin
	if ($OUTPUT->ajax_call) {
	if (!$RCMAIL->config->get('devel_mode') && !rc_request_header('X-RoundCube-Referer')) {
	header('HTTP/1.1 404 Not Found');
	die("Invalid Request");
	}
	}


	// not logged in -> show login page
	if (empty($RCMAIL->user->ID)) {

	if ($OUTPUT->ajax_call)
	$OUTPUT->redirect(array(), 2000);

	// check if installer is still active
	if ($RCMAIL->config->get('enable_installer') && is_readable('./installer/index.php')) {
	$OUTPUT->add_footer(html::div(array('style' => "background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em"),
	html::tag('h2', array('style' => "margin-top:0.2em"), "Installer script is still accessible") .
	html::p(null, "The install script of your RoundCube installation is still stored in its default location!") .
	html::p(null, "Please <b>remove</b> the whole <tt>installer</tt> folder from the RoundCube directory because .
	these files may expose sensitive configuration data like server passwords and encryption keys
	to the public. Make sure you cannot access the <a href=\"./installer/\">installer script</a> from your browser.")
	)
	);
	}

	$OUTPUT->set_env('task', 'login');
	$OUTPUT->send('login');
	}


	// handle keep-alive signal
	if ($RCMAIL->action == 'keep-alive') {
	$OUTPUT->reset();
	$OUTPUT->send();
	}
	// save preference value
	else if ($RCMAIL->action == 'save-pref') {
	$RCMAIL->user->save_prefs(array(get_input_value('_name', RCUBE_INPUT_POST) => get_input_value('_value', RCUBE_INPUT_POST)));
	$OUTPUT->reset();
	$OUTPUT->send();
	}


	// map task/action to a certain include file
	$action_map = array(
	'mail' => array(
	'preview' => 'show.inc',
	'print' => 'show.inc',
	'moveto' => 'move_del.inc',
	'delete' => 'move_del.inc',
	'send' => 'sendmail.inc',
	'expunge' => 'folders.inc',
	'purge' => 'folders.inc',
	'remove-attachment' => 'attachments.inc',
	'display-attachment' => 'attachments.inc',
	'upload' => 'attachments.inc',
	),

	'addressbook' => array(
	'add' => 'edit.inc',
	),

	'settings' => array(
	'folders' => 'manage_folders.inc',
	'create-folder' => 'manage_folders.inc',
	'rename-folder' => 'manage_folders.inc',
	'delete-folder' => 'manage_folders.inc',
	'subscribe' => 'manage_folders.inc',
	'unsubscribe' => 'manage_folders.inc',
	'add-identity' => 'edit_identity.inc',
	)
	);

	// include task specific functions
	include_once 'program/steps/'.$RCMAIL->task.'/func.inc';

	// allow 5 "redirects" to another action
	$redirects = 0; $incstep = null;
	while ($redirects < 5) {
	$stepfile = !empty($action_map[$RCMAIL->task][$RCMAIL->action]) ?
	$action_map[$RCMAIL->task][$RCMAIL->action] : strtr($RCMAIL->action, '-', '_') . '.inc';
	-
	+
	+ // execute a plugin action
	+ if (eregi('^plugin.', $RCMAIL->action)) {
	+ $RCMAIL->plugins->exec_action($RCMAIL->action);
	+ break;
	+ }
	// try to include the step file
	- if (is_file(($incfile = 'program/steps/'.$RCMAIL->task.'/'.$stepfile))) {
	+ else if (is_file(($incfile = 'program/steps/'.$RCMAIL->task.'/'.$stepfile))) {
	include($incfile);
	$redirects++;
	}
	else {
	break;
	}
	}


	// parse main template (default)
	$OUTPUT->send($RCMAIL->task);


	// if we arrive here, something went wrong
	raise_error(array(
	'code' => 404,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => "Invalid request"), true, true);

	?>
	diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
	new file mode 100644
	index 000000000..92471384e
	--- /dev/null
	+++ b/plugins/additional_message_headers/additional_message_headers.php
	@@ -0,0 +1,42 @@
	+<?php
	+
	+/**
	+ * Additional Message Headers
	+ *
	+ * Very simple plugin which will read additional headers for outgoing messages from the config file.
	+ *
	+ * Enable the plugin in config/main.inc.php and add your desired headers.
	+ *
	+ * @version 1.0
	+ * @author Ziba Scott
	+ * @website http://roundcube.net
	+ *
	+ * Example:
	+ *
	+ * $rcmail_config['additional_message_headers']['X-Remote-Browser'] = $_SERVER['HTTP_USER_AGENT'];
	+ * $rcmail_config['additional_message_headers']['X-Originating-IP'] = $_SERVER['REMOTE_ADDR'];
	+ * $rcmail_config['additional_message_headers']['X-RoundCube-Server'] = $_SERVER['SERVER_ADDR'];
	+ * if( isset( $_SERVER['MACHINE_NAME'] )) {
	+ * $rcmail_config['additional_message_headers']['X-RoundCube-Server'] .= ' (' . $_SERVER['MACHINE_NAME'] . ')';
	+ * }
	+ */
	+class additional_message_headers extends rcube_plugin
	+{
	+ public $task = 'mail';
	+
	+ function init()
	+ {
	+ $this->add_hook('outgoing_message_headers', array($this, 'message_headers'));
	+ }
	+
	+ function message_headers($args){
	+
	+ // additional email headers
	+ $additional_headers = rcmail::get_instance()->config->get('additional_message_headers',array());
	+ foreach($additional_headers as $header=>$value){
	+ $args['headers'][$header] = $value;
	+ }
	+
	+ return $args;
	+ }
	+}
	diff --git a/plugins/autologon/autologon.php b/plugins/autologon/autologon.php
	new file mode 100644
	index 000000000..c40f2d4eb
	--- /dev/null
	+++ b/plugins/autologon/autologon.php
	@@ -0,0 +1,44 @@
	+<?php
	+
	+/**
	+ * Sample plugin to try out some hooks.
	+ * This performs an automatic login if accessed from localhost
	+ */
	+class autologon extends rcube_plugin
	+{
	+
	+ function init()
	+ {
	+ $this->add_hook('startup', array($this, 'startup'));
	+ $this->add_hook('authenticate', array($this, 'authenticate'));
	+ }
	+
	+ function startup($args)
	+ {
	+ $rcmail = rcmail::get_instance();
	+
	+ // change action to login
	+ if ($args['task'] == 'mail' && empty($args['action']) && empty($_SESSION['user_id']) && !empty($_GET['_autologin']) && $this->is_localhost())
	+ $args['action'] = 'login';
	+
	+ return $args;
	+ }
	+
	+ function authenticate($args)
	+ {
	+ if (!empty($_GET['_autologin']) && $this->is_localhost()) {
	+ $args['user'] = 'me';
	+ $args['pass'] = '******';
	+ $args['host'] = 'localhost';
	+ }
	+
	+ return $args;
	+ }
	+
	+ function is_localhost()
	+ {
	+ return $_SERVER['REMOTE_ADDR'] == '::1' \|\| $_SERVER['REMOTE_ADDR'] == '127.0.0.1';
	+ }
	+
	+}
	+
	diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
	new file mode 100644
	index 000000000..28ccde4b3
	--- /dev/null
	+++ b/plugins/database_attachments/database_attachments.php
	@@ -0,0 +1,152 @@
	+<?php
	+/**
	+ * Filesystem Attachments
	+ *
	+ * This plugin which provides database backed storage for temporary
	+ * attachment file handling. The primary advantage of this plugin
	+ * is its compatibility with round-robin dns multi-server roundcube
	+ * installations.
	+ *
	+ * This plugin relies on the core filesystem_attachments plugin
	+ *
	+ * @author Ziba Scott <ziba@umich.edu>
	+ *
	+ */
	+require_once('plugins/filesystem_attachments/filesystem_attachments.php');
	+class database_attachments extends filesystem_attachments
	+{
	+
	+ // A prefix for the cache key used in the session and in the key field of the cache table
	+ private $cache_prefix = "db_attach";
	+
	+ /**
	+ * Helper method to generate a unique key for the given attachment file
	+ */
	+ private function _key($filepath)
	+ {
	+ return $this->cache_prefix.md5(mktime().$filepath.$_SESSION['user_id']);
	+ }
	+
	+ /**
	+ * Save a newly uploaded attachment
	+ */
	+ function upload($args)
	+ {
	+ $args['status'] = false;
	+ $rcmail = rcmail::get_instance();
	+ $key = $this->_key($args['path']);
	+ $data = base64_encode(file_get_contents($args['path']));
	+
	+ $status = $rcmail->db->query(
	+ "INSERT INTO ".get_table_name('cache')."
	+ (created, user_id, cache_key, data)
	+ VALUES (".$rcmail->db->now().", ?, ?, ?)",
	+ $_SESSION['user_id'],
	+ $key,
	+ $data);
	+
	+ if ($status) {
	+ $args['id'] = $key;
	+ $args['status'] = true;
	+ unset($args['path']);
	+ }
	+
	+ return $args;
	+ }
	+
	+ /**
	+ * Save an attachment from a non-upload source (draft or forward)
	+ */
	+ function save($args)
	+ {
	+ $args['status'] = false;
	+ $rcmail = rcmail::get_instance();
	+
	+ $key = $this->_key($args['name']);
	+ $data = base64_encode($args['data']);
	+
	+ $status = $rcmail->db->query(
	+ "INSERT INTO ".get_table_name('cache')."
	+ (created, user_id, cache_key, data)
	+ VALUES (".$rcmail->db->now().", ?, ?, ?)",
	+ $_SESSION['user_id'],
	+ $key,
	+ $data);
	+
	+ if ($status) {
	+ $args['id'] = $key;
	+ $args['status'] = true;
	+ }
	+
	+ return $args;
	+ }
	+
	+ /**
	+ * Remove an attachment from storage
	+ * This is triggered by the remove attachment button on the compose screen
	+ */
	+ function remove($args)
	+ {
	+ $args['status'] = false;
	+ $rcmail = rcmail::get_instance();
	+ $status = $rcmail->db->query(
	+ "DELETE FROM ".get_table_name('cache')."
	+ WHERE user_id=?
	+ AND cache_key=?",
	+ $_SESSION['user_id'],
	+ $args['id']);
	+
	+ if ($status) {
	+ $args['status'] = true;
	+ }
	+
	+ return $args;
	+ }
	+
	+ /**
	+ * When composing an html message, image attachments may be shown
	+ * For this plugin, $this->get_attachment will check the file and
	+ * return it's contents
	+ */
	+ function display($args)
	+ {
	+ return $this->get_attachment($args);
	+ }
	+
	+ /**
	+ * When displaying or sending the attachment the file contents are fetched
	+ * using this method. This is also called by the display_attachment hook.
	+ */
	+ function get_attachment($args)
	+ {
	+ $rcmail = rcmail::get_instance();
	+
	+ $sql_result = $rcmail->db->query(
	+ "SELECT cache_id, data
	+ FROM ".get_table_name('cache')."
	+ WHERE user_id=?
	+ AND cache_key=?",
	+ $_SESSION['user_id'],
	+ $args['id']);
	+
	+ if ($sql_arr = $rcmail->db->fetch_assoc($sql_result)) {
	+ $args['data'] = base64_decode($sql_arr['data']);
	+ $args['status'] = true;
	+ }
	+
	+ return $args;
	+ }
	+
	+ /**
	+ * Delete all temp files associated with this user
	+ */
	+ function cleanup($args)
	+ {
	+ $rcmail = rcmail::get_instance();
	+ $rcmail->db->query(
	+ "DELETE FROM ".get_table_name('cache')."
	+ WHERE user_id=?
	+ AND cache_key like '{$this->cache_prefix}%'",
	+ $_SESSION['user_id']);
	+ }
	+}
	diff --git a/plugins/debug_logger/debug_logger.php b/plugins/debug_logger/debug_logger.php
	new file mode 100644
	index 000000000..8cd335187
	--- /dev/null
	+++ b/plugins/debug_logger/debug_logger.php
	@@ -0,0 +1,146 @@
	+<?php
	+
	+/**
	+ * Debug Logger
	+ *
	+ * Enhanced logging for debugging purposes. It is not recommened
	+ * to be enabled on production systems without testing because of
	+ * the somewhat increased memory, cpu and disk i/o overhead.
	+ *
	+ * Debug Logger listens for existing console("message") calls and
	+ * introduces start and end tags as well as free form tagging
	+ * which can redirect messages to files. The resulting log files
	+ * provide timing and tag quantity results.
	+ *
	+ * Enable the plugin in config/main.inc.php and add your desired
	+ * log types and files.
	+ *
	+ * @version 1.0
	+ * @author Ziba Scott
	+ * @website http://roundcube.net
	+ *
	+ * Example:
	+ *
	+ * config/main.inc.php:
	+ *
	+ * // $rcmail_config['debug_logger'][type of logging] = name of file in log_dir
	+ * // The 'master' log includes timing information
	+ * $rcmail_config['debug_logger']['master'] = 'master';
	+ * // If you want sql messages to also go into a separate file
	+ * $rcmail_config['debug_logger']['sql'] = 'sql';
	+ *
	+ * index.php (just after $RCMAIL->plugins->init()):
	+ *
	+ * console("my test","start");
	+ * console("my message");
	+ * console("my sql calls","start");
	+ * console("cp -r * /dev/null","shell exec");
	+ * console("select * from example","sql");
	+ * console("select * from example","sql");
	+ * console("select * from example","sql");
	+ * console("end");
	+ * console("end");
	+ *
	+ *
	+ * logs/master (after reloading the main page):
	+ *
	+ * [17-Feb-2009 16:51:37 -0500] start: Task: mail.
	+ * [17-Feb-2009 16:51:37 -0500] start: my test
	+ * [17-Feb-2009 16:51:37 -0500] my message
	+ * [17-Feb-2009 16:51:37 -0500] shell exec: cp -r * /dev/null
	+ * [17-Feb-2009 16:51:37 -0500] start: my sql calls
	+ * [17-Feb-2009 16:51:37 -0500] sql: select * from example
	+ * [17-Feb-2009 16:51:37 -0500] sql: select * from example
	+ * [17-Feb-2009 16:51:37 -0500] sql: select * from example
	+ * [17-Feb-2009 16:51:37 -0500] end: my sql calls - 0.0018 seconds shell exec: 1, sql: 3,
	+ * [17-Feb-2009 16:51:37 -0500] end: my test - 0.0055 seconds shell exec: 1, sql: 3,
	+ * [17-Feb-2009 16:51:38 -0500] end: Task: mail. - 0.8854 seconds shell exec: 1, sql: 3,
	+ *
	+ * logs/sql (after reloading the main page):
	+ *
	+ * [17-Feb-2009 16:51:37 -0500] sql: select * from example
	+ * [17-Feb-2009 16:51:37 -0500] sql: select * from example
	+ * [17-Feb-2009 16:51:37 -0500] sql: select * from example
	+ */
	+class debug_logger extends rcube_plugin
	+{
	+ function init()
	+ {
	+ require_once(dirname(__FILE__).'/runlog/runlog.php');
	+ $this->runlog = new runlog();
	+
	+ if(!rcmail::get_instance()->config->get('log_dir')){
	+ rcmail::get_instance()->config->set('log_dir',INSTALL_PATH.'logs');
	+ }
	+
	+ $log_config = rcmail::get_instance()->config->get('debug_logger',array());
	+
	+ foreach($log_config as $type=>$file){
	+ $this->runlog->set_file(rcmail::get_instance()->config->get('log_dir').'/'.$file, $type);
	+ }
	+
	+ $start_string = "";
	+ $action = rcmail::get_instance()->action;
	+ $task = rcmail::get_instance()->task;
	+ if($action){
	+ $start_string .= "Action: ".$action.". ";
	+ }
	+ if($task){
	+ $start_string .= "Task: ".$task.". ";
	+ }
	+ $this->runlog->start($start_string);
	+
	+ $this->add_hook('console', array($this, 'console'));
	+ $this->add_hook('authenticate', array($this, 'authenticate'));
	+ }
	+
	+ function authenticate($args){
	+ $this->runlog->note('Authenticating '.$args['user'].'@'.$args['host']);
	+ return $args;
	+ }
	+
	+ function console($args){
	+ $note = $args[0];
	+ $type = $args[1];
	+
	+
	+ if(!isset($args[1])){
	+ // This could be extended to detect types based on the
	+ // file which called console. For now only rcube_imap.inc is supported
	+ $bt = debug_backtrace(true);
	+ $file = $bt[3]['file'];
	+ switch(basename($file)){
	+ case 'rcube_imap.php':
	+ $type = 'imap';
	+ break;
	+ default:
	+ $type = FALSE;
	+ break;
	+ }
	+ }
	+ switch($note){
	+ case 'end':
	+ $type = 'end';
	+ break;
	+ }
	+
	+
	+ switch($type){
	+ case 'start':
	+ $this->runlog->start($note);
	+ break;
	+ case 'end':
	+ $this->runlog->end();
	+ break;
	+ default:
	+ $this->runlog->note($note, $type);
	+ break;
	+ }
	+ return $args;
	+ }
	+
	+ function __destruct(){
	+ $this->runlog->end();
	+ }
	+}
	+?>
	diff --git a/plugins/debug_logger/runlog/runlog.php b/plugins/debug_logger/runlog/runlog.php
	new file mode 100644
	index 000000000..c9f672615
	--- /dev/null
	+++ b/plugins/debug_logger/runlog/runlog.php
	@@ -0,0 +1,227 @@
	+<?php
	+
	+/**
	+ * runlog
	+ *
	+ * @author Ziba Scott <ziba@umich.edu>
	+ */
	+class runlog {
	+
	+ private $start_time = FALSE;
	+
	+ private $parent_stack = array();
	+
	+ public $print_to_console = FALSE;
	+
	+ private $file_handles = array();
	+
	+ private $indent = 0;
	+
	+ public $threshold = 0;
	+
	+ public $tag_count = array();
	+
	+ public $timestamp = "d-M-Y H:i:s O";
	+
	+ public $max_line_size = 150;
	+
	+ private $run_log = array();
	+
	+ function runlog()
	+ {
	+ $this->start_time = microtime( TRUE );
	+ }
	+
	+ public function start( $name, $tag = FALSE )
	+ {
	+ $this->run_log[] = array( 'type' => 'start',
	+ 'tag' => $tag,
	+ 'index' => count($this->run_log),
	+ 'value' => $name,
	+ 'time' => microtime( TRUE ),
	+ 'parents' => $this->parent_stack,
	+ 'ended' => false,
	+ );
	+ $this->parent_stack[] = $name;
	+
	+ $this->print_to_console("start: ".$name, $tag, 'start');
	+ $this->print_to_file("start: ".$name, $tag, 'start');
	+ $this->indent++;
	+ }
	+
	+ public function end()
	+ {
	+ $name = array_pop( $this->parent_stack );
	+ foreach ( $this->run_log as $k => $entry ) {
	+ if ( $entry['value'] == $name && $entry['type'] == 'start' && $entry['ended'] == false) {
	+ $lastk = $k;
	+ }
	+ }
	+ $start = $this->run_log[$lastk]['time'];
	+ $this->run_log[$lastk]['duration'] = microtime( TRUE ) - $start;
	+ $this->run_log[$lastk]['ended'] = true;
	+
	+ $this->run_log[] = array( 'type' => 'end',
	+ 'tag' => $this->run_log[$lastk]['tag'],
	+ 'index' => $lastk,
	+ 'value' => $name,
	+ 'time' => microtime( TRUE ),
	+ 'duration' => microtime( TRUE ) - $start,
	+ 'parents' => $this->parent_stack,
	+ );
	+ $this->indent--;
	+ if($this->run_log[$lastk]['duration'] >= $this->threshold){
	+ $tag_report = "";
	+ foreach($this->tag_count as $tag=>$count){
	+ $tag_report .= "$tag: $count, ";
	+ }
	+ if(!empty($tag_report)){
	+// $tag_report = "\n$tag_report\n";
	+ }
	+ $end_txt = sprintf("end: $name - %0.4f seconds $tag_report", $this->run_log[$lastk]['duration'] );
	+ $this->print_to_console($end_txt, $this->run_log[$lastk]['tag'] , 'end');
	+ $this->print_to_file($end_txt, $this->run_log[$lastk]['tag'], 'end');
	+ }
	+ }
	+
	+ public function increase_tag_count($tag){
	+ if(!isset($this->tag_count[$tag])){
	+ $this->tag_count[$tag] = 0;
	+ }
	+ $this->tag_count[$tag]++;
	+ }
	+
	+ public function get_text(){
	+ $text = "";
	+ foreach($this->run_log as $entry){
	+ $text .= str_repeat(" ",count($entry['parents']));
	+ if($entry['tag'] != 'text'){
	+ $text .= $entry['tag'].': ';
	+ }
	+ $text .= $entry['value'];
	+
	+ if($entry['tag'] == 'end'){
	+ $text .= sprintf(" - %0.4f seconds", $entry['duration'] );
	+ }
	+
	+ $text .= "\n";
	+ }
	+ return $text;
	+ }
	+
	+ public function set_file($filename, $tag = 'master'){
	+ if(!isset($this->file_handle[$tag])){
	+ $this->file_handles[$tag] = fopen($filename, 'a');
	+ if(!$this->file_handles[$tag]){
	+ trigger_error('Could not open file for writing: '.$filename);
	+ }
	+ }
	+ }
	+
	+ public function note( $msg, $tag = FALSE )
	+ {
	+ if($tag){
	+ $this->increase_tag_count($tag);
	+ }
	+ if ( is_array( $msg )) {
	+ $msg = '<pre>' . print_r( $msg, TRUE ) . '</pre>';
	+ }
	+ $this->debug_messages[] = $msg;
	+ $this->run_log[] = array( 'type' => 'note',
	+ 'tag' => $tag ? $tag:"text",
	+ 'value' => htmlentities($msg),
	+ 'time' => microtime( TRUE ),
	+ 'parents' => $this->parent_stack,
	+ );
	+
	+ $this->print_to_file($msg, $tag);
	+ $this->print_to_console($msg, $tag);
	+
	+ }
	+
	+ public function print_to_file($msg, $tag = FALSE, $type = FALSE){
	+ if(!$tag){
	+ $file_handle_tag = 'master';
	+ }
	+ else{
	+ $file_handle_tag = $tag;
	+ }
	+ if($file_handle_tag != 'master' && isset($this->file_handles[$file_handle_tag])){
	+ $buffer = $this->get_indent();
	+ $buffer .= "$msg\n";
	+ if(!empty($this->timestamp)){
	+ $buffer = sprintf("[%s] %s",date($this->timestamp, mktime()), $buffer);
	+ }
	+ fwrite($this->file_handles[$file_handle_tag], wordwrap($buffer, $this->max_line_size, "\n "));
	+ }
	+ if(isset($this->file_handles['master']) && $this->file_handles['master']){
	+ $buffer = $this->get_indent();
	+ if($tag){
	+ $buffer .= "$tag: ";
	+ }
	+ $msg = str_replace("\n","",$msg);
	+ $buffer .= "$msg";
	+ if(!empty($this->timestamp)){
	+ $buffer = sprintf("[%s] %s",date($this->timestamp, mktime()), $buffer);
	+ }
	+ if(strlen($buffer) > $this->max_line_size){
	+ $buffer = substr($buffer,0,$this->max_line_size - 3)."...";
	+ }
	+ fwrite($this->file_handles['master'], $buffer."\n");
	+ }
	+ }
	+
	+ public function print_to_console($msg, $tag=FALSE){
	+ if($this->print_to_console){
	+ if(is_array($this->print_to_console)){
	+ if(in_array($tag, $this->print_to_console)){
	+ echo $this->get_indent();
	+ if($tag){
	+ echo "$tag: ";
	+ }
	+ echo "$msg\n";
	+ }
	+ }
	+ else{
	+ echo $this->get_indent();
	+ if($tag){
	+ echo "$tag: ";
	+ }
	+ echo "$msg\n";
	+ }
	+ }
	+ }
	+
	+ public function print_totals(){
	+ $totals = array();
	+ foreach ( $this->run_log as $k => $entry ) {
	+ if ( $entry['type'] == 'start' && $entry['ended'] == true) {
	+ $totals[$entry['value']]['duration'] += $entry['duration'];
	+ $totals[$entry['value']]['count'] += 1;
	+ }
	+ }
	+ if($this->file_handle){
	+ foreach($totals as $name=>$details){
	+ fwrite($this->file_handle,$name.": ".number_format($details['duration'],4)."sec, ".$details['count']." calls \n");
	+ }
	+ }
	+ }
	+
	+ private function get_indent(){
	+ $buf = "";
	+ for($i = 0; $i < $this->indent; $i++){
	+ $buf .= " ";
	+ }
	+ return $buf;
	+ }
	+
	+
	+ function __destruct(){
	+ foreach($this->file_handles as $handle){
	+ fclose($handle);
	+ }
	+ }
	+
	+}
	+
	+?>
	diff --git a/plugins/emoticons/emoticons.php b/plugins/emoticons/emoticons.php
	new file mode 100644
	index 000000000..be736b625
	--- /dev/null
	+++ b/plugins/emoticons/emoticons.php
	@@ -0,0 +1,39 @@
	+<?php
	+
	+/**
	+ * Display Emoticons
	+ *
	+ * Sample plugin to replace emoticons in plain text message body with real icons
	+ *
	+ * @version 1.0.1
	+ * @author Thomas Bruederli
	+ * @website http://roundcube.net
	+ */
	+class emoticons extends rcube_plugin
	+{
	+ public $task = 'mail';
	+ private $map;
	+
	+ function init()
	+ {
	+ $this->task = 'mail';
	+ $this->add_hook('message_part_after', array($this, 'replace'));
	+
	+ $this->map = array(
	+ ':)' => html::img(array('src' => './program/js/tiny_mce/plugins/emotions/img/smiley-smile.gif', 'alt' => ':)')),
	+ ':-)' => html::img(array('src' => './program/js/tiny_mce/plugins/emotions/img/smiley-smile.gif', 'alt' => ':-)')),
	+ ':(' => html::img(array('src' => './program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif', 'alt' => ':(')),
	+ ':-(' => html::img(array('src' => './program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif', 'alt' => ':-(')),
	+ );
	+ }
	+
	+ function replace($args)
	+ {
	+ if ($args['type'] == 'plain')
	+ return array('body' => strtr($args['body'], $this->map));
	+
	+ return null;
	+ }
	+
	+}
	+
	diff --git a/plugins/example_addressbook/example_addressbook.php b/plugins/example_addressbook/example_addressbook.php
	new file mode 100644
	index 000000000..081efcb13
	--- /dev/null
	+++ b/plugins/example_addressbook/example_addressbook.php
	@@ -0,0 +1,42 @@
	+<?php
	+
	+/**
	+ * Sample plugin to add a new address book
	+ * with just a static list of contacts
	+ */
	+class example_addressbook extends rcube_plugin
	+{
	+ private $abook_id = 'static';
	+
	+ public function init()
	+ {
	+ $this->add_hook('address_sources', array($this, 'address_sources'));
	+ $this->add_hook('get_address_book', array($this, 'get_address_book'));
	+
	+ // use this address book for autocompletion queries
	+ // (maybe this should be configurable by the user?)
	+ $config = rcmail::get_instance()->config;
	+ $sources = $config->get('autocomplete_addressbooks', array('sql'));
	+ if (!in_array($this->abook_id, $sources)) {
	+ $sources[] = $this->abook_id;
	+ $config->set('autocomplete_addressbooks', $sources);
	+ }
	+ }
	+
	+ public function address_sources($p)
	+ {
	+ $p['sources'][$this->abook_id] = array('id' => $this->abook_id, 'name' => 'Static List', 'readonly' => true);
	+ return $p;
	+ }
	+
	+ public function get_address_book($p)
	+ {
	+ if ($p['id'] == $this->abook_id) {
	+ require_once(dirname(__FILE__) . '/example_addressbook_backend.php');
	+ $p['instance'] = new example_addressbook_backend;
	+ }
	+
	+ return $p;
	+ }
	+
	+}
	diff --git a/plugins/example_addressbook/example_addressbook_backend.php b/plugins/example_addressbook/example_addressbook_backend.php
	new file mode 100644
	index 000000000..ad6b89d67
	--- /dev/null
	+++ b/plugins/example_addressbook/example_addressbook_backend.php
	@@ -0,0 +1,72 @@
	+<?php
	+
	+/**
	+ * Example backend class for a custom address book
	+ *
	+ * This one just holds a static list of address records
	+ *
	+ * @author Thomas Bruederli
	+ */
	+class example_addressbook_backend extends rcube_addressbook
	+{
	+ public $primary_key = 'ID';
	+ public $readonly = true;
	+
	+ private $filter;
	+ private $result;
	+
	+ public function __construct()
	+ {
	+ $this->ready = true;
	+ }
	+
	+ public function set_search_set($filter)
	+ {
	+ $this->filter = $filter;
	+ }
	+
	+ public function get_search_set()
	+ {
	+ return $this->filter;
	+ }
	+
	+ public function reset()
	+ {
	+ $this->result = null;
	+ $this->filter = null;
	+ }
	+
	+ public function list_records($cols=null, $subset=0)
	+ {
	+ $this->result = $this->count();
	+ $this->result->add(array('ID' => '111', 'name' => "Example Contact", 'firstname' => "Example", 'surname' => "Contact", 'email' => "example@roundcube.net"));
	+
	+ return $this->result;
	+ }
	+
	+ public function search($fields, $value, $strict=false, $select=true)
	+ {
	+ // no search implemented, just list all records
	+ return $this->list_records();
	+ }
	+
	+ public function count()
	+ {
	+ return new rcube_result_set(1, ($this->list_page-1) * $this->page_size);
	+ }
	+
	+ public function get_result()
	+ {
	+ return $this->result;
	+ }
	+
	+ public function get_record($id, $assoc=false)
	+ {
	+ $this->list_records();
	+ $first = $this->result->first();
	+ $sql_arr = $first['ID'] == $id ? $first : null;
	+
	+ return $assoc && $sql_arr ? $sql_arr : $this->result;
	+ }
	+
	+}
	diff --git a/plugins/filesystem_attachments/filesystem_attachments.php b/plugins/filesystem_attachments/filesystem_attachments.php
	new file mode 100644
	index 000000000..9a6c0a81d
	--- /dev/null
	+++ b/plugins/filesystem_attachments/filesystem_attachments.php
	@@ -0,0 +1,144 @@
	+<?php
	+/**
	+ * Filesystem Attachments
	+ *
	+ * This is a core plugin which provides basic, filesystem based
	+ * attachment temporary file handling. This includes storing
	+ * attachments of messages currently being composed, writing attachments
	+ * to disk when drafts with attachments are re-opened and writing
	+ * attachments to disk for inline display in current html compositions.
	+ *
	+ * Developers may wish to extend this class when creating attachment
	+ * handler plugins:
	+ * require_once('plugins/filesystem_attachments/filesystem_attachments.php');
	+ * class myCustom_attachments extends filesystem_attachments
	+ *
	+ * @author Ziba Scott <ziba@umich.edu>
	+ * @author Thomas Bruederli <roundcube@gmail.com>
	+ *
	+ */
	+class filesystem_attachments extends rcube_plugin
	+{
	+ public $task = 'mail';
	+
	+ function init()
	+ {
	+ // Save a newly uploaded attachment
	+ $this->add_hook('upload_attachment', array($this, 'upload'));
	+
	+ // Save an attachment from a non-upload source (draft or forward)
	+ $this->add_hook('save_attachment', array($this, 'save'));
	+
	+ // Remove an attachment from storage
	+ $this->add_hook('remove_attachment', array($this, 'remove'));
	+
	+ // When composing an html message, image attachments may be shown
	+ $this->add_hook('display_attachment', array($this, 'display'));
	+
	+ // Get the attachment from storage and place it on disk to be sent
	+ $this->add_hook('get_attachment', array($this, 'get_attachment'));
	+
	+ // Delete all temp files associated with this user
	+ $this->add_hook('cleanup_attachments', array($this, 'cleanup'));
	+ }
	+
	+ /**
	+ * Save a newly uploaded attachment
	+ */
	+ function upload($args)
	+ {
	+ $args['status'] = false;
	+ $rcmail = rcmail::get_instance();
	+
	+ // use common temp dir for file uploads
	+ // #1484529: we need absolute path on Windows for move_uploaded_file()
	+ $temp_dir = realpath($rcmail->config->get('temp_dir'));
	+ $tmpfname = tempnam($temp_dir, 'rcmAttmnt');
	+
	+ if (move_uploaded_file($args['path'], $tmpfname) && file_exists($tmpfname)) {
	+ $args['id'] = count($_SESSION['plugins']['filesystem_attachments']['tmp_files'])+1;
	+ $args['path'] = $tmpfname;
	+ $args['status'] = true;
	+
	+ // Note the file for later cleanup
	+ $_SESSION['plugins']['filesystem_attachments']['tmp_files'][] = $tmpfname;
	+ }
	+
	+ return $args;
	+ }
	+
	+ /**
	+ * Save an attachment from a non-upload source (draft or forward)
	+ */
	+ function save($args)
	+ {
	+ $args['status'] = false;
	+ $rcmail = rcmail::get_instance();
	+ $temp_dir = unslashify($rcmail->config->get('temp_dir'));
	+ $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
	+
	+ if ($fp = fopen($tmp_path, 'w')) {
	+ fwrite($fp, $args['data']);
	+ fclose($fp);
	+
	+ $args['id'] = count($_SESSION['plugins']['filesystem_attachments']['tmp_files'])+1;
	+ $args['path'] = $tmp_path;
	+ $args['status'] = true;
	+
	+ // Note the file for later cleanup
	+ $_SESSION['plugins']['filesystem_attachments']['tmp_files'][] = $tmp_path;
	+ }
	+
	+ return $args;
	+ }
	+
	+ /**
	+ * Remove an attachment from storage
	+ * This is triggered by the remove attachment button on the compose screen
	+ */
	+ function remove($args)
	+ {
	+ $args['status'] = @unlink($args['path']);
	+ return $args;
	+ }
	+
	+ /**
	+ * When composing an html message, image attachments may be shown
	+ * For this plugin, the file is already in place, just check for
	+ * the existance of the proper metadata
	+ */
	+ function display($args)
	+ {
	+ $args['status'] = file_exists($args['path']);
	+ return $args;
	+ }
	+
	+ /**
	+ * This attachment plugin doesn't require any steps to put the file
	+ * on disk for use. This stub function is kept here to make this
	+ * class handy as a parent class for other plugins which may need it.
	+ */
	+ function get_attachment($args)
	+ {
	+ return $args;
	+ }
	+
	+ /**
	+ * Delete all temp files associated with this user
	+ */
	+ function cleanup($args)
	+ {
	+ // $_SESSION['compose']['attachments'] is not a complete record of
	+ // temporary files because loading a draft or starting a forward copies
	+ // the file to disk, but does not make an entry in that array
	+ if (is_array($_SESSION['plugins']['filesystem_attachments']['tmp_files'])){
	+ foreach ($_SESSION['plugins']['filesystem_attachments']['tmp_files'] as $filename){
	+ if(file_exists($filename)){
	+ unlink($filename);
	+ }
	+ }
	+ unset($_SESSION['plugins']['filesystem_attachments']['tmp_files']);
	+ }
	+ return $args;
	+ }
	+}
	diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php
	new file mode 100644
	index 000000000..57422a74d
	--- /dev/null
	+++ b/plugins/http_authentication/http_authentication.php
	@@ -0,0 +1,41 @@
	+<?php
	+
	+/**
	+ * HTTP Basic Authentication
	+ *
	+ * Make use of an existing HTTP authentication and perform login with the existing user credentials
	+ *
	+ * @version 1.0
	+ * @author Thomas Bruederli
	+ */
	+class http_authentication extends rcube_plugin
	+{
	+
	+ function init()
	+ {
	+ $this->add_hook('startup', array($this, 'startup'));
	+ $this->add_hook('authenticate', array($this, 'authenticate'));
	+ }
	+
	+ function startup($args)
	+ {
	+ // change action to login
	+ if ($args['task'] == 'mail' && empty($args['action']) && empty($_SESSION['user_id'])
	+ && !empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW']))
	+ $args['action'] = 'login';
	+
	+ return $args;
	+ }
	+
	+ function authenticate($args)
	+ {
	+ if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) {
	+ $args['user'] = $_SERVER['PHP_AUTH_USER'];
	+ $args['pass'] = $_SERVER['PHP_AUTH_PW'];
	+ }
	+
	+ return $args;
	+ }
	+
	+}
	+
	diff --git a/plugins/markasjunk/junk_act.png b/plugins/markasjunk/junk_act.png
	new file mode 100644
	index 000000000..b5a84f604
	Binary files /dev/null and b/plugins/markasjunk/junk_act.png differ
	diff --git a/plugins/markasjunk/junk_pas.png b/plugins/markasjunk/junk_pas.png
	new file mode 100644
	index 000000000..b88a561a4
	Binary files /dev/null and b/plugins/markasjunk/junk_pas.png differ
	diff --git a/plugins/markasjunk/localization/en_US.inc b/plugins/markasjunk/localization/en_US.inc
	new file mode 100644
	index 000000000..6f63e161a
	--- /dev/null
	+++ b/plugins/markasjunk/localization/en_US.inc
	@@ -0,0 +1,7 @@
	+<?php
	+
	+$labels = array();
	+$labels['buttontitle'] = 'Mark as Junk';
	+$labels['reportedasjunk'] = 'Successfully reported as Junk';
	+
	+?>
	\ No newline at end of file
	diff --git a/plugins/markasjunk/markasjunk.js b/plugins/markasjunk/markasjunk.js
	new file mode 100644
	index 000000000..8b02d7438
	--- /dev/null
	+++ b/plugins/markasjunk/markasjunk.js
	@@ -0,0 +1,28 @@
	+/* Mark-as-Junk plugin script */
	+
	+function rcmail_markasjunk(prop)
	+{
	+ if (!rcmail.env.uid && (!rcmail.message_list \|\| !rcmail.message_list.get_selection().length))
	+ return;
	+
	+ var uids = rcmail.env.uid ? rcmail.env.uid : rcmail.message_list.get_selection().join(',');
	+
	+ rcmail.set_busy(true, 'loading');
	+ rcmail.http_post('plugin.markasjunk', '_uid='+uids+'&_mbox='+urlencode(rcmail.env.mailbox), true);
	+}
	+
	+// callback for app-onload event
	+if (window.rcmail) {
	+ rcmail.addEventListener('init', function(evt) {
	+
	+ // register command (directly enable in message view mode)
	+ rcmail.register_command('plugin.markasjunk', rcmail_markasjunk, rcmail.env.uid);
	+
	+ // add event-listener to message list
	+ if (rcmail.message_list)
	+ rcmail.message_list.addEventListener('select', function(list){
	+ rcmail.enable_command('plugin.markasjunk', list.get_selection().length > 0);
	+ });
	+ })
	+}
	+
	diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php
	new file mode 100644
	index 000000000..959111d84
	--- /dev/null
	+++ b/plugins/markasjunk/markasjunk.php
	@@ -0,0 +1,47 @@
	+<?php
	+
	+/**
	+ * Mark as Junk
	+ *
	+ * Sample plugin that adds a new button to the mailbox toolbar
	+ * to mark the selected messages as Junk and move them to the Junk folder
	+ *
	+ * @version 1.0
	+ * @author Thomas Bruederli
	+ */
	+class markasjunk extends rcube_plugin
	+{
	+ public $task = 'mail';
	+
	+ function init()
	+ {
	+ $this->register_action('plugin.markasjunk', array($this, 'request_action'));
	+ $GLOBALS['IMAP_FLAGS']['JUNK'] = 'Junk';
	+
	+ $rcmail = rcmail::get_instance();
	+ if ($rcmail->action == '' \|\| $rcmail->action == 'show') {
	+ $this->include_script('markasjunk.js');
	+ $this->add_texts('localization', true);
	+ $this->add_button(array('command' => 'plugin.markasjunk', 'imagepas' => 'junk_pas.png', 'imageact' => 'junk_act.png'), 'toolbar');
	+ }
	+ }
	+
	+ function request_action()
	+ {
	+ $this->add_texts('localization');
	+
	+ $uids = get_input_value('_uid', RCUBE_INPUT_POST);
	+ $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
	+
	+ $rcmail = rcmail::get_instance();
	+ $rcmail->imap->set_flag($uids, 'JUNK');
	+
	+ if (($junk_mbox = $rcmail->config->get('junk_mbox')) && $mbox != $junk_mbox) {
	+ $rcmail->output->command('move_messages', $junk_mbox);
	+ }
	+
	+ $rcmail->output->command('display_message', $this->gettext('reportedasjunk'), 'confirmation');
	+ $rcmail->output->send();
	+ }
	+
	+}
	\ No newline at end of file
	diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
	new file mode 100644
	index 000000000..75595693c
	--- /dev/null
	+++ b/plugins/new_user_identity/new_user_identity.php
	@@ -0,0 +1,49 @@
	+<?php
	+/**
	+ * New user identity
	+ *
	+ * Populates a new user's default identity from LDAP on their first visit.
	+ *
	+ * This plugin requires that a working public_ldap directory be configured.
	+ *
	+ * @version 1.0
	+ * @author Kris Steinhoff
	+ *
	+ * Example configuration:
	+ *
	+ * // The id of the address book to use to automatically set a new
	+ * // user's full name in their new identity. (This should be an
	+ * // string, which refers to the $rcmail_config['ldap_public'] array.)
	+ * $rcmail_config['new_user_identity_addressbook'] = 'People';
	+ *
	+ * // When automatically setting a new users's full name in their
	+ * // new identity, match the user's login name against this field.
	+ * $rcmail_config['new_user_identity_match'] = 'uid';
	+ *
	+ * // Use the value in this field to automatically set a new users's
	+ * // full name in their new identity.
	+ * $rcmail_config['new_user_identity_field'] = 'name';
	+ */
	+class new_user_identity extends rcube_plugin
	+{
	+ function init()
	+ {
	+ $this->add_hook('create_user', array($this, 'lookup_user_name'));
	+ }
	+
	+ function lookup_user_name($args)
	+ {
	+ $rcmail = rcmail::get_instance();
	+ if ($addressbook = $rcmail->config->get('new_user_identity_addressbook')) {
	+ $match = $rcmail->config->get('new_user_identity_match');
	+ $ldap = $rcmail->get_address_book($addressbook);
	+ $ldap->prop['search_fields'] = array($match);
	+ $results = $ldap->search($match, $args['user'], TRUE);
	+ if (count($results->records) == 1) {
	+ $args['user_name'] = $results->records[0][$rcmail->config->get('new_user_identity_field')];
	+ }
	+ }
	+ return $args;
	+ }
	+}
	+?>
	diff --git a/plugins/password/localization/en_US.inc b/plugins/password/localization/en_US.inc
	new file mode 100644
	index 000000000..b54bcd4c9
	--- /dev/null
	+++ b/plugins/password/localization/en_US.inc
	@@ -0,0 +1,15 @@
	+<?php
	+
	+$labels = array();
	+$labels['changepasswd'] = 'Change Password';
	+$labels['curpasswd'] = 'Current Password:';
	+$labels['newpasswd'] = 'New Password:';
	+$labels['confpasswd'] = 'Confirm New Password:';
	+
	+$messages = array();
	+$messages['nopassword'] = "Please input new password.";
	+$messages['nocurpassword'] = "Please input current password.";
	+$messages['passwordincorrectly'] = "Current password incorrectly.";
	+$messages['passwordinconsistency'] = "Inconsistency of password, please try again.";
	+
	+?>
	\ No newline at end of file
	diff --git a/plugins/password/localization/pl_PL.inc b/plugins/password/localization/pl_PL.inc
	new file mode 100644
	index 000000000..197999531
	--- /dev/null
	+++ b/plugins/password/localization/pl_PL.inc
	@@ -0,0 +1,15 @@
	+<?php
	+
	+$labels = array();
	+$labels['changepasswd'] = 'Zmiana hasła';
	+$labels['curpasswd'] = 'Aktualne hasło:';
	+$labels['newpasswd'] = 'Nowe hasło:';
	+$labels['confpasswd'] = 'Potwierdź hasło:';
	+
	+$messages = array();
	+$messages['nopassword'] = 'Wprowadź nowe hasło.';
	+$messages['nocurpassword'] = 'Wprowadź aktualne hasło.';
	+$messages['passwordincorrect'] = 'Błędne aktualne hasło, spróbuj ponownie.';
	+$messages['passwordinconsistency'] = 'Hasła nie pasują, spróbuj ponownie.';
	+
	+?>
	diff --git a/plugins/password/password.js b/plugins/password/password.js
	new file mode 100644
	index 000000000..3d05b622b
	--- /dev/null
	+++ b/plugins/password/password.js
	@@ -0,0 +1,44 @@
	+/* Password change interface (tab) */
	+
	+if (window.rcmail) {
	+ rcmail.addEventListener('init', function(evt) {
	+ // <span id="settingstabdefault" class="tablink"><roundcube:button command="preferences" type="link" label="preferences" title="editpreferences" /></span>
	+ var tab = $('<span>').attr('id', 'settingstabpluginpassword').addClass('tablink');
	+
	+ var button = $('<a>').attr('href', rcmail.env.comm_path+'&_action=plugin.password').html(rcmail.gettext('password')).appendTo(tab);
	+ button.bind('click', function(e){ return rcmail.command('plugin.password', this) });
	+
	+ // add button and register commands
	+ rcmail.add_element(tab, 'tabs');
	+ rcmail.register_command('plugin.password', function() { rcmail.goto_url('plugin.password') }, true);
	+ rcmail.register_command('plugin.password-save', function() {
	+ var input_curpasswd = rcube_find_object('_curpasswd');
	+ var input_newpasswd = rcube_find_object('_newpasswd');
	+ var input_confpasswd = rcube_find_object('_confpasswd');
	+
	+ if (input_curpasswd && input_curpasswd.value=='') {
	+ alert(rcmail.gettext('nocurpassword', 'password'));
	+ input_curpasswd.focus();
	+ } else if (input_newpasswd && input_newpasswd.value=='') {
	+ alert(rcmail.gettext('nopassword', 'password'));
	+ input_newpasswd.focus();
	+ } else if (input_confpasswd && input_confpasswd.value=='') {
	+ alert(rcmail.gettext('nopassword', 'password'));
	+ input_confpasswd.focus();
	+ } else if ((input_newpasswd && input_confpasswd) && (input_newpasswd.value != input_confpasswd.value)) {
	+ alert(rcmail.gettext('passwordinconsistency', 'password'));
	+ input_newpasswd.focus();
	+ } else {
	+ rcmail.gui_objects.passform.submit();
	+ }
	+ }, true);
	+ })
	+
	+ // set page title
	+ if (rcmail.env.action == 'plugin.password' && rcmail.env.task == 'settings') {
	+ var title = rcmail.gettext('changepasswd','password')
	+ if (rcmail.env.product_name)
	+ title = rcmail.env.product_name + ' :: ' + title;
	+ rcmail.set_pagetitle(title);
	+ }
	+}
	diff --git a/plugins/password/password.php b/plugins/password/password.php
	new file mode 100644
	index 000000000..4a35da119
	--- /dev/null
	+++ b/plugins/password/password.php
	@@ -0,0 +1,160 @@
	+<?php
	+
	+/**
	+ * Change Password
	+ *
	+ * Sample plugin that adds a possibility to change password
	+ * (Settings -> Password tab)
	+ *
	+ * @version 1.0
	+ * @author Aleksander 'A.L.E.C' Machniak
	+ */
	+class password extends rcube_plugin
	+{
	+ public $task = 'settings';
	+
	+ function init()
	+ {
	+ $rcmail = rcmail::get_instance();
	+ // add Tab label
	+ $rcmail->output->add_label('password');
	+ $this->register_action('plugin.password', array($this, 'password_init'));
	+ $this->register_action('plugin.password-save', array($this, 'password_save'));
	+ $this->register_handler('plugin.body', array($this, 'password_form'));
	+ $this->include_script('password.js');
	+ }
	+
	+ function password_init()
	+ {
	+ $this->add_texts('localization/');
	+ rcmail::get_instance()->output->send('plugin');
	+ }
	+
	+ function password_save()
	+ {
	+ $rcmail = rcmail::get_instance();
	+
	+ $this->add_texts('localization/');
	+
	+ if (!isset($_POST['_curpasswd']) \|\| !isset($_POST['_newpasswd']))
	+ $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
	+ else {
	+ $curpwd = get_input_value('_curpasswd', RCUBE_INPUT_POST);
	+ $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST);
	+
	+ if ($_SESSION['password'] != $rcmail->encrypt_passwd($curpwd))
	+ $rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error');
	+ else if ($res = $this->_save($newpwd)) {
	+ $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
	+ $_SESSION['password'] = $rcmail->encrypt_passwd($newpwd);
	+ } else
	+ $rcmail->output->command('display_message', $this->gettext('errorsaving'), 'error');
	+ }
	+
	+ rcmail_overwrite_action('plugin.password');
	+ rcmail::get_instance()->output->send('plugin');
	+ }
	+
	+ function password_form()
	+ {
	+ $rcmail = rcmail::get_instance();
	+
	+ // add some labels to client
	+ $rcmail->output->add_label(
	+ 'password.nopassword',
	+ 'password.nocurpassword',
	+ 'password.passwordinconsistency',
	+ 'password.changepasswd'
	+ );
	+// $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
	+ $rcmail->output->set_env('product_name', $rcmail->config->get('product_name'));
	+
	+ // allow the following attributes to be added to the <table> tag
	+ $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
	+
	+ // return the complete edit form as table
	+ $out = '<table' . $attrib_str . ">\n\n";
	+
	+ $a_show_cols = array('curpasswd' => array('type' => 'text'),
	+ 'newpasswd' => array('type' => 'text'),
	+ 'confpasswd' => array('type' => 'text'));
	+
	+ // show current password selection
	+ $field_id = 'curpasswd';
	+ $input_newpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id, 'size' => 20));
	+
	+ $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
	+ $field_id,
	+ rep_specialchars_output($this->gettext('curpasswd')),
	+ $input_newpasswd->show($rcmail->config->get('curpasswd')));
	+
	+ // show new password selection
	+ $field_id = 'newpasswd';
	+ $input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id, 'size' => 20));
	+
	+ $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
	+ $field_id,
	+ rep_specialchars_output($this->gettext('newpasswd')),
	+ $input_newpasswd->show($rcmail->config->get('newpasswd')));
	+
	+ // show confirm password selection
	+ $field_id = 'confpasswd';
	+ $input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id, 'size' => 20));
	+
	+ $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
	+ $field_id,
	+ rep_specialchars_output($this->gettext('confpasswd')),
	+ $input_confpasswd->show($rcmail->config->get('confpasswd')));
	+
	+ $out .= "\n</table>";
	+
	+ $out .= '<br />';
	+
	+ $out .= $rcmail->output->button(array(
	+ 'command' => 'plugin.password-save',
	+ 'type' => 'input',
	+ 'class' => 'button mainaction',
	+ 'label' => 'save'
	+ ));
	+
	+ $rcmail->output->add_gui_object('passform', 'password-form');
	+
	+ return $rcmail->output->form_tag(array(
	+ 'id' => 'password-form',
	+ 'name' => 'password-form',
	+ 'method' => 'post',
	+ 'action' => './?_task=settings&_action=plugin.password-save',
	+ ), $out);
	+ }
	+
	+
	+ private function _save($passwd)
	+ {
	+ $cfg = rcmail::get_instance()->config;
	+
	+ if (!($sql = $cfg->get('password_query')))
	+ $sql = "SELECT update_passwd('%p', '%u')";
	+
	+ $sql = str_replace('%u', $_SESSION['username'], $sql);
	+ $sql = str_replace('%p', crypt($passwd), $sql);
	+
	+ if ($dsn = $cfg->get('db_passwd_dsn')) {
	+ $db = new rcube_mdb2($dsn, '', FALSE);
	+ $db->set_debug((bool)$cfg->get('sql_debug'));
	+ $db->db_connect('w');
	+ } else {
	+ $db = rcmail::get_instance()->get_dbh();
	+ }
	+
	+ if (!$db->db_connected)
	+ return false;
	+
	+ $res = $db->query($sql);
	+ $res = $db->fetch_array($res);
	+
	+ return $res;
	+ }
	+
	+}
	+
	+?>
	diff --git a/plugins/show_additional_headers/show_additional_headers.php b/plugins/show_additional_headers/show_additional_headers.php
	new file mode 100644
	index 000000000..c31c9df6b
	--- /dev/null
	+++ b/plugins/show_additional_headers/show_additional_headers.php
	@@ -0,0 +1,49 @@
	+<?php
	+
	+/**
	+ * Show additional message headers
	+ *
	+ * Proof-of-concept plugin which will fetch additional headers
	+ * and display them in the message view.
	+ *
	+ * Enable the plugin in config/main.inc.php and add your desired headers:
	+ * $rcmail_config['show_additional_headers'] = array('User-Agent');
	+ *
	+ * @version 1.0
	+ * @author Thomas Bruederli
	+ * @website http://roundcube.net
	+ */
	+class show_additional_headers extends rcube_plugin
	+{
	+ public $task = 'mail';
	+
	+ function init()
	+ {
	+ $rcmail = rcmail::get_instance();
	+ if ($rcmail->action == 'show' \|\| $rcmail->action == 'preview') {
	+ $this->add_hook('imap_init', array($this, 'imap_init'));
	+ $this->add_hook('message_headers_output', array($this, 'message_headers'));
	+ }
	+ }
	+
	+ function imap_init($p)
	+ {
	+ $rcmail = rcmail::get_instance();
	+ if ($add_headers = $rcmail->config->get('show_additional_headers', array()))
	+ $p['fetch_headers'] = trim($p['fetch_headers'].' ' . strtoupper(join(' ', $add_headers)));
	+
	+ return $p;
	+ }
	+
	+ function message_headers($p)
	+ {
	+ $rcmail = rcmail::get_instance();
	+ foreach ($rcmail->config->get('show_additional_headers', array()) as $header) {
	+ $key = strtolower($header);
	+ if ($value = $p['headers']->others[$key])
	+ $p['output'][$key] = array('title' => $header, 'value' => $value);
	+ }
	+
	+ return $p;
	+ }
	+}
	diff --git a/plugins/subscriptions_option/localization/en_US.inc b/plugins/subscriptions_option/localization/en_US.inc
	new file mode 100644
	index 000000000..5a348e0ee
	--- /dev/null
	+++ b/plugins/subscriptions_option/localization/en_US.inc
	@@ -0,0 +1,6 @@
	+<?php
	+
	+$labels = array();
	+$labels['useimapsubscriptions'] = 'Use IMAP Subscriptions';
	+
	+?>
	diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php
	new file mode 100644
	index 000000000..ba7236c67
	--- /dev/null
	+++ b/plugins/subscriptions_option/subscriptions_option.php
	@@ -0,0 +1,84 @@
	+<?php
	+
	+/**
	+ * Subscription Options
	+ *
	+ * A plugin which can enable or disable the use of imap subscriptions.
	+ * It includes a toggle on the settings page under "Server Settings".
	+ * The preference can also be locked
	+ *
	+ * Add it to the plugins list in config/main.inc.php to enable the user option
	+ * The user option can be hidden and set globally by adding 'use_subscriptions'
	+ * to the the 'dont_override' configure line:
	+ * $rcmail_config['dont_override'] = array('use_subscriptions');
	+ * and then set the global preference"
	+ * $rcmail_config['use_subscriptions'] = true; // or false
	+ *
	+ * Roundcube caches folder lists. When a user changes this option or visits
	+ * their folder list, this cache is refreshed. If the option is on the
	+ * 'dont_override' list and the global option has changed, don't expect
	+ * to see the change until the folder list cache is refreshed.
	+ *
	+ * @version 1.0
	+ * @author Ziba Scott
	+ */
	+class subscriptions_option extends rcube_plugin
	+{
	+
	+ function init()
	+ {
	+ $this->add_texts('localization/', false);
	+ $dont_override = rcmail::get_instance()->config->get('dont_override', array());
	+ if (!in_array('use_subscriptions', $dont_override)){
	+ $this->add_hook('user_preferences', array($this, 'settings_table'));
	+ $this->add_hook('save_preferences', array($this, 'save_prefs'));
	+ }
	+ $this->add_hook('list_mailboxes', array($this, 'list_mailboxes'));
	+ $this->add_hook('manage_folders', array($this, 'manage_folders'));
	+ }
	+
	+ function settings_table($args)
	+ {
	+ if ($args['section'] == 'server') {
	+ $use_subscriptions = rcmail::get_instance()->config->get('use_subscriptions');
	+ $field_id = 'rcmfd_use_subscriptions';
	+ $use_subscriptions = new html_checkbox(array('name' => '_use_subscriptions', 'id' => $field_id, 'value' => 1));
	+
	+ $args['table']->add('title', html::label($field_id, Q($this->gettext('useimapsubscriptions'))));
	+ $args['table']->add(null, $use_subscriptions->show($use_subscriptions?1:0));
	+ }
	+
	+ return $args;
	+ }
	+
	+ function save_prefs($args){
	+ $rcmail = rcmail::get_instance();
	+ $use_subscriptions = $rcmail->config->get('use_subscriptions');
	+
	+ $args['prefs']['use_subscriptions'] = isset($_POST['_use_subscriptions']) ? true : false;
	+ // if the use_subscriptions preference changes, flush the folder cache
	+ if (($use_subscriptions && !isset($_POST['_use_subscriptions'])) \|\|
	+ (!$use_subscriptions && isset($_POST['_use_subscriptions']))) {
	+ $rcmail->imap_init(true);
	+ $rcmail->imap->clear_cache('mailboxes');
	+ }
	+
	+ return $args;
	+ }
	+
	+ function list_mailboxes($args){
	+ $rcmail = rcmail::get_instance();
	+ if (!$rcmail->config->get('use_subscriptions', true)) {
	+ $args['folders'] = iil_C_ListMailboxes($rcmail->imap->conn, $rcmail->imap->_mod_mailbox($args['root']), $args['filter']);
	+ }
	+ return $args;
	+ }
	+
	+ function manage_folders($args){
	+ $rcmail = rcmail::get_instance();
	+ if (!$rcmail->config->get('use_subscriptions', true)) {
	+ $args['table']->remove_column('subscribed');
	+ }
	+ return $args;
	+ }
	+}
	diff --git a/plugins/userinfo/localization/de_CH.inc b/plugins/userinfo/localization/de_CH.inc
	new file mode 100644
	index 000000000..5f236b66c
	--- /dev/null
	+++ b/plugins/userinfo/localization/de_CH.inc
	@@ -0,0 +1,9 @@
	+<?php
	+
	+$labels = array();
	+$labels['userinfo'] = 'Benutzerinfo';
	+$labels['created'] = 'Erstellt';
	+$labels['lastlogin'] = 'Letztes Login';
	+$labels['defaultidentity'] = 'Standard-Absender';
	+
	+?>
	\ No newline at end of file
	diff --git a/plugins/userinfo/localization/en_US.inc b/plugins/userinfo/localization/en_US.inc
	new file mode 100644
	index 000000000..1a2fd9016
	--- /dev/null
	+++ b/plugins/userinfo/localization/en_US.inc
	@@ -0,0 +1,9 @@
	+<?php
	+
	+$labels = array();
	+$labels['userinfo'] = 'User info';
	+$labels['created'] = 'Created';
	+$labels['lastlogin'] = 'Last Login';
	+$labels['defaultidentity'] = 'Default Identity';
	+
	+?>
	\ No newline at end of file
	diff --git a/plugins/userinfo/userinfo.js b/plugins/userinfo/userinfo.js
	new file mode 100644
	index 000000000..70a5085b3
	--- /dev/null
	+++ b/plugins/userinfo/userinfo.js
	@@ -0,0 +1,16 @@
	+/* Show user-info plugin script */
	+
	+if (window.rcmail) {
	+ rcmail.addEventListener('init', function(evt) {
	+ // <span id="settingstabdefault" class="tablink"><roundcube:button command="preferences" type="link" label="preferences" title="editpreferences" /></span>
	+ var tab = $('<span>').attr('id', 'settingstabpluginuserinfo').addClass('tablink');
	+
	+ var button = $('<a>').attr('href', rcmail.env.comm_path+'&_action=plugin.userinfo').html(rcmail.gettext('userinfo', 'userinfo')).appendTo(tab);
	+ button.bind('click', function(e){ return rcmail.command('plugin.userinfo', this) });
	+
	+ // add button and register command
	+ rcmail.add_element(tab, 'tabs');
	+ rcmail.register_command('plugin.userinfo', function(){ rcmail.goto_url('plugin.userinfo') }, true);
	+ })
	+}
	+
	diff --git a/plugins/userinfo/userinfo.php b/plugins/userinfo/userinfo.php
	new file mode 100644
	index 000000000..0f1b18cd9
	--- /dev/null
	+++ b/plugins/userinfo/userinfo.php
	@@ -0,0 +1,53 @@
	+<?php
	+
	+/**
	+ * Sample plugin that adds a new tab to the settings section
	+ * to display some information about the current user
	+ */
	+class userinfo extends rcube_plugin
	+{
	+ public $task = 'settings';
	+
	+ function init()
	+ {
	+ $this->add_texts('localization/', array('userinfo'));
	+ $this->register_action('plugin.userinfo', array($this, 'infostep'));
	+ $this->include_script('userinfo.js');
	+ }
	+
	+ function infostep()
	+ {
	+ $this->register_handler('plugin.body', array($this, 'infohtml'));
	+ rcmail::get_instance()->output->send('plugin');
	+ }
	+
	+ function infohtml()
	+ {
	+ $rcmail = rcmail::get_instance();
	+ $user = $rcmail->user;
	+
	+ $table = new html_table(array('cols' => 2, 'cellpadding' => 3));
	+
	+ $table->add('title', 'ID');
	+ $table->add('', Q($user->ID));
	+
	+ $table->add('title', Q($this->gettext('username')));
	+ $table->add('', Q($user->data['username']));
	+
	+ $table->add('title', Q($this->gettext('server')));
	+ $table->add('', Q($user->data['mail_host']));
	+
	+ $table->add('title', Q($this->gettext('created')));
	+ $table->add('', Q($user->data['created']));
	+
	+ $table->add('title', Q($this->gettext('lastlogin')));
	+ $table->add('', Q($user->data['last_login']));
	+
	+ $identity = $user->get_identity();
	+ $table->add('title', Q($this->gettext('defaultidentity')));
	+ $table->add('', Q($identity['name'] . ' <' . $identity['email'] . '>'));
	+
	+ return html::tag('h4', null, Q('Infos for ' . $user->get_username())) . $table->show();
	+ }
	+
	+}
	\ No newline at end of file
	diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
	new file mode 100644
	index 000000000..da8ea1c15
	--- /dev/null
	+++ b/plugins/vcard_attachments/vcard_attachments.php
	@@ -0,0 +1,115 @@
	+<?php
	+
	+/**
	+ * Detect VCard attachments and show a button to add them to address book
	+ *
	+ * @version 1.0
	+ * @author Thomas Bruederli
	+ */
	+class vcard_attachments extends rcube_plugin
	+{
	+ public $task = 'mail';
	+
	+ private $message;
	+ private $vcard_part;
	+
	+ function init()
	+ {
	+ $rcmail = rcmail::get_instance();
	+ if ($rcmail->action == 'show' \|\| $rcmail->action == 'preview') {
	+ $this->add_hook('message_load', array($this, 'message_load'));
	+ $this->add_hook('template_object_messagebody', array($this, 'html_output'));
	+ }
	+
	+ $this->register_action('plugin.savevcard', array($this, 'save_vcard'));
	+ }
	+
	+ /**
	+ * Check message attachments for vcards
	+ */
	+ function message_load($p)
	+ {
	+ $this->message = $p['object'];
	+
	+ foreach ((array)$this->message->attachments as $attachment) {
	+ if (in_array($attachment->mimetype, array('text/vcard', 'text/x-vcard')))
	+ $this->vcard_part = $attachment->mime_id;
	+ }
	+ }
	+
	+ /**
	+ * This callback function adds a box below the message content
	+ * if there is a vcard attachment available
	+ */
	+ function html_output($p)
	+ {
	+ if ($this->vcard_part) {
	+ $vcard = new rcube_vcard($this->message->get_part_content($this->vcard_part));
	+
	+ // successfully parsed vcard
	+ if ($vcard->displayname) {
	+ $display = $vcard->displayname;
	+ if ($vcard->email[0])
	+ $display .= ' <'.$vcard->email[0].'>';
	+
	+ // add box below messsage body
	+ $p['content'] .= html::p(array('style' => "margin:1em; padding:0.5em; border:1px solid #999; width: auto;"),
	+ html::a(array(
	+ 'href' => "#",
	+ 'onclick' => "return plugin_vcard_save_contact('".JQ($this->vcard_part)."')",
	+ 'title' => "Save contact in local address book"), // TODO: localize this title
	+ html::img(array('src' => '/images/buttons/add_contact_act.png', 'align' => "middle")))
	+ . ' ' . html::span(null, Q($display)));
	+
	+ $this->include_script('vcardattach.js');
	+ }
	+ }
	+
	+ return $p;
	+ }
	+
	+ /**
	+ * Handler for request action
	+ */
	+ function save_vcard()
	+ {
	+ $uid = get_input_value('_uid', RCUBE_INPUT_POST);
	+ $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
	+ $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
	+
	+ $rcmail = rcmail::get_instance();
	+ $part = $uid && $mime_id ? $rcmail->imap->get_message_part($uid, $mime_id) : null;
	+
	+ $error_msg = 'Failed to saved vcard'; // TODO: localize this text
	+
	+ if ($part && ($vcard = new rcube_vcard($part)) && $vcard->displayname && $vcard->email) {
	+ $contacts = $rcmail->get_address_book(null, true);
	+
	+ // check for existing contacts
	+ $existing = $contacts->search('email', $vcard->email[0], true, false);
	+ if ($done = $existing->count) {
	+ $rcmail->output->command('display_message', $this->gettext('contactexists'), 'warning');
	+ }
	+ else {
	+ // add contact
	+ $success = $contacts->insert(array(
	+ 'name' => $vcard->displayname,
	+ 'firstname' => $vcard->firstname,
	+ 'surname' => $vcard->surname,
	+ 'email' => $vcard->email[0],
	+ 'vcard' => $vcard->export(),
	+ ));
	+
	+ if ($success)
	+ $rcmail->output->command('display_message', $this->gettext('addedsuccessfully'), 'confirmation');
	+ else
	+ $rcmail->output->command('display_message', $error_msg, 'error');
	+ }
	+ }
	+ else
	+ $rcmail->output->command('display_message', $error_msg, 'error');
	+
	+ $rcmail->output->send();
	+ }
	+
	+}
	\ No newline at end of file
	diff --git a/plugins/vcard_attachments/vcardattach.js b/plugins/vcard_attachments/vcardattach.js
	new file mode 100644
	index 000000000..e03e5084d
	--- /dev/null
	+++ b/plugins/vcard_attachments/vcardattach.js
	@@ -0,0 +1,10 @@
	+
	+function plugin_vcard_save_contact(mime_id)
	+{
	+ rcmail.set_busy(true, 'loading');
	+ rcmail.http_post('plugin.savevcard', '_uid='+rcmail.env.uid+'&_mbox='+urlencode(rcmail.env.mailbox)+'&_part='+urlencode(mime_id), true);
	+
	+ return false;
	+}
	+
	+
	diff --git a/program/include/html.php b/program/include/html.php
	index 01ad41544..78e696cb6 100644
	--- a/program/include/html.php
	+++ b/program/include/html.php
	@@ -1,684 +1,712 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/html.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev, - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Helper class to create valid XHTML code \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: $

	*/


	/**
	* Class for HTML code creation
	*
	* @package HTML
	*/
	class html
	{
	protected $tagname;
	protected $attrib = array();
	protected $allowed = array();
	protected $content;

	public static $common_attrib = array('id','class','style','title','align');
	- public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','tr','th','td','style');
	+ public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','tr','th','td','style','script');
	public static $lc_tags = true;

	/**
	* Constructor
	*
	* @param array Hash array with tag attributes
	*/
	public function __construct($attrib = array())
	{
	if (is_array($attrib)) {
	$this->attrib = $attrib;
	}
	}

	/**
	* Return the tag code
	*
	* @return string The finally composed HTML tag
	*/
	public function show()
	{
	return self::tag($this->tagname, $this->attrib, $this->content, array_merge(self::$common_attrib, $this->allowed));
	}

	/**** STATIC METHODS *****/

	/**
	* Generic method to create a HTML tag
	*
	* @param string Tag name
	* @param array Tag attributes as key/value pairs
	* @param string Optinal Tag content (creates a container tag)
	* @param array List with allowed attributes, omit to allow all
	* @return string The XHTML tag
	*/
	public static function tag($tagname, $attrib = array(), $content = null, $allowed_attrib = null)
	{
	$inline_tags = array('a','span','img');
	$suffix = $attrib['nl'] \|\| ($content && $attrib['nl'] !== false && !in_array($tagname, $inline_tags)) ? "\n" : '';

	$tagname = self::$lc_tags ? strtolower($tagname) : $tagname;
	if ($content \|\| in_array($tagname, self::$containers)) {
	$templ = $attrib['noclose'] ? "<%s%s>%s" : "<%s%s>%s</%s>%s";
	unset($attrib['noclose']);
	return sprintf($templ, $tagname, self::attrib_string($attrib, $allowed_attrib), $content, $tagname, $suffix);
	}
	else {
	return sprintf("<%s%s />%s", $tagname, self::attrib_string($attrib, $allowed_attrib), $suffix);
	}
	}

	/**
	* Derrived method for <div> containers
	*
	* @param mixed Hash array with tag attributes or string with class name
	* @param string Div content
	* @return string HTML code
	* @see html::tag()
	*/
	public static function div($attr = null, $cont = null)
	{
	if (is_string($attr)) {
	$attr = array('class' => $attr);
	}
	return self::tag('div', $attr, $cont, array_merge(self::$common_attrib, array('onclick')));
	}

	/**
	* Derrived method for <p> blocks
	*
	* @param mixed Hash array with tag attributes or string with class name
	* @param string Paragraph content
	* @return string HTML code
	* @see html::tag()
	*/
	public static function p($attr = null, $cont = null)
	{
	if (is_string($attr)) {
	$attr = array('class' => $attr);
	}
	return self::tag('p', $attr, $cont, self::$common_attrib);
	}

	/**
	* Derrived method to create <img />
	*
	* @param mixed Hash array with tag attributes or string with image source (src)
	* @return string HTML code
	* @see html::tag()
	*/
	public static function img($attr = null)
	{
	if (is_string($attr)) {
	$attr = array('src' => $attr);
	}
	return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib, array('src','alt','width','height','border','usemap')));
	}

	/**
	* Derrived method for link tags
	*
	* @param mixed Hash array with tag attributes or string with link location (href)
	* @param string Link content
	* @return string HTML code
	* @see html::tag()
	*/
	public static function a($attr, $cont)
	{
	if (is_string($attr)) {
	$attr = array('href' => $attr);
	}
	return self::tag('a', $attr, $cont, array_merge(self::$common_attrib, array('href','target','name','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
	}

	/**
	* Derrived method for inline span tags
	*
	* @param mixed Hash array with tag attributes or string with class name
	* @param string Tag content
	* @return string HTML code
	* @see html::tag()
	*/
	public static function span($attr, $cont)
	{
	if (is_string($attr)) {
	$attr = array('class' => $attr);
	}
	return self::tag('span', $attr, $cont, self::$common_attrib);
	}

	/**
	* Derrived method for form element labels
	*
	* @param mixed Hash array with tag attributes or string with 'for' attrib
	* @param string Tag content
	* @return string HTML code
	* @see html::tag()
	*/
	public static function label($attr, $cont)
	{
	if (is_string($attr)) {
	$attr = array('for' => $attr);
	}
	return self::tag('label', $attr, $cont, array_merge(self::$common_attrib, array('for')));
	}

	/**
	* Derrived method to create <iframe></iframe>
	*
	* @param mixed Hash array with tag attributes or string with frame source (src)
	* @return string HTML code
	* @see html::tag()
	*/
	public static function iframe($attr = null, $cont = null)
	{
	if (is_string($attr)) {
	$attr = array('src' => $attr);
	}
	return self::tag('iframe', $attr, $cont, array_merge(self::$common_attrib, array('src','name','width','height','border','frameborder')));
	}

	/**
	* Derrived method for line breaks
	*
	* @return string HTML code
	* @see html::tag()
	*/
	public static function br()
	{
	return self::tag('br');
	}

	/**
	* Create string with attributes
	*
	* @param array Associative arry with tag attributes
	* @param array List of allowed attributes
	* @return string Valid attribute string
	*/
	public static function attrib_string($attrib = array(), $allowed = null)
	{
	if (empty($attrib)) {
	return '';
	}

	$allowed_f = array_flip((array)$allowed);
	$attrib_arr = array();
	foreach ($attrib as $key => $value) {
	// skip size if not numeric
	if (($key=='size' && !is_numeric($value))) {
	continue;
	}

	// ignore "internal" or not allowed attributes
	if ($key == 'nl' \|\| ($allowed && !isset($allowed_f[$key])) \|\| $value === null) {
	continue;
	}

	// skip empty eventhandlers
	if (preg_match('/^on[a-z]+/', $key) && !$value) {
	continue;
	}

	// attributes with no value
	if (in_array($key, array('checked', 'multiple', 'disabled', 'selected'))) {
	if ($value) {
	$attrib_arr[] = sprintf('%s="%s"', $key, $key);
	}
	}
	else if ($key=='value') {
	$attrib_arr[] = sprintf('%s="%s"', $key, Q($value, 'strict', false));
	}
	else {
	$attrib_arr[] = sprintf('%s="%s"', $key, Q($value));
	}
	}
	return count($attrib_arr) ? ' '.implode(' ', $attrib_arr) : '';
	}
	}

	/**
	* Class to create an HTML input field
	*
	* @package HTML
	*/
	class html_inputfield extends html
	{
	protected $tagname = 'input';
	protected $type = 'text';
	protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck','results');

	public function __construct($attrib = array())
	{
	if (is_array($attrib)) {
	$this->attrib = $attrib;
	}

	if ($attrib['type']) {
	$this->type = $attrib['type'];
	}

	if ($attrib['newline']) {
	$this->newline = true;
	}
	}

	/**
	* Compose input tag
	*
	* @param string Field value
	* @param array Additional attributes to override
	* @return string HTML output
	*/
	public function show($value = null, $attrib = null)
	{
	// overwrite object attributes
	if (is_array($attrib)) {
	$this->attrib = array_merge($this->attrib, $attrib);
	}

	// set value attribute
	if ($value !== null) {
	$this->attrib['value'] = $value;
	}
	// set type
	$this->attrib['type'] = $this->type;
	return parent::show();
	}
	}

	/**
	* Class to create an HTML password field
	*
	* @package HTML
	*/
	class html_passwordfield extends html_inputfield
	{
	protected $type = 'password';
	}

	/**
	* Class to create an hidden HTML input field
	*
	* @package HTML
	*/

	class html_hiddenfield extends html_inputfield
	{
	protected $type = 'hidden';
	protected $fields_arr = array();
	protected $newline = true;

	/**
	* Constructor
	*
	* @param array Named tag attributes
	*/
	public function __construct($attrib = null)
	{
	if (is_array($attrib)) {
	$this->add($attrib);
	}
	}

	/**
	* Add a hidden field to this instance
	*
	* @param array Named tag attributes
	*/
	public function add($attrib)
	{
	$this->fields_arr[] = $attrib;
	}

	/**
	* Create HTML code for the hidden fields
	*
	* @return string Final HTML code
	*/
	public function show()
	{
	$out = '';
	foreach ($this->fields_arr as $attrib) {
	$out .= self::tag($this->tagname, array('type' => $this->type) + $attrib);
	}
	return $out;
	}
	}

	/**
	* Class to create HTML radio buttons
	*
	* @package HTML
	*/
	class html_radiobutton extends html_inputfield
	{
	protected $type = 'radio';

	/**
	* Get HTML code for this object
	*
	* @param string Value of the checked field
	* @param array Additional attributes to override
	* @return string HTML output
	*/
	public function show($value = '', $attrib = null)
	{
	// overwrite object attributes
	if (is_array($attrib)) {
	$this->attrib = array_merge($this->attrib, $attrib);
	}

	// set value attribute
	$this->attrib['checked'] = ((string)$value == (string)$this->attrib['value']);

	return parent::show();
	}
	}

	/**
	* Class to create HTML checkboxes
	*
	* @package HTML
	*/
	class html_checkbox extends html_inputfield
	{
	protected $type = 'checkbox';

	/**
	* Get HTML code for this object
	*
	* @param string Value of the checked field
	* @param array Additional attributes to override
	* @return string HTML output
	*/
	public function show($value = '', $attrib = null)
	{
	// overwrite object attributes
	if (is_array($attrib)) {
	$this->attrib = array_merge($this->attrib, $attrib);
	}

	// set value attribute
	$this->attrib['checked'] = ((string)$value == (string)$this->attrib['value']);

	return parent::show();
	}
	}

	/**
	* Class to create an HTML textarea
	*
	* @package HTML
	*/
	class html_textarea extends html
	{
	protected $tagname = 'textarea';
	protected $allowed = array('name','rows','cols','wrap','tabindex','onchange','disabled','readonly','spellcheck');

	/**
	* Get HTML code for this object
	*
	* @param string Textbox value
	* @param array Additional attributes to override
	* @return string HTML output
	*/
	public function show($value = '', $attrib = null)
	{
	// overwrite object attributes
	if (is_array($attrib)) {
	$this->attrib = array_merge($this->attrib, $attrib);
	}

	// take value attribute as content
	if (empty($value) && !empty($this->attrib['value'])) {
	$value = $this->attrib['value'];
	}

	// make shure we don't print the value attribute
	if (isset($this->attrib['value'])) {
	unset($this->attrib['value']);
	}

	if (!empty($value) && !ereg('mce_editor', $this->attrib['class'])) {
	$value = Q($value, 'strict', false);
	}

	return self::tag($this->tagname, $this->attrib, $value, array_merge(self::$common_attrib, $this->allowed));
	}
	}

	/**
	* Builder for HTML drop-down menus
	* Syntax:<pre>
	* // create instance. arguments are used to set attributes of select-tag
	* $select = new html_select(array('name' => 'fieldname'));
	*
	* // add one option
	* $select->add('Switzerland', 'CH');
	*
	* // add multiple options
	* $select->add(array('Switzerland','Germany'), array('CH','DE'));
	*
	* // generate pulldown with selection 'Switzerland' and return html-code
	* // as second argument the same attributes available to instanciate can be used
	* print $select->show('CH');
	* </pre>
	*
	* @package HTML
	*/
	class html_select extends html
	{
	protected $tagname = 'select';
	protected $options = array();
	protected $allowed = array('name','size','tabindex','autocomplete','multiple','onchange','disabled');

	/**
	* Add a new option to this drop-down
	*
	* @param mixed Option name or array with option names
	* @param mixed Option value or array with option values
	*/
	public function add($names, $values = null)
	{
	if (is_array($names)) {
	foreach ($names as $i => $text) {
	$this->options[] = array('text' => $text, 'value' => $values[$i]);
	}
	}
	else {
	$this->options[] = array('text' => $names, 'value' => $values);
	}
	}


	/**
	* Get HTML code for this object
	*
	* @param string Value of the selection option
	* @param array Additional attributes to override
	* @return string HTML output
	*/
	public function show($select = array(), $attrib = null)
	{
	// overwrite object attributes
	if (is_array($attrib)) {
	$this->attrib = array_merge($this->attrib, $attrib);
	}

	$this->content = "\n";
	$select = (array)$select;
	foreach ($this->options as $option) {
	$attr = array(
	'value' => $option['value'],
	'selected' => (in_array($option['value'], $select, true) \|\|
	in_array($option['text'], $select, true)) ? 1 : null);

	$this->content .= self::tag('option', $attr, Q($option['text']));
	}
	return parent::show();
	}
	}


	/**
	* Class to build an HTML table
	*
	* @package HTML
	*/
	class html_table extends html
	{
	protected $tagname = 'table';
	protected $allowed = array('id','class','style','width','summary','cellpadding','cellspacing','border');
	private $header = array();
	private $rows = array();
	private $rowindex = 0;
	private $colindex = 0;


	public function __construct($attrib = array())
	{
	$this->attrib = array_merge($attrib, array('summary' => '', 'border' => 0));
	}

	/**
	* Add a table cell
	*
	* @param array Cell attributes
	* @param string Cell content
	*/
	public function add($attr, $cont)
	{
	if (is_string($attr)) {
	$attr = array('class' => $attr);
	}

	$cell = new stdClass;
	$cell->attrib = $attr;
	$cell->content = $cont;

	$this->rows[$this->rowindex]->cells[$this->colindex] = $cell;
	$this->colindex++;

	if ($this->attrib['cols'] && $this->colindex == $this->attrib['cols']) {
	$this->add_row();
	}
	}

	/**
	* Add a table header cell
	*
	* @param array Cell attributes
	* @param string Cell content
	*/
	public function add_header($attr, $cont)
	{
	if (is_string($attr))
	$attr = array('class' => $attr);

	$cell = new stdClass;
	$cell->attrib = $attr;
	$cell->content = $cont;
	$this->header[] = $cell;
	}

	+ /**
	+ * Remove a column from a table
	+ * Useful for plugins making alterations
	+ *
	+ * @param string $class
	+ */
	+ public function remove_column($class)
	+ {
	+ // Remove the header
	+ foreach($this->header as $index=>$header){
	+ if($header->attrib['class'] == $class){
	+ unset($this->header[$index]);
	+ break;
	+ }
	+ }
	+
	+ // Remove cells from rows
	+ foreach($this->rows as $i=>$row){
	+ foreach($row->cells as $j=>$cell){
	+ if($cell->attrib['class'] == $class){
	+ unset($this->rows[$i]->cells[$j]);
	+ break;
	+ }
	+ }
	+ }
	+ }
	+
	+
	/**
	* Jump to next row
	*
	* @param array Row attributes
	*/
	public function add_row($attr = array())
	{
	$this->rowindex++;
	$this->colindex = 0;
	$this->rows[$this->rowindex] = new stdClass;
	$this->rows[$this->rowindex]->attrib = $attr;
	$this->rows[$this->rowindex]->cells = array();
	}

	/**
	* Set current row attrib
	*
	* @param array Row attributes
	*/
	public function set_row_attribs($attr = array())
	{
	if (is_string($attr))
	$attr = array('class' => $attr);

	$this->rows[$this->rowindex]->attrib = $attr;
	}

	/**
	* Build HTML output of the table data
	*
	* @param array Table attributes
	* @return string The final table HTML code
	*/
	public function show($attrib = null)
	{
	if (is_array($attrib))
	$this->attrib = array_merge($this->attrib, $attrib);

	$thead = $tbody = "";

	// include <thead>
	if (!empty($this->header)) {
	$rowcontent = '';
	foreach ($this->header as $c => $col) {
	$rowcontent .= self::tag('td', $col->attrib, $col->content);
	}
	$thead = self::tag('thead', null, self::tag('tr', null, $rowcontent));
	}

	foreach ($this->rows as $r => $row) {
	$rowcontent = '';
	foreach ($row->cells as $c => $col) {
	$rowcontent .= self::tag('td', $col->attrib, $col->content);
	}

	if ($r < $this->rowindex \|\| count($row->cells)) {
	$tbody .= self::tag('tr', $row->attrib, $rowcontent);
	}
	}

	if ($this->attrib['rowsonly']) {
	return $tbody;
	}

	// add <tbody>
	$this->content = $thead . self::tag('tbody', null, $tbody);

	unset($this->attrib['cols'], $this->attrib['rowsonly']);
	return parent::show();
	}

	/**
	* Count number of rows
	*
	* @return The number of rows
	*/
	public function size()
	{
	return count($this->rows);
	}
	}

	?>
	diff --git a/program/include/iniset.php b/program/include/iniset.php
	index 234f9ebcb..46f3750ea 100755
	--- a/program/include/iniset.php
	+++ b/program/include/iniset.php
	@@ -1,119 +1,119 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/iniset.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2008-2009, RoundCube Dev, - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Setup the application envoronment required to process \|
	\| any request. \|
	+-----------------------------------------------------------------------+
	\| Author: Till Klampaeckel <till@php.net> \|
	\| Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: cache.inc 88 2005-12-03 16:54:12Z roundcube $

	*/


	// application constants
	-define('RCMAIL_VERSION', '0.2-trunk');
	+define('RCMAIL_VERSION', '0.3-trunk');
	define('RCMAIL_CHARSET', 'UTF-8');
	define('JS_OBJECT_NAME', 'rcmail');

	if (!defined('INSTALL_PATH')) {
	define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
	}

	define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');

	// make sure path_separator is defined
	if (!defined('PATH_SEPARATOR')) {
	define('PATH_SEPARATOR', (eregi('win', PHP_OS) ? ';' : ':'));
	}

	// RC include folders MUST be included FIRST to avoid other
	// possible not compatible libraries (i.e PEAR) to be included
	// instead the ones provided by RC
	$include_path = INSTALL_PATH . PATH_SEPARATOR;
	$include_path.= INSTALL_PATH . 'program' . PATH_SEPARATOR;
	$include_path.= INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
	$include_path.= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
	$include_path.= ini_get('include_path');

	if (set_include_path($include_path) === false) {
	die('Fatal error: ini_set/set_include_path does not work.');
	}

	ini_set('error_reporting', E_ALL&~E_NOTICE);
	if (isset($_SERVER['HTTPS'])) {
	ini_set('session.cookie_secure', ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off'))?1:0);
	} else {
	ini_set('session.cookie_secure', 0);
	}
	ini_set('session.name', 'roundcube_sessid');
	ini_set('session.use_cookies', 1);
	ini_set('session.only_use_cookies', 1);
	set_magic_quotes_runtime(0);

	// increase maximum execution time for php scripts
	// (does not work in safe mode)
	if (!ini_get('safe_mode')) {
	set_time_limit(120);
	}

	// set internal encoding for mbstring extension
	if(extension_loaded('mbstring'))
	mb_internal_encoding(RCMAIL_CHARSET);


	/**
	* Use PHP5 autoload for dynamic class loading
	*
	* @todo Make Zend, PEAR etc play with this
	* @todo Make our classes conform to a more straight forward CS.
	*/
	function __autoload($classname)
	{
	$filename = preg_replace(
	array('/MDB2_(.+)/',
	'/Mail_(.+)/',
	'/^html_.+/',
	'/^utf8$/',
	'/html2text/'
	),
	array('MDB2/\\1',
	'Mail/\\1',
	'html',
	'utf8.class',
	'lib/html2text' // see #1485505
	),
	$classname
	);
	include $filename. '.php';
	}

	/**
	* Local callback function for PEAR errors
	*/
	function rcube_pear_error($err)
	{
	error_log(sprintf("%s (%s): %s",
	$err->getMessage(),
	$err->getCode(),
	$err->getUserinfo()), 0);
	}

	// include global functions
	require_once 'include/bugs.inc';
	require_once 'include/main.inc';
	require_once 'include/rcube_shared.inc';


	// set PEAR error handling (will also load the PEAR main class)
	PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
	diff --git a/program/include/main.inc b/program/include/main.inc
	index b22be1aca..b3d0dab2a 100644
	--- a/program/include/main.inc
	+++ b/program/include/main.inc
	@@ -1,1243 +1,1246 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/main.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev, - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Provide basic functions for the webmail package \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	/**
	* RoundCube Webmail common functions
	*
	* @package Core
	* @author Thomas Bruederli <roundcube@gmail.com>
	*/

	require_once('lib/utf7.inc');
	require_once('include/rcube_shared.inc');

	// fallback if not PHP modules are available
	@include_once('lib/des.inc');
	@include_once('lib/utf8.class.php');

	// define constannts for input reading
	define('RCUBE_INPUT_GET', 0x0101);
	define('RCUBE_INPUT_POST', 0x0102);
	define('RCUBE_INPUT_GPC', 0x0103);



	/**
	* Return correct name for a specific database table
	*
	* @param string Table name
	* @return string Translated table name
	*/
	function get_table_name($table)
	{
	global $CONFIG;

	// return table name if configured
	$config_key = 'db_table_'.$table;

	if (strlen($CONFIG[$config_key]))
	return $CONFIG[$config_key];

	return $table;
	}


	/**
	* Return correct name for a specific database sequence
	* (used for Postgres only)
	*
	* @param string Secuence name
	* @return string Translated sequence name
	*/
	function get_sequence_name($sequence)
	{
	// return table name if configured
	$config_key = 'db_sequence_'.$sequence;
	$opt = rcmail::get_instance()->config->get($config_key);

	if (!empty($opt))
	return $opt;

	return $sequence;
	}


	/**
	* Get localized text in the desired language
	* It's a global wrapper for rcmail::gettext()
	*
	* @param mixed Named parameters array or label name
	* @return string Localized text
	* @see rcmail::gettext()
	*/
	-function rcube_label($p)
	+function rcube_label($p, $domain=null)
	{
	- return rcmail::get_instance()->gettext($p);
	+ return rcmail::get_instance()->gettext($p, $domain);
	}


	/**
	* Overwrite action variable
	*
	* @param string New action value
	*/
	function rcmail_overwrite_action($action)
	{
	$app = rcmail::get_instance();
	$app->action = $action;
	$app->output->set_env('action', $action);
	}


	/**
	* Compose an URL for a specific action
	*
	* @param string Request action
	* @param array More URL parameters
	* @param string Request task (omit if the same)
	* @return The application URL
	*/
	function rcmail_url($action, $p=array(), $task=null)
	{
	$app = rcmail::get_instance();
	return $app->url((array)$p + array('_action' => $action, 'task' => $task));
	}


	/**
	* Garbage collector function for temp files.
	* Remove temp files older than two days
	*/
	function rcmail_temp_gc()
	{
	$tmp = unslashify($CONFIG['temp_dir']);
	$expire = mktime() - 172800; // expire in 48 hours

	if ($dir = opendir($tmp))
	{
	while (($fname = readdir($dir)) !== false)
	{
	if ($fname{0} == '.')
	continue;

	if (filemtime($tmp.'/'.$fname) < $expire)
	@unlink($tmp.'/'.$fname);
	}

	closedir($dir);
	}
	}


	/**
	* Garbage collector for cache entries.
	* Remove all expired message cache records
	*/
	function rcmail_cache_gc()
	{
	$rcmail = rcmail::get_instance();
	$db = $rcmail->get_dbh();

	// get target timestamp
	$ts = get_offset_time($rcmail->config->get('message_cache_lifetime', '30d'), -1);

	$db->query("DELETE FROM ".get_table_name('messages')."
	WHERE created < " . $db->fromunixtime($ts));

	$db->query("DELETE FROM ".get_table_name('cache')."
	WHERE created < " . $db->fromunixtime($ts));
	}


	/**
	* Convert a string from one charset to another.
	* Uses mbstring and iconv functions if possible
	*
	* @param string Input string
	* @param string Suspected charset of the input string
	* @param string Target charset to convert to; defaults to RCMAIL_CHARSET
	* @return Converted string
	*/
	function rcube_charset_convert($str, $from, $to=NULL)
	{
	static $mbstring_loaded = null;
	static $mbstring_list = null;
	static $convert_warning = false;

	$from = strtoupper($from);
	$to = $to==NULL ? strtoupper(RCMAIL_CHARSET) : strtoupper($to);
	$error = false; $conv = null;

	# RFC1642
	if ($from == 'UNICODE-1-1-UTF-7')
	$from = 'UTF-7';
	if ($to == 'UNICODE-1-1-UTF-7')
	$to = 'UTF-7';

	if ($from == $to \|\| empty($str) \|\| empty($from))
	return $str;

	$aliases = array(
	'US-ASCII' => 'ISO-8859-1',
	'ANSI_X3.110-1983' => 'ISO-8859-1',
	'ANSI_X3.4-1968' => 'ISO-8859-1',
	'UNKNOWN-8BIT' => 'ISO-8859-15',
	'X-UNKNOWN' => 'ISO-8859-15',
	'X-USER-DEFINED' => 'ISO-8859-15',
	'ISO-8859-8-I' => 'ISO-8859-8',
	'KS_C_5601-1987' => 'EUC-KR',
	);

	// convert charset using iconv module
	if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
	$aliases['GB2312'] = 'GB18030';
	$_iconv = iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
	if ($_iconv !== false) {
	return $_iconv;
	}
	}

	if (is_null($mbstring_loaded))
	$mbstring_loaded = extension_loaded('mbstring');

	// convert charset using mbstring module
	if ($mbstring_loaded) {
	$aliases['UTF-7'] = 'UTF7-IMAP';
	$aliases['WINDOWS-1257'] = 'ISO-8859-13';

	if (is_null($mbstring_list)) {
	$mbstring_list = mb_list_encodings();
	$mbstring_list = array_map('strtoupper', $mbstring_list);
	}

	$mb_from = $aliases[$from] ? $aliases[$from] : $from;
	$mb_to = $aliases[$to] ? $aliases[$to] : $to;

	// return if encoding found, string matches encoding and convert succeeded
	if (in_array($mb_from, $mbstring_list) && in_array($mb_to, $mbstring_list)) {
	if (mb_check_encoding($str, $mb_from) && ($out = mb_convert_encoding($str, $mb_to, $mb_from)))
	return $out;
	}
	}

	# try to convert with custom classes
	if (class_exists('utf8'))
	$conv = new utf8();

	// convert string to UTF-8
	if ($from == 'UTF-7') {
	if ($_str = utf7_to_utf8($str))
	$str = $_str;
	else
	$error = true;
	}
	else if (($from == 'ISO-8859-1') && function_exists('utf8_encode')) {
	$str = utf8_encode($str);
	}
	else if ($from != 'UTF-8' && $conv) {
	$conv->loadCharset($from);
	$str = $conv->strToUtf8($str);
	}
	else if ($from != 'UTF-8')
	$error = true;

	// encode string for output
	if ($to == 'UTF-7') {
	return utf8_to_utf7($str);
	}
	else if ($to == 'ISO-8859-1' && function_exists('utf8_decode')) {
	return utf8_decode($str);
	}
	else if ($to != 'UTF-8' && $conv) {
	$conv->loadCharset($to);
	return $conv->utf8ToStr($str);
	}
	else if ($to != 'UTF-8') {
	$error = true;
	}

	// report error
	if ($error && !$convert_warning){
	raise_error(array(
	'code' => 500,
	'type' => 'php',
	'file' => __FILE__,
	'message' => "Could not convert string from $from to $to. Make sure iconv is installed or lib/utf8.class is available"
	), true, false);

	$convert_warning = true;
	}

	// return UTF-8 string
	return $str;
	}


	/**
	* Replacing specials characters to a specific encoding type
	*
	* @param string Input string
	* @param string Encoding type: text\|html\|xml\|js\|url
	* @param string Replace mode for tags: show\|replace\|remove
	* @param boolean Convert newlines
	* @return The quoted string
	*/
	function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
	{
	- global $OUTPUT;
	static $html_encode_arr = false;
	static $js_rep_table = false;
	static $xml_rep_table = false;

	- $charset = $OUTPUT->get_charset();
	+ $charset = rcmail::get_instance()->config->get('charset', RCMAIL_CHARSET);
	$is_iso_8859_1 = false;
	if ($charset == 'ISO-8859-1') {
	$is_iso_8859_1 = true;
	}
	if (!$enctype)
	$enctype = $OUTPUT->type;

	// encode for plaintext
	if ($enctype=='text')
	return str_replace("\r\n", "\n", $mode=='remove' ? strip_tags($str) : $str);

	// encode for HTML output
	if ($enctype=='html')
	{
	if (!$html_encode_arr)
	{
	$html_encode_arr = get_html_translation_table(HTML_SPECIALCHARS);
	unset($html_encode_arr['?']);
	}

	$ltpos = strpos($str, '<');
	$encode_arr = $html_encode_arr;

	// don't replace quotes and html tags
	if (($mode=='show' \|\| $mode=='') && $ltpos!==false && strpos($str, '>', $ltpos)!==false)
	{
	unset($encode_arr['"']);
	unset($encode_arr['<']);
	unset($encode_arr['>']);
	unset($encode_arr['&']);
	}
	else if ($mode=='remove')
	$str = strip_tags($str);

	// avoid douple quotation of &
	$out = preg_replace('/&([A-Za-z]{2,6}\|#[0-9]{2,4});/', '&\\1;', strtr($str, $encode_arr));

	return $newlines ? nl2br($out) : $out;
	}

	if ($enctype=='url')
	return rawurlencode($str);

	// if the replace tables for XML and JS are not yet defined
	if ($js_rep_table===false)
	{
	$js_rep_table = $xml_rep_table = array();
	$xml_rep_table['&'] = '&';

	for ($c=160; $c<256; $c++) // can be increased to support more charsets
	{
	$xml_rep_table[Chr($c)] = "&#$c;";

	if ($is_iso_8859_1)
	$js_rep_table[Chr($c)] = sprintf("\\u%04x", $c);
	}

	$xml_rep_table['"'] = '"';
	$js_rep_table['"'] = '\\"';
	$js_rep_table["'"] = "\\'";
	$js_rep_table["\\"] = "\\\\";
	}

	// encode for XML
	if ($enctype=='xml')
	return strtr($str, $xml_rep_table);

	// encode for javascript use
	if ($enctype=='js')
	{
	if ($charset!='UTF-8')
	$str = rcube_charset_convert($str, RCMAIL_CHARSET,$charset);

	return preg_replace(array("/\r?\n/", "/\r/", '/<\\//'), array('\n', '\n', '<\\/'), strtr($str, $js_rep_table));
	}

	// no encoding given -> return original string
	return $str;
	}

	/**
	* Quote a given string.
	* Shortcut function for rep_specialchars_output
	*
	* @return string HTML-quoted string
	* @see rep_specialchars_output()
	*/
	function Q($str, $mode='strict', $newlines=TRUE)
	{
	return rep_specialchars_output($str, 'html', $mode, $newlines);
	}

	/**
	* Quote a given string for javascript output.
	* Shortcut function for rep_specialchars_output
	*
	* @return string JS-quoted string
	* @see rep_specialchars_output()
	*/
	function JQ($str)
	{
	return rep_specialchars_output($str, 'js');
	}


	/**
	* Read input value and convert it for internal use
	* Performs stripslashes() and charset conversion if necessary
	*
	* @param string Field name to read
	* @param int Source to get value from (GPC)
	* @param boolean Allow HTML tags in field value
	* @param string Charset to convert into
	* @return string Field value or NULL if not available
	*/
	function get_input_value($fname, $source, $allow_html=FALSE, $charset=NULL)
	{
	global $OUTPUT;
	$value = NULL;

	if ($source==RCUBE_INPUT_GET && isset($_GET[$fname]))
	$value = $_GET[$fname];
	else if ($source==RCUBE_INPUT_POST && isset($_POST[$fname]))
	$value = $_POST[$fname];
	else if ($source==RCUBE_INPUT_GPC)
	{
	if (isset($_POST[$fname]))
	$value = $_POST[$fname];
	else if (isset($_GET[$fname]))
	$value = $_GET[$fname];
	else if (isset($_COOKIE[$fname]))
	$value = $_COOKIE[$fname];
	}

	// strip single quotes if magic_quotes_sybase is enabled
	if (ini_get('magic_quotes_sybase'))
	$value = str_replace("''", "'", $value);
	// strip slashes if magic_quotes enabled
	else if (get_magic_quotes_gpc() \|\| get_magic_quotes_runtime())
	$value = stripslashes($value);

	// remove HTML tags if not allowed
	if (!$allow_html)
	$value = strip_tags($value);

	// convert to internal charset
	if (is_object($OUTPUT))
	return rcube_charset_convert($value, $OUTPUT->get_charset(), $charset);
	else
	return $value;
	}

	/**
	* Remove all non-ascii and non-word chars
	* except . and -
	*/
	function asciiwords($str, $css_id = false)
	{
	$allowed = 'a-z0-9\_\-' . (!$css_id ? '\.' : '');
	return preg_replace("/[^$allowed]/i", '', $str);
	}

	/**
	* Remove single and double quotes from given string
	*
	* @param string Input value
	* @return string Dequoted string
	*/
	function strip_quotes($str)
	{
	return preg_replace('/[\'"]/', '', $str);
	}


	/**
	* Remove new lines characters from given string
	*
	* @param string Input value
	* @return string Stripped string
	*/
	function strip_newlines($str)
	{
	return preg_replace('/[\r\n]/', '', $str);
	}


	/**
	* Create a HTML table based on the given data
	*
	* @param array Named table attributes
	* @param mixed Table row data. Either a two-dimensional array or a valid SQL result set
	* @param array List of cols to show
	* @param string Name of the identifier col
	* @return string HTML table code
	*/
	function rcube_table_output($attrib, $table_data, $a_show_cols, $id_col)
	{
	global $RCMAIL;

	$table = new html_table(/array('cols' => count($a_show_cols))/);

	// add table header
	foreach ($a_show_cols as $col)
	$table->add_header($col, Q(rcube_label($col)));

	$c = 0;
	if (!is_array($table_data))
	{
	$db = $RCMAIL->get_dbh();
	while ($table_data && ($sql_arr = $db->fetch_assoc($table_data)))
	{
	$zebra_class = $c % 2 ? 'even' : 'odd';
	$table->add_row(array('id' => 'rcmrow' . $sql_arr[$id_col], 'class' => "contact $zebra_class"));

	// format each col
	foreach ($a_show_cols as $col)
	$table->add($col, Q($sql_arr[$col]));

	$c++;
	}
	}
	else
	{
	foreach ($table_data as $row_data)
	{
	$zebra_class = $c % 2 ? 'even' : 'odd';
	$table->add_row(array('id' => 'rcmrow' . $row_data[$id_col], 'class' => "contact $zebra_class"));

	// format each col
	foreach ($a_show_cols as $col)
	$table->add($col, Q($row_data[$col]));

	$c++;
	}
	}

	return $table->show($attrib);
	}


	/**
	* Create an edit field for inclusion on a form
	*
	* @param string col field name
	* @param string value field value
	* @param array attrib HTML element attributes for field
	* @param string type HTML element type (default 'text')
	* @return string HTML field definition
	*/
	function rcmail_get_edit_field($col, $value, $attrib, $type='text')
	{
	$fname = '_'.$col;
	$attrib['name'] = $fname;

	if ($type=='checkbox')
	{
	$attrib['value'] = '1';
	$input = new html_checkbox($attrib);
	}
	else if ($type=='textarea')
	{
	$attrib['cols'] = $attrib['size'];
	$input = new html_textarea($attrib);
	}
	else
	$input = new html_inputfield($attrib);

	// use value from post
	if (!empty($_POST[$fname]))
	$value = get_input_value($fname, RCUBE_INPUT_POST,
	$type == 'textarea' && strpos($attrib['class'], 'mce_editor')!==false ? true : false);

	$out = $input->show($value);

	return $out;
	}


	/**
	* Replace all css definitions with #container [def]
	* and remove css-inlined scripting
	*
	* @param string CSS source code
	* @param string Container ID to use as prefix
	* @return string Modified CSS source
	*/
	function rcmail_mod_css_styles($source, $container_id)
	{
	$last_pos = 0;
	$replacements = new rcube_string_replacer;

	// ignore the whole block if evil styles are detected
	$stripped = preg_replace('/[^a-z\(:]/', '', rcmail_xss_entitiy_decode($source));
	if (preg_match('/expression\|behavior\|url\(\|import/', $stripped))
	return '/* evil! */';

	// cut out all contents between { and }
	while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos)))
	{
	$key = $replacements->add(substr($source, $pos+1, $pos2-($pos+1)));
	$source = substr($source, 0, $pos+1) . $replacements->get_replacement($key) . substr($source, $pos2, strlen($source)-$pos2);
	$last_pos = $pos+2;
	}

	// remove html comments and add #container to each tag selector.
	// also replace body definition because we also stripped off the <body> tag
	$styles = preg_replace(
	array(
	'/(^\s<!--)\|(-->\s$)/',
	'/(^\s\|,\s\|\}\s)([a-z0-9\._#][a-z0-9\.\-_])/im',
	"/$container_id\s+body/i",
	),
	array(
	'',
	"\\1#$container_id \\2",
	"$container_id div.rcmBody",
	),
	$source);

	// put block contents back in
	$styles = $replacements->resolve($styles);

	return $styles;
	}


	/**
	* Decode escaped entities used by known XSS exploits.
	* See http://downloads.securityfocus.com/vulnerabilities/exploits/26800.eml for examples
	*
	* @param string CSS content to decode
	* @return string Decoded string
	*/
	function rcmail_xss_entitiy_decode($content)
	{
	$out = html_entity_decode(html_entity_decode($content));
	$out = preg_replace_callback('/\\\([0-9a-f]{4})/i', 'rcmail_xss_entitiy_decode_callback', $out);
	$out = preg_replace('#/\.\*/#Um', '', $out);
	return $out;
	}


	/**
	* preg_replace_callback callback for rcmail_xss_entitiy_decode_callback
	*
	* @param array matches result from preg_replace_callback
	* @return string decoded entity
	*/
	function rcmail_xss_entitiy_decode_callback($matches)
	{
	return chr(hexdec($matches[1]));
	}

	/**
	* Compose a valid attribute string for HTML tags
	*
	* @param array Named tag attributes
	* @param array List of allowed attributes
	* @return string HTML formatted attribute string
	*/
	function create_attrib_string($attrib, $allowed_attribs=array('id', 'class', 'style'))
	{
	// allow the following attributes to be added to the <iframe> tag
	$attrib_str = '';
	foreach ($allowed_attribs as $a)
	if (isset($attrib[$a]))
	$attrib_str .= sprintf(' %s="%s"', $a, str_replace('"', '"', $attrib[$a]));

	return $attrib_str;
	}


	/**
	* Convert a HTML attribute string attributes to an associative array (name => value)
	*
	* @param string Input string
	* @return array Key-value pairs of parsed attributes
	*/
	function parse_attrib_string($str)
	{
	$attrib = array();
	preg_match_all('/\s([-_a-z]+)=(["\'])??(?(2)([^\2])\2\|(\S+?))/Ui', stripslashes($str), $regs, PREG_SET_ORDER);

	// convert attributes to an associative array (name => value)
	- if ($regs)
	- foreach ($regs as $attr)
	- {
	- $attrib[strtolower($attr[1])] = $attr[3] . $attr[4];
	- }
	+ if ($regs) {
	+ foreach ($regs as $attr) {
	+ $attrib[strtolower($attr[1])] = html_entity_decode($attr[3] . $attr[4]);
	+ }
	+ }

	return $attrib;
	}


	/**
	* Convert the given date to a human readable form
	* This uses the date formatting properties from config
	*
	* @param mixed Date representation (string or timestamp)
	* @param string Date format to use
	* @return string Formatted date string
	*/
	function format_date($date, $format=NULL)
	{
	global $CONFIG;

	$ts = NULL;

	if (is_numeric($date))
	$ts = $date;
	else if (!empty($date))
	{
	// support non-standard "GMTXXXX" literal
	$date = preg_replace('/GMT\s*([+-][0-9]+)/', '\\1', $date);
	// if date parsing fails, we have a date in non-rfc format.
	// remove token from the end and try again
	while ((($ts = @strtotime($date))===false) \|\| ($ts < 0))
	{
	$d = explode(' ', $date);
	array_pop($d);
	if (!$d) break;
	$date = implode(' ', $d);
	}
	}

	if (empty($ts))
	return '';

	// get user's timezone
	if ($CONFIG['timezone'] === 'auto')
	$tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : date('Z')/3600;
	else {
	$tz = $CONFIG['timezone'];
	if ($CONFIG['dst_active'])
	$tz++;
	}

	// convert time to user's timezone
	$timestamp = $ts - date('Z', $ts) + ($tz * 3600);

	// get current timestamp in user's timezone
	$now = time(); // local time
	$now -= (int)date('Z'); // make GMT time
	$now += ($tz * 3600); // user's time
	$now_date = getdate($now);

	$today_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday'], $now_date['year']);
	$week_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday']-6, $now_date['year']);

	// define date format depending on current time
	if ($CONFIG['prettydate'] && !$format && $timestamp > $today_limit && $timestamp < $now)
	return sprintf('%s %s', rcube_label('today'), date($CONFIG['date_today'] ? $CONFIG['date_today'] : 'H:i', $timestamp));
	else if ($CONFIG['prettydate'] && !$format && $timestamp > $week_limit && $timestamp < $now)
	$format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i';
	else if (!$format)
	$format = $CONFIG['date_long'] ? $CONFIG['date_long'] : 'd.m.Y H:i';


	// parse format string manually in order to provide localized weekday and month names
	// an alternative would be to convert the date() format string to fit with strftime()
	$out = '';
	for($i=0; $i<strlen($format); $i++)
	{
	if ($format{$i}=='\\') // skip escape chars
	continue;

	// write char "as-is"
	if ($format{$i}==' ' \|\| $format{$i-1}=='\\')
	$out .= $format{$i};
	// weekday (short)
	else if ($format{$i}=='D')
	$out .= rcube_label(strtolower(date('D', $timestamp)));
	// weekday long
	else if ($format{$i}=='l')
	$out .= rcube_label(strtolower(date('l', $timestamp)));
	// month name (short)
	else if ($format{$i}=='M')
	$out .= rcube_label(strtolower(date('M', $timestamp)));
	// month name (long)
	else if ($format{$i}=='F')
	$out .= rcube_label('long'.strtolower(date('M', $timestamp)));
	else if ($format{$i}=='x')
	$out .= strftime('%x %X', $timestamp);
	else
	$out .= date($format{$i}, $timestamp);
	}

	return $out;
	}


	/**
	* Compose a valid representaion of name and e-mail address
	*
	* @param string E-mail address
	* @param string Person name
	* @return string Formatted string
	*/
	function format_email_recipient($email, $name='')
	{
	if ($name && $name != $email)
	{
	// Special chars as defined by RFC 822 need to in quoted string (or escaped).
	return sprintf('%s <%s>', preg_match('/[\<\>\\\.\[\]@,;:"]/', $name) ? '"'.addcslashes($name, '"').'"' : $name, $email);
	}
	else
	return $email;
	}



	/**** debugging functions ******/


	/**
	* Print or write debug messages
	*
	* @param mixed Debug message or data
	*/
	function console()
	{
	+ $args = func_get_args();
	+ if (class_exists('rcmail', false))
	+ rcmail::get_instance()->plugins->exec_hook('console', $args);
	+
	$msg = array();
	- foreach (func_get_args() as $arg)
	- $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
	+ foreach ($args as $arg)
	+ $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;

	if (!($GLOBALS['CONFIG']['debug_level'] & 4))
	write_log('console', join(";\n", $msg));
	else if ($GLOBALS['OUTPUT']->ajax_call)
	print "/\n " . join(";\n", $msg) . " \n/\n";
	else
	{
	print '<div style="background:#eee; border:1px solid #ccc; margin-bottom:3px; padding:6px"><pre>';
	print join(";<br/>\n", $msg);
	print "</pre></div>\n";
	}
	}


	/**
	* Append a line to a logfile in the logs directory.
	* Date will be added automatically to the line.
	*
	* @param $name name of log file
	* @param line Line to append
	*/
	function write_log($name, $line)
	{
	global $CONFIG;

	if (!is_string($line))
	$line = var_export($line, true);

	$log_entry = sprintf("[%s]: %s\n",
	date("d-M-Y H:i:s O", mktime()),
	$line);

	if ($CONFIG['log_driver'] == 'syslog') {
	if ($name == 'errors')
	$prio = LOG_ERR;
	else
	$prio = LOG_INFO;
	syslog($prio, $log_entry);
	} else {
	// log_driver == 'file' is assumed here
	if (empty($CONFIG['log_dir']))
	$CONFIG['log_dir'] = INSTALL_PATH.'logs';

	// try to open specific log file for writing
	if ($fp = @fopen($CONFIG['log_dir'].'/'.$name, 'a')) {
	fwrite($fp, $log_entry);
	fflush($fp);
	fclose($fp);
	}
	}
	}


	/**
	* @access private
	*/
	function rcube_timer()
	{
	list($usec, $sec) = explode(" ", microtime());
	return ((float)$usec + (float)$sec);
	}


	/**
	* @access private
	*/
	function rcube_print_time($timer, $label='Timer')
	{
	static $print_count = 0;

	$print_count++;
	$now = rcube_timer();
	$diff = $now-$timer;

	if (empty($label))
	$label = 'Timer '.$print_count;

	console(sprintf("%s: %0.4f sec", $label, $diff));
	}


	/**
	* Return the mailboxlist in HTML
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	function rcmail_mailbox_list($attrib)
	{
	global $RCMAIL;
	static $a_mailboxes;

	$attrib += array('maxlength' => 100, 'relanames' => false);

	// add some labels to client
	$RCMAIL->output->add_label('purgefolderconfirm', 'deletemessagesconfirm');

	$type = $attrib['type'] ? $attrib['type'] : 'ul';
	unset($attrib['type']);

	if ($type=='ul' && !$attrib['id'])
	$attrib['id'] = 'rcmboxlist';

	// get mailbox list
	$mbox_name = $RCMAIL->imap->get_mailbox_name();

	// build the folders tree
	if (empty($a_mailboxes)) {
	// get mailbox list
	$a_folders = $RCMAIL->imap->list_mailboxes();
	$delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
	$a_mailboxes = array();

	foreach ($a_folders as $folder)
	rcmail_build_folder_tree($a_mailboxes, $folder, $delimiter);
	}

	if ($type=='select') {
	$select = new html_select($attrib);

	// add no-selection option
	if ($attrib['noselection'])
	$select->add(rcube_label($attrib['noselection']), '0');

	rcmail_render_folder_tree_select($a_mailboxes, $mbox_name, $attrib['maxlength'], $select, $attrib['realnames']);
	$out = $select->show();
	}
	else {
	$js_mailboxlist = array();
	$out = html::tag('ul', $attrib, rcmail_render_folder_tree_html($a_mailboxes, $mbox_name, $js_mailboxlist, $attrib), html::$common_attrib);

	$RCMAIL->output->add_gui_object('mailboxlist', $attrib['id']);
	$RCMAIL->output->set_env('mailboxes', $js_mailboxlist);
	$RCMAIL->output->set_env('collapsed_folders', $RCMAIL->config->get('collapsed_folders'));
	}

	return $out;
	}


	/**
	* Return the mailboxlist as html_select object
	*
	* @param array Named parameters
	* @return object html_select HTML drop-down object
	*/
	function rcmail_mailbox_select($p = array())
	{
	global $RCMAIL;

	$p += array('maxlength' => 100, 'relanames' => false);
	$a_mailboxes = array();

	foreach ($RCMAIL->imap->list_mailboxes() as $folder)
	rcmail_build_folder_tree($a_mailboxes, $folder, $RCMAIL->imap->get_hierarchy_delimiter());

	$select = new html_select($p);

	if ($p['noselection'])
	$select->add($p['noselection'], '');

	rcmail_render_folder_tree_select($a_mailboxes, $mbox, $p['maxlength'], $select, $p['realnames']);

	return $select;
	}


	/**
	* Create a hierarchical array of the mailbox list
	* @access private
	*/
	function rcmail_build_folder_tree(&$arrFolders, $folder, $delm='/', $path='')
	{
	$pos = strpos($folder, $delm);
	if ($pos !== false) {
	$subFolders = substr($folder, $pos+1);
	$currentFolder = substr($folder, 0, $pos);
	$virtual = !isset($arrFolders[$currentFolder]);
	}
	else {
	$subFolders = false;
	$currentFolder = $folder;
	$virtual = false;
	}

	$path .= $currentFolder;

	if (!isset($arrFolders[$currentFolder])) {
	$arrFolders[$currentFolder] = array(
	'id' => $path,
	'name' => rcube_charset_convert($currentFolder, 'UTF-7'),
	'virtual' => $virtual,
	'folders' => array());
	}
	else
	$arrFolders[$currentFolder]['virtual'] = $virtual;

	if (!empty($subFolders))
	rcmail_build_folder_tree($arrFolders[$currentFolder]['folders'], $subFolders, $delm, $path.$delm);
	}


	/**
	* Return html for a structured list <ul> for the mailbox tree
	* @access private
	*/
	function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel=0)
	{
	global $RCMAIL, $CONFIG;

	$maxlength = intval($attrib['maxlength']);
	$realnames = (bool)$attrib['realnames'];
	$msgcounts = $RCMAIL->imap->get_cache('messagecount');

	$idx = 0;
	$out = '';
	foreach ($arrFolders as $key => $folder) {
	$zebra_class = (($nestLevel+1)*$idx) % 2 == 0 ? 'even' : 'odd';
	$title = null;

	if (($folder_class = rcmail_folder_classname($folder['id'])) && !$realnames) {
	$foldername = rcube_label($folder_class);
	}
	else {
	$foldername = $folder['name'];

	// shorten the folder name to a given length
	if ($maxlength && $maxlength > 1) {
	$fname = abbreviate_string($foldername, $maxlength);
	if ($fname != $foldername)
	$title = $foldername;
	$foldername = $fname;
	}
	}

	// make folder name safe for ids and class names
	$folder_id = asciiwords($folder['id'], true);
	$classes = array('mailbox');

	// set special class for Sent, Drafts, Trash and Junk
	if ($folder['id']==$CONFIG['sent_mbox'])
	$classes[] = 'sent';
	else if ($folder['id']==$CONFIG['drafts_mbox'])
	$classes[] = 'drafts';
	else if ($folder['id']==$CONFIG['trash_mbox'])
	$classes[] = 'trash';
	else if ($folder['id']==$CONFIG['junk_mbox'])
	$classes[] = 'junk';
	else if ($folder['id']=='INBOX')
	$classes[] = 'inbox';
	else
	$classes[] = '_'.asciiwords($folder_class ? $folder_class : strtolower($folder['id']), true);

	$classes[] = $zebra_class;

	if ($folder['id'] == $mbox_name)
	$classes[] = 'selected';

	$collapsed = preg_match('/&'.rawurlencode($folder['id']).'&/', $RCMAIL->config->get('collapsed_folders'));
	$unread = $msgcounts ? intval($msgcounts[$folder['id']]['UNSEEN']) : 0;

	if ($folder['virtual'])
	$classes[] = 'virtual';
	else if ($unread)
	$classes[] = 'unread';

	$js_name = JQ($folder['id']);
	$html_name = Q($foldername . ($unread ? " ($unread)" : ''));
	$link_attrib = $folder['virtual'] ? array() : array(
	'href' => rcmail_url('', array('_mbox' => $folder['id'])),
	'onclick' => sprintf("return %s.command('list','%s',this)", JS_OBJECT_NAME, $js_name),
	'title' => $title,
	);

	$out .= html::tag('li', array(
	'id' => "rcmli".$folder_id,
	'class' => join(' ', $classes),
	'noclose' => true),
	html::a($link_attrib, $html_name) .
	(!empty($folder['folders']) ? html::div(array(
	'class' => ($collapsed ? 'collapsed' : 'expanded'),
	'style' => "position:absolute",
	'onclick' => sprintf("%s.command('collapse-folder', '%s')", JS_OBJECT_NAME, $js_name)
	), ' ') : ''));

	$jslist[$folder_id] = array('id' => $folder['id'], 'name' => $foldername, 'virtual' => $folder['virtual']);

	if (!empty($folder['folders'])) {
	$out .= html::tag('ul', array('style' => ($collapsed ? "display:none;" : null)),
	rcmail_render_folder_tree_html($folder['folders'], $mbox_name, $jslist, $attrib, $nestLevel+1));
	}

	$out .= "</li>\n";
	$idx++;
	}

	return $out;
	}


	/**
	* Return html for a flat list <select> for the mailbox tree
	* @access private
	*/
	function rcmail_render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames=false, $nestLevel=0)
	{
	$idx = 0;
	$out = '';
	foreach ($arrFolders as $key=>$folder)
	{
	if (!$realnames && ($folder_class = rcmail_folder_classname($folder['id'])))
	$foldername = rcube_label($folder_class);
	else
	{
	$foldername = $folder['name'];

	// shorten the folder name to a given length
	if ($maxlength && $maxlength>1)
	$foldername = abbreviate_string($foldername, $maxlength);
	}

	$select->add(str_repeat(' ', $nestLevel*4) . $foldername, $folder['id']);

	if (!empty($folder['folders']))
	$out .= rcmail_render_folder_tree_select($folder['folders'], $mbox_name, $maxlength, $select, $realnames, $nestLevel+1);

	$idx++;
	}

	return $out;
	}


	/**
	* Return internal name for the given folder if it matches the configured special folders
	* @access private
	*/
	function rcmail_folder_classname($folder_id)
	{
	global $CONFIG;

	// for these mailboxes we have localized labels and css classes
	foreach (array('sent', 'drafts', 'trash', 'junk') as $smbx)
	{
	if ($folder_id == $CONFIG[$smbx.'_mbox'])
	return $smbx;
	}

	if ($folder_id == 'INBOX')
	return 'inbox';
	}


	/**
	* Try to localize the given IMAP folder name.
	* UTF-7 decode it in case no localized text was found
	*
	* @param string Folder name
	* @return string Localized folder name in UTF-8 encoding
	*/
	function rcmail_localize_foldername($name)
	{
	if ($folder_class = rcmail_folder_classname($name))
	return rcube_label($folder_class);
	else
	return rcube_charset_convert($name, 'UTF-7');
	}


	/**
	* Output HTML editor scripts
	*
	* @param string Editor mode
	*/
	function rcube_html_editor($mode='')
	{
	global $OUTPUT, $CONFIG;

	$lang = $tinylang = strtolower(substr($_SESSION['language'], 0, 2));
	if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$tinylang.'.js'))
	$tinylang = 'en';

	$OUTPUT->include_script('tiny_mce/tiny_mce.js');
	$OUTPUT->include_script('editor.js');
	$OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.JQ($tinylang).'", '.intval($CONFIG['enable_spellcheck']).', "'.$mode.'");');
	}



	/**
	* Helper class to turn relative urls into absolute ones
	* using a predefined base
	*/
	class rcube_base_replacer
	{
	private $base_url;

	public function __construct($base)
	{
	$this->base_url = $base;
	}

	public function callback($matches)
	{
	return $matches[1] . '="' . make_absolute_url($matches[3], $this->base_url) . '"';
	}
	}

	?>
	diff --git a/program/include/rcmail.php b/program/include/rcmail.php
	index 9aad25b27..56fc2f5db 100644
	--- a/program/include/rcmail.php
	+++ b/program/include/rcmail.php
	@@ -1,958 +1,980 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcmail.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2008-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Application class providing core functions and holding \|
	\| instances of all 'global' objects like db- and imap-connections \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: rcmail.php 328 2006-08-30 17:41:21Z thomasb $

	*/


	/**
	* Application class of RoundCube Webmail
	* implemented as singleton
	*
	* @package Core
	*/
	class rcmail
	{
	static public $main_tasks = array('mail','settings','addressbook','login','logout');

	static private $instance;

	public $config;
	public $user;
	public $db;
	public $imap;
	public $output;
	+ public $plugins;
	public $task = 'mail';
	public $action = '';
	public $comm_path = './';

	private $texts;


	/**
	* This implements the 'singleton' design pattern
	*
	* @return object rcmail The one and only instance
	*/
	static function get_instance()
	{
	if (!self::$instance) {
	self::$instance = new rcmail();
	self::$instance->startup(); // init AFTER object was linked with self::$instance
	}

	return self::$instance;
	}


	/**
	* Private constructor
	*/
	private function __construct()
	{
	// load configuration
	$this->config = new rcube_config();

	register_shutdown_function(array($this, 'shutdown'));
	}


	/**
	* Initial startup function
	* to register session, create database and imap connections
	*
	* @todo Remove global vars $DB, $USER
	*/
	private function startup()
	{
	$config_all = $this->config->all();

	// initialize syslog
	if ($this->config->get('log_driver') == 'syslog') {
	$syslog_id = $this->config->get('syslog_id', 'roundcube');
	$syslog_facility = $this->config->get('syslog_facility', LOG_USER);
	openlog($syslog_id, LOG_ODELAY, $syslog_facility);
	}
	-
	+
	// set task and action properties
	$this->set_task(strip_quotes(get_input_value('_task', RCUBE_INPUT_GPC)));
	$this->action = asciiwords(get_input_value('_action', RCUBE_INPUT_GPC));

	// connect to database
	$GLOBALS['DB'] = $this->get_dbh();

	// use database for storing session data
	include_once('include/session.inc');

	// set session domain
	if (!empty($config_all['session_domain'])) {
	ini_set('session.cookie_domain', $config_all['session_domain']);
	}
	// set session garbage collecting time according to session_lifetime
	if (!empty($config_all['session_lifetime'])) {
	ini_set('session.gc_maxlifetime', ($config_all['session_lifetime']) * 120);
	}

	// start PHP session (if not in CLI mode)
	if ($_SERVER['REMOTE_ADDR'])
	session_start();

	// set initial session vars
	if (!isset($_SESSION['auth_time'])) {
	$_SESSION['auth_time'] = time();
	$_SESSION['temp'] = true;
	}

	// create user object
	$this->set_user(new rcube_user($_SESSION['user_id']));

	// reset some session parameters when changing task
	if ($_SESSION['task'] != $this->task)
	unset($_SESSION['page']);

	// set current task to session
	$_SESSION['task'] = $this->task;

	// create IMAP object
	if ($this->task == 'mail')
	$this->imap_init();
	+
	+ // create plugin API and load plugins
	+ $this->plugins = rcube_plugin_api::get_instance();
	}


	/**
	* Setter for application task
	*
	* @param string Task to set
	*/
	public function set_task($task)
	{
	if (!in_array($task, self::$main_tasks))
	$task = 'mail';

	$this->task = $task;
	$this->comm_path = $this->url(array('task' => $task));

	if ($this->output)
	$this->output->set_env('task', $task);
	}


	/**
	* Setter for system user object
	*
	* @param object rcube_user Current user instance
	*/
	public function set_user($user)
	{
	if (is_object($user)) {
	$this->user = $user;
	$GLOBALS['USER'] = $this->user;

	// overwrite config with user preferences
	$this->config->merge((array)$this->user->get_prefs());
	}

	$_SESSION['language'] = $this->user->language = $this->language_prop($this->config->get('language', $_SESSION['language']));

	// set localization
	setlocale(LC_ALL, $_SESSION['language'] . '.utf8', 'en_US.utf8');

	// workaround for http://bugs.php.net/bug.php?id=18556
	if (in_array($_SESSION['language'], array('tr_TR', 'ku', 'az_AZ')))
	setlocale(LC_CTYPE, 'en_US' . '.utf8');
	}


	/**
	* Check the given string and return a valid language code
	*
	* @param string Language code
	* @return string Valid language code
	*/
	private function language_prop($lang)
	{
	static $rcube_languages, $rcube_language_aliases;

	// user HTTP_ACCEPT_LANGUAGE if no language is specified
	if (empty($lang) \|\| $lang == 'auto') {
	$accept_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
	$lang = str_replace('-', '_', $accept_langs[0]);
	}

	if (empty($rcube_languages)) {
	@include(INSTALL_PATH . 'program/localization/index.inc');
	}

	// check if we have an alias for that language
	if (!isset($rcube_languages[$lang]) && isset($rcube_language_aliases[$lang])) {
	$lang = $rcube_language_aliases[$lang];
	}
	// try the first two chars
	else if (!isset($rcube_languages[$lang])) {
	$short = substr($lang, 0, 2);

	// check if we have an alias for the short language code
	if (!isset($rcube_languages[$short]) && isset($rcube_language_aliases[$short])) {
	$lang = $rcube_language_aliases[$short];
	}
	// expand 'nn' to 'nn_NN'
	else if (!isset($rcube_languages[$short])) {
	$lang = $short.'_'.strtoupper($short);
	}
	}

	if (!isset($rcube_languages[$lang]) \|\| !is_dir(INSTALL_PATH . 'program/localization/' . $lang)) {
	$lang = 'en_US';
	}

	return $lang;
	}


	/**
	* Get the current database connection
	*
	* @return object rcube_mdb2 Database connection object
	*/
	public function get_dbh()
	{
	if (!$this->db) {
	$config_all = $this->config->all();

	$this->db = new rcube_mdb2($config_all['db_dsnw'], $config_all['db_dsnr'], $config_all['db_persistent']);
	$this->db->sqlite_initials = INSTALL_PATH . 'SQL/sqlite.initial.sql';
	$this->db->set_debug((bool)$config_all['sql_debug']);
	$this->db->db_connect('w');
	}

	return $this->db;
	}


	/**
	* Return instance of the internal address book class
	*
	* @param boolean True if the address book needs to be writeable
	* @return object rcube_contacts Address book object
	*/
	public function get_address_book($id, $writeable = false)
	{
	$contacts = null;
	$ldap_config = (array)$this->config->get('ldap_public');
	$abook_type = strtolower($this->config->get('address_book_type'));
	+
	+ $plugin = $this->plugins->exec_hook('get_address_book', array('id' => $id, 'writeable' => $writeable));

	- if ($id && $ldap_config[$id]) {
	+ // plugin returned instance of a rcube_addressbook
	+ if ($plugin['instance'] instanceof rcube_addressbook) {
	+ $contacts = $plugin['instance'];
	+ }
	+ else if ($id && $ldap_config[$id]) {
	$contacts = new rcube_ldap($ldap_config[$id]);
	}
	+ else if ($id === '0') {
	+ $contacts = new rcube_contacts($this->db, $this->user->ID);
	+ }
	else if ($abook_type == 'ldap') {
	// Use the first writable LDAP address book.
	foreach ($ldap_config as $id => $prop) {
	if (!$writeable \|\| $prop['writable']) {
	$contacts = new rcube_ldap($prop);
	break;
	}
	}
	}
	else {
	$contacts = new rcube_contacts($this->db, $this->user->ID);
	}

	return $contacts;
	}


	/**
	* Init output object for GUI and add common scripts.
	* This will instantiate a rcmail_template object and set
	* environment vars according to the current session and configuration
	*
	* @param boolean True if this request is loaded in a (i)frame
	* @return object rcube_template Reference to HTML output object
	*/
	public function load_gui($framed = false)
	{
	// init output page
	if (!($this->output instanceof rcube_template))
	$this->output = new rcube_template($this->task, $framed);

	foreach (array('flag_for_deletion','read_when_deleted') as $js_config_var) {
	$this->output->set_env($js_config_var, $this->config->get($js_config_var));
	}

	// set keep-alive/check-recent interval
	if ($keep_alive = $this->config->get('keep_alive')) {
	// be sure that it's less than session lifetime
	if ($session_lifetime = $this->config->get('session_lifetime'))
	$keep_alive = min($keep_alive, $session_lifetime * 60 - 30);
	$this->output->set_env('keep_alive', max(60, $keep_alive));
	}

	if ($framed) {
	$this->comm_path .= '&_framed=1';
	$this->output->set_env('framed', true);
	}

	$this->output->set_env('task', $this->task);
	$this->output->set_env('action', $this->action);
	$this->output->set_env('comm_path', $this->comm_path);
	$this->output->set_charset($this->config->get('charset', RCMAIL_CHARSET));

	// add some basic label to client
	$this->output->add_label('loading');

	return $this->output;
	}


	/**
	* Create an output object for JSON responses
	*
	* @return object rcube_json_output Reference to JSON output object
	*/
	public function init_json()
	{
	if (!($this->output instanceof rcube_json_output))
	$this->output = new rcube_json_output($this->task);

	return $this->output;
	}


	/**
	* Create global IMAP object and connect to server
	*
	* @param boolean True if connection should be established
	* @todo Remove global $IMAP
	*/
	public function imap_init($connect = false)
	{
	$this->imap = new rcube_imap($this->db);
	$this->imap->debug_level = $this->config->get('debug_level');
	$this->imap->skip_deleted = $this->config->get('skip_deleted');

	// enable caching of imap data
	if ($this->config->get('enable_caching')) {
	$this->imap->set_caching(true);
	}

	// set pagesize from config
	$this->imap->set_pagesize($this->config->get('pagesize', 50));

	// Setting root and delimiter before iil_Connect can save time detecting them
	// using NAMESPACE and LIST
	$options = array(
	'imap' => $this->config->get('imap_auth_type', 'check'),
	'delimiter' => isset($_SESSION['imap_delimiter']) ? $_SESSION['imap_delimiter'] : $this->config->get('imap_delimiter'),
	);

	if (isset($_SESSION['imap_root']))
	$options['rootdir'] = $_SESSION['imap_root'];
	else if ($imap_root = $this->config->get('imap_root'))
	$options['rootdir'] = $imap_root;

	$this->imap->set_options($options);

	// set global object for backward compatibility
	$GLOBALS['IMAP'] = $this->imap;

	if ($connect)
	$this->imap_connect();
	}


	/**
	* Connect to IMAP server with stored session data
	*
	* @return bool True on success, false on error
	*/
	public function imap_connect()
	{
	$conn = false;

	if ($_SESSION['imap_host'] && !$this->imap->conn) {
	if (!($conn = $this->imap->connect($_SESSION['imap_host'], $_SESSION['username'], $this->decrypt_passwd($_SESSION['password']), $_SESSION['imap_port'], $_SESSION['imap_ssl']))) {
	if ($this->output)
	$this->output->show_message($this->imap->error_code == -1 ? 'imaperror' : 'sessionerror', 'error');
	}

	$this->set_imap_prop();
	}

	return $conn;
	}


	/**
	* Perfom login to the IMAP server and to the webmail service.
	* This will also create a new user entry if auto_create_user is configured.
	*
	* @param string IMAP user name
	* @param string IMAP password
	* @param string IMAP host
	* @return boolean True on success, False on failure
	*/
	function login($username, $pass, $host=NULL)
	{
	$user = NULL;
	$config = $this->config->all();

	if (!$host)
	$host = $config['default_host'];

	// Validate that selected host is in the list of configured hosts
	if (is_array($config['default_host'])) {
	$allowed = false;
	foreach ($config['default_host'] as $key => $host_allowed) {
	if (!is_numeric($key))
	$host_allowed = $key;
	if ($host == $host_allowed) {
	$allowed = true;
	break;
	}
	}
	if (!$allowed)
	return false;
	}
	else if (!empty($config['default_host']) && $host != $config['default_host'])
	return false;

	// parse $host URL
	$a_host = parse_url($host);
	if ($a_host['host']) {
	$host = $a_host['host'];
	$imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? $a_host['scheme'] : null;
	if(!empty($a_host['port']))
	$imap_port = $a_host['port'];
	else if ($imap_ssl && $imap_ssl != 'tls')
	$imap_port = 993;
	}

	$imap_port = $imap_port ? $imap_port : $config['default_port'];

	/* Modify username with domain if required
	Inspired by Marco <P0L0_notspam_binware.org>
	*/
	// Check if we need to add domain
	if (!empty($config['username_domain']) && !strpos($username, '@')) {
	if (is_array($config['username_domain']) && isset($config['username_domain'][$host]))
	$username .= '@'.$config['username_domain'][$host];
	else if (is_string($config['username_domain']))
	$username .= '@'.$config['username_domain'];
	}

	// try to resolve email address from virtuser table
	if (strpos($username, '@'))
	if ($virtuser = rcube_user::email2user($username))
	$username = $virtuser;

	// lowercase username if it's an e-mail address (#1484473)
	if (strpos($username, '@'))
	$username = rc_strtolower($username);

	// user already registered -> overwrite username
	if ($user = rcube_user::query($username, $host))
	$username = $user->data['username'];

	// exit if IMAP login failed
	if (!($imap_login = $this->imap->connect($host, $username, $pass, $imap_port, $imap_ssl)))
	return false;

	// user already registered -> update user's record
	if (is_object($user)) {
	$user->touch();
	}
	// create new system user
	else if ($config['auto_create_user']) {
	if ($created = rcube_user::create($username, $host)) {
	$user = $created;

	// get existing mailboxes (but why?)
	// $a_mailboxes = $this->imap->list_mailboxes();
	}
	}
	else {
	raise_error(array(
	'code' => 600,
	'type' => 'php',
	'file' => RCMAIL_CONFIG_DIR."/main.inc.php",
	'message' => "Acces denied for new user $username. 'auto_create_user' is disabled"
	), true, false);
	}

	// login succeeded
	if (is_object($user) && $user->ID) {
	$this->set_user($user);

	// set session vars
	$_SESSION['user_id'] = $user->ID;
	$_SESSION['username'] = $user->data['username'];
	$_SESSION['imap_host'] = $host;
	$_SESSION['imap_port'] = $imap_port;
	$_SESSION['imap_ssl'] = $imap_ssl;
	$_SESSION['password'] = $this->encrypt_passwd($pass);
	$_SESSION['login_time'] = mktime();

	if ($_REQUEST['_timezone'] != '_default_')
	$_SESSION['timezone'] = floatval($_REQUEST['_timezone']);

	// force reloading complete list of subscribed mailboxes
	$this->set_imap_prop();
	$this->imap->clear_cache('mailboxes');

	if ($config['create_default_folders'])
	$this->imap->create_default_folders();

	return true;
	}

	return false;
	}


	/**
	* Set root dir and last stored mailbox
	* This must be done AFTER connecting to the server!
	*/
	public function set_imap_prop()
	{
	$this->imap->set_charset($this->config->get('default_charset', RCMAIL_CHARSET));

	if ($default_folders = $this->config->get('default_imap_folders')) {
	$this->imap->set_default_mailboxes($default_folders);
	}
	if (!empty($_SESSION['mbox'])) {
	$this->imap->set_mailbox($_SESSION['mbox']);
	}
	if (isset($_SESSION['page'])) {
	$this->imap->set_page($_SESSION['page']);
	}

	// cache IMAP root and delimiter in session for performance reasons
	$_SESSION['imap_root'] = $this->imap->root_dir;
	$_SESSION['imap_delimiter'] = $this->imap->delimiter;
	}


	/**
	* Auto-select IMAP host based on the posted login information
	*
	* @return string Selected IMAP host
	*/
	public function autoselect_host()
	{
	$default_host = $this->config->get('default_host');
	$host = null;

	if (is_array($default_host)) {
	$post_host = get_input_value('_host', RCUBE_INPUT_POST);

	// direct match in default_host array
	if ($default_host[$post_host] \|\| in_array($post_host, array_values($default_host))) {
	$host = $post_host;
	}

	// try to select host by mail domain
	list($user, $domain) = explode('@', get_input_value('_user', RCUBE_INPUT_POST));
	if (!empty($domain)) {
	foreach ($default_host as $imap_host => $mail_domains) {
	if (is_array($mail_domains) && in_array($domain, $mail_domains)) {
	$host = $imap_host;
	break;
	}
	}
	}

	// take the first entry if $host is still an array
	if (empty($host)) {
	$host = array_shift($default_host);
	}
	}
	else if (empty($default_host)) {
	$host = get_input_value('_host', RCUBE_INPUT_POST);
	}
	else
	$host = $default_host;

	return $host;
	}


	/**
	* Get localized text in the desired language
	*
	* @param mixed Named parameters array or label name
	* @return string Localized text
	*/
	- public function gettext($attrib)
	+ public function gettext($attrib, $domain=null)
	{
	// load localization files if not done yet
	if (empty($this->texts))
	$this->load_language();

	// extract attributes
	if (is_string($attrib))
	$attrib = array('name' => $attrib);

	$nr = is_numeric($attrib['nr']) ? $attrib['nr'] : 1;
	$vars = isset($attrib['vars']) ? $attrib['vars'] : '';

	$command_name = !empty($attrib['command']) ? $attrib['command'] : NULL;
	$alias = $attrib['name'] ? $attrib['name'] : ($command_name && $command_label_map[$command_name] ? $command_label_map[$command_name] : '');
	-
	+
	+ // check for text with domain
	+ if ($domain && ($text_item = $this->texts[$domain.'.'.$alias]))
	+ ;
	// text does not exist
	- if (!($text_item = $this->texts[$alias])) {
	+ else if (!($text_item = $this->texts[$alias])) {
	/*
	raise_error(array(
	'code' => 500,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => "Missing localized text for '$alias' in '$sess_user_lang'"), TRUE, FALSE);
	*/
	return "[$alias]";
	}

	// make text item array
	$a_text_item = is_array($text_item) ? $text_item : array('single' => $text_item);

	// decide which text to use
	if ($nr == 1) {
	$text = $a_text_item['single'];
	}
	else if ($nr > 0) {
	$text = $a_text_item['multiple'];
	}
	else if ($nr == 0) {
	if ($a_text_item['none'])
	$text = $a_text_item['none'];
	else if ($a_text_item['single'])
	$text = $a_text_item['single'];
	else if ($a_text_item['multiple'])
	$text = $a_text_item['multiple'];
	}

	// default text is single
	if ($text == '') {
	$text = $a_text_item['single'];
	}

	// replace vars in text
	if (is_array($attrib['vars'])) {
	foreach ($attrib['vars'] as $var_key => $var_value)
	$a_replace_vars[$var_key{0}=='$' ? substr($var_key, 1) : $var_key] = $var_value;
	}

	if ($a_replace_vars)
	$text = preg_replace('/\$\{?([_a-z]{1}[_a-z0-9]*)\}?/ei', '$a_replace_vars["\1"]', $text);

	// format output
	if (($attrib['uppercase'] && strtolower($attrib['uppercase']=='first')) \|\| $attrib['ucfirst'])
	return ucfirst($text);
	else if ($attrib['uppercase'])
	return strtoupper($text);
	else if ($attrib['lowercase'])
	return strtolower($text);

	return $text;
	}


	/**
	* Load a localization package
	*
	* @param string Language ID
	*/
	- public function load_language($lang = null)
	+ public function load_language($lang = null, $add = array())
	{
	$lang = $this->language_prop(($lang ? $lang : $_SESSION['language']));

	// load localized texts
	if (empty($this->texts) \|\| $lang != $_SESSION['language']) {
	$this->texts = array();

	// get english labels (these should be complete)
	@include(INSTALL_PATH . 'program/localization/en_US/labels.inc');
	@include(INSTALL_PATH . 'program/localization/en_US/messages.inc');

	if (is_array($labels))
	$this->texts = $labels;
	if (is_array($messages))
	$this->texts = array_merge($this->texts, $messages);

	// include user language files
	if ($lang != 'en' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) {
	include_once(INSTALL_PATH . 'program/localization/' . $lang . '/labels.inc');
	include_once(INSTALL_PATH . 'program/localization/' . $lang . '/messages.inc');

	if (is_array($labels))
	$this->texts = array_merge($this->texts, $labels);
	if (is_array($messages))
	$this->texts = array_merge($this->texts, $messages);
	}

	$_SESSION['language'] = $lang;
	}
	+
	+ // append additional texts (from plugin)
	+ if (is_array($add) && !empty($add))
	+ $this->texts += $add;
	}


	/**
	* Read directory program/localization and return a list of available languages
	*
	* @return array List of available localizations
	*/
	public function list_languages()
	{
	static $sa_languages = array();

	if (!sizeof($sa_languages)) {
	@include(INSTALL_PATH . 'program/localization/index.inc');

	if ($dh = @opendir(INSTALL_PATH . 'program/localization')) {
	while (($name = readdir($dh)) !== false) {
	if ($name{0}=='.' \|\| !is_dir(INSTALL_PATH . 'program/localization/' . $name))
	continue;

	if ($label = $rcube_languages[$name])
	$sa_languages[$name] = $label ? $label : $name;
	}
	closedir($dh);
	}
	}

	return $sa_languages;
	}


	/**
	* Check the auth hash sent by the client against the local session credentials
	*
	* @return boolean True if valid, False if not
	*/
	function authenticate_session()
	{
	global $SESS_CLIENT_IP, $SESS_CHANGED;

	// advanced session authentication
	if ($this->config->get('double_auth')) {
	$now = time();
	$valid = ($_COOKIE['sessauth'] == $this->get_auth_hash(session_id(), $_SESSION['auth_time']) \|\|
	$_COOKIE['sessauth'] == $this->get_auth_hash(session_id(), $_SESSION['last_auth']));

	// renew auth cookie every 5 minutes (only for GET requests)
	if (!$valid \|\| ($_SERVER['REQUEST_METHOD']!='POST' && $now - $_SESSION['auth_time'] > 300)) {
	$_SESSION['last_auth'] = $_SESSION['auth_time'];
	$_SESSION['auth_time'] = $now;
	rcmail::setcookie('sessauth', $this->get_auth_hash(session_id(), $now), 0);
	}
	}
	else {
	$valid = $this->config->get('ip_check') ? $_SERVER['REMOTE_ADDR'] == $SESS_CLIENT_IP : true;
	}

	// check session filetime
	$lifetime = $this->config->get('session_lifetime');
	if (!empty($lifetime) && isset($SESS_CHANGED) && $SESS_CHANGED + $lifetime*60 < time()) {
	$valid = false;
	}

	return $valid;
	}


	/**
	* Destroy session data and remove cookie
	*/
	public function kill_session()
	{
	$_SESSION = array('language' => $this->user->language, 'auth_time' => time(), 'temp' => true);
	rcmail::setcookie('sessauth', '-del-', time() - 60);
	$this->user->reset();
	}


	/**
	* Do server side actions on logout
	*/
	public function logout_actions()
	{
	$config = $this->config->all();

	// on logout action we're not connected to imap server
	if (($config['logout_purge'] && !empty($config['trash_mbox'])) \|\| $config['logout_expunge']) {
	if (!$this->authenticate_session())
	return;

	$this->imap_init(true);
	}

	if ($config['logout_purge'] && !empty($config['trash_mbox'])) {
	$this->imap->clear_mailbox($config['trash_mbox']);
	}

	if ($config['logout_expunge']) {
	$this->imap->expunge('INBOX');
	}
	}


	/**
	* Function to be executed in script shutdown
	* Registered with register_shutdown_function()
	*/
	public function shutdown()
	{
	if (is_object($this->imap)) {
	$this->imap->close();
	$this->imap->write_cache();
	}

	if (is_object($this->contacts))
	$this->contacts->close();

	// before closing the database connection, write session data
	if ($_SERVER['REMOTE_ADDR'])
	session_write_close();
	}


	/**
	* Create unique authorization hash
	*
	* @param string Session ID
	* @param int Timestamp
	* @return string The generated auth hash
	*/
	private function get_auth_hash($sess_id, $ts)
	{
	$auth_string = sprintf('rcmailsess%sR%sChk:%s;%s',
	$sess_id,
	$ts,
	$this->config->get('ip_check') ? $_SERVER['REMOTE_ADDR'] : '*...*',
	$_SERVER['HTTP_USER_AGENT']);

	if (function_exists('sha1'))
	return sha1($auth_string);
	else
	return md5($auth_string);
	}

	/**
	* Encrypt IMAP password using DES encryption
	*
	* @param string Password to encrypt
	* @return string Encryprted string
	*/
	public function encrypt_passwd($pass)
	{
	if (function_exists('mcrypt_module_open') && ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, ""))) {
	$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
	mcrypt_generic_init($td, $this->config->get_des_key(), $iv);
	$cypher = mcrypt_generic($td, $pass);
	mcrypt_generic_deinit($td);
	mcrypt_module_close($td);
	}
	else if (function_exists('des')) {
	$cypher = des($this->config->get_des_key(), $pass, 1, 0, NULL);
	}
	else {
	$cypher = $pass;

	raise_error(array(
	'code' => 500,
	'type' => 'php',
	'file' => __FILE__,
	'message' => "Could not convert encrypt password. Make sure Mcrypt is installed or lib/des.inc is available"
	), true, false);
	}

	return base64_encode($cypher);
	}


	/**
	* Decrypt IMAP password using DES encryption
	*
	* @param string Encrypted password
	* @return string Plain password
	*/
	public function decrypt_passwd($cypher)
	{
	if (function_exists('mcrypt_module_open') && ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, ""))) {
	$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
	mcrypt_generic_init($td, $this->config->get_des_key(), $iv);
	$pass = mdecrypt_generic($td, base64_decode($cypher));
	mcrypt_generic_deinit($td);
	mcrypt_module_close($td);
	}
	else if (function_exists('des')) {
	$pass = des($this->config->get_des_key(), base64_decode($cypher), 0, 0, NULL);
	}
	else {
	$pass = base64_decode($cypher);
	}

	return preg_replace('/\x00/', '', $pass);
	}


	/**
	* Build a valid URL to this instance of RoundCube
	*
	* @param mixed Either a string with the action or url parameters as key-value pairs
	* @return string Valid application URL
	*/
	public function url($p)
	{
	if (!is_array($p))
	$p = array('_action' => @func_get_arg(0));
	+
	+ $task = $p['_task'] ? $p['_task'] : $p['task'];
	+ if (!$task \|\| !in_array($task, rcmail::$main_tasks))
	+ $task = $this->task;

	- if (!$p['task'] \|\| !in_array($p['task'], rcmail::$main_tasks))
	- $p['task'] = $this->task;
	-
	- $p['_task'] = $p['task'];
	+ $p['_task'] = $task;
	unset($p['task']);

	$url = './';
	$delm = '?';
	- foreach (array_reverse($p) as $par => $val)
	+ foreach (array_reverse($p) as $key => $val)
	{
	if (!empty($val)) {
	+ $par = $key[0] == '_' ? $key : '_'.$key;
	$url .= $delm.urlencode($par).'='.urlencode($val);
	$delm = '&';
	}
	}
	return $url;
	}


	/**
	* Helper method to set a cookie with the current path and host settings
	*
	* @param string Cookie name
	* @param string Cookie value
	* @param string Expiration time
	*/
	public static function setcookie($name, $value, $exp = 0)
	{
	$cookie = session_get_cookie_params();
	setcookie($name, $value, $exp, $cookie['path'], $cookie['domain'],
	($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off')));
	}
	}


	diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php
	new file mode 100644
	index 000000000..9e970f213
	--- /dev/null
	+++ b/program/include/rcube_addressbook.php
	@@ -0,0 +1,169 @@
	+<?php
	+
	+/*
	+ +-----------------------------------------------------------------------+
	+ \| program/include/rcube_addressbook.php \|
	+ \| \|
	+ \| This file is part of the RoundCube Webmail client \|
	+ \| Copyright (C) 2006-2009, RoundCube Dev. - Switzerland \|
	+ \| Licensed under the GNU GPL \|
	+ \| \|
	+ \| PURPOSE: \|
	+ \| Interface to the local address book database \|
	+ \| \|
	+ +-----------------------------------------------------------------------+
	+ \| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+ +-----------------------------------------------------------------------+
	+
	+ $Id: $
	+
	+*/
	+
	+
	+/**
	+ * Abstract skeleton of an address book/repository
	+ *
	+ * @package Addressbook
	+ */
	+abstract class rcube_addressbook
	+{
	+ /** public properties */
	+ var $primary_key;
	+ var $readonly = true;
	+ var $ready = false;
	+ var $list_page = 1;
	+ var $page_size = 10;
	+
	+ /**
	+ * Save a search string for future listings
	+ *
	+ * @param mixed Search params to use in listing method, obtained by get_search_set()
	+ */
	+ abstract function set_search_set($filter);
	+
	+ /**
	+ * Getter for saved search properties
	+ *
	+ * @return mixed Search properties used by this class
	+ */
	+ abstract function get_search_set();
	+
	+ /**
	+ * Reset saved results and search parameters
	+ */
	+ abstract function reset();
	+
	+ /**
	+ * List the current set of contact records
	+ *
	+ * @param array List of cols to show
	+ * @param int Only return this number of records, use negative values for tail
	+ * @return array Indexed list of contact records, each a hash array
	+ */
	+ abstract function list_records($cols=null, $subset=0);
	+
	+ /**
	+ * Search records
	+ *
	+ * @param array List of fields to search in
	+ * @param string Search value
	+ * @param boolean True if results are requested, False if count only
	+ * @return Indexed list of contact records and 'count' value
	+ */
	+ abstract function search($fields, $value, $strict=false, $select=true);
	+
	+ /**
	+ * Count number of available contacts in database
	+ *
	+ * @return object rcube_result_set Result set with values for 'count' and 'first'
	+ */
	+ abstract function count();
	+
	+ /**
	+ * Return the last result set
	+ *
	+ * @return object rcube_result_set Current result set or NULL if nothing selected yet
	+ */
	+ abstract function get_result();
	+
	+ /**
	+ * Get a specific contact record
	+ *
	+ * @param mixed record identifier(s)
	+ * @param boolean True to return record as associative array, otherwise a result set is returned
	+ * @return mixed Result object with all record fields or False if not found
	+ */
	+ abstract function get_record($id, $assoc=false);
	+
	+ /**
	+ * Close connection to source
	+ * Called on script shutdown
	+ */
	+ function close() { }
	+
	+ /**
	+ * 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;
	+ }
	+
	+ /**
	+ * Create a new contact record
	+ *
	+ * @param array Assoziative array with save data
	+ * @param boolean True to check for duplicates first
	+ * @return The created record ID on success, False on error
	+ */
	+ function insert($save_data, $check=false)
	+ {
	+ /* empty for read-only address books */
	+ }
	+
	+ /**
	+ * Update a specific contact record
	+ *
	+ * @param mixed Record identifier
	+ * @param array Assoziative array with save data
	+ * @return True on success, False on error
	+ */
	+ function update($id, $save_cols)
	+ {
	+ /* empty for read-only address books */
	+ }
	+
	+ /**
	+ * Mark one or more contact records as deleted
	+ *
	+ * @param array Record identifiers
	+ */
	+ function delete($ids)
	+ {
	+ /* empty for read-only address books */
	+ }
	+
	+ /**
	+ * Remove all records from the database
	+ */
	+ function delete_all()
	+ {
	+ /* empty for read-only address books */
	+ }
	+
	+}
	+
	\ No newline at end of file
	diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
	index 7be2b0d2c..1312a73de 100644
	--- a/program/include/rcube_config.php
	+++ b/program/include/rcube_config.php
	@@ -1,253 +1,254 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_config.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2008-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Class to read configuration settings \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: $

	*/

	/**
	* Configuration class for RoundCube
	*
	* @package Core
	*/
	class rcube_config
	{
	private $prop = array();
	private $errors = array();


	/**
	* Object constructor
	*/
	public function __construct()
	{
	$this->load();
	}


	/**
	* Load config from local config file
	*
	* @todo Remove global $CONFIG
	*/
	private function load()
	{
	// start output buffering, we don't need any output yet,
	// it'll be cleared after reading of config files, etc.
	ob_start();

	// load main config file
	if (include(RCMAIL_CONFIG_DIR . '/main.inc.php'))
	$this->prop = (array)$rcmail_config;
	else
	$this->errors[] = 'main.inc.php was not found.';

	// load database config
	if (include(RCMAIL_CONFIG_DIR . '/db.inc.php'))
	$this->prop += (array)$rcmail_config;
	else
	$this->errors[] = 'db.inc.php was not found.';

	// load host-specific configuration
	$this->load_host_config();

	// set skin (with fallback to old 'skin_path' property)
	if (empty($this->prop['skin']) && !empty($this->prop['skin_path']))
	$this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
	else if (empty($this->prop['skin']))
	$this->prop['skin'] = 'default';

	// fix paths
	$this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';
	$this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp';
	+ $this->prop['plugins_dir'] = $this->prop['plugins_dir'] ? unslashify($this->prop['plugins_dir']) : INSTALL_PATH . 'plugins';

	// fix default imap folders encoding
	foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
	$this->prop[$folder] = rcube_charset_convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF-7');

	if (!empty($this->prop['default_imap_folders']))
	foreach ($this->prop['default_imap_folders'] as $n => $folder)
	$this->prop['default_imap_folders'][$n] = rcube_charset_convert($folder, RCMAIL_CHARSET, 'UTF-7');

	// set PHP error logging according to config
	if ($this->prop['debug_level'] & 1) {
	ini_set('log_errors', 1);

	if ($this->prop['log_driver'] == 'syslog') {
	ini_set('error_log', 'syslog');
	} else {
	ini_set('error_log', $this->prop['log_dir'].'/errors');
	}
	}
	if ($this->prop['debug_level'] & 4) {
	ini_set('display_errors', 1);
	}
	else {
	ini_set('display_errors', 0);
	}

	// clear output buffer
	ob_end_clean();

	// export config data
	$GLOBALS['CONFIG'] = &$this->prop;
	}


	/**
	* Load a host-specific config file if configured
	* This will merge the host specific configuration with the given one
	*/
	private function load_host_config()
	{
	$fname = null;

	if (is_array($this->prop['include_host_config'])) {
	$fname = $this->prop['include_host_config'][$_SERVER['HTTP_HOST']];
	}
	else if (!empty($this->prop['include_host_config'])) {
	$fname = preg_replace('/[^a-z0-9\.\-_]/i', '', $_SERVER['HTTP_HOST']) . '.inc.php';
	}

	if ($fname && is_file(RCMAIL_CONFIG_DIR . '/' . $fname)) {
	include(RCMAIL_CONFIG_DIR . '/' . $fname);
	$this->prop = array_merge($this->prop, (array)$rcmail_config);
	}
	}


	/**
	* Getter for a specific config parameter
	*
	* @param string Parameter name
	* @param mixed Default value if not set
	* @return mixed The requested config value
	*/
	public function get($name, $def = null)
	{
	return isset($this->prop[$name]) ? $this->prop[$name] : $def;
	}


	/**
	* Setter for a config parameter
	*
	* @param string Parameter name
	* @param mixed Parameter value
	*/
	public function set($name, $value)
	{
	$this->prop[$name] = $value;
	}


	/**
	* Override config options with the given values (eg. user prefs)
	*
	* @param array Hash array with config props to merge over
	*/
	public function merge($prefs)
	{
	$this->prop = array_merge($this->prop, $prefs);
	}


	/**
	* Getter for all config options
	*
	* @return array Hash array containg all config properties
	*/
	public function all()
	{
	return $this->prop;
	}


	/**
	* Return a 24 byte key for the DES encryption
	*
	* @return string DES encryption key
	*/
	public function get_des_key()
	{
	$key = !empty($this->prop['des_key']) ? $this->prop['des_key'] : 'rcmail?24BitPwDkeyF**ECB';
	$len = strlen($key);

	// make sure the key is exactly 24 chars long
	if ($len<24)
	$key .= str_repeat('_', 24-$len);
	else if ($len>24)
	substr($key, 0, 24);

	return $key;
	}


	/**
	* Try to autodetect operating system and find the correct line endings
	*
	* @return string The appropriate mail header delimiter
	*/
	public function header_delimiter()
	{
	// use the configured delimiter for headers
	if (!empty($this->prop['mail_header_delimiter']))
	return $this->prop['mail_header_delimiter'];
	else if (strtolower(substr(PHP_OS, 0, 3) == 'win'))
	return "\r\n";
	else if (strtolower(substr(PHP_OS, 0, 3) == 'mac'))
	return "\r\n";
	else
	return "\n";
	}



	/**
	* Return the mail domain configured for the given host
	*
	* @param string IMAP host
	* @return string Resolved SMTP host
	*/
	public function mail_domain($host)
	{
	$domain = $host;

	if (is_array($this->prop['mail_domain'])) {
	if (isset($this->prop['mail_domain'][$host]))
	$domain = $this->prop['mail_domain'][$host];
	}
	else if (!empty($this->prop['mail_domain']))
	$domain = $this->prop['mail_domain'];

	return $domain;
	}


	/**
	* Getter for error state
	*
	* @return mixed Error message on error, False if no errors
	*/
	public function get_error()
	{
	return empty($this->errors) ? false : join("\n", $this->errors);
	}


	}

	diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
	index 65d89ca2b..f440e5f8a 100644
	--- a/program/include/rcube_contacts.php
	+++ b/program/include/rcube_contacts.php
	@@ -1,390 +1,359 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_contacts.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2006-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Interface to the local address book database \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: rcube_contacts.inc 328 2006-08-30 17:41:21Z thomasb $

	*/


	/**
	* Model class for the local address book database
	*
	* @package Addressbook
	*/
	-class rcube_contacts
	+class rcube_contacts extends rcube_addressbook
	{
	var $db = null;
	var $db_name = '';
	var $user_id = 0;
	var $filter = null;
	var $result = null;
	var $search_fields;
	var $search_string;
	var $table_cols = array('name', 'email', 'firstname', 'surname', 'vcard');

	/** public properties */
	var $primary_key = 'contact_id';
	var $readonly = false;
	var $list_page = 1;
	var $page_size = 10;
	var $ready = false;


	/**
	* Object constructor
	*
	* @param object Instance of the rcube_db class
	* @param integer User-ID
	*/
	function __construct($dbconn, $user)
	{
	$this->db = $dbconn;
	$this->db_name = get_table_name('contacts');
	$this->user_id = $user;
	$this->ready = $this->db && !$this->db->is_error();
	}


	- /**
	- * 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;
	- }
	-
	-
	/**
	* Save a search string for future listings
	*
	* @param string SQL params to use in listing method
	*/
	function set_search_set($filter)
	{
	$this->filter = $filter;
	}


	/**
	* Getter for saved search properties
	*
	* @return mixed Search properties used by this class
	*/
	function get_search_set()
	{
	return $this->filter;
	}


	/**
	* Reset all saved results and search parameters
	*/
	function reset()
	{
	$this->result = null;
	$this->filter = null;
	$this->search_fields = null;
	$this->search_string = null;
	}


	- /**
	- * Close connection to source
	- * Called on script shutdown
	- */
	- function close(){}
	-
	-
	/**
	* List the current set of contact records
	*
	* @param array List of cols to show
	* @param int Only return this number of records, use negative values for tail
	* @return array Indexed list of contact records, each a hash array
	*/
	function list_records($cols=null, $subset=0)
	{
	// count contacts for this user
	$this->result = $this->count();
	$sql_result = NULL;

	// get contacts from DB
	if ($this->result->count)
	{
	$start_row = $subset < 0 ? $this->result->first + $this->page_size + $subset : $this->result->first;
	$length = $subset != 0 ? abs($subset) : $this->page_size;

	$sql_result = $this->db->limitquery(
	"SELECT * FROM ".$this->db_name."
	WHERE del<>1
	AND user_id=?" .
	($this->filter ? " AND (".$this->filter.")" : "") .
	" ORDER BY name",
	$start_row,
	$length,
	$this->user_id);
	}

	while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result)))
	{
	$sql_arr['ID'] = $sql_arr[$this->primary_key];
	// make sure we have a name to display
	if (empty($sql_arr['name']))
	$sql_arr['name'] = $sql_arr['email'];
	$this->result->add($sql_arr);
	}

	return $this->result;
	}


	/**
	* Search contacts
	*
	* @param array List of fields to search in
	* @param string Search value
	* @param boolean True if results are requested, False if count only
	* @return Indexed list of contact records and 'count' value
	*/
	function search($fields, $value, $strict=false, $select=true)
	{
	if (!is_array($fields))
	$fields = array($fields);

	$add_where = array();
	foreach ($fields as $col)
	{
	if ($col == 'ID' \|\| $col == $this->primary_key)
	{
	$ids = !is_array($value) ? split(',', $value) : $value;
	$add_where[] = $this->primary_key.' IN ('.join(',', $ids).')';
	}
	else if ($strict)
	$add_where[] = $this->db->quoteIdentifier($col).'='.$this->db->quote($value);
	else
	$add_where[] = $this->db->ilike($col, '%'.$value.'%');
	}

	if (!empty($add_where))
	{
	$this->set_search_set(join(' OR ', $add_where));
	if ($select)
	$this->list_records();
	else
	$this->result = $this->count();
	}

	return $this->result;
	}


	/**
	* Count number of available contacts in database
	*
	* @return Result array with values for 'count' and 'first'
	*/
	function count()
	{
	// count contacts for this user
	$sql_result = $this->db->query(
	"SELECT COUNT(contact_id) AS rows
	FROM ".$this->db_name."
	WHERE del<>1
	AND user_id=?".
	($this->filter ? " AND (".$this->filter.")" : ""),
	$this->user_id);

	$sql_arr = $this->db->fetch_assoc($sql_result);
	return new rcube_result_set($sql_arr['rows'], ($this->list_page-1) * $this->page_size);;
	}


	/**
	* Return the last result set
	*
	* @return Result array or NULL if nothing selected yet
	*/
	- function get_result($as_res=true)
	+ function get_result()
	{
	return $this->result;
	}


	/**
	* Get a specific contact record
	*
	* @param mixed record identifier(s)
	* @return Result object with all record fields or False if not found
	*/
	function get_record($id, $assoc=false)
	{
	// return cached result
	if ($this->result && ($first = $this->result->first()) && $first[$this->primary_key] == $id)
	return $assoc ? $first : $this->result;

	$this->db->query(
	"SELECT * FROM ".$this->db_name."
	WHERE contact_id=?
	AND user_id=?
	AND del<>1",
	$id,
	$this->user_id);

	if ($sql_arr = $this->db->fetch_assoc())
	{
	$sql_arr['ID'] = $sql_arr[$this->primary_key];
	$this->result = new rcube_result_set(1);
	$this->result->add($sql_arr);
	}

	return $assoc && $sql_arr ? $sql_arr : $this->result;
	}


	/**
	* Create a new contact record
	*
	* @param array Assoziative array with save data
	* @return The created record ID on success, False on error
	*/
	function insert($save_data, $check=false)
	{
	if (is_object($save_data) && is_a($save_data, rcube_result_set))
	return $this->insert_recset($save_data, $check);

	$insert_id = $existing = false;

	if ($check)
	$existing = $this->search('email', $save_data['email'], true, false);

	$a_insert_cols = $a_insert_values = array();
	foreach ($this->table_cols as $col)
	if (isset($save_data[$col]))
	{
	$a_insert_cols[] = $this->db->quoteIdentifier($col);
	$a_insert_values[] = $this->db->quote($save_data[$col]);
	}

	if (!$existing->count && !empty($a_insert_cols))
	{
	$this->db->query(
	"INSERT INTO ".$this->db_name."
	(user_id, changed, del, ".join(', ', $a_insert_cols).")
	VALUES (?, ".$this->db->now().", 0, ".join(', ', $a_insert_values).")",
	$this->user_id);

	$insert_id = $this->db->insert_id(get_sequence_name('contacts'));
	}

	return $insert_id;
	}


	/**
	* Insert new contacts for each row in set
	*/
	function insert_recset($result, $check=false)
	{
	$ids = array();
	while ($row = $result->next())
	{
	if ($insert = $this->insert($row, $check))
	$ids[] = $insert;
	}
	return $ids;
	}


	/**
	* Update a specific contact record
	*
	* @param mixed Record identifier
	* @param array Assoziative array with save data
	* @return True on success, False on error
	*/
	function update($id, $save_cols)
	{
	$updated = false;
	$write_sql = array();
	foreach ($this->table_cols as $col)
	if (isset($save_cols[$col]))
	$write_sql[] = sprintf("%s=%s", $this->db->quoteIdentifier($col), $this->db->quote($save_cols[$col]));

	if (!empty($write_sql))
	{
	$this->db->query(
	"UPDATE ".$this->db_name."
	SET changed=".$this->db->now().", ".join(', ', $write_sql)."
	WHERE contact_id=?
	AND user_id=?
	AND del<>1",
	$id,
	$this->user_id);

	$updated = $this->db->affected_rows();
	}

	return $updated;
	}


	/**
	* Mark one or more contact records as deleted
	*
	* @param array Record identifiers
	*/
	function delete($ids)
	{
	if (is_array($ids))
	$ids = join(',', $ids);

	$this->db->query(
	"UPDATE ".$this->db_name."
	SET del=1
	WHERE user_id=?
	AND contact_id IN (".$ids.")",
	$this->user_id);

	return $this->db->affected_rows();
	}


	/**
	* Remove all records from the database
	*/
	function delete_all()
	{
	$this->db->query("DELETE FROM {$this->db_name} WHERE user_id=?", $this->user_id);
	return $this->db->affected_rows();
	}

	}
	diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
	index 78f6176bf..c83c6aeea 100644
	--- a/program/include/rcube_html_page.php
	+++ b/program/include/rcube_html_page.php
	@@ -1,255 +1,258 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_html_page.php \|
	\| \|
	\| This file is part of the RoundCube PHP suite \|
	\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| CONTENTS: \|
	\| Class to build XHTML page output \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: $

	*/

	/**
	* Class for HTML page creation
	*
	* @package HTML
	*/
	class rcube_html_page
	{
	protected $scripts_path = '';
	protected $script_files = array();
	protected $scripts = array();
	protected $charset = 'UTF-8';

	- protected $script_tag_file = "<script type=\"text/javascript\" src=\"%s%s\"></script>\n";
	- protected $script_tag = "<script type=\"text/javascript\">\n<!--\n%s\n\n//-->\n</script>\n";
	+ protected $script_tag_file = "<script type=\"text/javascript\" src=\"%s\"></script>\n";
	+ protected $script_tag = "<script type=\"text/javascript\">\n/* <![CDATA[ /\n%s\n/ ]]> */\n</script>";
	protected $default_template = "<html>\n<head><title></title></head>\n<body></body>\n</html>";

	protected $title = '';
	protected $header = '';
	protected $footer = '';
	protected $body = '';


	/** Constructor */
	public function __construct() {}

	/**
	* Link an external script file
	*
	* @param string File URL
	* @param string Target position [head\|foot]
	*/
	public function include_script($file, $position='head')
	{
	static $sa_files = array();
	+
	+ if (!ereg('^https?://', $file) && $file[0] != '/')
	+ $file = $this->scripts_path . $file;

	if (in_array($file, $sa_files)) {
	return;
	}
	if (!is_array($this->script_files[$position])) {
	$this->script_files[$position] = array();
	}
	$this->script_files[$position][] = $file;
	}

	/**
	* Add inline javascript code
	*
	* @param string JS code snippet
	* @param string Target position [head\|head_top\|foot]
	*/
	public function add_script($script, $position='head')
	{
	if (!isset($this->scripts[$position])) {
	$this->scripts[$position] = "\n".rtrim($script);
	} else {
	$this->scripts[$position] .= "\n".rtrim($script);
	}
	}

	/**
	* Add HTML code to the page header
	*/
	public function add_header($str)
	{
	$this->header .= "\n".$str;
	}

	/**
	* Add HTML code to the page footer
	* To be added right befor </body>
	*/
	public function add_footer($str)
	{
	$this->footer .= "\n".$str;
	}

	/**
	* Setter for page title
	*/
	public function set_title($t)
	{
	$this->title = $t;
	}

	/**
	* Setter for output charset.
	* To be specified in a meta tag and sent as http-header
	*/
	public function set_charset($charset)
	{
	$this->charset = $charset;
	}

	/**
	* Getter for output charset
	*/
	public function get_charset()
	{
	return $this->charset;
	}

	/**
	* Reset all saved properties
	*/
	public function reset()
	{
	$this->script_files = array();
	$this->scripts = array();
	$this->title = '';
	$this->header = '';
	$this->footer = '';
	$this->body = '';
	}

	/**
	* Process template and write to stdOut
	*
	* @param string HTML template
	* @param string Base for absolute paths
	*/
	public function write($templ='', $base_path='')
	{
	$output = empty($templ) ? $this->default_template : trim($templ);

	// set default page title
	if (empty($this->title)) {
	$this->title = 'RoundCube Mail';
	}

	// replace specialchars in content
	$__page_title = Q($this->title, 'show', FALSE);
	$__page_header = $__page_body = $__page_footer = '';

	// include meta tag with charset
	if (!empty($this->charset)) {
	if (!headers_sent()) {
	header('Content-Type: text/html; charset=' . $this->charset);
	}
	$__page_header = '<meta http-equiv="content-type"';
	$__page_header.= ' content="text/html; charset=';
	$__page_header.= $this->charset . '" />'."\n";
	}

	// definition of the code to be placed in the document header and footer
	if (is_array($this->script_files['head'])) {
	foreach ($this->script_files['head'] as $file) {
	- $__page_header .= sprintf($this->script_tag_file, $this->scripts_path, $file);
	+ $__page_header .= sprintf($this->script_tag_file, $file);
	}
	}

	$head_script = $this->scripts['head_top'] . $this->scripts['head'];
	if (!empty($head_script)) {
	$__page_header .= sprintf($this->script_tag, $head_script);
	}

	if (!empty($this->header)) {
	$__page_header .= $this->header;
	}

	if (is_array($this->script_files['foot'])) {
	foreach ($this->script_files['foot'] as $file) {
	- $__page_footer .= sprintf($this->script_tag_file, $this->scripts_path, $file);
	+ $__page_footer .= sprintf($this->script_tag_file, $file);
	}
	}

	if (!empty($this->scripts['foot'])) {
	$__page_footer .= sprintf($this->script_tag, $this->scripts['foot']);
	}

	if (!empty($this->footer)) {
	$__page_footer .= $this->footer;
	}

	// find page header
	if ($hpos = strpos(strtolower($output), '</head>')) {
	$__page_header .= "\n";
	}
	else {
	if (!is_numeric($hpos)) {
	$hpos = strpos(strtolower($output), '<body');
	}
	if (!is_numeric($hpos) && ($hpos = strpos(strtolower($output), '<html'))) {
	while ($output[$hpos] != '>') {
	$hpos++;
	}
	$hpos++;
	}
	$__page_header = "<head>\n<title>$__page_title</title>\n$__page_header\n</head>\n";
	}

	// add page hader
	if ($hpos) {
	$output = substr($output,0,$hpos) . $__page_header . substr($output,$hpos,strlen($output));
	}
	else {
	$output = $__page_header . $output;
	}

	// find page body
	if ($bpos = strpos(strtolower($output), '<body')) {
	while ($output[$bpos] != '>') {
	$bpos++;
	}
	$bpos++;
	}
	else {
	$bpos = strpos(strtolower($output), '</head>')+7;
	}

	// add page body
	if ($bpos && $__page_body) {
	$output = substr($output,0,$bpos) . "\n$__page_body\n" . substr($output,$bpos,strlen($output));
	}

	// find and add page footer
	$output_lc = strtolower($output);
	if (($fpos = strrpos($output_lc, '</body>')) \|\| ($fpos = strrpos($output_lc, '</html>'))) {
	$output = substr($output, 0, $fpos) . "$__page_footer\n" . substr($output, $fpos);
	}
	else {
	$output .= "\n".$__page_footer;
	}

	// reset those global vars
	$__page_header = $__page_footer = '';

	// correct absolute paths in images and other tags
	$output = preg_replace('/(src\|href\|background)=(["\']?)(\/[a-z0-9_\-]+)/Ui', "\\1=\\2$base_path\\3", $output);
	$output = str_replace('$__skin_path', $base_path, $output);

	echo rcube_charset_convert($output, 'UTF-8', $this->charset);
	}
	}

	diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
	index da7c5bf88..e2b6c0d9a 100644
	--- a/program/include/rcube_imap.php
	+++ b/program/include/rcube_imap.php
	@@ -1,3136 +1,3145 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_imap.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, 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/tnef_decoder.inc');


	/**
	* Interface class for accessing an IMAP server
	*
	* This is a wrapper that implements the Iloha IMAP Library (IIL)
	*
	* @package Mail
	* @author Thomas Bruederli <roundcube@gmail.com>
	* @version 1.40
	* @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_charset = 'ISO-8859-1';
	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 $skip_deleted = FALSE;
	var $search_set = NULL;
	var $search_string = '';
	var $search_charset = '';
	var $search_sort_field = '';
	var $debug_level = 1;
	var $error_code = 0;
	var $options = array('imap' => 'check');


	/**
	* Object constructor
	*
	* @param object DB Database connection
	*/
	function __construct($db_conn)
	{
	$this->db = $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 string SSL schema (either ssl or tls) or null if plain connection
	* @return boolean TRUE on success, FALSE on failure
	* @access public
	*/
	function connect($host, $user, $pass, $port=143, $use_ssl=null)
	{
	global $ICL_SSL, $ICL_PORT, $IMAP_USE_INTERNAL_DATE;

	// check for Open-SSL support in PHP build
	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);
	$port = 143;
	}

	$ICL_PORT = $port;
	$IMAP_USE_INTERNAL_DATE = false;

	$this->conn = iil_Connect($host, $user, $pass, $this->options);
	$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'])
	{
	$this->error_code = $GLOBALS['iil_errornum'];
	raise_error(array('code' => 403,
	'type' => 'imap',
	'message' => $GLOBALS['iil_error']), TRUE, FALSE);
	}

	// get server properties
	if ($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);

	// 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.
	*
	* 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;
	$this->options['rootdir'] = $root;

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


	/**
	* Set default message charset
	*
	* This will be used for message decoding if a charset specification is not available
	*
	* @param string Charset string
	* @access public
	*/
	function set_charset($cs)
	{
	$this->default_charset = $cs;
	}


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


	/**
	* Set internal mailbox reference.
	*
	* All operations will be perfomed on this mailbox/folder
	*
	* @param string Mailbox/Folder name
	* @access public
	*/
	function set_mailbox($new_mbox)
	{
	$mailbox = $this->_mod_mailbox($new_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;
	}


	/**
	* Save a set of message ids for future message listing methods
	*
	* @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($str=null, $msgs=null, $charset=null, $sort_field=null)
	{
	if (is_array($str) && $msgs == null)
	list($str, $msgs, $charset, $sort_field) = $str;
	if ($msgs != null && !is_array($msgs))
	$msgs = split(',', $msgs);

	$this->search_string = $str;
	$this->search_set = $msgs;
	$this->search_charset = $charset;
	$this->search_sort_field = $sort_field;
	}


	/**
	* Return the saved search set as hash array
	* @return array Search set
	*/
	function get_search_set()
	{
	return array($this->search_string, $this->search_set, $this->search_charset, $this->search_sort_field);
	}


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


	/**
	* 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_row)
	{
	$name = $this->_mod_mailbox($mbox_row, 'out');
	if (strlen($name))
	$a_out[] = $name;
	}

	// INBOX should always be available
	if (!in_array_nocase('INBOX', $a_out))
	array_unshift($a_out, 'INBOX');

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

	return $a_out;
	}


	/**
	* Private method for mailbox listing
	*
	* @return array List of mailboxes/folders
	* @see rcube_imap::list_mailboxes()
	* @access private
	*/
	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);
	+ // 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();

	// 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 int Number of messages
	* @access public
	*/
	function messagecount($mbox_name='', $mode='ALL', $force=FALSE)
	{
	$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $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;

	// count search set
	if ($this->search_string && $mailbox == $this->mailbox && $mode == 'ALL' && !$force)
	return count((array)$this->search_set);

	$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 a bit 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 int 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_name='', $page=NULL, $sort_field=NULL, $sort_order=NULL)
	{
	$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $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();

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

	$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;
	$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)
	{
	$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;
	}
	// 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);
	}
	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' : '')))
	{
	$mymsgidx = array_slice ($msg_index, $begin, $end-$begin);
	$msgs = join(",", $mymsgidx);
	}
	else
	{
	$msgs = sprintf("%d:%d", $begin+1, $end);
	$msg_index = range($begin, $end);
	}


	// 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+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)) {
	return array();
	}

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

	return array_values($a_msg_headers);
	}


	/**
	* Private method for listing a set of message headers (search results)
	*
	* @param string Mailbox/folder name
	* @param int Current page to list
	* @param string Header field to sort by
	* @param string Sort order [ASC\|DESC]
	* @return array Indexed array with message header objects
	* @access private
	* @see rcube_imap::list_header_set()
	*/
	function _list_header_set($mailbox, $page=NULL, $sort_field=NULL, $sort_order=NULL)
	{
	if (!strlen($mailbox) \|\| empty($this->search_set))
	return array();

	$msgs = $this->search_set;
	$a_msg_headers = array();
	$start_msg = ($this->list_page-1) * $this->page_size;

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

	// sorted messages, so we can first slice array and then fetch only wanted headers
	if ($this->get_capability('sort')) // 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));

	// 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);
	if ($cnt > 300 && $cnt > $this->page_size) { // experimantal value for best result
	// 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));
	// ...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
	return array_slice(array_values($a_msg_headers), $start_msg, min($cnt-$start_msg, $this->page_size));
	}
	}
	}


	/**
	* Helper function to get first and last index of the requested set
	*
	* @param int message count
	* @param mixed page number to show, or string 'all'
	* @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 int 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);
	+ $a_header_index = iil_C_FetchHeaders($this->conn, $mailbox, $msgs, false, $this->fetch_add_headers);
	$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 IDs (not UIDs)
	*
	* @param string Mailbox to get index from
	* @param string Sort column
	* @param string Sort order [ASC, DESC]
	* @return array Indexed array with message ids
	*/
	function message_index($mbox_name='', $sort_field=NULL, $sort_order=NULL)
	{
	$this->_set_sort_order($sort_field, $sort_order);

	$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
	if (!isset($this->cache[$key]) && $this->search_string && $mailbox == $this->mailbox)
	{
	$this->cache[$key] = array();

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

	- if ($this->sort_order == 'DESC')
	+ if ($this->sort_order == 'DESC')
	$this->cache[$key] = array_reverse($this->search_set);
	- else
	- $this->cache[$key] = $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);
	+ $a_index = iil_C_FetchHeaderIndex($this->conn, $mailbox, join(',', $this->search_set), $this->sort_field, false);

	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
	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_keys($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, '')))
	{
	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);

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

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

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


	/**
	* @access private
	*/
	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)
	{
	unset($cache_index[$id]);
	continue;
	}

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

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


	// fetch complete headers and add to cache
	- $headers = iil_C_FetchHeader($this->conn, $mailbox, $id);
	+ $headers = iil_C_FetchHeader($this->conn, $mailbox, $id, false, $this->fetch_add_headers);
	$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 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='', $str=NULL, $charset=NULL, $sort_field=NULL)
	{
	if (!$str)
	return false;

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

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

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

	$results = $this->search($mbox_name, $res, 'US-ASCII', $sort_field);
	}

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

	return $results;
	}


	/**
	* Private search method
	*
	* @return array search results as list of message ids
	* @access private
	* @see rcube_imap::search()
	*/
	function _search_index($mailbox, $criteria='ALL', $charset=NULL, $sort_field=NULL)
	{
	if ($sort_field && $this->get_capability('sort'))
	{
	$charset = $charset ? $charset : $this->default_charset;
	$a_messages = iil_C_Sort($this->conn, $mailbox, $sort_field, $criteria, FALSE, $charset);
	}
	else
	$a_messages = iil_C_Search($this->conn, $mailbox, ($charset ? "CHARSET $charset " : '') . $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]);
	}

	return $a_messages;
	}


	/**
	* Refresh saved search set
	*
	* @return array Current search set
	*/
	function refresh_search()
	{
	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();
	}


	/**
	* Check if the given message ID is part of the current search set
	*
	* @return boolean True on match or if no search request is stored
	*/
	function in_searchset($msgid)
	{
	if (!empty($this->search_string))
	return in_array("$msgid", (array)$this->search_set, true);
	else
	return true;
	}


	/**
	* Return message headers object of a specific message
	*
	* @param int Message ID
	* @param string Mailbox to read from
	* @param boolean True if $id is the message UID
	* @param boolean True if we need also BODYSTRUCTURE in headers
	* @return object Message headers representation
	*/
	function get_headers($id, $mbox_name=NULL, $is_uid=TRUE, $bodystr=FALSE)
	{
	$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, $bodystr);
	+ $headers = iil_C_FetchHeader($this->conn, $mailbox, $id, $is_uid, $bodystr, $this->fetch_add_headers);

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

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

	return $headers;
	}


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

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

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

	if (!$structure_str)
	$structure_str = iil_C_FetchStructureString($this->conn, $this->mailbox, $msg_id);
	$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);

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

	// don't trust given content-type
	if (empty($struct->parts) && !empty($struct->headers['ctype']))
	{
	$struct->mime_id = '1';
	$struct->mimetype = strtolower($struct->headers['ctype']);
	list($struct->ctype_primary, $struct->ctype_secondary) = explode('/', $struct->mimetype);
	}

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

	return $struct;
	}


	/**
	* Build message part object
	*
	* @access private
	*/
	function &_structure_part($part, $count=0, $parent='', $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; $i<count($part); $i++)
	if (!is_array($part[$i]))
	{
	$struct->ctype_secondary = strtolower($part[$i]);
	break;
	}

	$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 (strtolower($part[$i][0]) == 'message' \|\|
	(in_array('name', (array)$part[$i][2]) && (empty($part[$i][3]) \|\| $part[$i][3]=='NIL'))) {
	$part_headers[] = $struct->mime_id ? $struct->mime_id.'.'.$i+1 : $i+1;
	}

	// pre-fetch headers of all parts (in one command for better performance)
	if ($part_headers)
	$part_headers = iil_C_FetchMIMEHeaders($this->conn, $this->mailbox, $this->_msg_id, $part_headers);

	$struct->parts = array();
	for ($i=0, $count=0; $i<count($part); $i++)
	if (is_array($part[$i]) && count($part[$i]) > 3)
	$struct->parts[] = $this->_structure_part($part[$i], ++$count, $struct->mime_id,
	$part_headers[$struct->mime_id ? $struck->mime_id.'.'.$i+1 : $i+1]);

	return $struct;
	}


	// regular part
	$struct->ctype_primary = strtolower($part[0]);
	$struct->ctype_secondary = strtolower($part[1]);
	$struct->mimetype = $struct->ctype_primary.'/'.$struct->ctype_secondary;

	// read content type parameters
	if (is_array($part[2]))
	{
	$struct->ctype_parameters = array();
	for ($i=0; $i<count($part[2]); $i+=2)
	$struct->ctype_parameters[strtolower($part[2][$i])] = $part[2][$i+1];

	if (isset($struct->ctype_parameters['charset']))
	$struct->charset = $struct->ctype_parameters['charset'];
	}

	// read content encoding
	if (!empty($part[5]) && $part[5]!='NIL')
	{
	$struct->encoding = strtolower($part[5]);
	$struct->headers['content-transfer-encoding'] = $struct->encoding;
	}

	// get part size
	if (!empty($part[6]) && $part[6]!='NIL')
	$struct->size = intval($part[6]);

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

	if (is_array($part[$di][1]))
	for ($n=0; $n<count($part[$di][1]); $n+=2)
	$struct->d_parameters[strtolower($part[$di][1][$n])] = $part[$di][1][$n+1];
	}

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

	// get part ID
	if (!empty($part[3]) && $part[3]!='NIL')
	{
	$struct->content_id = $part[3];
	$struct->headers['content-id'] = $part[3];

	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($raw_headers))
	$raw_headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $struct->mime_id);
	$struct->headers = $this->_parse_headers($raw_headers) + $struct->headers;
	}

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

	// normalize filename property
	$this->_set_part_filename($struct, $raw_headers);

	return $struct;
	}


	/**
	* Set attachment filename from message part structure
	*
	* @access private
	* @param object rcube_message_part Part object
	* @param string Part's raw headers
	*/
	function _set_part_filename(&$part, $headers=null)
	{
	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, $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, $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, $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, $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 : 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);
	}
	}


	/**
	* Fetch message body of a specific message from the server
	*
	* @param int Message UID
	* @param string Part number
	* @param object rcube_message_part Part object created by get_structure()
	* @param mixed True to print part, ressource to write part contents in
	* @param resource File pointer to save the message part
	* @return string Message/part body if not printed
	*/
	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 = iml_GetRawStructureArray($structure_str);
	$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');
	$o_part->encoding = strtolower(iml_GetPartEncodingString($structure, $part));
	$o_part->charset = iml_GetPartCharset($structure, $part);
	}

	// TODO: Add caching for message parts

	if (!$part) $part = 'TEXT';

	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;
	}
	}
	else
	{
	if ($fp && $o_part->encoding == 'base64')
	return iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part, 3, $fp);
	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);
	}

	if ($fp)
	{
	fwrite($fp, $body);
	return true;
	}
	}

	return $body;
	}


	/**
	* Fetch message body of a specific message from the server
	*
	* @param int Message UID
	* @return string Message/part body
	* @see rcube_imap::get_message_part()
	*/
	function &get_body($uid, $part=1)
	{
	$headers = $this->get_headers($uid);
	return rcube_charset_convert(
	$this->mime_decode($this->get_message_part($uid, $part), 'quoted-printable'),
	$headers->charset ? $headers->charset : $this->default_charset);
	}


	/**
	* Returns the whole message source as string
	*
	* @param int Message UID
	* @return string Message source string
	*/
	function &get_raw_body($uid)
	{
	if (!($msg_id = $this->_uid2id($uid)))
	return FALSE;

	return iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id);
	}


	/**
	* Returns the message headers as string
	*
	* @param int Message UID
	* @return string Message headers string
	*/
	function &get_raw_headers($uid)
	{
	if (!($msg_id = $this->_uid2id($uid)))
	return FALSE;

	$headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $msg_id, NULL);

	return $headers;
	}


	/**
	* Sends the whole message source to stdout
	*
	* @param int Message UID
	*/
	function print_raw_body($uid)
	{
	if (!($msg_id = $this->_uid2id($uid)))
	return FALSE;

	iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, NULL, 2);
	}


	/**
	* Set message flag to one or several messages
	*
	* @param mixed Message UIDs as array or as comma-separated string
	* @param string Flag to set: SEEN, UNDELETED, DELETED, RECENT, ANSWERED, DRAFT, MDNSENT
	* @return boolean True on success, False on failure
	*/
	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 if ($flag=='UNFLAGGED')
	$result = iil_C_UnFlag($this->conn, $this->mailbox, join(',', array_values($msg_ids)), 'FLAGGED');
	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
	*
	* @param string Target mailbox
	* @param string Message source
	* @return boolean True on success, False on error
	*/
	function save_message($mbox_name, &$message)
	{
	$mailbox = $this->_mod_mailbox($mbox_name);

	// make sure mailbox exists
	if (($mailbox == 'INBOX') \|\| 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
	*
	* @param string List of UIDs to move, separated by comma
	* @param string Target mailbox
	* @param string Source mailbox
	* @return boolean True on success, False on error
	*/
	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 ($to_mbox != 'INBOX' && !in_array($to_mbox, $this->_list_mailboxes()))
	{
	if (in_array($to_mbox_in, $this->default_folders))
	$this->create_mailbox($to_mbox_in, 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);

	$iil_move = iil_C_Move($this->conn, join(',', $a_mids), $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) {
	// but only when flag_for_deletion is set to false
	if (!rcmail::get_instance()->config->get('flag_for_deletion', false))
	{
	$this->_expunge($from_mbox, FALSE);
	$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_mids));
	}

	// remove message ids from search set
	if ($moved && $this->search_set && $from_mbox == $this->mailbox)
	$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);
	}

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

	return $moved;
	}


	/**
	* Mark messages as deleted and expunge mailbox
	*
	* @param string List of UIDs to move, separated by comma
	* @param string Source mailbox
	* @return boolean True on success, False on error
	*/
	function delete_message($uids, $mbox_name='')
	{
	$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))
	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);
	unset($this->uid_id_map[$mailbox]);
	}

	// remove message ids from search set
	if ($deleted && $this->search_set && $mailbox == $this->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);
	}

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

	return $deleted;
	}


	/**
	* Clear all messages in a specific mailbox
	*
	* @param string Mailbox name
	* @return int Above 0 on success
	*/
	function clear_mailbox($mbox_name=NULL)
	{
	$mailbox = !empty($mbox_name) ? $this->_mod_mailbox($mbox_name) : $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
	*
	* @param string Mailbox name
	* @param boolean False if cache should not be cleared
	* @return boolean True on success
	*/
	function expunge($mbox_name='', $clear_cache=TRUE)
	{
	$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
	return $this->_expunge($mailbox, $clear_cache);
	}


	/**
	* Send IMAP expunge command and clear cache
	*
	* @see rcube_imap::expunge()
	* @access private
	*/
	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
	* --------------------------------*/


	/**
	* Get a list of all folders available on the IMAP server
	*
	* @param string IMAP root dir
	* @return array Indexed array with folder names
	*/
	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)
	{
	$name = $this->_mod_mailbox($mbox_name, 'out');
	if (strlen($name))
	$a_folders[] = $name;
	}

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


	/**
	* Get mailbox quota information
	* added by Nuny
	*
	* @return mixed Quota info or False if not supported
	*/
	function get_quota()
	{
	if ($this->get_capability('QUOTA'))
	return iil_C_GetQuota($this->conn);

	return FALSE;
	}


	/**
	* Subscribe to a specific mailbox(es)
	*
	* @param array Mailbox name(s)
	* @return boolean True on success
	*/
	function subscribe($a_mboxes)
	{
	if (!is_array($a_mboxes))
	$a_mboxes = array($a_mboxes);

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


	/**
	* Unsubscribe mailboxes
	*
	* @param array Mailbox name(s)
	* @return boolean True on success
	*/
	function unsubscribe($a_mboxes)
	{
	if (!is_array($a_mboxes))
	$a_mboxes = array($a_mboxes);

	// 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
	*
	* @param string New mailbox name (as utf-7 string)
	* @param boolean True if the new mailbox should be subscribed
	* @param string Name of the created mailbox, false on error
	*/
	function create_mailbox($name, $subscribe=FALSE)
	{
	$result = FALSE;

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

	$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)))
	$result = iil_C_CreateFolder($this->conn, $abs_name);

	// try to subscribe it
	if ($result && $subscribe)
	$this->subscribe($name);

	return $result ? $name : FALSE;
	}


	/**
	* Set a new name to an existing mailbox
	*
	* @param string Mailbox to rename (as utf-7 string)
	* @param string New mailbox name (as utf-7 string)
	* @return string Name of the renames mailbox, False on error
	*/
	function rename_mailbox($mbox_name, $new_name)
	{
	$result = FALSE;

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

	// check if mailbox is subscribed
	$a_subscribed = $this->_list_mailboxes();
	$subscribed = in_array($mailbox, $a_subscribed);

	// unsubscribe folder
	if ($subscribed)
	iil_C_UnSubscribe($this->conn, $mailbox);

	if (strlen($abs_name))
	$result = iil_C_RenameFolder($this->conn, $mailbox, $abs_name);

	if ($result)
	{
	$delm = $this->get_hierarchy_delimiter();

	// check if mailbox children are subscribed
	foreach ($a_subscribed as $c_subscribed)
	if (preg_match('/^'.preg_quote($mailbox.$delm, '/').'/', $c_subscribed))
	{
	iil_C_UnSubscribe($this->conn, $c_subscribed);
	iil_C_Subscribe($this->conn, preg_replace('/^'.preg_quote($mailbox, '/').'/', $abs_name, $c_subscribed));
	}

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

	// try to subscribe it
	if ($result && $subscribed)
	iil_C_Subscribe($this->conn, $abs_name);

	return $result ? $name : FALSE;
	}


	/**
	* Remove mailboxes from server
	*
	* @param string Mailbox name
	* @return boolean True on success
	*/
	function delete_mailbox($mbox_name)
	{
	$deleted = FALSE;

	if (is_array($mbox_name))
	$a_mboxes = $mbox_name;
	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), '*');

	if (is_array($a_mboxes))
	foreach ($a_mboxes as $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)
	$deleted = TRUE;

	foreach ($all_mboxes as $c_mbox)
	{
	$regex = preg_quote($mailbox . $this->delimiter, '/');
	$regex = '/^' . $regex . '/';
	if (preg_match($regex, $c_mbox))
	{
	iil_C_UnSubscribe($this->conn, $c_mbox);
	$result = iil_C_DeleteFolder($this->conn, $c_mbox);
	if ($result>=0)
	$deleted = TRUE;
	}
	}
	}

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

	return $deleted;
	}


	/**
	* Create all folders specified as default
	*/
	function create_default_folders()
	{
	$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))
	$this->create_mailbox($folder, TRUE);
	else if (!in_array_nocase($abs_name, $a_subscribed))
	$this->subscribe($folder);
	}
	}



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

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

	/**
	* @access private
	*/
	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];
	}

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

	/**
	* @access private
	*/
	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));
	}
	}
	}

	/**
	* @access private
	*/
	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->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]);
	}
	}

	/**
	* @access 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
	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;
	}

	/**
	* @access 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=?
	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 (".$this->db->now().", ?, ?, ?)",
	$_SESSION['user_id'],
	$key,
	$data);
	}
	}

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



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


	/**
	* Checks if the cache is up-to-date
	*
	* @param string Mailbox name
	* @param string Internal cache key
	* @return int -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");
	+ $header = iil_C_FetchHeader($this->conn, $mailbox, "$msg_count", false, $this->fetch_add_headers);
	$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;
	}

	/**
	* @access 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))
	$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']);

	// 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)
	{
	$internal_key = '__single_msg';

	if ($this->caching_enabled && (!isset($this->cache[$internal_key][$uid]) \|\|
	($struct && empty($this->cache[$internal_key][$uid]->structure))))
	{
	$sql_select = "idx, uid, headers" . ($struct ? ", structure" : '');
	$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))
	{
	$this->cache[$internal_key][$uid] = 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']);
	}
	}

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

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

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

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

	$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_field)." ".$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];
	}

	/**
	* @access private
	*/
	function add_message_cache($key, $index, $headers, $struct=null)
	{
	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]->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(
	"SELECT message_id
	FROM ".get_table_name('messages')."
	WHERE user_id=?
	AND cache_key=?
	AND uid=?
	AND del<>1",
	$_SESSION['user_id'],
	$key,
	$headers->uid);

	// update cache record
	if ($sql_arr = $this->db->fetch_assoc($sql_result))
	{
	$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']
	);
	}
	else // insert new record
	{
	$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, structure)
	VALUES (?, 0, ?, ".$this->db->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),
	is_object($struct) ? serialize($struct) : NULL
	);
	}
	}

	/**
	* @access private
	*/
	function remove_message_cache($key, $index)
	{
	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,
	$index);
	}

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




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

	/**
	* Split an address list into a structured array list
	*
	* @param string Input string
	* @param int List only this number of addresses
	* @param boolean Decode address strings
	* @return array Indexed list of addresses
	*/
	function decode_address_list($input, $max=null, $decode=true)
	{
	$a = $this->_parse_address_list($input, $decode);
	$out = array();
	// Special chars as defined by RFC 822 need to in quoted string (or escaped).
	$special_chars = '[\<\>\\\.\[\]@,;:"]';

	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']));
	if ($name && $address && $name != $address)
	$string = sprintf('%s <%s>', preg_match("/$special_chars/", $name) ? '"'.addcslashes($name, '"').'"' : $name, $address);
	else if ($address)
	$string = $address;
	else if ($name)
	$string = $name;

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

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

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


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

	return $str;
	}


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

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

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

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

	// 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 : rcmail::get_instance()->config->get('default_charset', 'ISO-8859-1'));
	}


	/**
	* Decode a part of a mime-encoded string
	*
	* @access private
	*/
	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
	}


	/**
	* Decode a mime part
	*
	* @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;

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

	default:
	return $input;
	}
	}


	/**
	* Convert body charset to UTF-8 according to the ctype_parameters
	*
	* @param string Part body to decode
	* @param string Charset to convert from
	* @return string Content converted to internal charset
	*/
	function charset_decode($body, $ctype_param)
	{
	if (is_array($ctype_param) && !empty($ctype_param['charset']))
	return rcube_charset_convert($body, $ctype_param['charset']);

	// defaults to what is specified in the class header
	return rcube_charset_convert($body, $this->default_charset);
	}


	/**
	* Translate UID to message ID
	*
	* @param int Message UID
	* @param string Mailbox name
	* @return int Message ID
	*/
	function get_id($uid, $mbox_name=NULL)
	{
	$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
	return $this->_uid2id($uid, $mailbox);
	}


	/**
	* Translate message number to UID
	*
	* @param int Message ID
	* @param string Mailbox name
	* @return int Message UID
	*/
	function get_uid($id,$mbox_name=NULL)
	{
	$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
	return $this->_id2uid($id, $mailbox);
	}



	/* --------------------------------
	* 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)
	{
	if ($sort_field != null)
	$this->sort_field = asciiwords($sort_field);
	if ($sort_order != null)
	$this->sort_order = strtoupper($sort_order) == 'DESC' ? 'DESC' : 'ASC';
	}

	/**
	* Sort mailboxes first by default folders and then in alphabethical order
	* @access private
	*/
	function _sort_mailbox_list($a_folders)
	{
	$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)
	{
	if ($folder{0}=='.')
	continue;

	if (($p = array_search(strtolower($folder), $this->default_folders_lc)) !== false && !$a_defaults[$p])
	$a_defaults[$p] = $folder;
	else
	$folders[$folder] = rc_strtolower(rcube_charset_convert($folder, 'UTF-7'));
	}

	// sort folders and place defaults on the top
	asort($folders, SORT_LOCALE_STRING);
	ksort($a_defaults);
	$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 _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
	*/
	function _uid2id($uid, $mbox_name=NULL)
	{
	if (!$mbox_name)
	$mbox_name = $this->mailbox;

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

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

	/**
	* @access 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;
	}

	return $uid;
	}


	/**
	* Subscribe/unsubscribe a list of mailboxes and update local cache
	* @access 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);
	$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
	* @access private
	*/
	function _set_messagecount($mbox_name, $mode, $increment)
	{
	$a_mailbox_cache = FALSE;
	$mailbox = $mbox_name ? $mbox_name : $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
	* @access private
	*/
	function _clear_messagecount($mbox_name='')
	{
	$a_mailbox_cache = FALSE;
	$mailbox = $mbox_name ? $mbox_name : $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);
	}
	}


	/**
	* Split RFC822 header string into an associative array
	* @access private
	*/
	function _parse_headers($headers)
	{
	$a_headers = array();
	$lines = explode("\n", $headers);
	$c = count($lines);
	for ($i=0; $i<$c; $i++)
	{
	if ($p = strpos($lines[$i], ': '))
	{
	$field = strtolower(substr($lines[$i], 0, $p));
	$value = trim(substr($lines[$i], $p+1));
	if (!empty($value))
	$a_headers[$field] = $value;
	}
	}

	return $a_headers;
	}


	/**
	* @access private
	*/
	function _parse_address_list($str, $decode=true)
	{
	// remove any newlines and carriage returns before
	$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 = rcube_explode_quoted_string(' ', $decode ? $this->decode_header($val) : $val);
	$result[$key]['name'] = '';

	foreach ($sub_a as $k => $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;
	}

	} // end class rcube_imap


	/**
	* Class representing a message part
	*
	* @package Mail
	*/
	class rcube_message_part
	{
	var $mime_id = '';
	var $ctype_primary = 'text';
	var $ctype_secondary = 'plain';
	var $mimetype = 'text/plain';
	var $disposition = '';
	var $filename = '';
	var $encoding = '8bit';
	var $charset = '';
	var $size = 0;
	var $headers = array();
	var $d_parameters = array();
	var $ctype_parameters = array();

	}


	/**
	* Class for sorting an array of iilBasicHeader objects in a predetermined order.
	*
	* @package Mail
	* @author Eric Stadtherr
	*/
	class rcube_header_sorter
	{
	var $sequence_numbers = array();

	/**
	* Set the predetermined sort order.
	*
	* @param array Numerically indexed array of IMAP message sequence numbers
	*/
	function set_sequence_numbers($seqnums)
	{
	$this->sequence_numbers = array_flip($seqnums);
	}

	/**
	* Sort the array of header objects
	*
	* @param array Array of iilBasicHeader objects indexed by UID
	*/
	function sort_headers(&$headers)
	{
	/*
	* uksort would work if the keys were the sequence number, but unfortunately
	* the keys are the UIDs. We'll use uasort instead and dereference the value
	* to get the sequence number (in the "id" field).
	*
	* uksort($headers, array($this, "compare_seqnums"));
	*/
	uasort($headers, array($this, "compare_seqnums"));
	}

	/**
	* Sort method called by uasort()
	*/
	function compare_seqnums($a, $b)
	{
	// First get the sequence number from the header object (the 'id' field).
	$seqa = $a->id;
	$seqb = $b->id;

	// then find each sequence number in my ordered list
	$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
	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);
	}


	diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
	index 0bd3a2bad..a14f4ae14 100644
	--- a/program/include/rcube_json_output.php
	+++ b/program/include/rcube_json_output.php
	@@ -1,255 +1,255 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_json_output.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2008-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Class to handle HTML page output using a skin template. \|
	\| Extends rcube_html_page class from rcube_shared.inc \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: $

	*/


	/**
	* View class to produce JSON responses
	*
	* @package View
	*/
	class rcube_json_output
	{
	private $config;
	private $charset = 'UTF-8';
	private $env = array();
	private $texts = array();
	private $commands = array();

	public $type = 'js';
	public $ajax_call = true;


	/**
	* Constructor
	*/
	public function __construct($task)
	{
	$this->config = rcmail::get_instance()->config;
	}


	/**
	* Set environment variable
	*
	* @param string Property name
	* @param mixed Property value
	*/
	public function set_env($name, $value)
	{
	$this->env[$name] = $value;
	}

	/**
	* Issue command to set page title
	*
	* @param string New page title
	*/
	public function set_pagetitle($title)
	{
	$name = $this->config->get('product_name');
	$this->command('set_pagetitle', JQ(empty($name) ? $title : $name.' :: '.$title));
	}

	/**
	* @ignore
	*/
	function set_charset($charset)
	{
	// ignore: $this->charset = $charset;
	}


	/**
	* Get charset for output
	*
	* @return string Output charset
	*/
	function get_charset()
	{
	return $this->charset;
	}


	/**
	* Register a template object handler
	*
	* @param string Object name
	* @param string Function name to call
	* @return void
	*/
	public function add_handler($obj, $func)
	{
	// ignore
	}

	/**
	* Register a list of template object handlers
	*
	* @param array Hash array with object=>handler pairs
	* @return void
	*/
	public function add_handlers($arr)
	{
	// ignore
	}


	/**
	* Call a client method
	*
	* @param string Method to call
	* @param ... Additional arguments
	*/
	public function command()
	{
	$this->commands[] = func_get_args();
	}


	/**
	* Add a localized label to the client environment
	*/
	public function add_label()
	{
	$arg_list = func_get_args();
	foreach ($arg_list as $i => $name) {
	$this->texts[$name] = rcube_label($name);
	}
	}


	/**
	* Invoke display_message command
	*
	* @param string Message to display
	* @param string Message type [notice\|confirm\|error]
	* @param array Key-value pairs to be replaced in localized text
	* @uses self::command()
	*/
	public function show_message($message, $type='notice', $vars=null)
	{
	$this->command(
	'display_message',
	rcube_label(array('name' => $message, 'vars' => $vars)),
	$type
	);
	}

	/**
	* Delete all stored env variables and commands
	*/
	public function reset()
	{
	$this->env = array();
	$this->texts = array();
	$this->commands = array();
	}

	/**
	* Redirect to a certain url
	*
	* @param mixed Either a string with the action or url parameters as key-value pairs
	* @see rcmail::url()
	*/
	public function redirect($p = array(), $delay = 1)
	{
	$location = rcmail::get_instance()->url($p);
	$this->remote_response("window.setTimeout(\"location.href='{$location}'\", $delay);");
	exit;
	}


	/**
	* Send an AJAX response to the client.
	*/
	public function send()
	{
	$this->remote_response();
	exit;
	}


	/**
	* Send an AJAX response with executable JS code
	*
	* @param string Additional JS code
	* @param boolean True if output buffer should be flushed
	* @return void
	* @deprecated
	*/
	- public function remote_response($add='', $flush=false)
	+ public function remote_response($add='')
	{
	static $s_header_sent = false;

	if (!$s_header_sent) {
	$s_header_sent = true;
	send_nocacheing_headers();
	- header('Content-Type: application/x-javascript; charset=' . $this->get_charset());
	+ header('Content-Type: text/plain; charset=' . $this->get_charset());
	print '/ ajax response ['.date('d/M/Y h:i:s O')."] /\n";
	}

	// unset default env vars
	unset($this->env['task'], $this->env['action'], $this->env['comm_path']);

	+ $rcmail = rcmail::get_instance();
	+ $response = array('action' => $rcmail->action, 'unlock' => (bool)$_REQUEST['_unlock']);
	+
	+ if (!empty($this->env))
	+ $response['env'] = $this->env;
	+
	+ if (!empty($this->texts))
	+ $response['texts'] = $this->texts;
	+
	// send response code
	- echo $this->get_js_commands() . $add;
	+ $response['exec'] = $this->get_js_commands() . $add;

	- // flush the output buffer
	- if ($flush)
	- flush();
	+ echo json_serialize($response);
	}


	/**
	* Return executable javascript code for all registered commands
	*
	* @return string $out
	*/
	private function get_js_commands()
	{
	$out = '';
	-
	- if (sizeof($this->env))
	- $out .= 'this.set_env('.json_serialize($this->env).");\n";

	- foreach($this->texts as $name => $text) {
	- $out .= sprintf("this.add_label('%s', '%s');\n", $name, JQ($text));
	- }
	-
	foreach ($this->commands as $i => $args) {
	$method = array_shift($args);
	foreach ($args as $i => $arg) {
	$args[$i] = json_serialize($arg);
	}

	$out .= sprintf(
	"this.%s(%s);\n",
	preg_replace('/^parent\./', '', $method),
	implode(',', $args)
	);
	}

	return $out;
	}
	}


	diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
	index 016fe94d5..544c7f744 100644
	--- a/program/include/rcube_ldap.php
	+++ b/program/include/rcube_ldap.php
	@@ -1,597 +1,597 @@
	<?php
	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_ldap.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2006-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Interface to an LDAP address directory \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/


	/**
	* Model class to access an LDAP address directory
	*
	* @package Addressbook
	*/
	-class rcube_ldap
	+class rcube_ldap extends rcube_addressbook
	{
	var $conn;
	var $prop = array();
	var $fieldmap = array();

	var $filter = '';
	var $result = null;
	var $ldap_result = null;
	var $sort_col = '';

	/** public properties */
	var $primary_key = 'ID';
	var $readonly = true;
	var $list_page = 1;
	var $page_size = 10;
	var $ready = false;


	/**
	* Object constructor
	*
	* @param array LDAP connection properties
	* @param integer User-ID
	*/
	function __construct($p)
	{
	$this->prop = $p;

	foreach ($p as $prop => $value)
	if (preg_match('/^(.+)_field$/', $prop, $matches))
	$this->fieldmap[$matches[1]] = $value;

	$this->sort_col = $p["sort"];

	$this->connect();
	}


	/**
	* Establish a connection to the LDAP server
	*/
	function connect()
	{
	global $RCMAIL;

	if (!function_exists('ldap_connect'))
	raise_error(array('code' => 100, 'type' => 'ldap', 'message' => "No ldap support in this installation of PHP"), true);

	if (is_resource($this->conn))
	return true;

	if (!is_array($this->prop['hosts']))
	$this->prop['hosts'] = array($this->prop['hosts']);

	if (empty($this->prop['ldap_version']))
	$this->prop['ldap_version'] = 3;

	foreach ($this->prop['hosts'] as $host)
	{
	if ($lc = @ldap_connect($host, $this->prop['port']))
	{
	if ($this->prop['use_tls']===true)
	if (!ldap_start_tls($lc))
	continue;

	ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['ldap_version']);
	$this->prop['host'] = $host;
	$this->conn = $lc;
	break;
	}
	}

	if (is_resource($this->conn))
	{
	$this->ready = true;

	// User specific access, generate the proper values to use.
	if ($this->prop["user_specific"]) {
	// No password set, use the session password
	if (empty($this->prop['bind_pass'])) {
	$this->prop['bind_pass'] = $RCMAIL->decrypt_passwd($_SESSION["password"]);
	}

	// Get the pieces needed for variable replacement.
	$fu = $RCMAIL->user->get_username();
	list($u, $d) = explode('@', $fu);

	// Replace the bind_dn and base_dn variables.
	$replaces = array('%fu' => $fu, '%u' => $u, '%d' => $d);
	$this->prop['bind_dn'] = strtr($this->prop['bind_dn'], $replaces);
	$this->prop['base_dn'] = strtr($this->prop['base_dn'], $replaces);
	}

	if (!empty($this->prop['bind_dn']) && !empty($this->prop['bind_pass']))
	$this->ready = $this->bind($this->prop['bind_dn'], $this->prop['bind_pass']);
	}
	else
	raise_error(array('code' => 100, 'type' => 'ldap', 'message' => "Could not connect to any LDAP server, tried $host:{$this->prop[port]} last"), true);

	// See if the directory is writeable.
	if ($this->prop['writable']) {
	$this->readonly = false;
	} // end if

	}


	/**
	* Bind connection with DN and password
	*
	* @param string Bind DN
	* @param string Bind password
	* @return boolean True on success, False on error
	*/
	function bind($dn, $pass)
	{
	if (!$this->conn) {
	return false;
	}

	if (@ldap_bind($this->conn, $dn, $pass)) {
	return true;
	}

	raise_error(array(
	'code' => ldap_errno($this->conn),
	'type' => 'ldap',
	'message' => "Bind failed for dn=$dn: ".ldap_error($this->conn)),
	true);

	return false;
	}


	/**
	* Close connection to LDAP server
	*/
	function close()
	{
	if ($this->conn)
	{
	@ldap_unbind($this->conn);
	$this->conn = null;
	}
	}


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


	/**
	* Save a search string for future listings
	*
	* @param string Filter string
	*/
	function set_search_set($filter)
	{
	$this->filter = $filter;
	}


	/**
	* Getter for saved search properties
	*
	* @return mixed Search properties used by this class
	*/
	function get_search_set()
	{
	return $this->filter;
	}


	/**
	* Reset all saved results and search parameters
	*/
	function reset()
	{
	$this->result = null;
	$this->ldap_result = null;
	$this->filter = '';
	}


	/**
	* List the current set of contact records
	*
	* @param array List of cols to show
	* @param int Only return this number of records
	* @return array Indexed list of contact records, each a hash array
	*/
	function list_records($cols=null, $subset=0)
	{
	// add general filter to query
	if (!empty($this->prop['filter']) && empty($this->filter))
	{
	$filter = $this->prop['filter'];
	$this->set_search_set($filter);
	}

	// exec LDAP search if no result resource is stored
	if ($this->conn && !$this->ldap_result)
	$this->_exec_search();

	// count contacts for this user
	$this->result = $this->count();

	// we have a search result resource
	if ($this->ldap_result && $this->result->count > 0)
	{
	if ($this->sort_col && $this->prop['scope'] !== "base")
	@ldap_sort($this->conn, $this->ldap_result, $this->sort_col);

	$start_row = $subset < 0 ? $this->result->first + $this->page_size + $subset : $this->result->first;
	$last_row = $this->result->first + $this->page_size;
	$last_row = $subset != 0 ? $start_row + abs($subset) : $last_row;

	$entries = ldap_get_entries($this->conn, $this->ldap_result);
	for ($i = $start_row; $i < min($entries['count'], $last_row); $i++)
	$this->result->add($this->_ldap2result($entries[$i]));
	}

	return $this->result;
	}


	/**
	* Search contacts
	*
	* @param array List of fields to search in
	* @param string Search value
	* @param boolean True if results are requested, False if count only
	* @return array Indexed list of contact records and 'count' value
	*/
	function search($fields, $value, $strict=false, $select=true)
	{
	// special treatment for ID-based search
	if ($fields == 'ID' \|\| $fields == $this->primary_key)
	{
	$ids = explode(',', $value);
	$result = new rcube_result_set();
	foreach ($ids as $id)
	if ($rec = $this->get_record($id, true))
	{
	$result->add($rec);
	$result->count++;
	}

	return $result;
	}

	$filter = '(\|';
	$wc = !$strict && $this->prop['fuzzy_search'] ? '*' : '';
	if (is_array($this->prop['search_fields']))
	{
	foreach ($this->prop['search_fields'] as $k => $field)
	$filter .= "($field=$wc" . rcube_ldap::quote_string($value) . "$wc)";
	}
	else
	{
	foreach ((array)$fields as $field)
	if ($f = $this->_map_field($field))
	$filter .= "($f=$wc" . rcube_ldap::quote_string($value) . "$wc)";
	}
	$filter .= ')';

	// avoid double-wildcard if $value is empty
	$filter = preg_replace('/\+/', '', $filter);

	// add general filter to query
	if (!empty($this->prop['filter']))
	$filter = '(&(' . preg_replace('/^$\|$$/', '', $this->prop['filter']) . ')' . $filter . ')';

	// set filter string and execute search
	$this->set_search_set($filter);
	$this->_exec_search();

	if ($select)
	$this->list_records();
	else
	$this->result = $this->count();

	return $this->result;
	}


	/**
	* Count number of available contacts in database
	*
	* @return object rcube_result_set Resultset with values for 'count' and 'first'
	*/
	function count()
	{
	$count = 0;
	if ($this->conn && $this->ldap_result) {
	$count = ldap_count_entries($this->conn, $this->ldap_result);
	} // end if
	elseif ($this->conn) {
	// We have a connection but no result set, attempt to get one.
	if (empty($this->filter)) {
	// The filter is not set, set it.
	$this->filter = $this->prop['filter'];
	} // end if
	$this->_exec_search();
	if ($this->ldap_result) {
	$count = ldap_count_entries($this->conn, $this->ldap_result);
	} // end if
	} // end else

	return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
	}


	/**
	* Return the last result set
	*
	* @return object rcube_result_set Current resultset or NULL if nothing selected yet
	*/
	function get_result()
	{
	return $this->result;
	}


	/**
	* Get a specific contact record
	*
	* @param mixed Record identifier
	* @param boolean Return as associative array
	* @return mixed Hash array or rcube_result_set with all record fields
	*/
	function get_record($dn, $assoc=false)
	{
	$res = null;
	if ($this->conn && $dn)
	{
	$this->ldap_result = @ldap_read($this->conn, base64_decode($dn), "(objectclass=*)", array_values($this->fieldmap));
	$entry = @ldap_first_entry($this->conn, $this->ldap_result);

	if ($entry && ($rec = ldap_get_attributes($this->conn, $entry)))
	{
	// Add in the dn for the entry.
	$rec["dn"] = base64_decode($dn);
	$res = $this->_ldap2result($rec);
	$this->result = new rcube_result_set(1);
	$this->result->add($res);
	}
	}

	return $assoc ? $res : $this->result;
	}


	/**
	* Create a new contact record
	*
	* @param array Hash array with save data
	* @return encoded record ID on success, False on error
	*/
	function insert($save_cols)
	{
	// Map out the column names to their LDAP ones to build the new entry.
	$newentry = array();
	$newentry["objectClass"] = $this->prop["LDAP_Object_Classes"];
	foreach ($save_cols as $col => $val) {
	$fld = "";
	$fld = $this->_map_field($col);
	if ($fld != "") {
	// The field does exist, add it to the entry.
	$newentry[$fld] = $val;
	} // end if
	} // end foreach

	// Verify that the required fields are set.
	// We know that the email address is required as a default of rcube, so
	// we will default its value into any unfilled required fields.
	foreach ($this->prop["required_fields"] as $fld) {
	if (!isset($newentry[$fld])) {
	$newentry[$fld] = $newentry[$this->_map_field("email")];
	} // end if
	} // end foreach

	// Build the new entries DN.
	$dn = $this->prop["LDAP_rdn"]."=".$newentry[$this->prop["LDAP_rdn"]].",".$this->prop['base_dn'];
	$res = @ldap_add($this->conn, $dn, $newentry);
	if ($res === FALSE) {
	return false;
	} // end if

	return base64_encode($dn);
	}


	/**
	* Update a specific contact record
	*
	* @param mixed Record identifier
	* @param array Hash array with save data
	* @return boolean True on success, False on error
	*/
	function update($id, $save_cols)
	{
	$record = $this->get_record($id, true);
	$result = $this->get_result();
	$record = $result->first();

	$newdata = array();
	$replacedata = array();
	$deletedata = array();
	foreach ($save_cols as $col => $val) {
	$fld = "";
	$fld = $this->_map_field($col);
	if ($fld != "") {
	// The field does exist compare it to the ldap record.
	if ($record[$col] != $val) {
	// Changed, but find out how.
	if (!isset($record[$col])) {
	// Field was not set prior, need to add it.
	$newdata[$fld] = $val;
	} // end if
	elseif ($val == "") {
	// Field supplied is empty, verify that it is not required.
	if (!in_array($fld, $this->prop["required_fields"])) {
	// It is not, safe to clear.
	$deletedata[$fld] = $record[$col];
	} // end if
	} // end elseif
	else {
	// The data was modified, save it out.
	$replacedata[$fld] = $val;
	} // end else
	} // end if
	} // end if
	} // end foreach

	// Update the entry as required.
	$dn = base64_decode($id);
	if (!empty($deletedata)) {
	// Delete the fields.
	$res = @ldap_mod_del($this->conn, $dn, $deletedata);
	if ($res === FALSE) {
	return false;
	} // end if
	} // end if

	if (!empty($replacedata)) {
	// Replace the fields.
	$res = @ldap_mod_replace($this->conn, $dn, $replacedata);
	if ($res === FALSE) {
	return false;
	} // end if
	} // end if

	if (!empty($newdata)) {
	// Add the fields.
	$res = @ldap_mod_add($this->conn, $dn, $newdata);
	if ($res === FALSE) {
	return false;
	} // end if
	} // end if

	return true;
	}


	/**
	* Mark one or more contact records as deleted
	*
	* @param array Record identifiers
	* @return boolean True on success, False on error
	*/
	function delete($ids)
	{
	if (!is_array($ids)) {
	// Not an array, break apart the encoded DNs.
	$dns = explode(",", $ids);
	} // end if

	foreach ($dns as $id) {
	$dn = base64_decode($id);
	// Delete the record.
	$res = @ldap_delete($this->conn, $dn);
	if ($res === FALSE) {
	return false;
	} // end if
	} // end foreach

	return true;
	}


	/**
	* Execute the LDAP search based on the stored credentials
	*
	* @access private
	*/
	function _exec_search()
	{
	if ($this->ready && $this->filter)
	{
	$function = $this->prop['scope'] == 'sub' ? 'ldap_search' : ($this->prop['scope'] == 'base' ? 'ldap_read' : 'ldap_list');
	$this->ldap_result = $function($this->conn, $this->prop['base_dn'], $this->filter, array_values($this->fieldmap), 0, 0);
	return true;
	}
	else
	return false;
	}


	/**
	* @access private
	*/
	function _ldap2result($rec)
	{
	$out = array();

	if ($rec['dn'])
	$out[$this->primary_key] = base64_encode($rec['dn']);

	foreach ($this->fieldmap as $rf => $lf)
	{
	if ($rec[$lf]['count'])
	$out[$rf] = $rec[$lf][0];
	}

	return $out;
	}


	/**
	* @access private
	*/
	function _map_field($field)
	{
	return $this->fieldmap[$field];
	}


	/**
	* @static
	*/
	function quote_string($str)
	{
	return strtr($str, array('*'=>'\2a', '('=>'\28', ')'=>'\29', '\\'=>'\5c'));
	}


	}


	diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
	index ec3be4b00..5c03b2147 100644
	--- a/program/include/rcube_message.php
	+++ b/program/include/rcube_message.php
	@@ -1,446 +1,449 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_message.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2008-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Logical representation of a mail message with all its data \|
	\| and related functions \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: rcube_imap.php 1344 2008-04-30 08:21:42Z thomasb $

	*/


	/**
	* Logical representation of a mail message with all its data
	* and related functions
	*
	* @package Mail
	* @author Thomas Bruederli <roundcube@gmail.com>
	*/
	class rcube_message
	{
	private $app;
	private $imap;
	private $opt = array();
	private $inline_parts = array();
	private $parse_alternative = false;

	public $uid = null;
	public $headers;
	public $structure;
	public $parts = array();
	public $mime_parts = array();
	public $attachments = array();
	public $subject = '';
	public $sender = null;
	public $is_safe = false;


	/**
	* __construct
	*
	* Provide a uid, and parse message structure.
	*
	* @param string $uid The message UID.
	*
	* @uses rcmail::get_instance()
	* @uses rcube_imap::decode_mime_string()
	* @uses self::set_safe()
	*
	* @see self::$app, self::$imap, self::$opt, self::$structure
	*/
	function __construct($uid)
	{
	$this->app = rcmail::get_instance();
	$this->imap = $this->app->imap;

	$this->uid = $uid;
	$this->headers = $this->imap->get_headers($uid, NULL, true, true);

	$this->subject = rcube_imap::decode_mime_string($this->headers->subject, $this->headers->charset);
	list(, $this->sender) = each($this->imap->decode_address_list($this->headers->from));

	$this->set_safe((intval($_GET['_safe']) \|\| $_SESSION['safe_messages'][$uid]));
	$this->opt = array(
	'safe' => $this->is_safe,
	'prefer_html' => $this->app->config->get('prefer_html'),
	'get_url' => rcmail_url('get', array('_mbox' => $this->imap->get_mailbox_name(), '_uid' => $uid))
	);

	if ($this->structure = $this->imap->get_structure($uid, $this->headers->body_structure)) {
	$this->get_mime_numbers($this->structure);
	$this->parse_structure($this->structure);
	}
	else {
	$this->body = $this->imap->get_body($uid);
	}
	+
	+ // notify plugins and let them analyze this structured message object
	+ $this->app->plugins->exec_hook('message_load', array('object' => $this));
	}


	/**
	* Return a (decoded) message header
	*
	* @param string Header name
	* @param bool Don't mime-decode the value
	* @return string Header value
	*/
	public function get_header($name, $raw = false)
	{
	$value = $this->headers->$name;
	return $raw ? $value : $this->imap->decode_header($value);
	}

	/**
	* Set is_safe var and session data
	*
	* @param bool enable/disable
	*/
	public function set_safe($safe = true)
	{
	$this->is_safe = $safe;
	$_SESSION['safe_messages'][$this->uid] = $this->is_safe;
	}

	/**
	* Compose a valid URL for getting a message part
	*
	* @param string Part MIME-ID
	* @return string URL or false if part does not exist
	*/
	public function get_part_url($mime_id)
	{
	if ($this->mime_parts[$mime_id])
	return $this->opt['get_url'] . "&_part=" . $mime_id;
	else
	return false;
	}


	/**
	* Get content of a specific part of this message
	*
	* @param string Part MIME-ID
	* @param resource File pointer to save the message part
	* @return string Part content
	*/
	public function get_part_content($mime_id, $fp=NULL)
	{
	if ($part = $this->mime_parts[$mime_id])
	return $this->imap->get_message_part($this->uid, $mime_id, $part, NULL, $fp);
	else
	return null;
	}


	/**
	* Determine if the message contains a HTML part
	*
	* @return bool True if a HTML is available, False if not
	*/
	function has_html_part()
	{
	// check all message parts
	foreach ($this->parts as $pid => $part) {
	$mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
	if ($mimetype == 'text/html')
	return true;
	}

	return false;
	}

	/**
	* Return the first HTML part of this message
	*
	* @return string HTML message part content
	*/
	function first_html_part()
	{
	// check all message parts
	foreach ($this->mime_parts as $mime_id => $part) {
	$mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
	if ($mimetype == 'text/html') {
	return $this->imap->get_message_part($this->uid, $mime_id, $part);
	}
	}
	}


	/**
	* Return the first text part of this message
	*
	* @return string Plain text message/part content
	*/
	function first_text_part()
	{
	// no message structure, return complete body
	if (empty($this->parts))
	return $this->body;

	$out = null;

	// check all message parts
	foreach ($this->mime_parts as $mime_id => $part) {
	$mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);

	if ($mimetype == 'text/plain') {
	$out = $this->imap->get_message_part($this->uid, $mime_id, $part);
	break;
	}
	else if ($mimetype == 'text/html') {
	$html_part = $this->imap->get_message_part($this->uid, $mime_id, $part);

	// remove special chars encoding
	$trans = array_flip(get_html_translation_table(HTML_ENTITIES));
	$html_part = strtr($html_part, $trans);

	// create instance of html2text class
	$txt = new html2text($html_part);
	$out = $txt->get_text();
	break;
	}
	}

	return $out;
	}


	/**
	* Raad the message structure returend by the IMAP server
	* and build flat lists of content parts and attachments
	*
	* @param object rcube_message_part Message structure node
	* @param bool True when called recursively
	*/
	private function parse_structure($structure, $recursive = false)
	{
	$message_ctype_primary = strtolower($structure->ctype_primary);
	$message_ctype_secondary = strtolower($structure->ctype_secondary);

	// show message headers
	if ($recursive && is_array($structure->headers) && isset($structure->headers['subject'])) {
	$c = new stdClass;
	$c->type = 'headers';
	$c->headers = &$structure->headers;
	$this->parts[] = $c;
	}

	// print body if message doesn't have multiple parts
	if ($message_ctype_primary == 'text' && !$recursive) {
	$structure->type = 'content';
	$this->parts[] = &$structure;
	}
	// the same for pgp signed messages
	else if ($message_ctype_primary == 'application' && $message_ctype_secondary == 'pgp' && !$recursive) {
	$structure->type = 'content';
	$this->parts[] = &$structure;
	}
	// message contains alternative parts
	else if ($message_ctype_primary == 'multipart' && ($message_ctype_secondary == 'alternative') && is_array($structure->parts)) {
	// get html/plaintext parts
	$plain_part = $html_part = $print_part = $related_part = null;

	foreach ($structure->parts as $p => $sub_part) {
	$rel_parts = $attachmnts = null;
	$sub_ctype_primary = strtolower($sub_part->ctype_primary);
	$sub_ctype_secondary = strtolower($sub_part->ctype_secondary);

	// check if sub part is
	if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='plain')
	$plain_part = $p;
	else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='html')
	$html_part = $p;
	else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='enriched')
	$enriched_part = $p;
	else if ($sub_ctype_primary=='multipart' && in_array($sub_ctype_secondary, array('related', 'mixed', 'alternative')))
	$related_part = $p;
	}

	// parse related part (alternative part could be in here)
	if ($related_part !== null && !$this->parse_alternative) {
	$this->parse_alternative = true;
	$this->parse_structure($structure->parts[$related_part], true);
	$this->parse_alternative = false;

	// if plain part was found, we should unset it if html is preferred
	if ($this->opt['prefer_html'] && count($this->parts))
	$plain_part = null;
	}

	// choose html/plain part to print
	if ($html_part !== null && $this->opt['prefer_html']) {
	$print_part = &$structure->parts[$html_part];
	}
	else if ($enriched_part !== null) {
	$print_part = &$structure->parts[$enriched_part];
	}
	else if ($plain_part !== null) {
	$print_part = &$structure->parts[$plain_part];
	}

	// add the right message body
	if (is_object($print_part)) {
	$print_part->type = 'content';
	$this->parts[] = $print_part;
	}
	// show plaintext warning
	else if ($html_part !== null && empty($this->parts)) {
	$c = new stdClass;
	$c->type = 'content';
	$c->body = rcube_label('htmlmessage');
	$c->ctype_primary = 'text';
	$c->ctype_secondary = 'plain';

	$this->parts[] = $c;
	}

	// add html part as attachment
	if ($html_part !== null && $structure->parts[$html_part] !== $print_part) {
	$html_part = &$structure->parts[$html_part];
	$html_part->filename = rcube_label('htmlmessage');
	$html_part->mimetype = 'text/html';

	$this->attachments[] = $html_part;
	}
	}
	// this is an ecrypted message -> create a plaintext body with the according message
	else if ($message_ctype_primary == 'multipart' && $message_ctype_secondary == 'encrypted') {
	$p = new stdClass;
	$p->type = 'content';
	$p->ctype_primary = 'text';
	$p->ctype_secondary = 'plain';
	$p->body = rcube_label('encryptedmessage');

	$this->parts[] = $p;
	}
	// message contains multiple parts
	else if (is_array($structure->parts) && !empty($structure->parts)) {
	// iterate over parts
	for ($i=0; $i < count($structure->parts); $i++) {
	$mail_part = &$structure->parts[$i];
	$primary_type = strtolower($mail_part->ctype_primary);
	$secondary_type = strtolower($mail_part->ctype_secondary);

	// multipart/alternative
	if ($primary_type=='multipart') {
	$this->parse_structure($mail_part, true);
	}
	// part text/[plain\|html] OR message/delivery-status
	else if (($primary_type == 'text' && ($secondary_type == 'plain' \|\| $secondary_type == 'html') && $mail_part->disposition != 'attachment') \|\|
	($primary_type == 'message' && ($secondary_type == 'delivery-status' \|\| $secondary_type == 'disposition-notification'))) {

	// add text part if we're not in alternative mode or if it matches the prefs
	if (!$this->parse_alternative \|\|
	($secondary_type == 'html' && $this->opt['prefer_html']) \|\|
	($secondary_type == 'plain' && !$this->opt['prefer_html'])) {
	$mail_part->type = 'content';
	$this->parts[] = $mail_part;
	}

	// list as attachment as well
	if (!empty($mail_part->filename))
	$this->attachments[] = $mail_part;
	}
	// part message/*
	else if ($primary_type=='message') {
	$this->parse_structure($mail_part, true);

	// list as attachment as well (mostly .eml)
	if (!empty($mail_part->filename))
	$this->attachments[] = $mail_part;
	}
	// ignore "virtual" protocol parts
	else if ($primary_type == 'protocol')
	continue;

	// part is Microsoft outlook TNEF (winmail.dat)
	else if ($primary_type == 'application' && $secondary_type == 'ms-tnef') {
	foreach ((array)$this->imap->tnef_decode($mail_part, $structure->headers['uid']) as $tnef_part) {
	$this->mime_parts[$tnef_part->mime_id] = $tnef_part;
	$this->attachments[] = $tnef_part;
	}
	}

	// part is file/attachment
	else if ($mail_part->disposition == 'attachment' \|\| $mail_part->disposition == 'inline' \|\|
	$mail_part->headers['content-id'] \|\| (empty($mail_part->disposition) && $mail_part->filename)) {
	// skip apple resource forks
	if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
	continue;

	// part belongs to a related message
	if ($message_ctype_secondary == 'related') {
	if ($mail_part->headers['content-id'])
	$mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
	if ($mail_part->headers['content-location'])
	$mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];

	if ($mail_part->content_id \|\| $mail_part->content_location) {
	$this->inline_parts[] = $mail_part;
	}
	}
	// is regular attachment
	else {
	if (!$mail_part->filename)
	$mail_part->filename = 'Part '.$mail_part->mime_id;
	$this->attachments[] = $mail_part;
	}
	}
	}

	// if this was a related part try to resolve references
	if ($message_ctype_secondary == 'related' && sizeof($this->inline_parts)) {
	$a_replaces = array();

	foreach ($this->inline_parts as $inline_object) {
	$part_url = $this->get_part_url($inline_object->mime_id);
	if ($inline_object->content_id)
	$a_replaces['cid:'.$inline_object->content_id] = $part_url;
	if ($inline_object->content_location)
	$a_replaces[$inline_object->content_location] = $part_url;
	}

	// add replace array to each content part
	// (will be applied later when part body is available)
	foreach ($this->parts as $i => $part) {
	if ($part->type == 'content')
	$this->parts[$i]->replaces = $a_replaces;
	}
	}
	}

	// message is single part non-text
	else if ($structure->filename) {
	$this->attachments[] = $structure;
	}
	}


	/**
	* Fill aflat array with references to all parts, indexed by part numbers
	*
	* @param object rcube_message_part Message body structure
	*/
	private function get_mime_numbers(&$part)
	{
	if (strlen($part->mime_id))
	$this->mime_parts[$part->mime_id] = &$part;

	if (is_array($part->parts))
	for ($i=0; $i<count($part->parts); $i++)
	$this->get_mime_numbers($part->parts[$i]);
	}


	}

	diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
	new file mode 100644
	index 000000000..62f65a9e4
	--- /dev/null
	+++ b/program/include/rcube_plugin.php
	@@ -0,0 +1,196 @@
	+<?php
	+
	+/*
	+ +-----------------------------------------------------------------------+
	+ \| program/include/rcube_plugin.php \|
	+ \| \|
	+ \| This file is part of the RoundCube Webmail client \|
	+ \| Copyright (C) 2008-2009, RoundCube Dev. - Switzerland \|
	+ \| Licensed under the GNU GPL \|
	+ \| \|
	+ \| PURPOSE: \|
	+ \| Abstract plugins interface/class \|
	+ \| All plugins need to extend this class \|
	+ +-----------------------------------------------------------------------+
	+ \| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+ +-----------------------------------------------------------------------+
	+
	+ $Id: $
	+
	+*/
	+
	+/**
	+ * Plugin interface class
	+ *
	+ * @package Core
	+ */
	+abstract class rcube_plugin
	+{
	+ public $ID;
	+ public $api;
	+ public $task;
	+ protected $home;
	+ protected $urlbase;
	+
	+ /**
	+ * Default constructor.
	+ */
	+ public function __construct($api)
	+ {
	+ $this->ID = get_class($this);
	+ $this->api = $api;
	+ $this->home = $api->dir . DIRECTORY_SEPARATOR . $this->ID;
	+ $this->urlbase = $api->url . $this->ID . '/';
	+ }
	+
	+ /**
	+ * Initialization method, needs to be implemented by the plugin itself
	+ */
	+ abstract function init();
	+
	+ /**
	+ * Register a callback function for a specific (server-side) hook
	+ *
	+ * @param string Hook name
	+ * @param mixed Callback function as string or array with object reference and method name
	+ */
	+ public function add_hook($hook, $callback)
	+ {
	+ $this->api->register_hook($hook, $callback);
	+ }
	+
	+ /**
	+ * Load localized texts from the plugins dir
	+ *
	+ * @param string Directory to search in
	+ * @param mixed Make texts also available on the client (array with list or true for all)
	+ */
	+ public function add_texts($dir, $add2client = false)
	+ {
	+ $domain = $this->ID;
	+
	+ $lang = $_SESSION['language'];
	+ $locdir = slashify(realpath(slashify($this->home) . $dir));
	+ $texts = array();
	+
	+ foreach (array('en_US', $lang) as $lng) {
	+ @include($locdir . $lng . '.inc');
	+ $texts = (array)$labels + (array)$messages + (array)$texts;
	+ }
	+
	+ // prepend domain to text keys and add to the application texts repository
	+ if (!empty($texts)) {
	+ $add = array();
	+ foreach ($texts as $key => $value)
	+ $add[$domain.'.'.$key] = $value;
	+
	+ $rcmail = rcmail::get_instance();
	+ $rcmail->load_language($lang, $add);
	+
	+ // add labels to client
	+ if ($add2client) {
	+ $js_labels = is_array($add2client) ? array_map(array($this, 'label_map_callback'), $add2client) : array_keys($add);
	+ $rcmail->output->add_label($js_labels);
	+ }
	+ }
	+ }
	+
	+ /**
	+ * Wrapper for rcmail::gettext() adding the plugin ID as domain
	+ *
	+ * @return string Localized text
	+ * @see rcmail::gettext()
	+ */
	+ function gettext($p)
	+ {
	+ return rcmail::get_instance()->gettext($p, $this->ID);
	+ }
	+
	+ /**
	+ * Register a handler for a specific client-request action
	+ *
	+ * The callback will be executed upon a request like /?_task=mail&_action=plugin.myaction
	+ *
	+ * @param string Action name (should be unique)
	+ * @param mixed Callback function as string or array with object reference and method name
	+ */
	+ public function register_action($action, $callback)
	+ {
	+ $this->api->register_action($action, $this->ID, $callback);
	+ }
	+
	+ /**
	+ * Register a handler function for a template object
	+ *
	+ * When parsing a template for display, tags like <roundcube:object name="plugin.myobject" />
	+ * will be replaced by the return value if the registered callback function.
	+ *
	+ * @param string Object name (should be unique and start with 'plugin.')
	+ * @param mixed Callback function as string or array with object reference and method name
	+ */
	+ public function register_handler($name, $callback)
	+ {
	+ $this->api->register_handler($name, $this->ID, $callback);
	+ }
	+
	+ /**
	+ * Make this javascipt file available on the client
	+ *
	+ * @param string File path; absolute or relative to the plugin directory
	+ */
	+ public function include_script($fn)
	+ {
	+ $this->api->include_script($this->ressource_url($fn));
	+ }
	+
	+ /**
	+ * Make this stylesheet available on the client
	+ *
	+ * @param string File path; absolute or relative to the plugin directory
	+ */
	+ public function include_stylesheet($fn)
	+ {
	+ $this->api->include_stylesheet($this->ressource_url($fn));
	+ }
	+
	+ /**
	+ * Append a button to a certain container
	+ *
	+ * @param array Hash array with named parameters (as used in skin templates)
	+ * @param string Container name where the buttons should be added to
	+ * @see rcube_remplate::button()
	+ */
	+ public function add_button($p, $container)
	+ {
	+ if ($this->api->output->type == 'html') {
	+ // fix relative paths
	+ foreach (array('imagepas', 'imageact', 'imagesel') as $key)
	+ if ($p[$key])
	+ $p[$key] = $this->api->url . $this->ressource_url($p[$key]);
	+
	+ $this->api->add_content($this->api->output->button($p), $container);
	+ }
	+ }
	+
	+ /**
	+ * Make the given file name link into the plugin directory
	+ */
	+ private function ressource_url($fn)
	+ {
	+ if ($fn[0] != '/' && !eregi('^https?://', $fn))
	+ return $this->ID . '/' . $fn;
	+ else
	+ return $fn;
	+ }
	+
	+ /**
	+ * Callback function for array_map
	+ */
	+ private function label_map_callback($key)
	+ {
	+ return $this->ID.'.'.$key;
	+ }
	+
	+
	+}
	+
	diff --git a/program/include/rcube_plugin_api.php b/program/include/rcube_plugin_api.php
	new file mode 100644
	index 000000000..4780f2e7e
	--- /dev/null
	+++ b/program/include/rcube_plugin_api.php
	@@ -0,0 +1,312 @@
	+<?php
	+
	+/*
	+ +-----------------------------------------------------------------------+
	+ \| program/include/rcube_plugin_api.php \|
	+ \| \|
	+ \| This file is part of the RoundCube Webmail client \|
	+ \| Copyright (C) 2008-2009, RoundCube Dev. - Switzerland \|
	+ \| Licensed under the GNU GPL \|
	+ \| \|
	+ \| PURPOSE: \|
	+ \| Plugins repository \|
	+ \| \|
	+ +-----------------------------------------------------------------------+
	+ \| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+ +-----------------------------------------------------------------------+
	+
	+ $Id: $
	+
	+*/
	+
	+/**
	+ * The plugin loader and global API
	+ *
	+ * @package Core
	+ */
	+class rcube_plugin_api
	+{
	+ static private $instance;
	+
	+ public $dir;
	+ public $url = 'plugins/';
	+ public $output;
	+
	+ public $handlers = array();
	+ private $plugins = array();
	+ private $actions = array();
	+ private $actionmap = array();
	+ private $objectsmap = array();
	+ private $template_contents = array();
	+
	+ private $required_plugins = array('filesystem_attachments');
	+
	+ /**
	+ * This implements the 'singleton' design pattern
	+ *
	+ * @return object rcube_plugin_api The one and only instance if this class
	+ */
	+ static function get_instance()
	+ {
	+ if (!self::$instance) {
	+ self::$instance = new rcube_plugin_api();
	+ }
	+
	+ return self::$instance;
	+ }
	+
	+
	+ /**
	+ * Private constructor
	+ */
	+ private function __construct()
	+ {
	+ $rcmail = rcmail::get_instance();
	+ $this->dir = realpath($rcmail->config->get('plugins_dir'));
	+ }
	+
	+
	+ /**
	+ * Load and init all enabled plugins
	+ *
	+ * This has to be done after rcmail::load_gui() or rcmail::init_json()
	+ * was called because plugins need to have access to rcmail->output
	+ */
	+ public function init()
	+ {
	+ $rcmail = rcmail::get_instance();
	+ $this->output = $rcmail->output;
	+
	+ $plugins_dir = dir($this->dir);
	+ $plugins_enabled = (array)$rcmail->config->get('plugins', array());
	+
	+ foreach ($plugins_enabled as $plugin_name) {
	+ $fn = $plugins_dir->path . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
	+
	+ if (file_exists($fn)) {
	+ include($fn);
	+
	+ // instantiate class if exists
	+ if (class_exists($plugin_name, false)) {
	+ $plugin = new $plugin_name($this);
	+ // check inheritance and task specification
	+ if (is_subclass_of($plugin, 'rcube_plugin') && (!$plugin->task \|\| $plugin->task == $rcmail->task)) {
	+ $plugin->init();
	+ $this->plugins[] = $plugin;
	+ }
	+ }
	+ else {
	+ raise_error(array('code' => 520, 'type' => 'php', 'message' => "No plugin class $plugin_name found in $fn"), true, false);
	+ }
	+ }
	+ else {
	+ raise_error(array('code' => 520, 'type' => 'php', 'message' => "Failed to load plugin file $fn"), true, false);
	+ }
	+ }
	+
	+ // check existance of all required core plugins
	+ foreach ($this->required_plugins as $plugin_name) {
	+ $loaded = false;
	+ foreach ($this->plugins as $plugin) {
	+ if ($plugin instanceof $plugin_name) {
	+ $loaded = true;
	+ break;
	+ }
	+ }
	+
	+ // load required core plugin if no derivate was found
	+ if (!$loaded) {
	+ $fn = $plugins_dir->path . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
	+ if (file_exists($fn)) {
	+ include($fn);
	+
	+ if (class_exists($plugin_name, false)) {
	+ $plugin = new $plugin_name($this);
	+ // check inheritance
	+ if (is_subclass_of($plugin, 'rcube_plugin')) {
	+ $plugin->init();
	+ $this->plugins[] = $plugin;
	+ $loaded = true;
	+ }
	+ }
	+ }
	+ }
	+
	+ // trigger fatal error if still not loaded
	+ if (!$loaded) {
	+ raise_error(array('code' => 520, 'type' => 'php', 'message' => "Requried plugin $plugin_name was not loaded"), true, true);
	+ }
	+ }
	+
	+ // register an internal hook
	+ $this->register_hook('template_container', array($this, 'template_container_hook'));
	+
	+ // maybe also register a shudown function which triggers shutdown functions of all plugin objects
	+
	+
	+ // call imap_init right now
	+ // (should actually be done in rcmail::imap_init() but plugins are not initialized then)
	+ if ($rcmail->imap) {
	+ $hook = $this->exec_hook('imap_init', array('fetch_headers' => $rcmail->imap->fetch_add_headers));
	+ if ($hook['fetch_headers'])
	+ $rcmail->imap->fetch_add_headers = $hook['fetch_headers'];
	+ }
	+ }
	+
	+
	+ /**
	+ * Allows a plugin object to register a callback for a certain hook
	+ *
	+ * @param string Hook name
	+ * @param mixed String with global function name or array($obj, 'methodname')
	+ */
	+ public function register_hook($hook, $callback)
	+ {
	+ if (is_callable($callback))
	+ $this->handlers[$hook][] = $callback;
	+ else
	+ raise_error(array('code' => 521, 'type' => 'php', 'message' => "Invalid callback function for $hook"), true, false);
	+ }
	+
	+
	+ /**
	+ * Triggers a plugin hook.
	+ * This is called from the application and executes all registered handlers
	+ *
	+ * @param string Hook name
	+ * @param array Named arguments (key->value pairs)
	+ * @return array The (probably) altered hook arguments
	+ */
	+ public function exec_hook($hook, $args = array())
	+ {
	+ $args += array('abort' => false);
	+
	+ foreach ((array)$this->handlers[$hook] as $callback) {
	+ $ret = call_user_func($callback, $args);
	+ if ($ret && is_array($ret))
	+ $args = $ret + $args;
	+
	+ if ($args['abort'])
	+ break;
	+ }
	+
	+ return $args;
	+ }
	+
	+
	+ /**
	+ * Let a plugin register a handler for a specific request
	+ *
	+ * @param string Action name (_task=mail&_action=plugin.foo)
	+ * @param string Plugin name that registers this action
	+ * @param mixed Callback: string with global function name or array($obj, 'methodname')
	+ */
	+ public function register_action($action, $owner, $callback)
	+ {
	+ // check action name
	+ if (strpos($action, 'plugin.') !== 0)
	+ $action = 'plugin.'.$action;
	+
	+ // can register action only if it's not taken or registered by myself
	+ if (!isset($this->actionmap[$action]) \|\| $this->actionmap[$action] == $owner) {
	+ $this->actions[$action] = $callback;
	+ $this->actionmap[$action] = $owner;
	+ }
	+ else {
	+ raise_error(array('code' => 523, 'type' => 'php', 'message' => "Cannot register action $action; already taken by another plugin"), true, false);
	+ }
	+ }
	+
	+
	+ /**
	+ * This method handles requests like _task=mail&_action=plugin.foo
	+ * It executes the callback function that was registered with the given action.
	+ *
	+ * @param string Action name
	+ */
	+ public function exec_action($action)
	+ {
	+ if (isset($this->actions[$action])) {
	+ call_user_func($this->actions[$action]);
	+ }
	+ else {
	+ raise_error(array('code' => 524, 'type' => 'php', 'message' => "No handler found for action $action"), true, true);
	+ }
	+ }
	+
	+
	+ /**
	+ * Register a handler function for template objects
	+ *
	+ * @param string Object name
	+ * @param string Plugin name that registers this action
	+ * @param mixed Callback: string with global function name or array($obj, 'methodname')
	+ */
	+ public function register_handler($name, $owner, $callback)
	+ {
	+ // check name
	+ if (strpos($name, 'plugin.') !== 0)
	+ $name = 'plugin.'.$name;
	+
	+ // can register handler only if it's not taken or registered by myself
	+ if (!isset($this->objectsmap[$name]) \|\| $this->objectsmap[$name] == $owner) {
	+ $this->output->add_handler($name, $callback);
	+ $this->objectsmap[$name] = $owner;
	+ }
	+ else {
	+ raise_error(array('code' => 525, 'type' => 'php', 'message' => "Cannot register template handler $name; already taken by another plugin"), true, false);
	+ }
	+ }
	+
	+ /**
	+ * Include a plugin script file in the current HTML page
	+ */
	+ public function include_script($fn)
	+ {
	+ if ($this->output->type == 'html') {
	+ $src = $this->ressource_url($fn);
	+ $this->output->add_header(html::tag('script', array('type' => "text/javascript", 'src' => $src)));
	+ }
	+ }
	+
	+ /**
	+ * Include a plugin stylesheet in the current HTML page
	+ */
	+ public function include_stylesheet($fn)
	+ {
	+ if ($this->output->type == 'html') {
	+ $src = $this->ressource_url($fn);
	+ $this->output->add_header(html::tag('link', array('rel' => "stylesheet", 'type' => "text/css", 'href' => $src)));
	+ }
	+ }
	+
	+ /**
	+ * Save the given HTML content to be added to a template container
	+ */
	+ public function add_content($html, $container)
	+ {
	+ $this->template_contents[$container] .= $html . "\n";
	+ }
	+
	+ /**
	+ * Callback for template_container hooks
	+ */
	+ private function template_container_hook($attrib)
	+ {
	+ $container = $attrib['name'];
	+ return array('content' => $this->template_contents[$container]);
	+ }
	+
	+ /**
	+ * Make the given file name link into the plugins directory
	+ */
	+ private function ressource_url($fn)
	+ {
	+ if ($fn[0] != '/' && !eregi('^https?://', $fn))
	+ return $this->url . $fn;
	+ else
	+ return $fn;
	+ }
	+
	+}
	+
	diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
	index 1e732ca11..557509a14 100755
	--- a/program/include/rcube_template.php
	+++ b/program/include/rcube_template.php
	@@ -1,1098 +1,1096 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_template.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2006-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Class to handle HTML page output using a skin template. \|
	\| Extends rcube_html_page class from rcube_shared.inc \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/


	/**
	* Class to create HTML page output using a skin template
	*
	* @package View
	* @todo Documentation
	* @uses rcube_html_page
	*/
	class rcube_template extends rcube_html_page
	{
	var $app;
	var $config;
	var $framed = false;
	var $pagetitle = '';
	var $env = array();
	var $js_env = array();
	var $js_commands = array();
	var $object_handlers = array();

	public $type = 'html';
	public $ajax_call = false;

	/**
	* Constructor
	*
	* @todo Use jQuery's $(document).ready() here.
	* @todo Replace $this->config with the real rcube_config object
	*/
	public function __construct($task, $framed = false)
	{
	parent::__construct();

	$this->app = rcmail::get_instance();
	$this->config = $this->app->config->all();
	$this->browser = new rcube_browser();

	//$this->framed = $framed;
	$this->set_env('task', $task);

	// load the correct skin (in case user-defined)
	$this->set_skin($this->config['skin']);

	// add common javascripts
	$javascript = 'var '.JS_OBJECT_NAME.' = new rcube_webmail();';

	// don't wait for page onload. Call init at the bottom of the page (delayed)
	- $javascript_foot = "if (window.call_init)\n call_init('".JS_OBJECT_NAME."');";
	+ $javascript_foot = '$(document).ready(function(){ '.JS_OBJECT_NAME.'.init(); });';

	$this->add_script($javascript, 'head_top');
	$this->add_script($javascript_foot, 'foot');
	$this->scripts_path = 'program/js/';
	+ $this->include_script('http://ajax.googleapis.com/ajax/libs/jquery/1.3/jquery.min.js');
	$this->include_script('common.js');
	$this->include_script('app.js');

	// register common UI objects
	$this->add_handlers(array(
	'loginform' => array($this, 'login_form'),
	'username' => array($this, 'current_username'),
	'message' => array($this, 'message_container'),
	'charsetselector' => array($this, 'charset_selector'),
	));
	}

	/**
	* Set environment variable
	*
	* @param string Property name
	* @param mixed Property value
	* @param boolean True if this property should be added to client environment
	*/
	public function set_env($name, $value, $addtojs = true)
	{
	$this->env[$name] = $value;
	if ($addtojs \|\| isset($this->js_env[$name])) {
	$this->js_env[$name] = $value;
	}
	}


	/**
	* Set page title variable
	*/
	public function set_pagetitle($title)
	{
	$this->pagetitle = $title;
	}


	/**
	* Getter for the current page title
	*
	* @return string The page title
	*/
	public function get_pagetitle()
	{
	if (!empty($this->pagetitle)) {
	$title = $this->pagetitle;
	}
	else if ($this->env['task'] == 'login') {
	$title = rcube_label(array('name' => 'welcome', 'vars' => array('product' => $this->config['product_name'])));
	}
	else {
	$title = ucfirst($this->env['task']);
	}

	return $title;
	}


	/**
	* Set skin
	*/
	public function set_skin($skin)
	{
	if (!empty($skin) && is_dir('skins/'.$skin) && is_readable('skins/'.$skin))
	$skin_path = 'skins/'.$skin;
	else
	$skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/default';

	$this->app->config->set('skin_path', $skin_path);
	$this->config['skin_path'] = $skin_path;
	}

	/**
	* Check if a specific template exists
	*
	* @param string Template name
	* @return boolean True if template exists
	*/
	public function template_exists($name)
	{
	$filename = $this->config['skin_path'] . '/templates/' . $name . '.html';

	return (is_file($filename) && is_readable($filename));
	}

	/**
	* Register a template object handler
	*
	* @param string Object name
	* @param string Function name to call
	* @return void
	*/
	public function add_handler($obj, $func)
	{
	$this->object_handlers[$obj] = $func;
	}

	/**
	* Register a list of template object handlers
	*
	* @param array Hash array with object=>handler pairs
	* @return void
	*/
	public function add_handlers($arr)
	{
	$this->object_handlers = array_merge($this->object_handlers, $arr);
	}

	/**
	* Register a GUI object to the client script
	*
	* @param string Object name
	* @param string Object ID
	* @return void
	*/
	public function add_gui_object($obj, $id)
	{
	$this->add_script(JS_OBJECT_NAME.".gui_object('$obj', '$id');");
	}

	/**
	* Call a client method
	*
	* @param string Method to call
	* @param ... Additional arguments
	*/
	public function command()
	{
	$this->js_commands[] = func_get_args();
	}


	/**
	* Add a localized label to the client environment
	*/
	public function add_label()
	{
	- $arg_list = func_get_args();
	- foreach ($arg_list as $i => $name) {
	+ $args = func_get_args();
	+ if (count($args) == 1 && is_array($args[0]))
	+ $args = $args[0];
	+
	+ foreach ($args as $name) {
	$this->command('add_label', $name, rcube_label($name));
	}
	}


	/**
	* Invoke display_message command
	*
	* @param string Message to display
	* @param string Message type [notice\|confirm\|error]
	* @param array Key-value pairs to be replaced in localized text
	* @uses self::command()
	*/
	public function show_message($message, $type='notice', $vars=NULL)
	{
	$this->command(
	'display_message',
	rcube_label(array('name' => $message, 'vars' => $vars)),
	$type);
	}


	/**
	* Delete all stored env variables and commands
	*
	* @return void
	* @uses rcube_html::reset()
	* @uses self::$env
	* @uses self::$js_env
	* @uses self::$js_commands
	* @uses self::$object_handlers
	*/
	public function reset()
	{
	$this->env = array();
	$this->js_env = array();
	$this->js_commands = array();
	$this->object_handlers = array();
	parent::reset();
	}


	/**
	* Redirect to a certain url
	*
	* @param mixed Either a string with the action or url parameters as key-value pairs
	* @see rcmail::url()
	*/
	public function redirect($p = array())
	{
	$location = $this->app->url($p);
	header('Location: ' . $location);
	exit;
	}


	/**
	* Send the request output to the client.
	* This will either parse a skin tempalte or send an AJAX response
	*
	* @param string Template name
	* @param boolean True if script should terminate (default)
	*/
	public function send($templ = null, $exit = true)
	{
	if ($templ != 'iframe') {
	$this->parse($templ, false);
	}
	else {
	$this->framed = $templ == 'iframe' ? true : $this->framed;
	$this->write();
	}

	if ($exit) {
	exit;
	}
	}

	/**
	* Process template and write to stdOut
	*
	* @param string HTML template
	* @see rcube_html_page::write()
	* @override
	*/
	public function write($template = '')
	{
	// unlock interface after iframe load
	if ($this->framed) {
	array_unshift($this->js_commands, array('set_busy', false));
	}
	// write all env variables to client
	$js = $this->framed ? "if(window.parent) {\n" : '';
	$js .= $this->get_js_commands() . ($this->framed ? ' }' : '');
	$this->add_script($js, 'head_top');

	// call super method
	parent::write($template, $this->config['skin_path']);
	}

	/**
	* Parse a specific skin template and deliver to stdout
	*
	* Either returns nothing, or exists hard (exit();)
	*
	* @param string Template name
	* @param boolean Exit script
	* @return void
	* @link http://php.net/manual/en/function.exit.php
	*/
	private function parse($name = 'main', $exit = true)
	{
	$skin_path = $this->config['skin_path'];
	$path = "$skin_path/templates/$name.html";

	// read template file
	if (($templ = @file_get_contents($path)) === false) {
	raise_error(array(
	'code' => 501,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => 'Error loading template for '.$name
	), true, true);
	return false;
	}

	// parse for specialtags
	$output = $this->parse_conditions($templ);
	$output = $this->parse_xml($output);

	// add debug console
	if ($this->config['debug_level'] & 8) {
	$this->add_footer('<div style="position:absolute;top:5px;left:5px;width:405px;padding:2px;background:white;opacity:0.8;filter:alpha(opacity=80);z-index:9000">
	<a href="#toggle" onclick="con=document.getElementById(\'dbgconsole\');con.style.display=(con.style.display==\'none\'?\'block\':\'none\');return false">console</a>
	<form action="/" name="debugform" style="display:inline"><textarea name="console" id="dbgconsole" rows="20" cols="40" wrap="off" style="display:none;width:400px;border:none;font-size:x-small" spellcheck="false"></textarea></form></div>'
	);
	}
	$output = $this->parse_with_globals($output);
	$this->write(trim($output), $skin_path);
	if ($exit) {
	exit;
	}
	}


	/**
	* Return executable javascript code for all registered commands
	*
	* @return string $out
	*/
	private function get_js_commands()
	{
	$out = '';
	if (!$this->framed && !empty($this->js_env)) {
	$out .= JS_OBJECT_NAME . '.set_env('.json_serialize($this->js_env).");\n";
	}
	foreach ($this->js_commands as $i => $args) {
	$method = array_shift($args);
	foreach ($args as $i => $arg) {
	$args[$i] = json_serialize($arg);
	}
	$parent = $this->framed \|\| preg_match('/^parent\./', $method);
	$out .= sprintf(
	"%s.%s(%s);\n",
	- ($parent ? 'parent.' : '') . JS_OBJECT_NAME,
	- preg_replace('/^parent\./', '', $method),
	- implode(',', $args)
	+ ($parent ? 'if(window.parent && parent.'.JS_OBJECT_NAME.') parent.' : '') . JS_OBJECT_NAME,
	+ preg_replace('/^parent\./', '', $method),
	+ implode(',', $args)
	);
	}

	return $out;
	}

	/**
	* Make URLs starting with a slash point to skin directory
	*
	* @param string Input string
	* @return string
	*/
	public function abs_url($str)
	{
	return preg_replace('/^\//', $this->config['skin_path'].'/', $str);
	}


	/*** Template parsing methods ***/

	/**
	* Replace all strings ($varname)
	* with the content of the according global variable.
	*/
	private function parse_with_globals($input)
	{
	$GLOBALS['__comm_path'] = Q($this->app->comm_path);
	return preg_replace('/\$(__[a-z0-9_\-]+)/e', '$GLOBALS["\\1"]', $input);
	}

	/**
	* Public wrapper to dipp into template parsing.
	*
	* @param string $input
	* @return string
	* @uses rcube_template::parse_xml()
	* @since 0.1-rc1
	*/
	public function just_parse($input)
	{
	return $this->parse_xml($input);
	}

	/**
	* Parse for conditional tags
	*
	* @param string $input
	* @return string
	*/
	private function parse_conditions($input)
	{
	$matches = preg_split('/<roundcube:(if\|elseif\|else\|endif)\s+([^>]+)>/is', $input, 2, PREG_SPLIT_DELIM_CAPTURE);
	if ($matches && count($matches) == 4) {
	if (preg_match('/^(else\|endif)$/i', $matches[1])) {
	return $matches[0] . $this->parse_conditions($matches[3]);
	}
	$attrib = parse_attrib_string($matches[2]);
	if (isset($attrib['condition'])) {
	$condmet = $this->check_condition($attrib['condition']);
	$submatches = preg_split('/<roundcube:(elseif\|else\|endif)\s+([^>]+)>/is', $matches[3], 2, PREG_SPLIT_DELIM_CAPTURE);
	if ($condmet) {
	$result = $submatches[0];
	$result.= ($submatches[1] != 'endif' ? preg_replace('/.*<roundcube:endif\s+[^>]+>/Uis', '', $submatches[3], 1) : $submatches[3]);
	}
	else {
	$result = "<roundcube:$submatches[1] $submatches[2]>" . $submatches[3];
	}
	return $matches[0] . $this->parse_conditions($result);
	}
	raise_error(array(
	'code' => 500,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => "Unable to parse conditional tag " . $matches[2]
	), true, false);
	}
	return $input;
	}


	/**
	* Determines if a given condition is met
	*
	* @todo Get rid off eval() once I understand what this does.
	* @todo Extend this to allow real conditions, not just "set"
	* @param string Condition statement
	* @return boolean True if condition is met, False if not
	*/
	private function check_condition($condition)
	{
	return eval("return (".$this->parse_expression($condition).");");
	}


	/**
	* Parses expression and replaces variables
	*
	* @param string Expression statement
	* @return string Expression statement
	*/
	private function parse_expression($expression)
	{
	return preg_replace(
	array(
	'/session:([a-z0-9_]+)/i',
	'/config:([a-z0-9_]+)(:([a-z0-9_]+))?/i',
	'/env:([a-z0-9_]+)/i',
	'/request:([a-z0-9_]+)/i',
	'/cookie:([a-z0-9_]+)/i'
	),
	array(
	"\$_SESSION['\\1']",
	"\$this->app->config->get('\\1',get_boolean('\\3'))",
	"\$this->env['\\1']",
	"get_input_value('\\1', RCUBE_INPUT_GPC)",
	"\$_COOKIE['\\1']"
	),
	$expression);
	}


	/**
	* Search for special tags in input and replace them
	* with the appropriate content
	*
	* @param string Input string to parse
	* @return string Altered input string
	* @todo Use DOM-parser to traverse template HTML
	* @todo Maybe a cache.
	*/
	private function parse_xml($input)
	{
	- return preg_replace_callback('/<roundcube:([-_a-z]+)\s+([^>]+)>/Ui', array($this, 'xml_command_callback'), $input);
	- }
	-
	-
	- /**
	- * This is a callback function for preg_replace_callback (see #1485286)
	- * It's only purpose is to reconfigure parameters for xml_command, so that the signature isn't disturbed
	- */
	- private function xml_command_callback($matches)
	- {
	- $str_attrib = isset($matches[2]) ? $matches[2] : '';
	- $add_attrib = isset($matches[3]) ? $matches[3] : array();
	-
	- $command = $matches[1];
	- //matches[0] is the entire matched portion of the string
	-
	- return $this->xml_command($command, $str_attrib, $add_attrib);
	+ return preg_replace_callback('/<roundcube:([-_a-z]+)\s+([^>]+)>/Ui', array($this, 'xml_command'), $input);
	}


	/**
	- * Convert a xml command tag into real content
	+ * Callback function for parsing an xml command tag
	+ * and turn it into real html content
	*
	- * @param string Tag command: object,button,label, etc.
	- * @param string Attribute string
	+ * @param array Matches array of preg_replace_callback
	* @return string Tag/Object content
	*/
	- private function xml_command($command, $str_attrib, $add_attrib = array())
	+ private function xml_command($matches)
	{
	- $command = strtolower($command);
	- $attrib = parse_attrib_string($str_attrib) + $add_attrib;
	+ $command = strtolower($matches[1]);
	+ $attrib = parse_attrib_string($matches[2]);

	// empty output if required condition is not met
	if (!empty($attrib['condition']) && !$this->check_condition($attrib['condition'])) {
	return '';
	}

	// execute command
	switch ($command) {
	// return a button
	case 'button':
	if ($attrib['name'] \|\| $attrib['command']) {
	return $this->button($attrib);
	}
	break;

	// show a label
	case 'label':
	if ($attrib['name'] \|\| $attrib['command']) {
	return Q(rcube_label($attrib + array('vars' => array('product' => $this->config['product_name']))));
	}
	break;

	// include a file
	case 'include':
	$path = realpath($this->config['skin_path'].$attrib['file']);
	if (is_readable($path)) {
	if ($this->config['skin_include_php']) {
	$incl = $this->include_php($path);
	}
	else {
	- $incl = file_get_contents($path);
	- }
	+ $incl = file_get_contents($path);
	+ }
	return $this->parse_xml($incl);
	}
	break;

	case 'plugin.include':
	- //rcube::tfk_debug(var_export($this->config['skin_path'], true));
	- $path = realpath($this->config['skin_path'].$attrib['file']);
	- if (!$path) {
	- //rcube::tfk_debug("Does not exist:");
	- //rcube::tfk_debug($this->config['skin_path']);
	- //rcube::tfk_debug($attrib['file']);
	- //rcube::tfk_debug($path);
	- }
	- $incl = file_get_contents($path);
	- if ($incl) {
	- return $this->parse_xml($incl);
	+ $hook = $this->app->plugins->exec_hook("template_plugin_include", $attrib);
	+ return $hook['content'];
	+ break;
	+
	+ // define a container block
	+ case 'container':
	+ if ($attrib['name'] && $attrib['id']) {
	+ $this->command('gui_container', $attrib['name'], $attrib['id']);
	+ // let plugins insert some content here
	+ $hook = $this->app->plugins->exec_hook("template_container", $attrib);
	+ return $hook['content'];
	}
	break;

	// return code for a specific application object
	case 'object':
	$object = strtolower($attrib['name']);
	+ $content = '';

	// we are calling a class/method
	if (($handler = $this->object_handlers[$object]) && is_array($handler)) {
	if ((is_object($handler[0]) && method_exists($handler[0], $handler[1])) \|\|
	(is_string($handler[0]) && class_exists($handler[0])))
	- return call_user_func($handler, $attrib);
	+ $content = call_user_func($handler, $attrib);
	}
	+ // execute object handler function
	else if (function_exists($handler)) {
	- // execute object handler function
	- return call_user_func($handler, $attrib);
	+ $content = call_user_func($handler, $attrib);
	}
	-
	- if ($object=='productname') {
	+ else if ($object == 'productname') {
	$name = !empty($this->config['product_name']) ? $this->config['product_name'] : 'RoundCube Webmail';
	- return Q($name);
	+ $content = Q($name);
	}
	- if ($object=='version') {
	+ else if ($object == 'version') {
	$ver = (string)RCMAIL_VERSION;
	if (is_file(INSTALL_PATH . '.svn/entries')) {
	if (preg_match('/Revision:\s(\d+)/', @shell_exec('svn info'), $regs))
	$ver .= ' [SVN r'.$regs[1].']';
	}
	- return $ver;
	+ $content = Q($ver);
	}
	- if ($object=='steptitle') {
	- return Q($this->get_pagetitle());
	+ else if ($object == 'steptitle') {
	+ $content = Q($this->get_pagetitle());
	}
	- if ($object=='pagetitle') {
	+ else if ($object == 'pagetitle') {
	$title = !empty($this->config['product_name']) ? $this->config['product_name'].' :: ' : '';
	$title .= $this->get_pagetitle();
	- return Q($title);
	+ $content = Q($title);
	}
	- break;
	+
	+ // exec plugin hooks for this template object
	+ $hook = $this->app->plugins->exec_hook("template_object_$object", $attrib + array('content' => $content));
	+ return $hook['content'];

	// return code for a specified eval expression
	case 'exp':
	- $value = $this->parse_expression($attrib['expression']);
	+ $value = $this->parse_expression($attrib['expression']);
	return eval("return Q($value);");

	// return variable
	case 'var':
	$var = explode(':', $attrib['name']);
	$name = $var[1];
	$value = '';

	switch ($var[0]) {
	case 'env':
	$value = $this->env[$name];
	break;
	case 'config':
	$value = $this->config[$name];
	if (is_array($value) && $value[$_SESSION['imap_host']]) {
	$value = $value[$_SESSION['imap_host']];
	}
	break;
	case 'request':
	$value = get_input_value($name, RCUBE_INPUT_GPC);
	break;
	case 'session':
	$value = $_SESSION[$name];
	break;
	case 'cookie':
	$value = htmlspecialchars($_COOKIE[$name]);
	break;
	}

	if (is_array($value)) {
	$value = implode(', ', $value);
	}

	return Q($value);
	break;
	}
	return '';
	}

	/**
	* Include a specific file and return it's contents
	*
	* @param string File path
	* @return string Contents of the processed file
	*/
	private function include_php($file)
	{
	ob_start();
	include $file;
	$out = ob_get_contents();
	ob_end_clean();

	return $out;
	}

	/**
	* Create and register a button
	*
	* @param array Named button attributes
	* @return string HTML button
	* @todo Remove all inline JS calls and use jQuery instead.
	* @todo Remove all sprintf()'s - they are pretty, but also slow.
	*/
	public function button($attrib)
	{
	static $sa_buttons = array();
	static $s_button_count = 100;

	// these commands can be called directly via url
	- $a_static_commands = array('compose', 'list');
	+ $a_static_commands = array('compose', 'list', 'preferences', 'folders', 'identities');

	if (!($attrib['command'] \|\| $attrib['name'])) {
	return '';
	}

	// try to find out the button type
	if ($attrib['type']) {
	$attrib['type'] = strtolower($attrib['type']);
	}
	else {
	$attrib['type'] = ($attrib['image'] \|\| $attrib['imagepas'] \|\| $attrib['imageact']) ? 'image' : 'link';
	}
	$command = $attrib['command'];

	// take the button from the stack
	if ($attrib['name'] && $sa_buttons[$attrib['name']]) {
	$attrib = $sa_buttons[$attrib['name']];
	}
	else if($attrib['image'] \|\| $attrib['imageact'] \|\| $attrib['imagepas'] \|\| $attrib['class']) {
	// add button to button stack
	if (!$attrib['name']) {
	$attrib['name'] = $command;
	}
	if (!$attrib['image']) {
	$attrib['image'] = $attrib['imagepas'] ? $attrib['imagepas'] : $attrib['imageact'];
	}
	$sa_buttons[$attrib['name']] = $attrib;
	}
	else if ($command && $sa_buttons[$command]) {
	// get saved button for this command/name
	$attrib = $sa_buttons[$command];
	}

	if (!$attrib['id']) {
	$attrib['id'] = sprintf('rcmbtn%d', $s_button_count++);
	}
	// get localized text for labels and titles
	if ($attrib['title']) {
	$attrib['title'] = Q(rcube_label($attrib['title']));
	}
	if ($attrib['label']) {
	$attrib['label'] = Q(rcube_label($attrib['label']));
	}
	if ($attrib['alt']) {
	$attrib['alt'] = Q(rcube_label($attrib['alt']));
	}
	// set title to alt attribute for IE browsers
	if ($this->browser->ie && $attrib['title'] && !$attrib['alt']) {
	$attrib['alt'] = $attrib['title'];
	unset($attrib['title']);
	}

	// add empty alt attribute for XHTML compatibility
	if (!isset($attrib['alt'])) {
	$attrib['alt'] = '';
	}

	// register button in the system
	if ($attrib['command']) {
	$this->add_script(sprintf(
	"%s.register_button('%s', '%s', '%s', '%s', '%s', '%s');",
	JS_OBJECT_NAME,
	$command,
	$attrib['id'],
	$attrib['type'],
	$attrib['imageact'] ? $this->abs_url($attrib['imageact']) : $attrib['classact'],
	$attrib['imagesel'] ? $this->abs_url($attrib['imagesel']) : $attrib['classsel'],
	$attrib['imageover'] ? $this->abs_url($attrib['imageover']) : ''
	));

	// make valid href to specific buttons
	if (in_array($attrib['command'], rcmail::$main_tasks)) {
	$attrib['href'] = rcmail_url(null, null, $attrib['command']);
	}
	else if (in_array($attrib['command'], $a_static_commands)) {
	$attrib['href'] = rcmail_url($attrib['command']);
	}
	else if ($attrib['command'] == 'permaurl' && !empty($this->env['permaurl'])) {
	$attrib['href'] = $this->env['permaurl'];
	}
	}

	// overwrite attributes
	if (!$attrib['href']) {
	$attrib['href'] = '#';
	}
	if ($command) {
	$attrib['onclick'] = sprintf(
	"return %s.command('%s','%s',this)",
	JS_OBJECT_NAME,
	$command,
	$attrib['prop']
	);
	}
	if ($command && $attrib['imageover']) {
	$attrib['onmouseover'] = sprintf(
	"return %s.button_over('%s','%s')",
	JS_OBJECT_NAME,
	$command,
	$attrib['id']
	);
	$attrib['onmouseout'] = sprintf(
	"return %s.button_out('%s','%s')",
	JS_OBJECT_NAME,
	$command,
	$attrib['id']
	);
	}

	if ($command && $attrib['imagesel']) {
	$attrib['onmousedown'] = sprintf(
	"return %s.button_sel('%s','%s')",
	JS_OBJECT_NAME,
	$command,
	$attrib['id']
	);
	$attrib['onmouseup'] = sprintf(
	"return %s.button_out('%s','%s')",
	JS_OBJECT_NAME,
	$command,
	$attrib['id']
	);
	}

	$out = '';

	// generate image tag
	if ($attrib['type']=='image') {
	$attrib_str = html::attrib_string(
	$attrib,
	array(
	'style', 'class', 'id', 'width',
	'height', 'border', 'hspace',
	'vspace', 'align', 'alt', 'tabindex'
	)
	);
	$btn_content = sprintf('<img src="%s"%s />', $this->abs_url($attrib['image']), $attrib_str);
	if ($attrib['label']) {
	$btn_content .= ' '.$attrib['label'];
	}
	$link_attrib = array('href', 'onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'title', 'target');
	}
	else if ($attrib['type']=='link') {
	$btn_content = $attrib['label'] ? $attrib['label'] : $attrib['command'];
	$link_attrib = array('href', 'onclick', 'title', 'id', 'class', 'style', 'tabindex', 'target');
	}
	else if ($attrib['type']=='input') {
	$attrib['type'] = 'button';

	if ($attrib['label']) {
	$attrib['value'] = $attrib['label'];
	}

	$attrib_str = html::attrib_string(
	$attrib,
	array(
	'type', 'value', 'onclick',
	'id', 'class', 'style', 'tabindex'
	)
	);
	$out = sprintf('<input%s disabled="disabled" />', $attrib_str);
	}

	// generate html code for button
	if ($btn_content) {
	$attrib_str = html::attrib_string($attrib, $link_attrib);
	$out = sprintf('<a%s>%s</a>', $attrib_str, $btn_content);
	}

	return $out;
	}


	/* *********** common functions delivering gui objects ************ */


	/**
	* Create a form tag with the necessary hidden fields
	*
	* @param array Named tag parameters
	* @return string HTML code for the form
	*/
	public function form_tag($attrib, $content = null)
	{
	if ($this->framed) {
	$hiddenfield = new html_hiddenfield(array('name' => '_framed', 'value' => '1'));
	$hidden = $hiddenfield->show();
	}

	if (!$content)
	$attrib['noclose'] = true;

	return html::tag('form',
	$attrib + array('action' => "./", 'method' => "get"),
	$hidden . $content);
	}


	/**
	* GUI object 'username'
	* Showing IMAP username of the current session
	*
	* @param array Named tag parameters (currently not used)
	* @return string HTML code for the gui object
	*/
	public function current_username($attrib)
	{
	static $username;

	// alread fetched
	if (!empty($username)) {
	return $username;
	}

	// get e-mail address form default identity
	if ($sql_arr = $this->app->user->get_identity()) {
	$username = $sql_arr['email'];
	}
	else {
	$username = $this->app->user->get_username();
	}

	return $username;
	}


	/**
	* GUI object 'loginform'
	* Returns code for the webmail login form
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	private function login_form($attrib)
	{
	$default_host = $this->config['default_host'];

	$_SESSION['temp'] = true;
	+
	+ // save original url
	+ $url = get_input_value('_url', RCUBE_INPUT_POST);
	+ if (empty($url) && !preg_match('/_action=logout/', $_SERVER['QUERY_STRING']))
	+ $url = $_SERVER['QUERY_STRING'];

	$input_user = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser', 'size' => 30) + $attrib);
	$input_pass = new html_passwordfield(array('name' => '_pass', 'id' => 'rcmloginpwd', 'size' => 30) + $attrib);
	$input_action = new html_hiddenfield(array('name' => '_action', 'value' => 'login'));
	$input_tzone = new html_hiddenfield(array('name' => '_timezone', 'id' => 'rcmlogintz', 'value' => '_default_'));
	+ $input_url = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => $url));
	$input_host = null;

	if (is_array($default_host)) {
	$input_host = new html_select(array('name' => '_host', 'id' => 'rcmloginhost'));

	foreach ($default_host as $key => $value) {
	if (!is_array($value)) {
	$input_host->add($value, (is_numeric($key) ? $value : $key));
	}
	else {
	$input_host = null;
	break;
	}
	}
	}
	else if (empty($default_host)) {
	$input_host = new html_inputfield(array('name' => '_host', 'id' => 'rcmloginhost', 'size' => 30));
	}

	$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
	$this->add_gui_object('loginform', $form_name);

	// create HTML table with two cols
	$table = new html_table(array('cols' => 2));

	$table->add('title', html::label('rcmloginuser', Q(rcube_label('username'))));
	$table->add(null, $input_user->show(get_input_value('_user', RCUBE_INPUT_POST)));

	$table->add('title', html::label('rcmloginpwd', Q(rcube_label('password'))));
	$table->add(null, $input_pass->show());

	// add host selection row
	if (is_object($input_host)) {
	$table->add('title', html::label('rcmloginhost', Q(rcube_label('server'))));
	$table->add(null, $input_host->show(get_input_value('_host', RCUBE_INPUT_POST)));
	}

	$out = $input_action->show();
	$out .= $input_tzone->show();
	+ $out .= $input_url->show();
	$out .= $table->show();

	// surround html output with a form tag
	if (empty($attrib['form'])) {
	$out = $this->form_tag(array('name' => $form_name, 'method' => "post"), $out);
	}

	return $out;
	}


	/**
	* GUI object 'searchform'
	* Returns code for search function
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	private function search_form($attrib)
	{
	// add some labels to client
	$this->add_label('searching');

	$attrib['name'] = '_q';

	if (empty($attrib['id'])) {
	$attrib['id'] = 'rcmqsearchbox';
	}
	if ($attrib['type'] == 'search' && !$this->browser->khtml) {
	unset($attrib['type'], $attrib['results']);
	}

	$input_q = new html_inputfield($attrib);
	$out = $input_q->show();

	$this->add_gui_object('qsearchbox', $attrib['id']);

	// add form tag around text field
	if (empty($attrib['form'])) {
	$out = $this->form_tag(array(
	'name' => "rcmqsearchform",
	'onsubmit' => JS_OBJECT_NAME . ".command('search');return false;",
	'style' => "display:inline"),
	$out);
	}

	return $out;
	}


	/**
	* Builder for GUI object 'message'
	*
	* @param array Named tag parameters
	* @return string HTML code for the gui object
	*/
	private function message_container($attrib)
	{
	if (isset($attrib['id']) === false) {
	$attrib['id'] = 'rcmMessageContainer';
	}

	$this->add_gui_object('message', $attrib['id']);
	return html::div($attrib, "");
	}


	/**
	* GUI object 'charsetselector'
	*
	* @param array Named parameters for the select tag
	* @return string HTML code for the gui object
	*/
	static function charset_selector($attrib)
	{
	// pass the following attributes to the form class
	$field_attrib = array('name' => '_charset');
	foreach ($attrib as $attr => $value) {
	if (in_array($attr, array('id', 'class', 'style', 'size', 'tabindex'))) {
	$field_attrib[$attr] = $value;
	}
	}
	$charsets = array(
	'US-ASCII' => 'ASCII (English)',
	'EUC-JP' => 'EUC-JP (Japanese)',
	'EUC-KR' => 'EUC-KR (Korean)',
	'BIG5' => 'BIG5 (Chinese)',
	'GB2312' => 'GB2312 (Chinese)',
	'ISO-2022-JP' => 'ISO-2022-JP (Japanese)',
	'ISO-8859-1' => 'ISO-8859-1 (Latin-1)',
	'ISO-8859-2' => 'ISO-8895-2 (Central European)',
	'ISO-8859-7' => 'ISO-8859-7 (Greek)',
	'ISO-8859-9' => 'ISO-8859-9 (Turkish)',
	'Windows-1251' => 'Windows-1251 (Cyrillic)',
	'Windows-1252' => 'Windows-1252 (Western)',
	'Windows-1255' => 'Windows-1255 (Hebrew)',
	'Windows-1256' => 'Windows-1256 (Arabic)',
	'Windows-1257' => 'Windows-1257 (Baltic)',
	'UTF-8' => 'UTF-8'
	);

	$select = new html_select($field_attrib);
	$select->add(array_values($charsets), array_keys($charsets));

	$set = $_POST['_charset'] ? $_POST['_charset'] : $this->get_charset();
	return $select->show($set);
	}

	} // end class rcube_template


	diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
	index 17debeb7a..b68c56cfa 100644
	--- a/program/include/rcube_user.php
	+++ b/program/include/rcube_user.php
	@@ -1,505 +1,513 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_user.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| This class represents a system user linked and provides access \|
	\| to the related database records. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: rcube_user.inc 933 2007-11-29 14:17:32Z thomasb $

	*/


	/**
	* Class representing a system user
	*
	* @package Core
	* @author Thomas Bruederli <roundcube@gmail.com>
	*/
	class rcube_user
	{
	public $ID = null;
	public $data = null;
	public $language = null;

	private $db = null;


	/**
	* Object constructor
	*
	* @param object DB Database connection
	*/
	function __construct($id = null, $sql_arr = null)
	{
	$this->db = rcmail::get_instance()->get_dbh();

	if ($id && !$sql_arr)
	{
	$sql_result = $this->db->query("SELECT * FROM ".get_table_name('users')." WHERE user_id=?", $id);
	$sql_arr = $this->db->fetch_assoc($sql_result);
	}

	if (!empty($sql_arr))
	{
	$this->ID = $sql_arr['user_id'];
	$this->data = $sql_arr;
	$this->language = $sql_arr['language'];
	}
	}


	/**
	* Build a user name string (as e-mail address)
	*
	* @return string Full user name
	*/
	function get_username()
	{
	return $this->data['username'] ? $this->data['username'] . (!strpos($this->data['username'], '@') ? '@'.$this->data['mail_host'] : '') : false;
	}


	/**
	* Get the preferences saved for this user
	*
	* @return array Hash array with prefs
	*/
	function get_prefs()
	{
	if (!empty($this->language))
	$prefs = array('language' => $this->language);

	if ($this->ID && $this->data['preferences'])
	$prefs += (array)unserialize($this->data['preferences']);

	return $prefs;
	}


	/**
	* Write the given user prefs to the user's record
	*
	* @param array User prefs to save
	* @return boolean True on success, False on failure
	*/
	function save_prefs($a_user_prefs)
	{
	if (!$this->ID)
	return false;

	$config = rcmail::get_instance()->config;
	$old_prefs = (array)$this->get_prefs();

	// merge (partial) prefs array with existing settings
	$save_prefs = $a_user_prefs + $old_prefs;
	unset($save_prefs['language']);

	// don't save prefs with default values if they haven't been changed yet
	foreach ($a_user_prefs as $key => $value) {
	if (!isset($old_prefs[$key]) && ($value == $config->get($key)))
	unset($save_prefs[$key]);
	}

	$this->db->query(
	"UPDATE ".get_table_name('users')."
	SET preferences=?,
	language=?
	WHERE user_id=?",
	serialize($save_prefs),
	$_SESSION['language'],
	$this->ID);

	$this->language = $_SESSION['language'];
	if ($this->db->affected_rows()) {
	$config->merge($a_user_prefs);
	return true;
	}

	return false;
	}


	/**
	* Get default identity of this user
	*
	* @param int Identity ID. If empty, the default identity is returned
	* @return array Hash array with all cols of the
	*/
	function get_identity($id = null)
	{
	$sql_result = $this->list_identities($id ? sprintf('AND identity_id=%d', $id) : '');
	return $this->db->fetch_assoc($sql_result);
	}


	/**
	* Return a list of all identities linked with this user
	*
	* @return array List of identities
	*/
	function list_identities($sql_add = '')
	{
	// get contacts from DB
	$sql_result = $this->db->query(
	"SELECT * FROM ".get_table_name('identities')."
	WHERE del<>1
	AND user_id=?
	$sql_add
	ORDER BY ".$this->db->quoteIdentifier('standard')." DESC, name ASC, identity_id ASC",
	$this->ID);

	return $sql_result;
	}


	/**
	* Update a specific identity record
	*
	* @param int Identity ID
	* @param array Hash array with col->value pairs to save
	* @return boolean True if saved successfully, false if nothing changed
	*/
	function update_identity($iid, $data)
	{
	if (!$this->ID)
	return false;

	$write_sql = array();

	foreach ((array)$data as $col => $value)
	{
	$write_sql[] = sprintf("%s=%s",
	$this->db->quoteIdentifier($col),
	$this->db->quote($value));
	}

	$this->db->query(
	"UPDATE ".get_table_name('identities')."
	SET ".join(', ', $write_sql)."
	WHERE identity_id=?
	AND user_id=?
	AND del<>1",
	$iid,
	$this->ID);

	return $this->db->affected_rows();
	}


	/**
	* Create a new identity record linked with this user
	*
	* @param array Hash array with col->value pairs to save
	* @return int The inserted identity ID or false on error
	*/
	function insert_identity($data)
	{
	if (!$this->ID)
	return false;

	$insert_cols = $insert_values = array();
	foreach ((array)$data as $col => $value)
	{
	$insert_cols[] = $this->db->quoteIdentifier($col);
	$insert_values[] = $this->db->quote($value);
	}

	$this->db->query(
	"INSERT INTO ".get_table_name('identities')."
	(user_id, ".join(', ', $insert_cols).")
	VALUES (?, ".join(', ', $insert_values).")",
	$this->ID);

	return $this->db->insert_id(get_sequence_name('identities'));
	}


	/**
	* Mark the given identity as deleted
	*
	* @param int Identity ID
	* @return boolean True if deleted successfully, false if nothing changed
	*/
	function delete_identity($iid)
	{
	if (!$this->ID)
	return false;

	if (!$this->ID \|\| $this->ID == '')
	return false;

	$sql_result = $this->db->query("SELECT count(*) AS ident_count FROM " .
	get_table_name('identities') .
	" WHERE user_id = ? AND del <> 1",
	$this->ID);

	$sql_arr = $this->db->fetch_assoc($sql_result);
	if ($sql_arr['ident_count'] <= 1)
	return false;

	$this->db->query(
	"UPDATE ".get_table_name('identities')."
	SET del=1
	WHERE user_id=?
	AND identity_id=?",
	$this->ID,
	$iid);

	return $this->db->affected_rows();
	}


	/**
	* Make this identity the default one for this user
	*
	* @param int The identity ID
	*/
	function set_default($iid)
	{
	if ($this->ID && $iid)
	{
	$this->db->query(
	"UPDATE ".get_table_name('identities')."
	SET ".$this->db->quoteIdentifier('standard')."='0'
	WHERE user_id=?
	AND identity_id<>?
	AND del<>1",
	$this->ID,
	$iid);
	}
	}


	/**
	* Update user's last_login timestamp
	*/
	function touch()
	{
	if ($this->ID)
	{
	$this->db->query(
	"UPDATE ".get_table_name('users')."
	SET last_login=".$this->db->now()."
	WHERE user_id=?",
	$this->ID);
	}
	}


	/**
	* Clear the saved object state
	*/
	function reset()
	{
	$this->ID = null;
	$this->data = null;
	}


	/**
	* Find a user record matching the given name and host
	*
	* @param string IMAP user name
	* @param string IMAP host name
	* @return object rcube_user New user instance
	*/
	static function query($user, $host)
	{
	$dbh = rcmail::get_instance()->get_dbh();

	// query for matching user name
	$query = "SELECT * FROM ".get_table_name('users')." WHERE mail_host=? AND %s=?";
	$sql_result = $dbh->query(sprintf($query, 'username'), $host, $user);

	// query for matching alias
	if (!($sql_arr = $dbh->fetch_assoc($sql_result))) {
	$sql_result = $dbh->query(sprintf($query, 'alias'), $host, $user);
	$sql_arr = $dbh->fetch_assoc($sql_result);
	}

	// user already registered -> overwrite username
	if ($sql_arr)
	return new rcube_user($sql_arr['user_id'], $sql_arr);
	else
	return false;
	}


	/**
	* Create a new user record and return a rcube_user instance
	*
	* @param string IMAP user name
	* @param string IMAP host
	* @return object rcube_user New user instance
	*/
	static function create($user, $host)
	{
	+ $user_name = '';
	$user_email = '';
	$rcmail = rcmail::get_instance();
	+
	+ $data = $rcmail->plugins->exec_hook('create_user', array('user'=>$user, 'user_name'=>$user_name, 'user_email'=>$user_email));
	+ $user_name = $data['user_name'];
	+ $user_email = $data['user_email'];
	+
	$dbh = $rcmail->get_dbh();

	// try to resolve user in virtuser table and file
	- if (!strpos($user, '@')) {
	+ if ($user_email != '' && !strpos($user, '@')) {
	if ($email_list = self::user2email($user, false))
	$user_email = $email_list[0];
	}
	-
	+
	$dbh->query(
	"INSERT INTO ".get_table_name('users')."
	(created, last_login, username, mail_host, alias, language)
	VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?, ?)",
	strip_newlines($user),
	strip_newlines($host),
	strip_newlines($user_email),
	$_SESSION['language']);

	if ($user_id = $dbh->insert_id(get_sequence_name('users')))
	{
	$mail_domain = $rcmail->config->mail_domain($host);

	if ($user_email=='')
	$user_email = strpos($user, '@') ? $user : sprintf('%s@%s', $user, $mail_domain);

	- $user_name = $user != $user_email ? $user : '';
	+ if ($user_name == '') {
	+ $user_name = $user != $user_email ? $user : '';
	+ }

	if (empty($email_list))
	$email_list[] = strip_newlines($user_email);

	// also create new identity records
	$standard = 1;
	foreach ($email_list as $email) {
	$dbh->query(
	"INSERT INTO ".get_table_name('identities')."
	(user_id, del, standard, name, email)
	VALUES (?, 0, ?, ?, ?)",
	$user_id,
	- $standard,
	+ $standard,
	strip_newlines($user_name),
	preg_replace('/^@/', $user . '@', $email));
	- $standard = 0;
	+ $standard = 0;
	}
	}
	else
	{
	raise_error(array(
	'code' => 500,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => "Failed to create new user"), true, false);
	}

	return $user_id ? new rcube_user($user_id) : false;
	}


	/**
	* Resolve username using a virtuser file
	*
	* @param string E-mail address to resolve
	* @return string Resolved IMAP username
	*/
	static function email2user($email)
	{
	$r = self::findinvirtual('^' . quotemeta($email) . '[[:space:]]');

	for ($i=0; $i<count($r); $i++)
	{
	$data = trim($r[$i]);
	$arr = preg_split('/\s+/', $data);
	if (count($arr) > 0)
	return trim($arr[count($arr)-1]);
	}

	return NULL;
	}


	/**
	* Resolve e-mail address from virtuser file/table
	*
	* @param string User name
	* @param boolean If true returns first found entry
	* @return mixed Resolved e-mail address string or array of strings
	*/
	static function user2email($user, $first=true)
	{
	$result = array();
	$rcmail = rcmail::get_instance();
	$dbh = $rcmail->get_dbh();

	// SQL lookup
	if ($virtuser_query = $rcmail->config->get('virtuser_query')) {
	$sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($user), $virtuser_query));
	while ($sql_arr = $dbh->fetch_array($sql_result))
	if (strpos($sql_arr[0], '@')) {
	$result[] = $sql_arr[0];
	- if ($first)
	- return $result[0];
	- }
	+ if ($first)
	+ return $result[0];
	+ }
	}
	// File lookup
	$r = self::findinvirtual('[[:space:]]' . quotemeta($user) . '[[:space:]]*$');
	for ($i=0; $i<count($r); $i++)
	{
	$data = $r[$i];
	$arr = preg_split('/\s+/', $data);
	if (count($arr) > 0 && strpos($arr[0], '@'))
	{
	$result[] = trim(str_replace('\\@', '@', $arr[0]));

	- if ($first)
	+ if ($first)
	return $result[0];
	}
	}

	return empty($result) ? NULL : $result;
	}


	/**
	* Find matches of the given pattern in virtuser file
	*
	* @param string Regular expression to search for
	* @return array Matching entries
	*/
	private static function findinvirtual($pattern)
	{
	$result = array();
	$virtual = null;

	if ($virtuser_file = rcmail::get_instance()->config->get('virtuser_file'))
	$virtual = file($virtuser_file);

	if (empty($virtual))
	return $result;

	// check each line for matches
	foreach ($virtual as $line)
	{
	$line = trim($line);
	if (empty($line) \|\| $line{0}=='#')
	continue;

	if (eregi($pattern, $line))
	$result[] = $line;
	}

	return $result;
	}

	}


	diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php
	index ce5087a0f..444900cde 100644
	--- a/program/include/rcube_vcard.php
	+++ b/program/include/rcube_vcard.php
	@@ -1,445 +1,445 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_vcard.php \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2008-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Logical representation of a vcard address record \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: $

	*/


	/**
	* Logical representation of a vcard-based address record
	* Provides functions to parse and export vCard data format
	*
	* @package Addressbook
	* @author Thomas Bruederli <roundcube@gmail.com>
	*/
	class rcube_vcard
	{
	private $raw = array(
	'FN' => array(),
	'N' => array(array('','','','','')),
	);

	public $business = false;
	public $displayname;
	public $surname;
	public $firstname;
	public $middlename;
	public $nickname;
	public $organization;
	public $notes;
	public $email = array();


	/**
	* Constructor
	*/
	public function __construct($vcard = null)
	{
	if (!empty($vcard))
	$this->load($vcard);
	}


	/**
	* Load record from (internal, unfolded) vcard 3.0 format
	*
	* @param string vCard string to parse
	*/
	public function load($vcard)
	{
	$this->raw = self::vcard_decode($vcard);

	// find well-known address fields
	$this->displayname = $this->raw['FN'][0];
	$this->surname = $this->raw['N'][0][0];
	$this->firstname = $this->raw['N'][0][1];
	$this->middlename = $this->raw['N'][0][2];
	$this->nickname = $this->raw['NICKNAME'][0];
	$this->organization = $this->raw['ORG'][0];
	$this->business = ($this->raw['X-ABShowAs'][0] == 'COMPANY') \|\| (join('', (array)$this->raw['N'][0]) == '' && !empty($this->organization));

	foreach ((array)$this->raw['EMAIL'] as $i => $raw_email)
	$this->email[$i] = is_array($raw_email) ? $raw_email[0] : $raw_email;

	// make the pref e-mail address the first entry in $this->email
	$pref_index = $this->get_type_index('EMAIL', 'pref');
	if ($pref_index > 0) {
	$tmp = $this->email[0];
	$this->email[0] = $this->email[$pref_index];
	$this->email[$pref_index] = $tmp;
	}
	}


	/**
	* Convert the data structure into a vcard 3.0 string
	*/
	public function export()
	{
	return self::rfc2425_fold(self::vcard_encode($this->raw));
	}


	/**
	* Setter for address record fields
	*
	* @param string Field name
	* @param string Field value
	* @param string Section name
	*/
	public function set($field, $value, $section = 'HOME')
	{
	switch ($field) {
	case 'name':
	case 'displayname':
	$this->raw['FN'][0] = $value;
	break;

	case 'firstname':
	$this->raw['N'][0][1] = $value;
	break;

	case 'surname':
	$this->raw['N'][0][0] = $value;
	break;

	case 'nickname':
	$this->raw['NICKNAME'][0] = $value;
	break;

	case 'organization':
	$this->raw['ORG'][0] = $value;
	break;

	case 'email':
	$index = $this->get_type_index('EMAIL', $section);
	if (!is_array($this->raw['EMAIL'][$index])) {
	$this->raw['EMAIL'][$index] = array(0 => $value, 'type' => array('INTERNET', $section, 'pref'));
	}
	else {
	$this->raw['EMAIL'][$index][0] = $value;
	}
	break;
	}
	}


	/**
	* Find index with the '$type' attribute
	*
	* @param string Field name
	* @return int Field index having $type set
	*/
	private function get_type_index($field, $type = 'pref')
	{
	$result = 0;
	if ($this->raw[$field]) {
	foreach ($this->raw[$field] as $i => $data) {
	if (is_array($data['type']) && in_array_nocase('pref', $data['type']))
	$result = $i;
	}
	}

	return $result;
	}


	/**
	* Factory method to import a vcard file
	*
	* @param string vCard file content
	* @return array List of rcube_vcard objects
	*/
	public static function import($data)
	{
	$out = array();

	// detect charset and convert to utf-8
	$encoding = self::detect_encoding($data);
	if ($encoding && $encoding != RCMAIL_CHARSET) {
	$data = rcube_charset_convert($data, $encoding);
	$data = preg_replace(array('/^[\xFE\xFF]{2}/', '/^\xEF\xBB\xBF/', '/^\x00+/'), '', $data); // also remove BOM
	}

	$vcard_block = '';
	$in_vcard_block = false;

	foreach (preg_split("/[\r\n]+/", $data) as $i => $line) {
	if ($in_vcard_block && !empty($line))
	$vcard_block .= $line . "\n";

	if (trim($line) == 'END:VCARD') {
	// parse vcard
	$obj = new rcube_vcard(self::cleanup($vcard_block));
	if (!empty($obj->displayname))
	$out[] = $obj;

	$in_vcard_block = false;
	}
	else if (trim($line) == 'BEGIN:VCARD') {
	$vcard_block = $line . "\n";
	$in_vcard_block = true;
	}
	}

	return $out;
	}


	/**
	* Normalize vcard data for better parsing
	*
	* @param string vCard block
	* @return string Cleaned vcard block
	*/
	private static function cleanup($vcard)
	{
	// Convert special types (like Skype) to normal type='skype' classes with this simple regex ;)
	$vcard = preg_replace(
	'/item(\d+)\.(TEL\|URL)([^:]?):(.?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s',
	'\2;type=\5\3:\4',
	$vcard);

	// Remove cruft like item1.X-AB*, item1.ADR instead of ADR, and empty lines
	$vcard = preg_replace(array('/^item\d\.X-AB.$/m', '/^item\d*\./m', "/\n+/"), array('', '', "\n"), $vcard);

	// remove vcard 2.1 charset definitions
	$vcard = preg_replace('/;CHARSET=[^:;]+/', '', $vcard);

	// if N doesn't have any semicolons, add some
	$vcard = preg_replace('/^(N:[^;\R]*)$/m', '\1;;;;', $vcard);

	return $vcard;
	}

	private static function rfc2425_fold_callback($matches)
	{
	return ":\n ".rtrim(chunk_split($matches[1], 72, "\n "));
	}

	private static function rfc2425_fold($val)
	{
	return preg_replace_callback('/:([^\n]{72,})/', array('self', 'rfc2425_fold_callback'), $val) . "\n";
	}


	/**
	* Decodes a vcard block (vcard 3.0 format, unfolded)
	* into an array structure
	*
	* @param string vCard block to parse
	* @return array Raw data structure
	*/
	private static function vcard_decode($vcard)
	{
	// Perform RFC2425 line unfolding
	$vcard = preg_replace(array("/\r/", "/\n\s+/"), '', $vcard);

	$lines = preg_split('/\r?\n/', $vcard);
	$data = array();

	for ($i=0; $i < count($lines); $i++) {
	if (!preg_match('/^([^\\:]*):(.+)$/', $lines[$i], $line))
	continue;

	// convert 2.1-style "EMAIL;internet;home:" to 3.0-style "EMAIL;TYPE=internet;TYPE=home:"
	if (($data['VERSION'][0] == "2.1") && preg_match('/^([^;]+);([^:]+)/', $line[1], $regs2) && !preg_match('/^TYPE=/i', $regs2[2])) {
	$line[1] = $regs2[1];
	foreach (explode(';', $regs2[2]) as $prop)
	$line[1] .= ';' . (strpos($prop, '=') ? $prop : 'TYPE='.$prop);
	}

	- if (!preg_match('/^(BEGIN\|END)$/', $line[1]) && preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
	+ if (!preg_match('/^(BEGIN\|END)$/i', $line[1]) && preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
	$entry = array('');
	- $field = $regs2[1][0];
	+ $field = strtoupper($regs2[1][0]);

	foreach($regs2[1] as $attrid => $attr) {
	if ((list($key, $value) = explode('=', $attr)) && $value) {
	if ($key == 'ENCODING') {
	# add next line(s) to value string if QP line end detected
	while ($value == 'QUOTED-PRINTABLE' && ereg('=$', $lines[$i]))
	$line[2] .= "\n" . $lines[++$i];

	$line[2] = self::decode_value($line[2], $value);
	}
	else
	$entry[strtolower($key)] = array_merge((array)$entry[strtolower($key)], (array)self::vcard_unquote($value, ','));
	}
	else if ($attrid > 0) {
	$entry[$key] = true; # true means attr without =value
	}
	}

	$entry[0] = self::vcard_unquote($line[2]);
	$data[$field][] = count($entry) > 1 ? $entry : $entry[0];
	}
	}

	unset($data['VERSION']);

	return $data;
	}


	/**
	* Split quoted string
	*
	* @param string vCard string to split
	* @param string Separator char/string
	* @return array List with splitted values
	*/
	private static function vcard_unquote($s, $sep = ';')
	{
	// break string into parts separated by $sep, but leave escaped $sep alone
	if (count($parts = explode($sep, strtr($s, array("\\$sep" => "\007")))) > 1) {
	foreach($parts as $s) {
	$result[] = self::vcard_unquote(strtr($s, array("\007" => "\\$sep")), $sep);
	}
	return $result;
	}
	else {
	return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\,' => ',', '\;' => ';', '\:' => ':'));
	}
	}


	/**
	* Decode a given string with the encoding rule from ENCODING attributes
	*
	* @param string String to decode
	* @param string Encoding type (quoted-printable and base64 supported)
	* @return string Decoded 8bit value
	*/
	private static function decode_value($value, $encoding)
	{
	switch (strtolower($encoding)) {
	case 'quoted-printable':
	return quoted_printable_decode($value);

	case 'base64':
	return base64_decode($value);

	default:
	return $value;
	}
	}


	/**
	* Encodes an entry for storage in our database (vcard 3.0 format, unfolded)
	*
	* @param array Raw data structure to encode
	* @return string vCard encoded string
	*/
	static function vcard_encode($data)
	{
	foreach((array)$data as $type => $entries) {
	/* valid N has 5 properties */
	while ($type == "N" && is_array($entries[0]) && count($entries[0]) < 5)
	$entries[0][] = "";

	foreach((array)$entries as $entry) {
	$attr = '';
	if (is_array($entry)) {
	$value = array();
	foreach($entry as $attrname => $attrvalues) {
	if (is_int($attrname))
	$value[] = $attrvalues;
	elseif ($attrvalues === true)
	$attr .= ";$attrname"; # true means just tag, not tag=value, as in PHOTO;BASE64:...
	else {
	foreach((array)$attrvalues as $attrvalue)
	$attr .= ";$attrname=" . self::vcard_quote($attrvalue, ',');
	}
	}
	}
	else {
	$value = $entry;
	}

	$vcard .= self::vcard_quote($type) . $attr . ':' . self::vcard_quote($value) . "\n";
	}
	}

	return "BEGIN:VCARD\nVERSION:3.0\n{$vcard}END:VCARD";
	}


	/**
	* Join indexed data array to a vcard quoted string
	*
	* @param array Field data
	* @param string Separator
	* @return string Joined and quoted string
	*/
	private static function vcard_quote($s, $sep = ';')
	{
	if (is_array($s)) {
	foreach($s as $part) {
	$r[] = self::vcard_quote($part, $sep);
	}
	return(implode($sep, (array)$r));
	}
	else {
	return strtr($s, array('\\' => '\\\\', "\r" => '', "\n" => '\n', ';' => '\;', ':' => '\:'));
	}
	}


	/**
	* Returns UNICODE type based on BOM (Byte Order Mark)
	*
	* @param string Input string to test
	* @return string Detected encoding
	*/
	private static function detect_encoding($string)
	{
	if (substr($string, 0, 4) == "\0\0\xFE\xFF") return 'UTF-32BE'; // Big Endian
	if (substr($string, 0, 4) == "\xFF\xFE\0\0") return 'UTF-32LE'; // Little Endian
	if (substr($string, 0, 2) == "\xFE\xFF") return 'UTF-16BE'; // Big Endian
	if (substr($string, 0, 2) == "\xFF\xFE") return 'UTF-16LE'; // Little Endian
	if (substr($string, 0, 3) == "\xEF\xBB\xBF") return 'UTF-8';

	// use mb_detect_encoding()
	$encodings = array('UTF-8', 'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3',
	'ISO-8859-4', 'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9',
	'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
	'WINDOWS-1252', 'WINDOWS-1251', 'BIG5', 'GB2312');

	if (function_exists('mb_detect_encoding') && ($enc = mb_detect_encoding($string, $encodings)))
	return $enc;

	// No match, check for UTF-8
	// from http://w3.org/International/questions/qa-forms-utf-8.html
	if (preg_match('/\A(
	[\x09\x0A\x0D\x20-\x7E]
	\| [\xC2-\xDF][\x80-\xBF]
	\| \xE0[\xA0-\xBF][\x80-\xBF]
	\| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}
	\| \xED[\x80-\x9F][\x80-\xBF]
	\| \xF0[\x90-\xBF][\x80-\xBF]{2}
	\| [\xF1-\xF3][\x80-\xBF]{3}
	\| \xF4[\x80-\x8F][\x80-\xBF]{2}
	)*\z/xs', substr($string, 0, 2048)))
	return 'UTF-8';

	return rcmail::get_instance()->config->get('default_charset', 'ISO-8859-1'); # fallback to Latin-1
	}

	}


	diff --git a/program/js/app.js b/program/js/app.js
	index 205bb2d6d..0e0c8bf25 100644
	--- a/program/js/app.js
	+++ b/program/js/app.js
	@@ -1,4226 +1,4021 @@
	/*
	+-----------------------------------------------------------------------+
	\| RoundCube Webmail Client Script \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev, - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Authors: Thomas Bruederli <roundcube@gmail.com> \|
	\| Charles McNulty <charles@charlesmcnulty.com> \|
	+-----------------------------------------------------------------------+
	- \| Requires: common.js, list.js \|
	+ \| Requires: jquery.js, common.js, list.js \|
	+-----------------------------------------------------------------------+

	$Id$
	*/


	-var rcube_webmail_client;
	-
	function rcube_webmail()
	- {
	+{
	this.env = new Object();
	this.labels = new Object();
	this.buttons = new Object();
	this.gui_objects = new Object();
	+ this.gui_containers = new Object();
	this.commands = new Object();
	+ this.command_handlers = new Object();
	this.onloads = new Array();

	// create protected reference to myself
	- rcube_webmail_client = this;
	- this.ref = 'rcube_webmail_client';
	+ this.ref = 'rcmail';
	var ref = this;

	// webmail client settings
	this.dblclick_time = 500;
	this.message_time = 3000;

	this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');

	// mimetypes supported by the browser (default settings)
	this.mimetypes = new Array('text/plain', 'text/html', 'text/xml',
	'image/jpeg', 'image/gif', 'image/png',
	'application/x-javascript', 'application/pdf',
	'application/x-shockwave-flash');

	// default environment vars
	this.env.keep_alive = 60; // seconds
	this.env.request_timeout = 180; // seconds
	this.env.draft_autosave = 0; // seconds
	this.env.comm_path = './';
	this.env.bin_path = './bin/';
	this.env.blankpage = 'program/blank.gif';

	+ // set jQuery ajax options
	+ jQuery.ajaxSetup({ cache:false,
	+ error:function(request, status, err){ ref.http_error(request, status, err); },
	+ beforeSend:function(xmlhttp){ xmlhttp.setRequestHeader('X-RoundCube-Referer', bw.get_cookie('roundcube_sessid')); }
	+ });
	+
	// set environment variable(s)
	this.set_env = function(p, value)
	{
	if (p != null && typeof(p) == 'object' && !value)
	for (var n in p)
	this.env[n] = p[n];
	else
	this.env[p] = value;
	};

	// add a localized label to the client environment
	this.add_label = function(key, value)
	{
	this.labels[key] = value;
	};

	// add a button to the button list
	this.register_button = function(command, id, type, act, sel, over)
	{
	if (!this.buttons[command])
	this.buttons[command] = new Array();

	var button_prop = {id:id, type:type};
	if (act) button_prop.act = act;
	if (sel) button_prop.sel = sel;
	if (over) button_prop.over = over;

	this.buttons[command][this.buttons[command].length] = button_prop;
	};

	// register a specific gui object
	this.gui_object = function(name, id)
	{
	this.gui_objects[name] = id;
	};

	+ // register a container object
	+ this.gui_container = function(name, id)
	+ {
	+ this.gui_containers[name] = id;
	+ };
	+
	+ // add a GUI element (html node) to a specified container
	+ this.add_element = function(elm, container)
	+ {
	+ if (this.gui_containers[container] && this.gui_containers[container].jquery)
	+ this.gui_containers[container].append(elm);
	+ };
	+
	+ // register an external handler for a certain command
	+ this.register_command = function(command, callback, enable)
	+ {
	+ this.command_handlers[command] = callback;
	+
	+ if (enable)
	+ this.enable_command(command, true);
	+ };
	+
	// execute the given script on load
	this.add_onload = function(f)
	- {
	- this.onloads[this.onloads.length] = f;
	- };
	+ {
	+ this.onloads[this.onloads.length] = f;
	+ };

	// initialize webmail client
	this.init = function()
	{
	var p = this;
	this.task = this.env.task;

	// check browser
	if (!bw.dom \|\| !bw.xmlhttp_test())
	{
	this.goto_url('error', '_code=0x199');
	return;
	}

	+ // find all registered gui containers
	+ for (var n in this.gui_containers)
	+ this.gui_containers[n] = $('#'+this.gui_containers[n]);
	+
	// find all registered gui objects
	for (var n in this.gui_objects)
	this.gui_objects[n] = rcube_find_object(this.gui_objects[n]);

	// tell parent window that this frame is loaded
	if (this.env.framed && parent.rcmail && parent.rcmail.set_busy)
	parent.rcmail.set_busy(false);

	// enable general commands
	this.enable_command('logout', 'mail', 'addressbook', 'settings', true);

	if (this.env.permaurl)
	this.enable_command('permaurl', true);

	switch (this.task)
	{
	case 'mail':
	if (this.gui_objects.messagelist)
	{
	this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {multiselect:true, draggable:true, keyboard:true, dblclick_time:this.dblclick_time});
	this.message_list.row_init = function(o){ p.init_message_row(o); };
	this.message_list.addEventListener('dblclick', function(o){ p.msglist_dbl_click(o); });
	this.message_list.addEventListener('keypress', function(o){ p.msglist_keypress(o); });
	this.message_list.addEventListener('select', function(o){ p.msglist_select(o); });
	this.message_list.addEventListener('dragstart', function(o){ p.drag_start(o); });
	this.message_list.addEventListener('dragmove', function(o, e){ p.drag_move(e); });
	this.message_list.addEventListener('dragend', function(o){ p.drag_active = false; });
	+ document.onmouseup = function(e){ return p.doc_mouse_up(e); };

	this.message_list.init();
	this.enable_command('toggle_status', 'toggle_flag', true);

	if (this.gui_objects.mailcontframe)
	- {
	this.gui_objects.mailcontframe.onmousedown = function(e){ return p.click_on_list(e); };
	- document.onmouseup = function(e){ return p.doc_mouse_up(e); };
	- }
	else
	this.message_list.focus();
	}

	if (this.env.coltypes)
	this.set_message_coltypes(this.env.coltypes);

	// enable mail commands
	this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);

	if (this.env.search_text != null && document.getElementById('quicksearchbox') != null)
	document.getElementById('quicksearchbox').value = this.env.search_text;

	if (this.env.action=='show' \|\| this.env.action=='preview')
	{
	this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 'mark', 'viewsource', 'print', 'load-attachment', 'load-headers', true);
	if (this.env.next_uid)
	{
	this.enable_command('nextmessage', true);
	this.enable_command('lastmessage', true);
	}
	if (this.env.prev_uid)
	{
	this.enable_command('previousmessage', true);
	this.enable_command('firstmessage', true);
	}
	}

	if (this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox)
	this.set_alttext('delete', 'movemessagetotrash');

	// make preview/message frame visible
	if (this.env.action == 'preview' && this.env.framed && parent.rcmail)
	{
	this.enable_command('compose', 'add-contact', false);
	parent.rcmail.show_contentframe(true);
	}

	if ((this.env.action=='show' \|\| this.env.action=='preview') && this.env.blockedobjects)
	{
	if (this.gui_objects.remoteobjectsmsg)
	this.gui_objects.remoteobjectsmsg.style.display = 'block';
	this.enable_command('load-images', 'always-load', true);
	}

	if (this.env.action=='compose')
	{
	this.enable_command('add-attachment', 'send-attachment', 'remove-attachment', 'send', true);
	if (this.env.spellcheck)
	{
	this.env.spellcheck.spelling_state_observer = function(s){ ref.set_spellcheck_state(s); };
	this.set_spellcheck_state('ready');
	- if (rcube_find_object('_is_html').value == '1')
	+ if ($("input[name='_is_html']").val() == '1')
	this.display_spellcheck_controls(false);
	}
	if (this.env.drafts_mailbox)
	this.enable_command('savedraft', true);

	document.onmouseup = function(e){ return p.doc_mouse_up(e); };
	}

	if (this.env.messagecount)
	this.enable_command('select-all', 'select-none', 'expunge', true);

	if (this.purge_mailbox_test())
	this.enable_command('purge', true);

	this.set_page_buttons();

	// init message compose form
	if (this.env.action=='compose')
	this.init_messageform();

	// show printing dialog
	if (this.env.action=='print')
	window.print();

	// get unread count for each mailbox
	if (this.gui_objects.mailboxlist)
	{
	this.env.unread_counts = {};
	this.gui_objects.folderlist = this.gui_objects.mailboxlist;
	this.http_request('getunread', '');
	}

	// ask user to send MDN
	if (this.env.mdn_request && this.env.uid)
	{
	var mdnurl = '_uid='+this.env.uid+'&_mbox='+urlencode(this.env.mailbox);
	if (confirm(this.get_label('mdnrequest')))
	this.http_post('sendmdn', mdnurl);
	else
	this.http_post('mark', mdnurl+'&_flag=mdnsent');
	}

	break;


	case 'addressbook':
	if (this.gui_objects.contactslist)
	{
	this.contact_list = new rcube_list_widget(this.gui_objects.contactslist, {multiselect:true, draggable:true, keyboard:true});
	this.contact_list.addEventListener('keypress', function(o){ p.contactlist_keypress(o); });
	this.contact_list.addEventListener('select', function(o){ p.contactlist_select(o); });
	this.contact_list.addEventListener('dragstart', function(o){ p.drag_start(o); });
	this.contact_list.addEventListener('dragmove', function(o, e){ p.drag_move(e); });
	this.contact_list.addEventListener('dragend', function(o){ p.drag_active = false; });
	this.contact_list.init();

	if (this.env.cid)
	this.contact_list.highlight_row(this.env.cid);

	if (this.gui_objects.contactslist.parentNode)
	{
	this.gui_objects.contactslist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };
	document.onmouseup = function(e){ return p.doc_mouse_up(e); };
	}
	else
	this.contact_list.focus();
	+
	+ this.gui_objects.folderlist = this.gui_objects.contactslist;
	}

	this.set_page_buttons();

	if (this.env.address_sources && this.env.address_sources[this.env.source] && !this.env.address_sources[this.env.source].readonly)
	this.enable_command('add', true);

	if (this.env.cid)
	this.enable_command('show', 'edit', true);

	if ((this.env.action=='add' \|\| this.env.action=='edit') && this.gui_objects.editform)
	this.enable_command('save', true);
	else
	this.enable_command('search', 'reset-search', 'moveto', 'import', true);

	if (this.contact_list && this.contact_list.rowcount > 0)
	this.enable_command('export', true);

	this.enable_command('list', true);
	break;


	case 'settings':
	this.enable_command('preferences', 'identities', 'save', 'folders', true);

	if (this.env.action=='identities' \|\| this.env.action=='edit-identity' \|\| this.env.action=='add-identity') {
	this.enable_command('add', this.env.identities_level < 2);
	this.enable_command('delete', 'edit', true);
	}

	if (this.env.action=='edit-identity' \|\| this.env.action=='add-identity')
	this.enable_command('save', true);

	if (this.env.action=='folders')
	this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', true);

	if (this.gui_objects.identitieslist)
	{
	this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist, {multiselect:false, draggable:false, keyboard:false});
	this.identity_list.addEventListener('select', function(o){ p.identity_select(o); });
	this.identity_list.init();
	this.identity_list.focus();

	if (this.env.iid)
	this.identity_list.highlight_row(this.env.iid);
	}

	if (this.gui_objects.subscriptionlist)
	this.init_subscription_list();

	break;

	case 'login':
	- var input_user = rcube_find_object('rcmloginuser');
	- var input_pass = rcube_find_object('rcmloginpwd');
	- var input_tz = rcube_find_object('rcmlogintz');
	-
	- if (input_user)
	- input_user.onkeyup = function(e){ return rcmail.login_user_keyup(e); };
	- if (input_user && input_user.value=='')
	+ var input_user = $('#rcmloginuser');
	+ input_user.bind('keypress', function(e){ return rcmail.login_user_keyup(e); });
	+
	+ if (input_user.val() == '')
	input_user.focus();
	- else if (input_pass)
	- input_pass.focus();
	+ else
	+ $('#rcmloginpwd').focus();

	// detect client timezone
	- if (input_tz)
	- input_tz.value = new Date().getTimezoneOffset() / -60;
	+ $('#rcmlogintz').val(new Date().getTimezoneOffset() / -60);

	this.enable_command('login', true);
	break;

	default:
	break;
	}

	// enable basic commands
	this.enable_command('logout', true);

	// flag object as complete
	this.loaded = true;

	// show message
	if (this.pending_message)
	this.display_message(this.pending_message[0], this.pending_message[1]);
	+
	+ // map implicit containers
	+ if (this.gui_objects.folderlist)
	+ this.gui_containers.foldertray = $(this.gui_objects.folderlist);

	- // start keep-alive interval
	- this.start_keepalive();
	+ // trigger init event hook
	+ this.triggerEvent('init', { task:this.task, action:this.env.action });

	// execute all foreign onload scripts
	+ // @deprecated
	for (var i=0; i<this.onloads.length; i++)
	{
	if (typeof(this.onloads[i]) == 'string')
	eval(this.onloads[i]);
	else if (typeof(this.onloads[i]) == 'function')
	this.onloads[i]();
	}
	- };
	+
	+ // start keep-alive interval
	+ this.start_keepalive();
	+ };

	// start interval for keep-alive/recent_check signal
	this.start_keepalive = function()
	{
	if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.mailboxlist)
	this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
	else if (this.env.keep_alive && !this.env.framed && this.task!='login')
	this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
	}

	this.init_message_row = function(row)
	{
	var uid = row.uid;
	if (uid && this.env.messages[uid])
	{
	row.deleted = this.env.messages[uid].deleted ? true : false;
	row.unread = this.env.messages[uid].unread ? true : false;
	row.replied = this.env.messages[uid].replied ? true : false;
	row.flagged = this.env.messages[uid].flagged ? true : false;
	row.forwarded = this.env.messages[uid].forwarded ? true : false;
	}

	// set eventhandler to message icon
	if ((row.icon = row.obj.cells[0].childNodes[0]) && row.icon.nodeName=='IMG')
	{
	var p = this;
	row.icon.id = 'msgicn_'+row.uid;
	row.icon._row = row.obj;
	row.icon.onmousedown = function(e) { p.command('toggle_status', this); };
	}

	// global variable 'flagged_col' may be not defined yet
	if (!this.env.flagged_col && this.env.coltypes)
	{
	var found;
	if((found = find_in_array('flag', this.env.coltypes)) >= 0)
	this.set_env('flagged_col', found+1);
	}

	// set eventhandler to flag icon, if icon found
	if (this.env.flagged_col && (row.flagged_icon = row.obj.cells[this.env.flagged_col].childNodes[0])
	&& row.flagged_icon.nodeName=='IMG')
	{
	var p = this;
	row.flagged_icon.id = 'flaggedicn_'+row.uid;
	row.flagged_icon._row = row.obj;
	row.flagged_icon.onmousedown = function(e) { p.command('toggle_flag', this); };
	}
	};

	// init message compose form: set focus and eventhandlers
	this.init_messageform = function()
	{
	if (!this.gui_objects.messageform)
	return false;

	//this.messageform = this.gui_objects.messageform;
	- var input_from = rcube_find_object('_from');
	- var input_to = rcube_find_object('_to');
	- var input_cc = rcube_find_object('_cc');
	- var input_bcc = rcube_find_object('_bcc');
	- var input_replyto = rcube_find_object('_replyto');
	- var input_subject = rcube_find_object('_subject');
	- var input_message = rcube_find_object('_message');
	- var draftid = rcube_find_object('_draft_saveid');
	+ var input_from = $("[name='_from']");
	+ var input_to = $("[name='_to']");
	+ var input_subject = $("input[name='_subject']");
	+ var input_message = $("[name='_message']").get(0);

	// init live search events
	- if (input_to)
	- this.init_address_input_events(input_to);
	- if (input_cc)
	- this.init_address_input_events(input_cc);
	- if (input_bcc)
	- this.init_address_input_events(input_bcc);
	+ this.init_address_input_events(input_to);
	+ this.init_address_input_events($("[name='_cc']"));
	+ this.init_address_input_events($("[name='_bcc']"));

	// add signature according to selected identity
	- if (input_from && input_from.type=='select-one' && (!draftid \|\| draftid.value=='')
	- // if we have HTML editor, signature is added in callback
	- && rcube_find_object('_is_html').value != '1')
	- {
	- this.change_identity(input_from);
	- }
	+ if (input_from.attr('type') == 'select-one' && $("input[name='_draft_saveid']").val() == ''
	+ && $("input[name='_is_html']").val() != '1') { // if we have HTML editor, signature is added in callback
	+ this.change_identity(input_from[0]);
	+ }

	- if (input_to && input_to.value=='')
	+ if (input_to.val() == '')
	input_to.focus();
	- else if (input_subject && input_subject.value=='')
	+ else if (input_subject.val() == '')
	input_subject.focus();
	else if (input_message)
	this.set_caret2start(input_message);

	// get summary of all field values
	this.compose_field_hash(true);

	// start the auto-save timer
	this.auto_save_start();
	};

	this.init_address_input_events = function(obj)
	{
	var handler = function(e){ return ref.ksearch_keypress(e,this); };
	-
	- if (obj.addEventListener)
	- obj.addEventListener(bw.safari ? 'keydown' : 'keypress', handler, false);
	- else
	- obj.onkeydown = handler;
	-
	- obj.setAttribute('autocomplete', 'off');
	+ obj.bind((bw.safari ? 'keydown' : 'keypress'), handler);
	+ obj.attr('autocomplete', 'off');
	};


	/*********************************************************/
	/******* client command interface *******/
	/*********************************************************/

	// execute a specific command on the web client
	this.command = function(command, props, obj)
	{
	if (obj && obj.blur)
	obj.blur();

	if (this.busy)
	return false;

	// command not supported or allowed
	if (!this.commands[command])
	{
	// pass command to parent window
	if (this.env.framed && parent.rcmail && parent.rcmail.command)
	parent.rcmail.command(command, props);

	return false;
	}

	// check input before leaving compose step
	if (this.task=='mail' && this.env.action=='compose' && (command=='list' \|\| command=='mail' \|\| command=='addressbook' \|\| command=='settings'))
	{
	if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
	return false;
	}

	- // process command
	+ // process external commands
	+ if (typeof this.command_handlers[command] == 'function')
	+ {
	+ var ret = this.command_handlers[command](props, obj);
	+ return ret !== null ? ret : (obj ? false : true);
	+ }
	+ else if (typeof this.command_handlers[command] == 'string')
	+ {
	+ var ret = window[this.command_handlers[command]](props, obj);
	+ return ret !== null ? ret : (obj ? false : true);
	+ }
	+
	+ // trigger plugin hook
	+ var event_ret = this.triggerEvent('before'+command, props);
	+ if (typeof event_ret != 'undefined') {
	+ // abort if one the handlers returned false
	+ if (event_ret === false)
	+ return false;
	+ else
	+ props = event_ret;
	+ }
	+
	+ // process internal command
	switch (command)
	{
	case 'login':
	if (this.gui_objects.loginform)
	this.gui_objects.loginform.submit();
	break;

	case 'logout':
	this.goto_url('logout', '', true);
	- break;
	+ break;

	// commands to switch task
	case 'mail':
	case 'addressbook':
	case 'settings':
	this.switch_task(command);
	break;

	case 'permaurl':
	if (obj && obj.href && obj.target)
	return true;
	else if (this.env.permaurl)
	parent.location.href = this.env.permaurl;
	break;

	// misc list commands
	case 'list':
	if (this.task=='mail')
	{
	if (this.env.search_request<0 \|\| (props != '' && (this.env.search_request && props != this.env.mailbox)))
	this.reset_qsearch();

	this.list_mailbox(props);

	if (this.env.trash_mailbox)
	this.set_alttext('delete', this.env.mailbox != this.env.trash_mailbox ? 'movemessagetotrash' : 'deletemessage');
	}
	else if (this.task=='addressbook')
	{
	if (this.env.search_request<0 \|\| (this.env.search_request && props != this.env.source))
	this.reset_qsearch();

	this.list_contacts(props);
	this.enable_command('add', (this.env.address_sources && !this.env.address_sources[props].readonly));
	}
	break;


	case 'load-headers':
	this.load_headers(obj);
	break;


	case 'sort':
	// get the type of sorting
	var a_sort = props.split('_');
	var sort_col = a_sort[0];
	var sort_order = a_sort[1] ? a_sort[1].toUpperCase() : null;
	- var header;

	// no sort order specified: toggle
	if (sort_order==null)
	{
	if (this.env.sort_col==sort_col)
	sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
	else
	sort_order = this.env.sort_order;
	}

	if (this.env.sort_col==sort_col && this.env.sort_order==sort_order)
	break;

	// set table header class
	- if (header = document.getElementById('rcm'+this.env.sort_col))
	- this.set_classname(header, 'sorted'+(this.env.sort_order.toUpperCase()), false);
	- if (header = document.getElementById('rcm'+sort_col))
	- this.set_classname(header, 'sorted'+sort_order, true);
	+ $('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));
	+ $('#rcm'+sort_col).addClass('sorted'+sort_order);

	// save new sort properties
	this.env.sort_col = sort_col;
	this.env.sort_order = sort_order;

	// reload message list
	this.list_mailbox('', '', sort_col+'_'+sort_order);
	break;

	case 'nextpage':
	this.list_page('next');
	break;

	case 'lastpage':
	this.list_page('last');
	break;

	case 'previouspage':
	this.list_page('prev');
	break;

	case 'firstpage':
	this.list_page('first');
	break;

	case 'expunge':
	if (this.env.messagecount)
	this.expunge_mailbox(this.env.mailbox);
	break;

	case 'purge':
	case 'empty-mailbox':
	if (this.env.messagecount)
	this.purge_mailbox(this.env.mailbox);
	break;


	// common commands used in multiple tasks
	case 'show':
	if (this.task=='mail')
	{
	var uid = this.get_single_uid();
	if (uid && (!this.env.uid \|\| uid != this.env.uid))
	{
	if (this.env.mailbox == this.env.drafts_mailbox)
	this.goto_url('compose', '_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true);
	else
	this.show_message(uid);
	}
	}
	else if (this.task=='addressbook')
	{
	var cid = props ? props : this.get_single_cid();
	if (cid && !(this.env.action=='show' && cid==this.env.cid))
	this.load_contact(cid, 'show');
	}
	break;

	case 'add':
	if (this.task=='addressbook')
	this.load_contact(0, 'add');
	else if (this.task=='settings')
	{
	this.identity_list.clear_selection();
	this.load_identity(0, 'add-identity');
	}
	break;

	case 'edit':
	var cid;
	if (this.task=='addressbook' && (cid = this.get_single_cid()))
	this.load_contact(cid, 'edit');
	else if (this.task=='settings' && props)
	this.load_identity(props, 'edit-identity');
	break;

	case 'save-identity':
	case 'save':
	if (this.gui_objects.editform)
	{
	- var input_pagesize = rcube_find_object('_pagesize');
	- var input_name = rcube_find_object('_name');
	- var input_email = rcube_find_object('_email');
	+ var input_pagesize = $("input[name='_pagesize']");
	+ var input_name = $("input[name='_name']");
	+ var input_email = $("input[name='_email']");

	// user prefs
	- if (input_pagesize && isNaN(parseInt(input_pagesize.value)))
	+ if (input_pagesize.length && isNaN(parseInt(input_pagesize.val())))
	{
	alert(this.get_label('nopagesizewarning'));
	input_pagesize.focus();
	break;
	}
	// contacts/identities
	else
	{
	- if (input_name && input_name.value == '')
	+ if (input_name.length && input_name.val() == '')
	{
	alert(this.get_label('nonamewarning'));
	input_name.focus();
	break;
	}
	- else if (input_email && !rcube_check_email(input_email.value))
	+ else if (input_email.length && !rcube_check_email(input_email.val()))
	{
	alert(this.get_label('noemailwarning'));
	input_email.focus();
	break;
	}
	}

	this.gui_objects.editform.submit();
	}
	break;

	case 'delete':
	// mail task
	if (this.task=='mail')
	this.delete_messages();
	// addressbook task
	else if (this.task=='addressbook')
	this.delete_contacts();
	// user settings task
	else if (this.task=='settings')
	this.delete_identity();
	break;


	// mail task commands
	case 'move':
	case 'moveto':
	if (this.task == 'mail')
	this.move_messages(props);
	else if (this.task == 'addressbook' && this.drag_active)
	this.copy_contact(null, props);
	break;

	case 'mark':
	if (props)
	this.mark_message(props);
	break;

	case 'toggle_status':
	if (props && !props._row)
	break;

	var uid;
	var flag = 'read';

	if (props._row.uid)
	{
	uid = props._row.uid;

	// toggle read/unread
	if (this.message_list.rows[uid].deleted) {
	flag = 'undelete';
	} else if (!this.message_list.rows[uid].unread)
	flag = 'unread';
	}

	this.mark_message(flag, uid);
	break;

	case 'toggle_flag':
	if (props && !props._row)
	break;

	var uid;
	var flag = 'flagged';

	if (props._row.uid)
	{
	uid = props._row.uid;
	// toggle flagged/unflagged
	if (this.message_list.rows[uid].flagged)
	flag = 'unflagged';
	}
	this.mark_message(flag, uid);
	break;

	case 'always-load':
	if (this.env.uid && this.env.sender) {
	this.add_contact(urlencode(this.env.sender));
	window.setTimeout(function(){ ref.command('load-images'); }, 300);
	break;
	}

	case 'load-images':
	if (this.env.uid)
	this.show_message(this.env.uid, true, this.env.action=='preview');
	break;

	case 'load-attachment':
	var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props.part;

	// open attachment in frame if it's of a supported mimetype
	if (this.env.uid && props.mimetype && find_in_array(props.mimetype, this.mimetypes)>=0)
	{
	if (props.mimetype == 'text/html')
	qstring += '&_safe=1';
	this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
	if (this.attachment_win)
	{
	window.setTimeout(function(){ ref.attachment_win.focus(); }, 10);
	break;
	}
	}

	this.goto_url('get', qstring+'&_download=1', false);
	break;

	case 'select-all':
	this.message_list.select_all(props);
	break;

	case 'select-none':
	this.message_list.clear_selection();
	break;

	case 'nextmessage':
	if (this.env.next_uid)
	this.show_message(this.env.next_uid, false, this.env.action=='preview');
	break;

	case 'lastmessage':
	if (this.env.last_uid)
	this.show_message(this.env.last_uid);
	break;

	case 'previousmessage':
	if (this.env.prev_uid)
	this.show_message(this.env.prev_uid, false, this.env.action=='preview');
	break;

	case 'firstmessage':
	if (this.env.first_uid)
	this.show_message(this.env.first_uid);
	break;

	case 'checkmail':
	this.check_for_recent(true);
	break;

	case 'compose':
	var url = this.env.comm_path+'&_action=compose';

	if (this.task=='mail')
	{
	url += '&_mbox='+urlencode(this.env.mailbox);

	if (this.env.mailbox==this.env.drafts_mailbox)
	{
	var uid;
	if (uid = this.get_single_uid())
	url += '&_draft_uid='+uid;
	}
	else if (props)
	url += '&_to='+urlencode(props);
	}
	// modify url if we're in addressbook
	else if (this.task=='addressbook')
	{
	// switch to mail compose step directly
	if (props && props.indexOf('@') > 0)
	{
	url = this.get_task_url('mail', url);
	this.redirect(url + '&_to='+urlencode(props));
	break;
	}

	// use contact_id passed as command parameter
	var a_cids = new Array();
	if (props)
	a_cids[a_cids.length] = props;
	// get selected contacts
	else if (this.contact_list)
	{
	var selection = this.contact_list.get_selection();
	for (var n=0; n<selection.length; n++)
	a_cids[a_cids.length] = selection[n];
	}

	if (a_cids.length)
	this.http_request('mailto', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source), true);

	break;
	}

	// don't know if this is necessary...
	url = url.replace(/&_framed=1/, "");

	this.redirect(url);
	break;

	case 'spellcheck':
	if (window.tinyMCE && tinyMCE.get('compose-body')) {
	tinyMCE.execCommand('mceSpellCheck', true);
	}
	else if (this.env.spellcheck && this.env.spellcheck.spellCheck && this.spellcheck_ready) {
	this.env.spellcheck.spellCheck(this.env.spellcheck.check_link);
	this.set_spellcheck_state('checking');
	}
	break;

	case 'savedraft':
	// Reset the auto-save timer
	self.clearTimeout(this.save_timer);

	if (!this.gui_objects.messageform)
	break;

	// if saving Drafts is disabled in main.inc.php
	// or if compose form did not change
	if (!this.env.drafts_mailbox \|\| this.cmp_hash == this.compose_field_hash())
	break;

	this.set_busy(true, 'savingmessage');
	var form = this.gui_objects.messageform;
	form.target = "savetarget";
	form._draft.value = '1';
	form.submit();
	break;

	case 'send':
	if (!this.gui_objects.messageform)
	break;

	if (!this.check_compose_input())
	break;

	// Reset the auto-save timer
	self.clearTimeout(this.save_timer);

	// all checks passed, send message
	this.set_busy(true, 'sendingmessage');
	var form = this.gui_objects.messageform;
	form.target = "savetarget";
	form._draft.value = '';
	form.submit();

	// clear timeout (sending could take longer)
	clearTimeout(this.request_timer);
	break;

	case 'add-attachment':
	this.show_attachment_form(true);

	case 'send-attachment':
	// Reset the auto-save timer
	self.clearTimeout(this.save_timer);

	this.upload_file(props)
	break;

	case 'remove-attachment':
	this.remove_attachment(props);
	break;

	case 'reply-all':
	case 'reply':
	var uid;
	if (uid = this.get_single_uid())
	this.goto_url('compose', '_reply_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(command=='reply-all' ? '&_all=1' : ''), true);
	break;

	case 'forward':
	var uid;
	if (uid = this.get_single_uid())
	this.goto_url('compose', '_forward_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true);
	break;

	case 'print':
	var uid;
	if (uid = this.get_single_uid())
	{
	ref.printwin = window.open(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''));
	if (this.printwin)
	{
	window.setTimeout(function(){ ref.printwin.focus(); }, 20);
	if (this.env.action != 'show')
	this.mark_message('read', uid);
	}
	}
	break;

	case 'viewsource':
	var uid;
	if (uid = this.get_single_uid())
	{
	ref.sourcewin = window.open(this.env.comm_path+'&_action=viewsource&_uid='+this.env.uid+'&_mbox='+urlencode(this.env.mailbox));
	if (this.sourcewin)
	window.setTimeout(function(){ ref.sourcewin.focus(); }, 20);
	}
	break;

	case 'add-contact':
	this.add_contact(props);
	break;

	// quicksearch
	case 'search':
	if (!props && this.gui_objects.qsearchbox)
	props = this.gui_objects.qsearchbox.value;
	if (props)
	{
	this.qsearch(props);
	break;
	}

	// reset quicksearch
	case 'reset-search':
	var s = this.env.search_request;
	this.reset_qsearch();

	if (s && this.env.mailbox)
	this.list_mailbox(this.env.mailbox);
	else if (s && this.task == 'addressbook')
	this.list_contacts(this.env.source);
	break;

	case 'import':
	if (this.env.action == 'import' && this.gui_objects.importform) {
	var file = document.getElementById('rcmimportfile');
	if (file && !file.value) {
	alert(this.get_label('selectimportfile'));
	break;
	}
	this.gui_objects.importform.submit();
	this.set_busy(true, 'importwait');
	this.lock_form(this.gui_objects.importform, true);
	}
	else
	this.goto_url('import');
	break;

	case 'export':
	if (this.contact_list.rowcount > 0) {
	var add_url = (this.env.source ? '_source='+urlencode(this.env.source)+'&' : '');
	if (this.env.search_request)
	add_url += '_search='+this.env.search_request;

	this.goto_url('export', add_url);
	}
	break;

	// collapse/expand folder
	case 'collapse-folder':
	if (props)
	this.collapse_folder(props);
	break;

	// user settings commands
	case 'preferences':
	this.goto_url('');
	break;

	case 'identities':
	this.goto_url('identities');
	break;

	case 'delete-identity':
	this.delete_identity();

	case 'folders':
	this.goto_url('folders');
	break;

	case 'subscribe':
	this.subscribe_folder(props);
	break;

	case 'unsubscribe':
	this.unsubscribe_folder(props);
	break;

	case 'create-folder':
	this.create_folder(props);
	break;

	case 'rename-folder':
	this.rename_folder(props);
	break;

	case 'delete-folder':
	this.delete_folder(props);
	break;

	}
	+
	+ this.triggerEvent('after'+command, props);

	return obj ? false : true;
	};

	// set command enabled or disabled
	this.enable_command = function()
	{
	var args = arguments;
	if(!args.length) return -1;

	var command;
	var enable = args[args.length-1];

	for(var n=0; n<args.length-1; n++)
	{
	command = args[n];
	this.commands[command] = enable;
	this.set_button(command, (enable ? 'act' : 'pas'));
	}
	return true;
	};

	// lock/unlock interface
	this.set_busy = function(a, message)
	{
	if (a && message)
	{
	var msg = this.get_label(message);
	if (msg==message)
	msg = 'Loading...';

	this.display_message(msg, 'loading', true);
	}
	else if (!a)
	this.hide_message();

	this.busy = a;
	//document.body.style.cursor = a ? 'wait' : 'default';

	if (this.gui_objects.editform)
	this.lock_form(this.gui_objects.editform, a);

	// clear pending timer
	if (this.request_timer)
	clearTimeout(this.request_timer);

	// set timer for requests
	if (a && this.env.request_timeout)
	this.request_timer = window.setTimeout(function(){ ref.request_timed_out(); }, this.env.request_timeout * 1000);
	};

	// return a localized string
	- this.get_label = function(name)
	+ this.get_label = function(name, domain)
	{
	- if (this.labels[name])
	+ if (domain && this.labels[domain+'.'+name])
	+ return this.labels[domain+'.'+name];
	+ else if (this.labels[name])
	return this.labels[name];
	else
	return name;
	};
	+
	+ // alias for convenience reasons
	+ this.gettext = this.get_label;

	// switch to another application task
	this.switch_task = function(task)
	{
	if (this.task===task && task!='mail')
	return;

	var url = this.get_task_url(task);
	if (task=='mail')
	url += '&_mbox=INBOX';

	this.redirect(url);
	};

	this.get_task_url = function(task, url)
	{
	if (!url)
	url = this.env.comm_path;

	return url.replace(/_task=[a-z]+/, '_task='+task);
	};

	// called when a request timed out
	this.request_timed_out = function()
	{
	this.set_busy(false);
	this.display_message('Request timed out!', 'error');
	};


	/*********************************************************/
	/******* event handling methods *******/
	/*********************************************************/

	this.doc_mouse_up = function(e)
	{
	- var model, li;
	+ var model, list, li;

	if (this.message_list) {
	if (!rcube_mouse_is_over(e, this.message_list.list))
	this.message_list.blur();
	+ list = this.message_list;
	model = this.env.mailboxes;
	}
	else if (this.contact_list) {
	if (!rcube_mouse_is_over(e, this.contact_list.list))
	this.contact_list.blur();
	+ list = this.contact_list;
	model = this.env.address_sources;
	}
	else if (this.ksearch_value) {
	this.ksearch_blur();
	}

	// handle mouse release when dragging
	if (this.drag_active && model && this.env.last_folder_target) {
	- this.set_classname(this.get_folder_li(this.env.last_folder_target), 'droptarget', false);
	+ $(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
	this.command('moveto', model[this.env.last_folder_target].id);
	this.env.last_folder_target = null;
	+ list.draglayer.hide();
	}
	};

	this.drag_start = function(list)
	{
	this.initialBodyScrollTop = bw.ie ? 0 : window.pageYOffset;
	this.initialMailBoxScrollTop = document.getElementById("mailboxlist-container").scrollTop;

	var model = this.task == 'mail' ? this.env.mailboxes : this.env.address_sources;

	this.drag_active = true;
	if (this.preview_timer)
	clearTimeout(this.preview_timer);

	// save folderlist and folders location/sizes for droptarget calculation in drag_move()
	if (this.gui_objects.folderlist && model)
	{
	var li, pos, list, height;
	- list = rcube_find_object(this.task == 'mail' ? 'mailboxlist' : 'directorylist');
	- pos = rcube_get_object_pos(list);
	- this.env.folderlist_coords = {x1:pos.x, y1:pos.y, x2:pos.x + list.offsetWidth, y2:pos.y + list.offsetHeight};
	+ list = $(this.gui_objects.folderlist);
	+ pos = list.offset();
	+ this.env.folderlist_coords = { x1:pos.left, y1:pos.top, x2:pos.left + list.width(), y2:pos.top + list.height() };

	this.env.folder_coords = new Array();
	for (var k in model) {
	- if (li = this.get_folder_li(k))
	- {
	- pos = rcube_get_object_pos(li.firstChild);
	- // only visible folders
	- if (height = li.firstChild.offsetHeight)
	- this.env.folder_coords[k] = {x1:pos.x, y1:pos.y, x2:pos.x + li.firstChild.offsetWidth, y2:pos.y + height};
	- }
	+ if (li = this.get_folder_li(k)) {
	+ pos = $(li.firstChild).offset();
	+ // only visible folders
	+ if (height = li.firstChild.offsetHeight)
	+ this.env.folder_coords[k] = { x1:pos.left, y1:pos.top, x2:pos.left + li.firstChild.offsetWidth, y2:pos.top + height };
	}
	}
	+ }
	};

	this.drag_move = function(e)
	- {
	- if (this.gui_objects.folderlist && this.env.folder_coords)
	- {
	+ {
	+ if (this.gui_objects.folderlist && this.env.folder_coords) {
	// offsets to compensate for scrolling while dragging a message
	var boffset = bw.ie ? -document.documentElement.scrollTop : this.initialBodyScrollTop;
	var moffset = this.initialMailBoxScrollTop-document.getElementById('mailboxlist-container').scrollTop;
	var toffset = -moffset-boffset;

	var li, pos, mouse;
	mouse = rcube_event.get_mouse_pos(e);
	pos = this.env.folderlist_coords;

	mouse.y += toffset;

	// if mouse pointer is outside of folderlist
	- if (mouse.x < pos.x1 \|\| mouse.x >= pos.x2
	- \|\| mouse.y < pos.y1 \|\| mouse.y >= pos.y2)
	- {
	- if (this.env.last_folder_target) {
	- this.set_classname(this.get_folder_li(this.env.last_folder_target), 'droptarget', false);
	+ if (mouse.x < pos.x1 \|\| mouse.x >= pos.x2 \|\| mouse.y < pos.y1 \|\| mouse.y >= pos.y2) {
	+ if (this.env.last_folder_target) {
	+ $(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
	this.env.last_folder_target = null;
	- }
	- return;
	}
	+ return;
	+ }

	// over the folders
	- for (var k in this.env.folder_coords)
	- {
	- pos = this.env.folder_coords[k];
	- if (this.check_droptarget(k) && ((mouse.x >= pos.x1) && (mouse.x < pos.x2)
	- && (mouse.y >= pos.y1) && (mouse.y < pos.y2)))
	- {
	- this.set_classname(this.get_folder_li(k), 'droptarget', true);
	- this.env.last_folder_target = k;
	- }
	- else
	- this.set_classname(this.get_folder_li(k), 'droptarget', false);
	+ for (var k in this.env.folder_coords) {
	+ pos = this.env.folder_coords[k];
	+ if (this.check_droptarget(k) && ((mouse.x >= pos.x1) && (mouse.x < pos.x2)
	+ && (mouse.y >= pos.y1) && (mouse.y < pos.y2))) {
	+ $(this.get_folder_li(k)).addClass('droptarget');
	+ this.env.last_folder_target = k;
	+ }
	+ else {
	+ $(this.get_folder_li(k)).removeClass('droptarget');
	+ if (k == this.env.last_folder_target)
	+ this.env.last_folder_target = null;
	}
	}
	- };
	+ }
	+ };

	this.collapse_folder = function(id)
	{
	var div;
	if ((li = this.get_folder_li(id)) &&
	- (div = li.getElementsByTagName("div")[0]) &&
	- (div.className.match(/collapsed/) \|\| div.className.match(/expanded/)))
	+ (div = $(li.getElementsByTagName("div")[0])) &&
	+ (div.hasClass('collapsed') \|\| div.hasClass('expanded')))
	{
	- var ul = li.getElementsByTagName("ul")[0];
	- if (div.className.match(/collapsed/))
	+ var ul = $(li.getElementsByTagName("ul")[0]);
	+ if (div.hasClass('collapsed'))
	{
	- ul.style.display = '';
	- this.set_classname(div, 'collapsed', false);
	- this.set_classname(div, 'expanded', true);
	+ ul.show();
	+ div.removeClass('collapsed').addClass('expanded');
	var reg = new RegExp('&'+urlencode(id)+'&');
	this.set_env('collapsed_folders', this.env.collapsed_folders.replace(reg, ''));
	}
	else
	{
	- ul.style.display = 'none';
	- this.set_classname(div, 'expanded', false);
	- this.set_classname(div, 'collapsed', true);
	+ ul.hide();
	+ div.removeClass('expanded').addClass('collapsed');
	this.set_env('collapsed_folders', this.env.collapsed_folders+'&'+urlencode(id)+'&');

	// select parent folder if one of its childs is currently selected
	if (this.env.mailbox.indexOf(id + this.env.delimiter) == 0)
	this.command('list', id);
	}

	// Work around a bug in IE6 and IE7, see #1485309
	if ((bw.ie6 \|\| bw.ie7) &&
	li.nextSibling &&
	(li.nextSibling.getElementsByTagName("ul").length>0) &&
	li.nextSibling.getElementsByTagName("ul")[0].style &&
	(li.nextSibling.getElementsByTagName("ul")[0].style.display!='none'))
	{
	li.nextSibling.getElementsByTagName("ul")[0].style.display = 'none';
	li.nextSibling.getElementsByTagName("ul")[0].style.display = '';
	}

	this.http_post('save-pref', '_name=collapsed_folders&_value='+urlencode(this.env.collapsed_folders));
	this.set_unread_count_display(id, false);
	}
	}

	this.click_on_list = function(e)
	{
	if (this.gui_objects.qsearchbox)
	this.gui_objects.qsearchbox.blur();

	if (this.message_list)
	this.message_list.focus();
	else if (this.contact_list)
	this.contact_list.focus();

	- var mbox_li;
	- if (mbox_li = this.get_folder_li())
	- this.set_classname(mbox_li, 'unfocused', true);
	-
	return rcube_event.get_button(e) == 2 ? true : rcube_event.cancel(e);
	};

	this.msglist_select = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);

	var selected = list.selection.length==1;

	// Hide certain command buttons when Drafts folder is selected
	if (this.env.mailbox == this.env.drafts_mailbox)
	{
	this.enable_command('reply', 'reply-all', 'forward', false);
	this.enable_command('show', 'print', selected);
	this.enable_command('delete', 'moveto', 'mark', (list.selection.length > 0 ? true : false));
	}
	else
	{
	this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected);
	this.enable_command('delete', 'moveto', 'mark', (list.selection.length > 0 ? true : false));
	}

	// start timer for message preview (wait for double click)
	if (selected && this.env.contentframe && !list.multi_selecting)
	this.preview_timer = window.setTimeout(function(){ ref.msglist_get_preview(); }, 200);
	else if (this.env.contentframe)
	this.show_contentframe(false);
	};

	this.msglist_dbl_click = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);

	var uid = list.get_single_selection();
	if (uid && this.env.mailbox == this.env.drafts_mailbox)
	this.goto_url('compose', '_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true);
	else if (uid)
	this.show_message(uid, false, false);
	};

	this.msglist_keypress = function(list)
	{
	if (list.key_pressed == list.ENTER_KEY)
	this.command('show');
	else if (list.key_pressed == list.DELETE_KEY)
	this.command('delete');
	else if (list.key_pressed == list.BACKSPACE_KEY)
	this.command('delete');
	else
	list.shiftkey = false;
	};

	this.msglist_get_preview = function()
	{
	var uid = this.get_single_uid();
	if (uid && this.env.contentframe && !this.drag_active)
	this.show_message(uid, false, true);
	else if (this.env.contentframe)
	this.show_contentframe(false);
	};

	this.check_droptarget = function(id)
	{
	if (this.task == 'mail')
	return (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
	else if (this.task == 'addressbook')
	return (id != this.env.source && this.env.address_sources[id] && !this.env.address_sources[id].readonly);
	else if (this.task == 'settings')
	return (id != this.env.folder);
	};


	/*********************************************************/
	/******* (message) list functionality *******/
	/*********************************************************/

	// when user doble-clicks on a row
	this.show_message = function(id, safe, preview)
	{
	if (!id) return;

	var add_url = '';
	var action = preview ? 'preview': 'show';
	var target = window;

	if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe])
	{
	target = window.frames[this.env.contentframe];
	add_url = '&_framed=1';
	}

	if (safe)
	add_url = '&_safe=1';

	// also send search request to get the right messages
	if (this.env.search_request)
	add_url += '&_search='+this.env.search_request;
	+
	var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url;
	if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
	this.show_contentframe(true);
	else
	{
	this.set_busy(true, 'loading');
	target.location.href = this.env.comm_path+url;

	// mark as read and change mbox unread counter
	if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread)
	{
	this.set_message(id, 'unread', false);
	- if (this.env.unread_counts[this.env.mailbox])
	- {
	- this.env.unread_counts[this.env.mailbox] -= 1;
	- this.set_unread_count(this.env.mailbox, this.env.unread_counts[this.env.mailbox], this.env.mailbox == 'INBOX');
	- }
	- }
	+ if (this.env.unread_counts[this.env.mailbox])
	+ {
	+ this.env.unread_counts[this.env.mailbox] -= 1;
	+ this.set_unread_count(this.env.mailbox, this.env.unread_counts[this.env.mailbox], this.env.mailbox == 'INBOX');
	+ }
	+ }
	}
	};

	this.show_contentframe = function(show)
	{
	var frm;
	- if (this.env.contentframe && (frm = rcube_find_object(this.env.contentframe)))
	+ if (this.env.contentframe && (frm = $('#'+this.env.contentframe)) && frm.length)
	{
	if (!show && window.frames[this.env.contentframe])
	{
	if (window.frames[this.env.contentframe].location.href.indexOf(this.env.blankpage)<0)
	window.frames[this.env.contentframe].location.href = this.env.blankpage;
	}
	else if (!bw.safari && !bw.konq)
	- frm.style.display = show ? 'block' : 'none';
	+ frm[show ? 'show' : 'hide']();
	}

	if (!show && this.busy)
	this.set_busy(false);
	};

	// list a specific page
	this.list_page = function(page)
	{
	if (page=='next')
	page = this.env.current_page+1;
	if (page=='last')
	page = this.env.pagecount;
	if (page=='prev' && this.env.current_page>1)
	page = this.env.current_page-1;
	if (page=='first' && this.env.current_page>1)
	page = 1;

	if (page > 0 && page <= this.env.pagecount)
	{
	this.env.current_page = page;

	if (this.task=='mail')
	this.list_mailbox(this.env.mailbox, page);
	else if (this.task=='addressbook')
	this.list_contacts(this.env.source, page);
	}
	};

	// list messages of a specific mailbox using filter
	this.filter_mailbox = function(filter)
	{
	var search;
	if (this.gui_objects.qsearchbox)
	search = this.gui_objects.qsearchbox.value;

	this.message_list.clear();

	// reset vars
	this.env.current_page = 1;
	this.set_busy(true, 'searching');
	this.http_request('search', '_filter='+filter
	+ (search ? '&_q='+urlencode(search) : '')
	+ (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), true);
	}


	// list messages of a specific mailbox
	this.list_mailbox = function(mbox, page, sort)
	{
	this.last_selected = 0;
	var add_url = '';
	var target = window;

	if (!mbox)
	mbox = this.env.mailbox;

	// add sort to url if set
	if (sort)
	add_url += '&_sort=' + sort;

	// also send search request to get the right messages
	if (this.env.search_request)
	add_url += '&_search='+this.env.search_request;

	// set page=1 if changeing to another mailbox
	if (!page && mbox != this.env.mailbox)
	{
	page = 1;
	this.env.current_page = page;
	if (this.message_list)
	this.message_list.clear_selection();
	this.show_contentframe(false);
	}

	if (mbox != this.env.mailbox \|\| (mbox == this.env.mailbox && !page && !sort))
	add_url += '&_refresh=1';

	this.select_folder(mbox, this.env.mailbox);
	this.env.mailbox = mbox;

	// load message list remotely
	if (this.gui_objects.messagelist)
	{
	this.list_mailbox_remote(mbox, page, add_url);
	return;
	}

	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
	{
	target = window.frames[this.env.contentframe];
	add_url += '&_framed=1';
	}

	// load message list to target frame/window
	if (mbox)
	{
	this.set_busy(true, 'loading');
	target.location.href = this.env.comm_path+'&_mbox='+urlencode(mbox)+(page ? '&_page='+page : '')+add_url;
	}
	};

	// send remote request to load message list
	this.list_mailbox_remote = function(mbox, page, add_url)
	{
	// clear message list first
	this.message_list.clear();

	// send request to server
	var url = '_mbox='+urlencode(mbox)+(page ? '&_page='+page : '');
	this.set_busy(true, 'loading');
	this.http_request('list', url+add_url, true);
	};

	this.expunge_mailbox = function(mbox)
	{
	var lock = false;
	var add_url = '';

	// lock interface if it's the active mailbox
	if (mbox == this.env.mailbox)
	{
	lock = true;
	this.set_busy(true, 'loading');
	add_url = '&_reload=1';
	}

	// send request to server
	var url = '_mbox='+urlencode(mbox);
	this.http_post('expunge', url+add_url, lock);
	};

	this.purge_mailbox = function(mbox)
	{
	var lock = false;
	var add_url = '';

	if (!confirm(this.get_label('purgefolderconfirm')))
	return false;

	// lock interface if it's the active mailbox
	if (mbox == this.env.mailbox)
	{
	lock = true;
	this.set_busy(true, 'loading');
	add_url = '&_reload=1';
	}

	// send request to server
	var url = '_mbox='+urlencode(mbox);
	this.http_post('purge', url+add_url, lock);
	return true;
	};

	// test if purge command is allowed
	this.purge_mailbox_test = function()
	{
	return (this.env.messagecount && (this.env.mailbox == this.env.trash_mailbox \|\| this.env.mailbox == this.env.junk_mailbox
	\|\| this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter))
	\|\| this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))));
	};

	// set message icon
	this.set_message_icon = function(uid)
	{
	var icn_src;
	var rows = this.message_list.rows;

	if (!rows[uid])
	return false;

	if (rows[uid].deleted && this.env.deletedicon)
	icn_src = this.env.deletedicon;
	else if (rows[uid].replied && this.env.repliedicon)
	{
	if (rows[uid].forwarded && this.env.forwardedrepliedicon)
	icn_src = this.env.forwardedrepliedicon;
	else
	icn_src = this.env.repliedicon;
	}
	else if (rows[uid].forwarded && this.env.forwardedicon)
	icn_src = this.env.forwardedicon;
	else if (rows[uid].unread && this.env.unreadicon)
	icn_src = this.env.unreadicon;
	else if (this.env.messageicon)
	icn_src = this.env.messageicon;

	if (icn_src && rows[uid].icon)
	rows[uid].icon.src = icn_src;

	icn_src = '';

	if (rows[uid].flagged && this.env.flaggedicon)
	icn_src = this.env.flaggedicon;
	else if (!rows[uid].flagged && this.env.unflaggedicon)
	icn_src = this.env.unflaggedicon;

	if (rows[uid].flagged_icon && icn_src)
	rows[uid].flagged_icon.src = icn_src;
	}

	// set message status
	this.set_message_status = function(uid, flag, status)
	{
	var rows = this.message_list.rows;

	if (!rows[uid]) return false;

	if (flag == 'unread')
	rows[uid].unread = status;
	else if(flag == 'deleted')
	rows[uid].deleted = status;
	else if (flag == 'replied')
	rows[uid].replied = status;
	else if (flag == 'forwarded')
	rows[uid].forwarded = status;
	else if (flag == 'flagged')
	rows[uid].flagged = status;

	this.env.messages[uid] = rows[uid];
	}

	// set message row status, class and icon
	this.set_message = function(uid, flag, status)
	{
	var rows = this.message_list.rows;

	if (!rows[uid]) return false;

	if (flag)
	this.set_message_status(uid, flag, status);

	+ var rowobj = $(rows[uid].obj);
	if (rows[uid].unread && rows[uid].classname.indexOf('unread')<0)
	{
	rows[uid].classname += ' unread';
	- this.set_classname(rows[uid].obj, 'unread', true);
	+ rowobj.addClass('unread');
	}
	else if (!rows[uid].unread && rows[uid].classname.indexOf('unread')>=0)
	{
	rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
	- this.set_classname(rows[uid].obj, 'unread', false);
	+ rowobj.removeClass('unread');
	}

	if (rows[uid].deleted && rows[uid].classname.indexOf('deleted')<0)
	{
	rows[uid].classname += ' deleted';
	- this.set_classname(rows[uid].obj, 'deleted', true);
	+ rowobj.addClass('deleted');
	}
	else if (!rows[uid].deleted && rows[uid].classname.indexOf('deleted')>=0)
	{
	rows[uid].classname = rows[uid].classname.replace(/\s*deleted/, '');
	- this.set_classname(rows[uid].obj, 'deleted', false);
	+ rowobj.removeClass('deleted');
	}

	if (rows[uid].flagged && rows[uid].classname.indexOf('flagged')<0)
	{
	rows[uid].classname += ' flagged';
	- this.set_classname(rows[uid].obj, 'flagged', true);
	+ rowobj.addClass('flagged');
	}
	else if (!rows[uid].flagged && rows[uid].classname.indexOf('flagged')>=0)
	{
	rows[uid].classname = rows[uid].classname.replace(/\s*flagged/, '');
	- this.set_classname(rows[uid].obj, 'flagged', false);
	+ rowobj.removeClass('flagged');
	}

	this.set_message_icon(uid);
	}

	// move selected messages to the specified mailbox
	this.move_messages = function(mbox)
	{
	// exit if current or no mailbox specified or if selection is empty
	if (!mbox \|\| mbox == this.env.mailbox \|\| (!this.env.uid && (!this.message_list \|\| !this.message_list.get_selection().length)))
	return;

	var lock = false;
	var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');

	// show wait message
	if (this.env.action=='show')
	{
	lock = true;
	this.set_busy(true, 'movingmessage');
	}
	else if (!this.env.flag_for_deletion)
	this.show_contentframe(false);

	// Hide message command buttons until a message is selected
	this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', false);

	this._with_selected_messages('moveto', lock, add_url, (this.env.flag_for_deletion ? false : true));
	};

	// delete selected messages from the current mailbox
	this.delete_messages = function()
	{
	var selection = this.message_list ? this.message_list.get_selection() : new Array();

	// exit if no mailbox specified or if selection is empty
	if (!this.env.uid && !selection.length)
	return;

	// if there is a trash mailbox defined and we're not currently in it:
	if (this.env.trash_mailbox && String(this.env.mailbox).toLowerCase() != String(this.env.trash_mailbox).toLowerCase())
	{
	// if shift was pressed delete it immediately
	if (this.message_list && this.message_list.shiftkey)
	{
	if (confirm(this.get_label('deletemessagesconfirm')))
	this.permanently_remove_messages();
	}
	else
	this.move_messages(this.env.trash_mailbox);
	}
	// if there is a trash mailbox defined but we are in it:
	else if (this.env.trash_mailbox && String(this.env.mailbox).toLowerCase() == String(this.env.trash_mailbox).toLowerCase())
	this.permanently_remove_messages();
	// if there isn't a defined trash mailbox and the config is set to flag for deletion
	else if (!this.env.trash_mailbox && this.env.flag_for_deletion)
	{
	this.mark_message('delete');
	if(this.env.action=="show")
	this.command('nextmessage','',this);
	else if (selection.length == 1)
	this.message_list.select_next();
	}
	// if there isn't a defined trash mailbox and the config is set NOT to flag for deletion
	else if (!this.env.trash_mailbox)
	this.permanently_remove_messages();
	};

	// delete the selected messages permanently
	this.permanently_remove_messages = function()
	{
	// exit if no mailbox specified or if selection is empty
	if (!this.env.uid && (!this.message_list \|\| !this.message_list.get_selection().length))
	return;

	this.show_contentframe(false);
	this._with_selected_messages('delete', false, '&_from='+(this.env.action ? this.env.action : ''), true);
	};

	// Send a specifc request with UIDs of all selected messages
	// @private
	this._with_selected_messages = function(action, lock, add_url, remove)
	{
	var a_uids = new Array();

	if (this.env.uid)
	a_uids[0] = this.env.uid;
	else
	{
	var selection = this.message_list.get_selection();
	var rows = this.message_list.rows;
	var id;
	for (var n=0; n<selection.length; n++)
	{
	id = selection[n];
	a_uids[a_uids.length] = id;

	if (remove)
	this.message_list.remove_row(id, (n == selection.length-1));
	else
	{
	this.set_message_status(id, 'deleted', true);
	if (this.env.read_when_deleted)
	- this.set_message_status(id, 'unread', false);
	- this.set_message(id);
	+ this.set_message_status(id, 'unread', false);
	+ this.set_message(id);
	}
	}
	}

	// also send search request to get the right messages
	if (this.env.search_request)
	add_url += '&_search='+this.env.search_request;

	// send request to server
	this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
	};

	// set a specific flag to one or more messages
	this.mark_message = function(flag, uid)
	{
	var a_uids = new Array();
	var r_uids = new Array();
	var selection = this.message_list ? this.message_list.get_selection() : new Array();

	if (uid)
	a_uids[0] = uid;
	else if (this.env.uid)
	a_uids[0] = this.env.uid;
	else if (this.message_list)
	{
	for (var n=0; n<selection.length; n++)
	{
	a_uids[a_uids.length] = selection[n];
	}
	}

	if (!this.message_list)
	r_uids = a_uids;
	else
	for (var id, n=0; n<a_uids.length; n++)
	{
	id = a_uids[n];
	if ((flag=='read' && this.message_list.rows[id].unread)
	\|\| (flag=='unread' && !this.message_list.rows[id].unread)
	\|\| (flag=='delete' && !this.message_list.rows[id].deleted)
	\|\| (flag=='undelete' && this.message_list.rows[id].deleted)
	\|\| (flag=='flagged' && !this.message_list.rows[id].flagged)
	\|\| (flag=='unflagged' && this.message_list.rows[id].flagged))
	{
	r_uids[r_uids.length] = id;
	}
	}

	// nothing to do
	if (!r_uids.length)
	return;

	switch (flag)
	{
	case 'read':
	case 'unread':
	this.toggle_read_status(flag, r_uids);
	break;
	case 'delete':
	case 'undelete':
	this.toggle_delete_status(r_uids);
	break;
	case 'flagged':
	case 'unflagged':
	this.toggle_flagged_status(flag, a_uids);
	break;
	}
	};

	// set class to read/unread
	this.toggle_read_status = function(flag, a_uids)
	{
	// mark all message rows as read/unread
	for (var i=0; i<a_uids.length; i++)
	this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));

	this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
	};

	// set image to flagged or unflagged
	this.toggle_flagged_status = function(flag, a_uids)
	{
	// mark all message rows as flagged/unflagged
	for (var i=0; i<a_uids.length; i++)
	this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));

	this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
	};

	// mark all message rows as deleted/undeleted
	this.toggle_delete_status = function(a_uids)
	{
	var rows = this.message_list ? this.message_list.rows : new Array();

	if (a_uids.length==1)
	{
	if (!rows.length \|\| (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
	this.flag_as_deleted(a_uids);
	else
	this.flag_as_undeleted(a_uids);

	return true;
	}

	var all_deleted = true;
	for (var i=0; i<a_uids.length; i++)
	{
	uid = a_uids[i];
	if (rows[uid]) {
	if (!rows[uid].deleted)
	{
	all_deleted = false;
	break;
	}
	}
	}

	if (all_deleted)
	this.flag_as_undeleted(a_uids);
	else
	this.flag_as_deleted(a_uids);

	return true;
	};

	this.flag_as_undeleted = function(a_uids)
	{
	for (var i=0; i<a_uids.length; i++)
	this.set_message(a_uids[i], 'deleted', false);

	this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
	return true;
	};

	this.flag_as_deleted = function(a_uids)
	{
	var add_url = '';
	var r_uids = new Array();
	var rows = this.message_list ? this.message_list.rows : new Array();

	for (var i=0; i<a_uids.length; i++)
	{
	uid = a_uids[i];
	if (rows[uid])
	{
	this.set_message(uid, 'deleted', true);
	if (rows[uid].unread)
	r_uids[r_uids.length] = uid;
	}
	}

	if (r_uids.length)
	add_url = '&_ruid='+r_uids.join(',');

	this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete'+add_url);
	return true;
	};

	// flag as read without mark request (called from backend)
	// argument should be a coma-separated list of uids
	this.flag_deleted_as_read = function(uids)
	{
	var icn_src;
	var rows = this.message_list ? this.message_list.rows : new Array();
	var str = String(uids);
	var a_uids = new Array();

	a_uids = str.split(',');

	for (var uid, i=0; i<a_uids.length; i++)
	{
	uid = a_uids[i];
	if (rows[uid])
	this.set_message(uid, 'unread', false);
	}
	};


	/*********************************************************/
	/******* login form methods *******/
	/*********************************************************/

	// handler for keyboard events on the _user field
	this.login_user_keyup = function(e)
	{
	var key = rcube_event.get_keycode(e);
	- var elm;
	+ var passwd = $('#rcmloginpwd');

	// enter
	- if ((key==13) && (elm = rcube_find_object('_pass')))
	- {
	- elm.focus();
	- return false;
	+ if (key == 13 && passwd.length && !passwd.val()) {
	+ passwd.focus();
	+ return rcube_event.cancel(e);
	}
	+
	+ return true;
	};


	/*********************************************************/
	/******* message compose methods *******/
	/*********************************************************/

	// checks the input fields before sending a message
	this.check_compose_input = function()
	{
	// check input fields
	- var input_to = rcube_find_object('_to');
	- var input_cc = rcube_find_object('_cc');
	- var input_bcc = rcube_find_object('_bcc');
	- var input_from = rcube_find_object('_from');
	- var input_subject = rcube_find_object('_subject');
	- var input_message = rcube_find_object('_message');
	+ var input_to = $("[name='_to']");
	+ var input_cc = $("[name='_cc']");
	+ var input_bcc = $("[name='_bcc']");
	+ var input_from = $("[name='_from']");
	+ var input_subject = $("[name='_subject']");
	+ var input_message = $("[name='_message']");

	// check sender (if have no identities)
	- if (input_from.type == 'text' && !rcube_check_email(input_from.value, true))
	+ if (input_from.attr('type') == 'text' && !rcube_check_email(input_from.val(), true))
	{
	alert(this.get_label('nosenderwarning'));
	input_from.focus();
	return false;
	}

	// check for empty recipient
	- var recipients = input_to.value ? input_to.value : (input_cc.value ? input_cc.value : input_bcc.value);
	+ var recipients = input_to.val() ? input_to.val() : (input_cc.val() ? input_cc.val() : input_bcc.val());
	if (!rcube_check_email(recipients.replace(/^\s+/, '').replace(/[\s,;]+$/, ''), true))
	{
	alert(this.get_label('norecipientwarning'));
	input_to.focus();
	return false;
	}

	// display localized warning for missing subject
	- if (input_subject && input_subject.value == '')
	+ if (input_subject.val() == '')
	{
	var subject = prompt(this.get_label('nosubjectwarning'), this.get_label('nosubject'));

	// user hit cancel, so don't send
	if (!subject && subject !== '')
	{
	input_subject.focus();
	return false;
	}
	else
	{
	- input_subject.value = subject ? subject : this.get_label('nosubject');
	+ input_subject.val((subject ? subject : this.get_label('nosubject')));
	}
	}

	// check for empty body
	- if ((!window.tinyMCE \|\| !tinyMCE.get('compose-body')) && input_message.value == '' && !confirm(this.get_label('nobodywarning')))
	+ if ((!window.tinyMCE \|\| !tinyMCE.get('compose-body')) && input_message.val() == '' && !confirm(this.get_label('nobodywarning')))
	{
	input_message.focus();
	return false;
	}
	else if (window.tinyMCE && tinyMCE.get('compose-body') && !tinyMCE.get('compose-body').getContent() && !confirm(this.get_label('nobodywarning')))
	{
	tinyMCE.get('compose-body').focus();
	return false;
	}

	// Apply spellcheck changes if spell checker is active
	this.stop_spellchecking();

	return true;
	};

	this.stop_spellchecking = function()
	{
	if (this.env.spellcheck && !this.spellcheck_ready) {
	exec_event(this.env.spellcheck.check_link, 'click');
	this.set_spellcheck_state('ready');
	}
	};

	this.display_spellcheck_controls = function(vis)
	{
	if (this.env.spellcheck) {
	// stop spellchecking process
	if (!vis)
	this.stop_spellchecking();

	this.env.spellcheck.check_link.style.visibility = vis ? 'visible' : 'hidden';
	this.env.spellcheck.switch_lan_pic.style.visibility = vis ? 'visible' : 'hidden';
	}
	};

	this.set_spellcheck_state = function(s)
	{
	this.spellcheck_ready = (s=='check_spelling' \|\| s=='ready');
	this.enable_command('spellcheck', this.spellcheck_ready);
	};

	this.set_draft_id = function(id)
	{
	- var f;
	- if (f = rcube_find_object('_draft_saveid'))
	- f.value = id;
	+ $("input[name='_draft_saveid']").val(id);
	};

	this.auto_save_start = function()
	{
	if (this.env.draft_autosave)
	this.save_timer = self.setTimeout(function(){ ref.command("savedraft"); }, this.env.draft_autosave * 1000);

	// Unlock interface now that saving is complete
	this.busy = false;
	};

	this.compose_field_hash = function(save)
	{
	// check input fields
	- var input_to = rcube_find_object('_to');
	- var input_cc = rcube_find_object('_cc');
	- var input_bcc = rcube_find_object('_bcc');
	- var input_subject = rcube_find_object('_subject');
	- var editor, input_message;
	+ var value_to = $("[name='_to']").val();
	+ var value_cc = $("[name='_cc']").val();
	+ var value_bcc = $("[name='_bcc']").val();
	+ var value_subject = $("[name='_subject']").val();
	var str = '';

	- if (input_to && input_to.value)
	- str += input_to.value+':';
	- if (input_cc && input_cc.value)
	- str += input_cc.value+':';
	- if (input_bcc && input_bcc.value)
	- str += input_bcc.value+':';
	- if (input_subject && input_subject.value)
	- str += input_subject.value+':';
	-
	- if (editor = tinyMCE.get('compose-body'))
	+ if (value_to)
	+ str += value_to+':';
	+ if (value_cc)
	+ str += value_cc+':';
	+ if (value_bcc)
	+ str += value_bcc+':';
	+ if (value_subject)
	+ str += value_subject+':';
	+
	+ var editor = tinyMCE.get('compose-body');
	+ if (editor)
	str += editor.getContent();
	else
	- {
	- input_message = rcube_find_object('_message');
	- str += input_message.value;
	- }
	+ str += $("[name='_message']").val();

	if (save)
	this.cmp_hash = str;

	return str;
	};

	this.change_identity = function(obj)
	{
	if (!obj \|\| !obj.options)
	return false;

	var id = obj.options[obj.selectedIndex].value;
	- var input_message = rcube_find_object('_message');
	- var message = input_message ? input_message.value : '';
	- var is_html = (rcube_find_object('_is_html').value == '1');
	+ var input_message = $("[name='_message']");
	+ var message = input_message.val();
	+ var is_html = ($("input[name='_is_html']").val() == '1');
	var sig, p;

	if (!this.env.identity)
	this.env.identity = id

	if (!is_html)
	{
	// remove the 'old' signature
	if (this.env.identity && this.env.signatures && this.env.signatures[this.env.identity])
	{
	if (this.env.signatures[this.env.identity]['is_html'])
	sig = this.env.signatures[this.env.identity]['plain_text'];
	else
	- sig = this.env.signatures[this.env.identity]['text'];
	+ sig = this.env.signatures[this.env.identity]['text'];

	- if (sig.indexOf('-- ')!=0)
	+ if (sig.indexOf('-- ')!=0)
	sig = '-- \n'+sig;

	p = message.lastIndexOf(sig);
	if (p>=0)
	message = message.substring(0, p-1) + message.substring(p+sig.length, message.length);
	}

	message = message.replace(/[\r\n]+$/, '');

	// add the new signature string
	if (this.env.signatures && this.env.signatures[id])
	{
	sig = this.env.signatures[id]['text'];
	if (this.env.signatures[id]['is_html'])
	{
	sig = this.env.signatures[id]['plain_text'];
	}
	if (sig.indexOf('-- ')!=0)
	sig = '-- \n'+sig;
	message += '\n\n'+sig;
	}
	}
	else
	{
	var editor = tinyMCE.get('compose-body');

	if (this.env.signatures)
	{
	// Append the signature as a div within the body
	var sigElem = editor.dom.get('_rc_sig');
	- var newsig = '';
	- var htmlsig = true;
	+ var newsig = '';
	+ var htmlsig = true;

	if (!sigElem)
	{
	- // add empty line before signature on IE
	- if (bw.ie)
	+ // add empty line before signature on IE
	+ if (bw.ie)
	editor.getBody().appendChild(editor.getDoc().createElement('br'));

	- sigElem = editor.getDoc().createElement('div');
	+ sigElem = editor.getDoc().createElement('div');
	sigElem.setAttribute('id', '_rc_sig');
	editor.getBody().appendChild(sigElem);
	}

	- if (this.env.signatures[id])
	- {
	- newsig = this.env.signatures[id]['text'];
	- htmlsig = this.env.signatures[id]['is_html'];
	-
	- if (newsig) {
	- if (htmlsig && this.env.signatures[id]['plain_text'].indexOf('-- ')!=0)
	+ if (this.env.signatures[id])
	+ {
	+ newsig = this.env.signatures[id]['text'];
	+ htmlsig = this.env.signatures[id]['is_html'];
	+
	+ if (newsig) {
	+ if (htmlsig && this.env.signatures[id]['plain_text'].indexOf('-- ')!=0)
	newsig = '<p>-- </p>' + newsig;
	- else if (!htmlsig && newsig.indexOf('-- ')!=0)
	+ else if (!htmlsig && newsig.indexOf('-- ')!=0)
	newsig = '-- \n' + newsig;
	- }
	- }
	+ }
	+ }

	if (htmlsig)
	sigElem.innerHTML = newsig;
	else
	sigElem.innerHTML = '<pre>' + newsig + '</pre>';
	}
	}

	- if (input_message)
	- input_message.value = message;
	+ input_message.val(message);

	this.env.identity = id;
	return true;
	};

	this.show_attachment_form = function(a)
	{
	if (!this.gui_objects.uploadbox)
	return false;

	var elm, list;
	if (elm = this.gui_objects.uploadbox)
	{
	- if (a && (list = this.gui_objects.attachmentlist))
	+ if (a && (list = this.gui_objects.attachmentlist))
	{
	- var pos = rcube_get_object_pos(list);
	- var left = pos.x;
	- var top = pos.y + list.offsetHeight + 10;
	-
	- elm.style.top = top+'px';
	- elm.style.left = left+'px';
	+ var pos = $(list).offset();
	+ elm.style.top = (pos.top + list.offsetHeight + 10) + 'px';
	+ elm.style.left = pos.left + 'px';
	}

	elm.style.visibility = a ? 'visible' : 'hidden';
	}

	// clear upload form
	- try {
	+ try {
	if (!a && this.gui_objects.attachmentform != this.gui_objects.messageform)
	- this.gui_objects.attachmentform.reset();
	- }
	- catch(e){} // ignore errors
	+ this.gui_objects.attachmentform.reset();
	+ }
	+ catch(e){} // ignore errors

	- return true;
	+ return true;
	};

	// upload attachment file
	this.upload_file = function(form)
	{
	if (!form)
	return false;

	// get file input fields
	var send = false;
	for (var n=0; n<form.elements.length; n++)
	if (form.elements[n].type=='file' && form.elements[n].value)
	{
	send = true;
	break;
	}

	// create hidden iframe and post upload form
	if (send)
	{
	var ts = new Date().getTime();
	var frame_name = 'rcmupload'+ts;

	// have to do it this way for IE
	// otherwise the form will be posted to a new window
	if(document.all)
	{
	var html = '<iframe name="'+frame_name+'" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
	document.body.insertAdjacentHTML('BeforeEnd',html);
	}
	else // for standards-compilant browsers
	{
	var frame = document.createElement('IFRAME');
	frame.name = frame_name;
	frame.style.border = 'none';
	frame.style.width = 0;
	frame.style.height = 0;
	frame.style.visibility = 'hidden';
	document.body.appendChild(frame);
	}

	form.target = frame_name;
	form.action = this.env.comm_path+'&_action=upload';
	form.setAttribute('enctype', 'multipart/form-data');
	form.submit();
	}

	// set reference to the form object
	this.gui_objects.attachmentform = form;
	return true;
	};

	// add file name to attachment list
	// called from upload page
	this.add2attachment_list = function(name, content)
	{
	if (!this.gui_objects.attachmentlist)
	return false;

	- var li = document.createElement('LI');
	- li.id = name;
	- li.innerHTML = content;
	- this.gui_objects.attachmentlist.appendChild(li);
	+ $('<li>').attr('id', name).html(content).appendTo(this.gui_objects.attachmentlist);
	return true;
	};

	this.remove_from_attachment_list = function(name)
	{
	if (!this.gui_objects.attachmentlist)
	return false;

	var list = this.gui_objects.attachmentlist.getElementsByTagName("li");
	for (i=0;i<list.length;i++)
	if (list[i].id == name)
	this.gui_objects.attachmentlist.removeChild(list[i]);
	};

	this.remove_attachment = function(name)
	{
	if (name)
	this.http_post('remove-attachment', '_file='+urlencode(name));

	return true;
	};

	// send remote request to add a new contact
	this.add_contact = function(value)
	{
	if (value)
	this.http_post('addcontact', '_address='+value);

	return true;
	};

	// send remote request to search mail or contacts
	this.qsearch = function(value, addurl)
	{
	if (value != '')
	{
	if (this.message_list)
	this.message_list.clear();
	else if (this.contact_list) {
	this.contact_list.clear(true);
	this.show_contentframe(false);
	}

	if (this.gui_objects.search_filter)
	addurl = '&_filter=' + this.gui_objects.search_filter.value;

	// reset vars
	this.env.current_page = 1;
	this.set_busy(true, 'searching');
	this.http_request('search', '_q='+urlencode(value)
	+ (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : '')
	+ (this.env.source ? '&_source='+urlencode(this.env.source) : '')
	+ (addurl ? addurl : ''), true);
	}
	return true;
	};

	// reset quick-search form
	this.reset_qsearch = function()
	{
	if (this.gui_objects.qsearchbox)
	this.gui_objects.qsearchbox.value = '';

	this.env.search_request = null;
	return true;
	};

	this.sent_successfully = function(type, msg)
	{
	this.list_mailbox();
	this.display_message(msg, type, true);
	}


	/*********************************************************/
	/******* keyboard live-search methods *******/
	/*********************************************************/

	// handler for keyboard events on address-fields
	this.ksearch_keypress = function(e, obj)
	{
	if (this.ksearch_timer)
	clearTimeout(this.ksearch_timer);

	var highlight;
	var key = rcube_event.get_keycode(e);
	var mod = rcube_event.get_modifier(e);

	switch (key)
	{
	case 38: // key up
	case 40: // key down
	if (!this.ksearch_pane)
	break;

	var dir = key==38 ? 1 : 0;

	highlight = document.getElementById('rcmksearchSelected');
	if (!highlight)
	- highlight = this.ksearch_pane.ul.firstChild;
	+ highlight = this.ksearch_pane.__ul.firstChild;

	if (highlight)
	this.ksearch_select(dir ? highlight.previousSibling : highlight.nextSibling);

	return rcube_event.cancel(e);

	case 9: // tab
	if(mod == SHIFT_KEY)
	break;

	case 13: // enter
	if (this.ksearch_selected===null \|\| !this.ksearch_input \|\| !this.ksearch_value)
	break;

	// insert selected address and hide ksearch pane
	this.insert_recipient(this.ksearch_selected);
	this.ksearch_hide();

	return rcube_event.cancel(e);

	case 27: // escape
	this.ksearch_hide();
	break;

	case 37: // left
	case 39: // right
	if (mod != SHIFT_KEY)
	return;
	}

	// start timer
	this.ksearch_timer = window.setTimeout(function(){ ref.ksearch_get_results(); }, 200);
	this.ksearch_input = obj;

	return true;
	};

	this.ksearch_select = function(node)
	{
	- var current = document.getElementById('rcmksearchSelected');
	- if (current && node) {
	- current.removeAttribute('id');
	- this.set_classname(current, 'selected', false);
	+ var current = $('#rcmksearchSelected');
	+ if (current[0] && node) {
	+ current.removeAttr('id').removeClass('selected');
	}

	if (node) {
	- node.setAttribute('id', 'rcmksearchSelected');
	- this.set_classname(node, 'selected', true);
	+ $(node).attr('id', 'rcmksearchSelected').addClass('selected');
	this.ksearch_selected = node._rcm_id;
	}
	};

	this.insert_recipient = function(id)
	{
	if (!this.env.contacts[id] \|\| !this.ksearch_input)
	return;

	// get cursor pos
	var inp_value = this.ksearch_input.value.toLowerCase();
	var cpos = this.get_caret_pos(this.ksearch_input);
	var p = inp_value.lastIndexOf(this.ksearch_value, cpos);

	// replace search string with full address
	var pre = this.ksearch_input.value.substring(0, p);
	var end = this.ksearch_input.value.substring(p+this.ksearch_value.length, this.ksearch_input.value.length);
	var insert = this.env.contacts[id]+', ';
	this.ksearch_input.value = pre + insert + end;

	// set caret to insert pos
	cpos = p+insert.length;
	if (this.ksearch_input.setSelectionRange)
	this.ksearch_input.setSelectionRange(cpos, cpos);
	};

	// address search processor
	this.ksearch_get_results = function()
	{
	var inp_value = this.ksearch_input ? this.ksearch_input.value : null;
	if (inp_value === null)
	return;

	- if (this.ksearch_pane && this.ksearch_pane.visible)
	- this.ksearch_pane.show(0);
	+ if (this.ksearch_pane && this.ksearch_pane.is(":visible"))
	+ this.ksearch_pane.hide();

	// get string from current cursor pos to last comma
	var cpos = this.get_caret_pos(this.ksearch_input);
	var p = inp_value.lastIndexOf(',', cpos-1);
	var q = inp_value.substring(p+1, cpos);

	// trim query string
	q = q.replace(/(^\s+\|\s+$)/g, '').toLowerCase();

	// Don't (re-)search if string is empty or if the last results are still active
	if (!q.length \|\| q == this.ksearch_value)
	return;

	this.ksearch_value = q;

	this.display_message(this.get_label('searching'), 'loading', true);
	this.http_post('autocomplete', '_search='+q);
	};

	this.ksearch_query_results = function(results, search)
	{
	// ignore this outdated search response
	if (search != this.ksearch_value)
	return;

	this.hide_message();
	this.env.contacts = results ? results : [];
	this.ksearch_display_results(this.env.contacts);
	};

	this.ksearch_display_results = function (a_results)
	{
	// display search results
	if (a_results.length && this.ksearch_input) {
	var p, ul, li;

	// create results pane if not present
	if (!this.ksearch_pane) {
	- ul = document.createElement('UL');
	- this.ksearch_pane = new rcube_layer('rcmKSearchpane', {vis:0, zindex:30000});
	- this.ksearch_pane.elm.appendChild(ul);
	- this.ksearch_pane.ul = ul;
	+ ul = $('<ul>');
	+ this.ksearch_pane = $('<div>').attr('id', 'rcmKSearchpane').css({ position:'absolute', 'z-index':30000 }).append(ul).appendTo(document.body);
	+ this.ksearch_pane.__ul = ul[0];
	}
	- else
	- ul = this.ksearch_pane.ul;

	// remove all search results
	+ ul = this.ksearch_pane.__ul;
	ul.innerHTML = '';

	// add each result line to list
	for (i=0; i<a_results.length; i++) {
	li = document.createElement('LI');
	li.innerHTML = a_results[i].replace(new RegExp('('+this.ksearch_value+')', 'ig'), '##$1%%').replace(/</g, '<').replace(/>/g, '>').replace(/##([^%]+)%%/g, '<b>$1</b>');
	li.onmouseover = function(){ ref.ksearch_select(this); };
	li.onmouseup = function(){ ref.ksearch_click(this) };
	li._rcm_id = i;
	ul.appendChild(li);
	}

	// select the first
	- ul.firstChild.setAttribute('id', 'rcmksearchSelected');
	- this.set_classname(ul.firstChild, 'selected', true);
	+ $(ul.firstChild).attr('id', 'rcmksearchSelected').addClass('selected');
	this.ksearch_selected = 0;

	// move the results pane right under the input box and make it visible
	- var pos = rcube_get_object_pos(this.ksearch_input);
	- this.ksearch_pane.move(pos.x, pos.y+this.ksearch_input.offsetHeight);
	- this.ksearch_pane.show(1);
	+ var pos = $(this.ksearch_input).offset();
	+ this.ksearch_pane.css({ left:pos.left+'px', top:(pos.top + this.ksearch_input.offsetHeight)+'px' }).show();
	}
	// hide results pane
	else
	this.ksearch_hide();
	};

	this.ksearch_click = function(node)
	{
	if (this.ksearch_input)
	this.ksearch_input.focus();

	this.insert_recipient(node._rcm_id);
	this.ksearch_hide();
	};

	this.ksearch_blur = function()
	{
	if (this.ksearch_timer)
	clearTimeout(this.ksearch_timer);

	this.ksearch_value = '';
	this.ksearch_input = null;

	this.ksearch_hide();
	};


	this.ksearch_hide = function()
	{
	this.ksearch_selected = null;

	if (this.ksearch_pane)
	- this.ksearch_pane.show(0);
	+ this.ksearch_pane.hide();
	};


	/*********************************************************/
	/******* address book methods *******/
	/*********************************************************/

	this.contactlist_keypress = function(list)
	{
	if (list.key_pressed == list.DELETE_KEY)
	this.command('delete');
	};

	this.contactlist_select = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);

	var id, frame, ref = this;
	if (id = list.get_single_selection())
	this.preview_timer = window.setTimeout(function(){ ref.load_contact(id, 'show'); }, 200);
	else if (this.env.contentframe)
	this.show_contentframe(false);

	this.enable_command('compose', list.selection.length > 0);
	this.enable_command('edit', (id && this.env.address_sources && !this.env.address_sources[this.env.source].readonly) ? true : false);
	this.enable_command('delete', list.selection.length && this.env.address_sources && !this.env.address_sources[this.env.source].readonly);

	return false;
	};

	this.list_contacts = function(src, page)
	{
	var add_url = '';
	var target = window;

	if (!src)
	src = this.env.source;

	if (page && this.current_page==page && src == this.env.source)
	return false;

	if (src != this.env.source)
	{
	page = 1;
	this.env.current_page = page;
	this.reset_qsearch();
	}

	this.select_folder(src, this.env.source);
	this.env.source = src;

	// load contacts remotely
	if (this.gui_objects.contactslist)
	{
	this.list_contacts_remote(src, page);
	return;
	}

	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
	{
	target = window.frames[this.env.contentframe];
	add_url = '&_framed=1';
	}

	// also send search request to get the correct listing
	if (this.env.search_request)
	add_url += '&_search='+this.env.search_request;

	this.set_busy(true, 'loading');
	target.location.href = this.env.comm_path+(src ? '&_source='+urlencode(src) : '')+(page ? '&_page='+page : '')+add_url;
	};

	// send remote request to load contacts list
	this.list_contacts_remote = function(src, page)
	{
	// clear message list first
	this.contact_list.clear(true);
	this.show_contentframe(false);
	this.enable_command('delete', 'compose', false);

	// send request to server
	var url = (src ? '_source='+urlencode(src) : '') + (page ? (src?'&':'') + '_page='+page : '');
	this.env.source = src;

	// also send search request to get the right messages
	if (this.env.search_request)
	url += '&_search='+this.env.search_request;

	this.set_busy(true, 'loading');
	this.http_request('list', url, true);
	};

	// load contact record
	this.load_contact = function(cid, action, framed)
	{
	var add_url = '';
	var target = window;
	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
	{
	add_url = '&_framed=1';
	target = window.frames[this.env.contentframe];
	this.show_contentframe(true);
	}
	else if (framed)
	return false;

	if (action && (cid \|\| action=='add') && !this.drag_active)
	{
	this.set_busy(true);
	target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_cid='+urlencode(cid) + add_url;
	}
	return true;
	};

	// copy a contact to the specified target (group or directory)
	this.copy_contact = function(cid, to)
	{
	if (!cid)
	cid = this.contact_list.get_selection().join(',');

	if (to != this.env.source && cid && this.env.address_sources[to] && !this.env.address_sources[to].readonly)
	this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to));
	};


	this.delete_contacts = function()
	{
	// exit if no mailbox specified or if selection is empty
	var selection = this.contact_list.get_selection();
	if (!(selection.length \|\| this.env.cid) \|\| !confirm(this.get_label('deletecontactconfirm')))
	return;

	var a_cids = new Array();
	var qs = '';

	if (this.env.cid)
	a_cids[a_cids.length] = this.env.cid;
	else
	{
	var id;
	for (var n=0; n<selection.length; n++)
	{
	id = selection[n];
	a_cids[a_cids.length] = id;
	this.contact_list.remove_row(id, (n == selection.length-1));
	}

	// hide content frame if we delete the currently displayed contact
	if (selection.length == 1)
	this.show_contentframe(false);
	}

	// also send search request to get the right records from the next page
	if (this.env.search_request)
	qs += '&_search='+this.env.search_request;

	// send request to server
	this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_from='+(this.env.action ? this.env.action : '')+qs);
	return true;
	};

	// update a contact record in the list
	this.update_contact_row = function(cid, cols_arr)
	- {
	+ {
	var row;
	- if (this.contact_list.rows[cid] && (row = this.contact_list.rows[cid].obj))
	- {
	+ if (this.contact_list.rows[cid] && (row = this.contact_list.rows[cid].obj)) {
	for (var c=0; c<cols_arr.length; c++)
	if (row.cells[c])
	- row.cells[c].innerHTML = cols_arr[c];
	+ $(row.cells[c]).html(cols_arr[c]);

	return true;
	- }
	+ }

	return false;
	- };
	+ };


	/*********************************************************/
	/******* user settings methods *******/
	/*********************************************************/

	this.init_subscription_list = function()
	{
	var p = this;
	this.subscription_list = new rcube_list_widget(this.gui_objects.subscriptionlist, {multiselect:false, draggable:true, keyboard:false, toggleselect:true});
	this.subscription_list.addEventListener('select', function(o){ p.subscription_select(o); });
	this.subscription_list.addEventListener('dragstart', function(o){ p.drag_active = true; });
	this.subscription_list.addEventListener('dragend', function(o){ p.subscription_move_folder(o); });
	this.subscription_list.row_init = function (row)
	{
	var anchors = row.obj.getElementsByTagName('A');
	if (anchors[0])
	anchors[0].onclick = function() { p.rename_folder(row.id); return false; };
	if (anchors[1])
	anchors[1].onclick = function() { p.delete_folder(row.id); return false; };
	row.obj.onmouseover = function() { p.focus_subscription(row.id); };
	row.obj.onmouseout = function() { p.unfocus_subscription(row.id); };
	}
	this.subscription_list.init();
	}

	this.identity_select = function(list)
	{
	var id;
	if (id = list.get_single_selection())
	this.load_identity(id, 'edit-identity');
	};

	// load contact record
	this.load_identity = function(id, action)
	{
	if (action=='edit-identity' && (!id \|\| id==this.env.iid))
	return false;

	var add_url = '';
	var target = window;
	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
	{
	add_url = '&_framed=1';
	target = window.frames[this.env.contentframe];
	document.getElementById(this.env.contentframe).style.visibility = 'inherit';
	}

	if (action && (id \|\| action=='add-identity'))
	{
	this.set_busy(true);
	target.location.href = this.env.comm_path+'&_action='+action+'&_iid='+id+add_url;
	}
	return true;
	};

	this.delete_identity = function(id)
	{
	// exit if no mailbox specified or if selection is empty
	var selection = this.identity_list.get_selection();
	if (!(selection.length \|\| this.env.iid))
	return;

	if (!id)
	id = this.env.iid ? this.env.iid : selection[0];

	// if (this.env.framed && id)
	this.goto_url('delete-identity', '_iid='+id, true);
	return true;
	};

	this.focus_subscription = function(id)
	{
	var row, folder;
	var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');

	if (this.drag_active && this.env.folder && (row = document.getElementById(id)))
	if (this.env.subscriptionrows[id] &&
	(folder = this.env.subscriptionrows[id][0]))
	{
	if (this.check_droptarget(folder) &&
	- !this.env.subscriptionrows[this.get_folder_row_id(this.env.folder)][2] &&
	- (folder != this.env.folder.replace(reg, '')) &&
	+ !this.env.subscriptionrows[this.get_folder_row_id(this.env.folder)][2] &&
	+ (folder != this.env.folder.replace(reg, '')) &&
	(!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter)))))
	{
	this.set_env('dstfolder', folder);
	- this.set_classname(row, 'droptarget', true);
	+ $(row).addClass('droptarget');
	}
	}
	else if (this.env.folder.match(new RegExp(RegExp.escape(this.env.delimiter))))
	{
	this.set_env('dstfolder', this.env.delimiter);
	- this.set_classname(this.subscription_list.frame, 'droptarget', true);
	+ $(this.subscription_list.frame).addClass('droptarget');
	}
	}

	this.unfocus_subscription = function(id)
	{
	- var row;
	+ var row = $('#'+id);
	this.set_env('dstfolder', null);
	- if (this.env.subscriptionrows[id] &&
	- (row = document.getElementById(id)))
	- this.set_classname(row, 'droptarget', false);
	+ if (this.env.subscriptionrows[id] && row[0])
	+ row.removeClass('droptarget');
	else
	- this.set_classname(this.subscription_list.frame, 'droptarget', false);
	+ $(this.subscription_list.frame).removeClass('droptarget');
	}

	this.subscription_select = function(list)
	{
	var id, folder;
	if ((id = list.get_single_selection()) &&
	this.env.subscriptionrows['rcmrow'+id] &&
	(folder = this.env.subscriptionrows['rcmrow'+id][0]))
	this.set_env('folder', folder);
	else
	this.set_env('folder', null);

	if (this.gui_objects.createfolderhint)
	- this.gui_objects.createfolderhint.innerHTML = this.env.folder ? this.get_label('addsubfolderhint') : '';
	+ $(this.gui_objects.createfolderhint).html(this.env.folder ? this.get_label('addsubfolderhint') : '');
	};

	this.subscription_move_folder = function(list)
	{
	var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
	if (this.env.folder && this.env.dstfolder && (this.env.dstfolder != this.env.folder) &&
	(this.env.dstfolder != this.env.folder.replace(reg, '')))
	{
	var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g');
	var basename = this.env.folder.replace(reg, '');
	var newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;

	this.set_busy(true, 'foldermoving');
	this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname), true);
	}
	this.drag_active = false;
	this.unfocus_subscription(this.get_folder_row_id(this.env.dstfolder));
	};

	// tell server to create and subscribe a new mailbox
	this.create_folder = function(name)
	{
	if (this.edit_folder)
	this.reset_folder_rename();

	var form;
	if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
	{
	name = form.elements['_folder_name'].value;

	if (name.indexOf(this.env.delimiter)>=0)
	{
	alert(this.get_label('forbiddencharacter')+' ('+this.env.delimiter+')');
	return false;
	}

	if (this.env.folder && name != '')
	name = this.env.folder+this.env.delimiter+name;

	this.set_busy(true, 'foldercreating');
	this.http_post('create-folder', '_name='+urlencode(name), true);
	}
	else if (form.elements['_folder_name'])
	form.elements['_folder_name'].focus();
	};

	// start renaming the mailbox name.
	// this will replace the name string with an input field
	this.rename_folder = function(id)
	{
	var temp, row, form;

	// reset current renaming
	if (temp = this.edit_folder)
	{
	this.reset_folder_rename();
	if (temp == id)
	return;
	}

	if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id)))
	{
	var reg = new RegExp('.*['+RegExp.escape(this.env.delimiter)+']');
	this.name_input = document.createElement('INPUT');
	this.name_input.value = this.env.subscriptionrows[id][0].replace(reg, '');
	this.name_input.style.width = '100%';

	reg = new RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
	this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
	this.name_input.onkeypress = function(e){ rcmail.name_input_keypress(e); };

	row.cells[0].replaceChild(this.name_input, row.cells[0].firstChild);
	this.edit_folder = id;
	this.name_input.select();

	if (form = this.gui_objects.editform)
	form.onsubmit = function(){ return false; };
	}
	};

	// remove the input field and write the current mailbox name to the table cell
	this.reset_folder_rename = function()
	{
	var cell = this.name_input ? this.name_input.parentNode : null;

	if (cell && this.edit_folder && this.env.subscriptionrows[this.edit_folder])
	- cell.innerHTML = this.env.subscriptionrows[this.edit_folder][1];
	+ $(cell).html(this.env.subscriptionrows[this.edit_folder][1]);

	this.edit_folder = null;
	};

	// handler for keyboard events on the input field
	this.name_input_keypress = function(e)
	{
	var key = rcube_event.get_keycode(e);

	// enter
	if (key==13)
	{
	var newname = this.name_input ? this.name_input.value : null;
	if (this.edit_folder && newname)
	{
	if (newname.indexOf(this.env.delimiter)>=0)
	{
	alert(this.get_label('forbiddencharacter')+' ('+this.env.delimiter+')');
	return false;
	}

	if (this.name_input.__parent)
	newname = this.name_input.__parent + this.env.delimiter + newname;

	this.set_busy(true, 'folderrenaming');
	this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname), true);
	}
	}
	// escape
	else if (key==27)
	this.reset_folder_rename();
	};

	// delete a specific mailbox with all its messages
	this.delete_folder = function(id)
	{
	var folder = this.env.subscriptionrows[id][0];

	if (this.edit_folder)
	this.reset_folder_rename();

	if (folder && confirm(this.get_label('deletefolderconfirm')))
	{
	this.set_busy(true, 'folderdeleting');
	this.http_post('delete-folder', '_mboxes='+urlencode(folder), true);
	this.set_env('folder', null);

	- if (this.gui_objects.createfolderhint)
	- this.gui_objects.createfolderhint.innerHTML = '';
	+ $(this.gui_objects.createfolderhint).html('');
	}
	};

	// add a new folder to the subscription list by cloning a folder row
	this.add_folder_row = function(name, display_name, replace, before)
	{
	if (!this.gui_objects.subscriptionlist)
	return false;

	// find not protected folder
	for (var refid in this.env.subscriptionrows)
	if (this.env.subscriptionrows[refid]!=null && !this.env.subscriptionrows[refid][2])
	break;

	var refrow, form;
	var tbody = this.gui_objects.subscriptionlist.tBodies[0];
	var id = 'rcmrow'+(tbody.childNodes.length+1);
	var selection = this.subscription_list.get_single_selection();

	if (replace && replace.id)
	{
	id = replace.id;
	refid = replace.id;
	}

	if (!id \|\| !(refrow = document.getElementById(refid)))
	{
	// Refresh page if we don't have a table row to clone
	this.goto_url('folders');
	}
	else
	{
	// clone a table row if there are existing rows
	var row = this.clone_table_row(refrow);
	row.id = id;

	if (before && (before = this.get_folder_row_id(before)))
	tbody.insertBefore(row, document.getElementById(before));
	else
	tbody.appendChild(row);

	if (replace)
	tbody.removeChild(replace);
	}

	// add to folder/row-ID map
	this.env.subscriptionrows[row.id] = [name, display_name, 0];

	// set folder name
	row.cells[0].innerHTML = display_name;

	// set messages count to zero
	if (!replace)
	row.cells[1].innerHTML = '*';

	if (!replace && row.cells[2] && row.cells[2].firstChild.tagName=='INPUT')
	{
	row.cells[2].firstChild.value = name;
	row.cells[2].firstChild.checked = true;
	}

	// add new folder to rename-folder list and clear input field
	if (!replace && (form = this.gui_objects.editform))
	{
	if (form.elements['_folder_oldname'])
	form.elements['_folder_oldname'].options[form.elements['_folder_oldname'].options.length] = new Option(name,name);
	if (form.elements['_folder_name'])
	form.elements['_folder_name'].value = '';
	}

	this.init_subscription_list();
	if (selection && document.getElementById('rcmrow'+selection))
	this.subscription_list.select_row(selection);

	if (document.getElementById(id).scrollIntoView)
	document.getElementById(id).scrollIntoView();
	};

	// replace an existing table row with a new folder line
	this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
	{
	var id = this.get_folder_row_id(oldfolder);
	var row = document.getElementById(id);

	// replace an existing table row (if found)
	this.add_folder_row(newfolder, display_name, row, before);

	// rename folder in rename-folder dropdown
	var form, elm;
	if ((form = this.gui_objects.editform) && (elm = form.elements['_folder_oldname']))
	{
	for (var i=0;i<elm.options.length;i++)
	{
	if (elm.options[i].value == oldfolder)
	{
	elm.options[i].text = display_name;
	elm.options[i].value = newfolder;
	break;
	}
	}

	form.elements['_folder_newname'].value = '';
	}
	};

	// remove the table row of a specific mailbox from the table
	// (the row will not be removed, just hidden)
	this.remove_folder_row = function(folder)
	{
	var row;
	var id = this.get_folder_row_id(folder);
	if (id && (row = document.getElementById(id)))
	row.style.display = 'none';

	// remove folder from rename-folder list
	var form;
	if ((form = this.gui_objects.editform) && form.elements['_folder_oldname'])
	{
	for (var i=0;i<form.elements['_folder_oldname'].options.length;i++)
	{
	if (form.elements['_folder_oldname'].options[i].value == folder)
	{
	form.elements['_folder_oldname'].options[i] = null;
	break;
	}
	}
	}

	if (form && form.elements['_folder_newname'])
	form.elements['_folder_newname'].value = '';
	};

	this.subscribe_folder = function(folder)
	{
	if (folder)
	this.http_post('subscribe', '_mbox='+urlencode(folder));
	};

	this.unsubscribe_folder = function(folder)
	{
	if (folder)
	this.http_post('unsubscribe', '_mbox='+urlencode(folder));
	};

	// helper method to find a specific mailbox row ID
	this.get_folder_row_id = function(folder)
	{
	for (var id in this.env.subscriptionrows)
	if (this.env.subscriptionrows[id] && this.env.subscriptionrows[id][0] == folder)
	break;

	return id;
	};

	// duplicate a specific table row
	this.clone_table_row = function(row)
	{
	var cell, td;
	var new_row = document.createElement('TR');
	for(var n=0; n<row.cells.length; n++)
	{
	cell = row.cells[n];
	td = document.createElement('TD');

	if (cell.className)
	td.className = cell.className;
	if (cell.align)
	td.setAttribute('align', cell.align);

	td.innerHTML = cell.innerHTML;
	new_row.appendChild(td);
	}

	return new_row;
	};


	/*********************************************************/
	/******* GUI functionality *******/
	/*********************************************************/

	// eable/disable buttons for page shifting
	this.set_page_buttons = function()
	{
	this.enable_command('nextpage', (this.env.pagecount > this.env.current_page));
	this.enable_command('lastpage', (this.env.pagecount > this.env.current_page));
	this.enable_command('previouspage', (this.env.current_page > 1));
	this.enable_command('firstpage', (this.env.current_page > 1));
	}

	// set button to a specific state
	this.set_button = function(command, state)
	{
	var a_buttons = this.buttons[command];
	var button, obj;

	if(!a_buttons \|\| !a_buttons.length)
	return false;

	for(var n=0; n<a_buttons.length; n++)
	{
	button = a_buttons[n];
	obj = document.getElementById(button.id);

	// get default/passive setting of the button
	if (obj && button.type=='image' && !button.status) {
	button.pas = obj._original_src ? obj._original_src : obj.src;
	// respect PNG fix on IE browsers
	if (obj.runtimeStyle && obj.runtimeStyle.filter && obj.runtimeStyle.filter.match(/src=['"]([^'"]+)['"]/))
	button.pas = RegExp.$1;
	}
	else if (obj && !button.status)
	button.pas = String(obj.className);

	// set image according to button state
	if (obj && button.type=='image' && button[state])
	{
	button.status = state;
	obj.src = button[state];
	}
	// set class name according to button state
	else if (obj && typeof(button[state])!='undefined')
	{
	button.status = state;
	obj.className = button[state];
	}
	// disable/enable input buttons
	if (obj && button.type=='input')
	{
	button.status = state;
	obj.disabled = !state;
	}
	}
	};

	// display a specific alttext
	this.set_alttext = function(command, label)
	{
	if (!this.buttons[command] \|\| !this.buttons[command].length)
	return;

	var button, obj, link;
	for (var n=0; n<this.buttons[command].length; n++)
	{
	button = this.buttons[command][n];
	obj = document.getElementById(button.id);

	if (button.type=='image' && obj)
	{
	obj.setAttribute('alt', this.get_label(label));
	if ((link = obj.parentNode) && link.tagName == 'A')
	link.setAttribute('title', this.get_label(label));
	}
	else if (obj)
	obj.setAttribute('title', this.get_label(label));
	}
	};

	// mouse over button
	this.button_over = function(command, id)
	{
	var a_buttons = this.buttons[command];
	var button, img;

	if(!a_buttons \|\| !a_buttons.length)
	return false;

	for(var n=0; n<a_buttons.length; n++)
	{
	button = a_buttons[n];
	if(button.id==id && button.status=='act')
	{
	img = document.getElementById(button.id);
	if (img && button.over)
	img.src = button.over;
	}
	}

	};

	// mouse down on button
	this.button_sel = function(command, id)
	{
	var a_buttons = this.buttons[command];
	var button, img;

	if(!a_buttons \|\| !a_buttons.length)
	return;

	for(var n=0; n<a_buttons.length; n++)
	{
	button = a_buttons[n];
	if(button.id==id && button.status=='act')
	{
	img = document.getElementById(button.id);
	if (img && button.sel)
	img.src = button.sel;
	}
	}
	};

	// mouse out of button
	this.button_out = function(command, id)
	{
	var a_buttons = this.buttons[command];
	var button, img;

	if(!a_buttons \|\| !a_buttons.length)
	return;

	for(var n=0; n<a_buttons.length; n++)
	{
	button = a_buttons[n];
	if(button.id==id && button.status=='act')
	{
	img = document.getElementById(button.id);
	if (img && button.act)
	img.src = button.act;
	}
	}
	};

	- // set/unset a specific class name
	- this.set_classname = function(obj, classname, set)
	- {
	- var reg = new RegExp('\s*'+classname, 'i');
	- if (!set && obj.className.match(reg))
	- obj.className = obj.className.replace(reg, '');
	- else if (set && !obj.className.match(reg))
	- obj.className += ' '+classname;
	- };
	-
	// write to the document/window title
	this.set_pagetitle = function(title)
	{
	if (title && document.title)
	document.title = title;
	}

	// display a system message
	this.display_message = function(msg, type, hold)
	{
	if (!this.loaded) // save message in order to display after page loaded
	{
	this.pending_message = new Array(msg, type);
	return true;
	}

	// pass command to parent window
	if (this.env.framed && parent.rcmail)
	return parent.rcmail.display_message(msg, type, hold);

	if (!this.gui_objects.message)
	return false;

	if (this.message_timer)
	clearTimeout(this.message_timer);

	var cont = msg;
	if (type)
	cont = '<div class="'+type+'">'+cont+'</div>';

	- var _rcube = this;
	- this.gui_objects.message.innerHTML = cont;
	- this.gui_objects.message.style.display = 'block';
	+ var obj = $(this.gui_objects.message).html(cont).show();

	if (type!='loading')
	- this.gui_objects.message.onmousedown = function(){ _rcube.hide_message(); return true; };
	+ obj.bind('mousedown', function(){ ref.hide_message(); return true; });

	if (!hold)
	- this.message_timer = window.setTimeout(function(){ ref.hide_message(); }, this.message_time);
	+ this.message_timer = window.setTimeout(function(){ ref.hide_message(true); }, this.message_time);
	};

	// make a message row disapear
	- this.hide_message = function()
	+ this.hide_message = function(fade)
	{
	if (this.gui_objects.message)
	- {
	- this.gui_objects.message.style.display = 'none';
	- this.gui_objects.message.onmousedown = null;
	- }
	+ $(this.gui_objects.message).unbind()[(fade?'fadeOut':'hide')]();
	};

	// mark a mailbox as selected and set environment variable
	this.select_folder = function(name, old)
	{
	if (this.gui_objects.folderlist)
	{
	var current_li, target_li;

	- if ((current_li = this.get_folder_li(old)))
	- {
	- this.set_classname(current_li, 'selected', false);
	- this.set_classname(current_li, 'unfocused', false);
	+ if ((current_li = this.get_folder_li(old))) {
	+ $(current_li).removeClass('selected').removeClass('unfocused');
	}

	- if ((target_li = this.get_folder_li(name)))
	- {
	- this.set_classname(target_li, 'unfocused', false);
	- this.set_classname(target_li, 'selected', true);
	+ if ((target_li = this.get_folder_li(name))) {
	+ $(target_li).removeClass('unfocused').addClass('selected');
	}
	}
	};

	// helper method to find a folder list item
	this.get_folder_li = function(name)
	{
	if (this.gui_objects.folderlist)
	{
	name = String(name).replace(this.identifier_expr, '');
	return document.getElementById('rcmli'+name);
	}

	return null;
	};

	// for reordering column array, Konqueror workaround
	this.set_message_coltypes = function(coltypes)
	{
	this.coltypes = coltypes;

	// set correct list titles
	var cell, col;
	var thead = this.gui_objects.messagelist ? this.gui_objects.messagelist.tHead : null;
	for (var n=0; thead && n<this.coltypes.length; n++)
	{
	col = this.coltypes[n];
	if ((cell = thead.rows[0].cells[n+1]) && (col=='from' \|\| col=='to'))
	{
	// if we have links for sorting, it's a bit more complicated...
	if (cell.firstChild && cell.firstChild.tagName=='A')
	{
	cell.firstChild.innerHTML = this.get_label(this.coltypes[n]);
	cell.firstChild.onclick = function(){ return rcmail.command('sort', this.__col, this); };
	cell.firstChild.__col = col;
	}
	else
	cell.innerHTML = this.get_label(this.coltypes[n]);

	cell.id = 'rcm'+col;
	}
	else if (col == 'subject' && this.message_list)
	this.message_list.subject_col = n+1;
	}
	};

	// create a table row in the message list
	this.add_message_row = function(uid, cols, flags, attachment, attop)
	{
	if (!this.gui_objects.messagelist \|\| !this.message_list)
	return false;

	var tbody = this.gui_objects.messagelist.tBodies[0];
	var rowcount = tbody.rows.length;
	var even = rowcount%2;

	- this.env.messages[uid] = {deleted:flags.deleted?1:0,
	- replied:flags.replied?1:0,
	- unread:flags.unread?1:0,
	- forwarded:flags.forwarded?1:0,
	- flagged:flags.flagged?1:0};
	-
	- var row = document.createElement('TR');
	- row.id = 'rcmrow'+uid;
	- row.className = 'message'
	- + (even ? ' even' : ' odd')
	+ this.env.messages[uid] = {
	+ deleted: flags.deleted?1:0,
	+ replied: flags.replied?1:0,
	+ unread: flags.unread?1:0,
	+ forwarded: flags.forwarded?1:0,
	+ flagged:flags.flagged?1:0
	+ };
	+
	+ var css_class = 'message'
	+ + (even ? ' even' : ' odd')
	+ (flags.unread ? ' unread' : '')
	- + (flags.deleted ? ' deleted' : '')
	- + (flags.flagged ? ' flagged' : '');
	+ + (flags.deleted ? ' deleted' : '')
	+ + (flags.flagged ? ' flagged' : '');
	+
	+ var row = $('<tr>').attr('id', 'rcmrow'+uid).attr('class', css_class);

	if (this.message_list.in_selection(uid))
	- row.className += ' selected';
	+ row.addClass('selected');

	var icon = this.env.messageicon;
	if (flags.deleted && this.env.deletedicon)
	icon = this.env.deletedicon;
	else if (flags.replied && this.env.repliedicon)
	{
	if (flags.forwarded && this.env.forwardedrepliedicon)
	icon = this.env.forwardedrepliedicon;
	else
	icon = this.env.repliedicon;
	}
	else if (flags.forwarded && this.env.forwardedicon)
	icon = this.env.forwardedicon;
	else if(flags.unread && this.env.unreadicon)
	icon = this.env.unreadicon;

	- var col = document.createElement('TD');
	- col.className = 'icon';
	- col.innerHTML = icon ? '<img src="'+icon+'" alt="" />' : '';
	- row.appendChild(col);
	+ // add icon col
	+ $('<td>').addClass('icon').html(icon ? '<img src="'+icon+'" alt="" />' : '').appendTo(row);

	// add each submitted col
	- for (var n = 0; n < this.coltypes.length; n++)
	- {
	+ for (var n = 0; n < this.coltypes.length; n++) {
	var c = this.coltypes[n];
	- col = document.createElement('TD');
	- col.className = String(c).toLowerCase();
	+ col = $('<td>').addClass(String(c).toLowerCase());

	- if (c=='flag')
	- {
	+ if (c=='flag') {
	if (flags.flagged && this.env.flaggedicon)
	- col.innerHTML = '<img src="'+this.env.flaggedicon+'" alt="" />';
	+ col.html('<img src="'+this.env.flaggedicon+'" alt="" />');
	else if(!flags.flagged && this.env.unflaggedicon)
	- col.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
	+ col.html('<img src="'+this.env.unflaggedicon+'" alt="" />');
	}
	else if (c=='attachment')
	- col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : ' ';
	+ col.html(attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : ' ');
	else
	- col.innerHTML = cols[c];
	+ col.html(cols[c]);

	- row.appendChild(col);
	+ col.appendTo(row);
	}

	this.message_list.insert_row(row, attop);

	// remove 'old' row
	- if (attop && this.env.pagesize && this.message_list.rowcount > this.env.pagesize)
	- {
	- var uid = this.message_list.get_last_row();
	- this.message_list.remove_row(uid);
	- this.message_list.clear_selection(uid);
	- }
	- };
	+ if (attop && this.env.pagesize && this.message_list.rowcount > this.env.pagesize) {
	+ var uid = this.message_list.get_last_row();
	+ this.message_list.remove_row(uid);
	+ this.message_list.clear_selection(uid);
	+ }
	+ };

	// replace content of row count display
	this.set_rowcount = function(text)
	{
	- if (this.gui_objects.countdisplay)
	- this.gui_objects.countdisplay.innerHTML = text;
	+ $(this.gui_objects.countdisplay).html(text);

	// update page navigation buttons
	this.set_page_buttons();
	};

	// replace content of mailboxname display
	this.set_mailboxname = function(content)
	{
	if (this.gui_objects.mailboxname && content)
	this.gui_objects.mailboxname.innerHTML = content;
	};

	// replace content of quota display
	this.set_quota = function(content)
	{
	- if (this.gui_objects.quotadisplay && content)
	- this.gui_objects.quotadisplay.innerHTML = content;
	+ if (content && this.gui_objects.quotadisplay)
	+ $(this.gui_objects.quotadisplay).html(content);
	};

	// update the mailboxlist
	this.set_unread_count = function(mbox, count, set_title)
	{
	if (!this.gui_objects.mailboxlist)
	return false;

	this.env.unread_counts[mbox] = count;
	this.set_unread_count_display(mbox, set_title);
	}

	// update the mailbox count display
	this.set_unread_count_display = function(mbox, set_title)
	{
	var reg, text_obj, item, mycount, childcount, div;
	if (item = this.get_folder_li(mbox))
	{
	mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
	text_obj = item.getElementsByTagName('a')[0];
	reg = /\s+$[0-9]+$$/i;

	childcount = 0;
	if ((div = item.getElementsByTagName('div')[0]) &&
	div.className.match(/collapsed/))
	{
	// add children's counters
	for (var k in this.env.unread_counts)
	- if (k.indexOf(mbox + this.env.delimiter) == 0) {
	+ if (k.indexOf(mbox + this.env.delimiter) == 0)
	childcount += this.env.unread_counts[k];
	- }
	}

	if (mycount && text_obj.innerHTML.match(reg))
	text_obj.innerHTML = text_obj.innerHTML.replace(reg, ' ('+mycount+')');
	else if (mycount)
	text_obj.innerHTML += ' ('+mycount+')';
	else
	text_obj.innerHTML = text_obj.innerHTML.replace(reg, '');

	// set parent's display
	reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+$');
	if (mbox.match(reg))
	this.set_unread_count_display(mbox.replace(reg, ''), false);

	// set the right classes
	- this.set_classname(item, 'unread', (mycount+childcount)>0 ? true : false);
	+ if ((mycount+childcount)>0)
	+ $(item).addClass('unread');
	+ else
	+ $(item).removeClass('unread');
	}

	// set unread count to window title
	reg = /^$[0-9]+$\s+/i;
	if (set_title && document.title)
	{
	var doc_title = String(document.title);
	var new_title = "";

	if (mycount && doc_title.match(reg))
	new_title = doc_title.replace(reg, '('+mycount+') ');
	else if (mycount)
	new_title = '('+mycount+') '+doc_title;
	else
	new_title = doc_title.replace(reg, '');

	this.set_pagetitle(new_title);
	}
	};

	// notifies that a new message(s) has hit the mailbox
	this.new_message_focus = function()
	{
	// focus main window
	if (this.env.framed && window.parent)
	window.parent.focus();
	else
	window.focus();
	}

	// add row to contacts list
	this.add_contact_row = function(cid, cols, select)
	{
	if (!this.gui_objects.contactslist \|\| !this.gui_objects.contactslist.tBodies[0])
	return false;

	var tbody = this.gui_objects.contactslist.tBodies[0];
	var rowcount = tbody.rows.length;
	var even = rowcount%2;

	- var row = document.createElement('TR');
	- row.id = 'rcmrow'+cid;
	- row.className = 'contact '+(even ? 'even' : 'odd');
	+ var row = $('<tr>').attr('id', 'rcmrow'+cid).addClass('class').addClass(even ? 'even' : 'odd');

	if (this.contact_list.in_selection(cid))
	- row.className += ' selected';
	+ row.addClass('selected');

	// add each submitted col
	- for (var c in cols)
	- {
	- col = document.createElement('TD');
	- col.className = String(c).toLowerCase();
	- col.innerHTML = cols[c];
	- row.appendChild(col);
	- }
	+ for (var c in cols) {
	+ col = $('<td>').addClass(String(c).toLowerCase()).html(cols[c]).appendTo(row);
	+ }

	this.contact_list.insert_row(row);
	this.enable_command('export', (this.contact_list.rowcount > 0));
	};

	this.toggle_prefer_html = function(checkbox)
	{
	var addrbook_show_images;
	if (addrbook_show_images = document.getElementById('rcmfd_addrbook_show_images'))
	addrbook_show_images.disabled = !checkbox.checked;
	}

	// display fetched raw headers
	this.set_headers = function(content)
	- {
	- if (this.gui_objects.all_headers_row && this.gui_objects.all_headers_box && content)
	- {
	- var box = this.gui_objects.all_headers_box;
	- box.innerHTML = content;
	- box.style.display = 'block';
	+ {
	+ if (this.gui_objects.all_headers_row && this.gui_objects.all_headers_box && content) {
	+ $(this.gui_objects.all_headers_box).html(content).show();

	if (this.env.framed && parent.rcmail)
	- parent.rcmail.set_busy(false);
	+ parent.rcmail.set_busy(false);
	else
	this.set_busy(false);
	- }
	- };
	+ }
	+ };

	// display all-headers row and fetch raw message headers
	this.load_headers = function(elem)
	{
	if (!this.gui_objects.all_headers_row \|\| !this.gui_objects.all_headers_box \|\| !this.env.uid)
	return;

	- this.set_classname(elem, 'show-headers', false);
	- this.set_classname(elem, 'hide-headers', true);
	- this.gui_objects.all_headers_row.style.display = bw.ie ? 'block' : 'table-row';
	+ $(elem).removeClass('show-headers').addClass('hide-headers');
	+ $(this.gui_objects.all_headers_row).show();
	elem.onclick = function() { rcmail.hide_headers(elem); }

	// fetch headers only once
	if (!this.gui_objects.all_headers_box.innerHTML)
	{
	- this.display_message(this.get_label('loading'), 'loading', true);
	+ this.display_message(this.get_label('loading'), 'loading', true);
	this.http_post('headers', '_uid='+this.env.uid);
	}
	}

	// hide all-headers row
	this.hide_headers = function(elem)
	{
	if (!this.gui_objects.all_headers_row \|\| !this.gui_objects.all_headers_box)
	return;

	- this.set_classname(elem, 'hide-headers', false);
	- this.set_classname(elem, 'show-headers', true);
	- this.gui_objects.all_headers_row.style.display = 'none';
	+ $(elem).removeClass('hide-headers').addClass('show-headers');
	+ $(this.gui_objects.all_headers_row).hide();
	elem.onclick = function() { rcmail.load_headers(elem); }
	}


	/********************************************************/
	/******* html to text conversion functions *******/
	/********************************************************/

	this.html2plain = function(htmlText, id)
	{
	- var http_request = new rcube_http_request();
	var url = this.env.bin_path+'html2text.php';
	var rcmail = this;

	this.set_busy(true, 'converting');
	console.log('HTTP POST: '+url);

	- http_request.onerror = function(o) { rcmail.http_error(o); };
	- http_request.oncomplete = function(o) { rcmail.set_text_value(o, id); };
	- http_request.POST(url, htmlText, 'application/octet-stream');
	- }
	-
	- this.set_text_value = function(httpRequest, id)
	- {
	- this.set_busy(false);
	- document.getElementById(id).value = httpRequest.get_text();
	- console.log(httpRequest.get_text());
	+ $.ajax({ type: 'POST', url: url, data: htmlText, contentType: 'application/octet-stream',
	+ error: function(o) { rcmail.http_error(o); },
	+ success: function(data) { rcmail.set_busy(false); $(document.getElementById(id)).val(data); console.log(data); }
	+ });
	}


	/********************************************************/
	/******* remote request methods *******/
	/********************************************************/

	this.redirect = function(url, lock)
	{
	if (lock \|\| lock === null)
	this.set_busy(true);

	if (this.env.framed && window.parent)
	parent.location.href = url;
	else
	location.href = url;
	};

	this.goto_url = function(action, query, lock)
	{
	var querystring = query ? '&'+query : '';
	this.redirect(this.env.comm_path+'&_action='+action+querystring, lock);
	};

	- this.http_sockets = new Array();
	-
	- // find a non-busy socket or create a new one
	- this.get_request_obj = function()
	- {
	- for (var n=0; n<this.http_sockets.length; n++)
	- {
	- if (!this.http_sockets[n].busy)
	- return this.http_sockets[n];
	- }
	-
	- // create a new XMLHTTP object
	- var i = this.http_sockets.length;
	- this.http_sockets[i] = new rcube_http_request();
	-
	- return this.http_sockets[i];
	- };
	-
	// send a http request to the server
	this.http_request = function(action, querystring, lock)
	- {
	- var request_obj = this.get_request_obj();
	+ {
	querystring += (querystring ? '&' : '') + '_remote=1';
	+ var url = this.env.comm_path + '&_action=' + action + '&' + querystring

	- // add timestamp to request url to avoid cacheing problems in Safari
	- if (bw.safari)
	- querystring += '&_ts='+(new Date().getTime());
	-
	// send request
	- if (request_obj)
	- {
	- console.log('HTTP request: '+this.env.comm_path+'&_action='+action+'&'+querystring);
	-
	- if (lock)
	- this.set_busy(true);
	-
	- var rcm = this;
	- request_obj.__lock = lock ? true : false;
	- request_obj.__action = action;
	- request_obj.onerror = function(o){ ref.http_error(o); };
	- request_obj.oncomplete = function(o){ ref.http_response(o); };
	- request_obj.GET(this.env.comm_path+'&_action='+action+'&'+querystring);
	- }
	- };
	-
	- // send a http POST request to the server
	- this.http_post = function(action, postdata, lock)
	- {
	- var request_obj;
	- if (postdata && typeof(postdata) == 'object')
	- postdata._remote = 1;
	- else
	- postdata += (postdata ? '&' : '') + '_remote=1';
	-
	- // send request
	- if (request_obj = this.get_request_obj())
	- {
	- console.log('HTTP POST: '+this.env.comm_path+'&_action='+action);
	+ console.log('HTTP POST: ' + url);
	+ jQuery.get(url, { _unlock:(lock?1:0) }, function(data){ ref.http_response(data); }, 'json');
	+ };

	- if (lock)
	- this.set_busy(true);
	+ // send a http POST request to the server
	+ this.http_post = function(action, postdata, lock)
	+ {
	+ var url = this.env.comm_path+'&_action=' + action;
	+
	+ if (postdata && typeof(postdata) == 'object') {
	+ postdata._remote = 1;
	+ postdata._unlock = (lock ? 1 : 0);
	+ }
	+ else
	+ postdata += (postdata ? '&' : '') + '_remote=1' + (lock ? '&_unlock=1' : '');

	- var rcm = this;
	- request_obj.__lock = lock ? true : false;
	- request_obj.__action = action;
	- request_obj.onerror = function(o){ rcm.http_error(o); };
	- request_obj.oncomplete = function(o){ rcm.http_response(o); };
	- request_obj.POST(this.env.comm_path+'&_action='+action, postdata);
	- }
	- };
	+ // send request
	+ console.log('HTTP POST: ' + url);
	+ jQuery.post(url, postdata, function(data){ ref.http_response(data); }, 'json');
	+ };

	// handle HTTP response
	- this.http_response = function(request_obj)
	- {
	- var ctype = request_obj.get_header('Content-Type');
	- if (ctype)
	- {
	- ctype = String(ctype).toLowerCase();
	- var ctype_array=ctype.split(";");
	- ctype = ctype_array[0];
	- }
	-
	- if (request_obj.__lock)
	+ this.http_response = function(response)
	+ {
	+ var console_msg = '';
	+
	+ if (response.unlock)
	this.set_busy(false);

	- console.log(request_obj.get_text());
	+ // set env vars
	+ if (response.env)
	+ this.set_env(response.env);

	- // if we get javascript code from server -> execute it
	- if (request_obj.get_text() && (ctype=='text/javascript' \|\| ctype=='application/x-javascript'))
	- eval(request_obj.get_text());
	+ // we have labels to add
	+ if (typeof response.texts == 'object') {
	+ for (var name in response.texts)
	+ if (typeof response.texts[name] == 'string')
	+ this.add_label(name, response.texts[name]);
	+ }

	+ // if we get javascript code from server -> execute it
	+ if (response.exec) {
	+ console.log(response.exec);
	+ eval(response.exec);
	+ }
	+
	// process the response data according to the sent action
	- switch (request_obj.__action) {
	+ switch (response.action) {
	case 'delete':
	if (this.task == 'addressbook') {
	var uid = this.contact_list.get_selection();
	this.enable_command('compose', (uid && this.contact_list.rows[uid]));
	this.enable_command('delete', 'edit', (uid && this.contact_list.rows[uid] && this.env.address_sources && !this.env.address_sources[this.env.source].readonly));
	this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
	}

	case 'moveto':
	if (this.env.action == 'show')
	this.command('list');
	else if (this.message_list)
	this.message_list.init();
	break;

	case 'purge':
	- case 'expunge':
	+ case 'expunge':
	if (!this.env.messagecount && this.task == 'mail') {
	// clear preview pane content
	if (this.env.contentframe)
	this.show_contentframe(false);
	// disable commands useless when mailbox is empty
	this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 'mark', 'viewsource',
	'print', 'load-attachment', 'purge', 'expunge', 'select-all', 'select-none', 'sort', false);
	}
	break;

	case 'check-recent':
	case 'getunread':
	case 'list':
	if (this.task == 'mail') {
	- if (this.message_list && request_obj.__action == 'list')
	+ if (this.message_list && response.action == 'list')
	this.msglist_select(this.message_list);
	this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
	this.enable_command('purge', this.purge_mailbox_test());
	}
	else if (this.task == 'addressbook')
	this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
	-
	break;
	- }
	-
	- request_obj.reset();
	- };
	+ }
	+ };

	// handle HTTP request errors
	- this.http_error = function(request_obj)
	+ this.http_error = function(request, status, err)
	{
	+ alert(status+":"+err);
	+/*
	//alert('Error sending request: '+request_obj.url+' => HTTP '+request_obj.xmlhttp.status);
	if (request_obj.__lock)
	this.set_busy(false);

	request_obj.reset();
	request_obj.__lock = false;
	this.display_message('Unknown Server Error!', 'error');
	+*/
	};

	// use an image to send a keep-alive siganl to the server
	this.send_keep_alive = function()
	{
	var d = new Date();
	this.http_request('keep-alive', '_t='+d.getTime());
	};

	// send periodic request to check for recent messages
	this.check_for_recent = function(setbusy)
	{
	if (this.busy)
	return;

	if (setbusy)
	this.set_busy(true, 'checkingmail');

	var addurl = '_t=' + (new Date().getTime());

	if (this.gui_objects.messagelist)
	addurl += '&_list=1';
	if (this.gui_objects.quotadisplay)
	addurl += '&_quota=1';
	if (this.env.search_request)
	addurl += '&_search=' + this.env.search_request;

	this.http_request('check-recent', addurl, true);
	};


	/********************************************************/
	/******* helper methods *******/
	/********************************************************/

	// check if we're in show mode or if we have a unique selection
	// and return the message uid
	this.get_single_uid = function()
	{
	return this.env.uid ? this.env.uid : (this.message_list ? this.message_list.get_single_selection() : null);
	};

	// same as above but for contacts
	this.get_single_cid = function()
	{
	return this.env.cid ? this.env.cid : (this.contact_list ? this.contact_list.get_single_selection() : null);
	};


	this.get_caret_pos = function(obj)
	{
	if (typeof(obj.selectionEnd)!='undefined')
	return obj.selectionEnd;
	else if (document.selection && document.selection.createRange)
	{
	var range = document.selection.createRange();
	if (range.parentElement()!=obj)
	return 0;

	var gm = range.duplicate();
	if (obj.tagName=='TEXTAREA')
	gm.moveToElementText(obj);
	else
	gm.expand('textedit');

	gm.setEndPoint('EndToStart', range);
	var p = gm.text.length;

	return p<=obj.value.length ? p : -1;
	}
	else
	return obj.value.length;
	};

	this.set_caret2start = function(obj)
	{
	if (obj.createTextRange)
	{
	var range = obj.createTextRange();
	range.collapse(true);
	range.select();
	}
	else if (obj.setSelectionRange)
	obj.setSelectionRange(0,0);

	obj.focus();
	};

	// set all fields of a form disabled
	this.lock_form = function(form, lock)
	{
	if (!form \|\| !form.elements)
	return;

	var type;
	for (var n=0; n<form.elements.length; n++)
	{
	type = form.elements[n];
	if (type=='hidden')
	continue;

	form.elements[n].disabled = lock;
	}
	};

	- } // end object rcube_webmail
	+} // end object rcube_webmail


	-/**
	- * Class for sending HTTP requests
	- * @constructor
	- */
	-function rcube_http_request()
	- {
	- this.url = '';
	- this.busy = false;
	- this.xmlhttp = null;
	-
	- // reset object properties
	- this.reset = function()
	- {
	- // set unassigned event handlers
	- this.onloading = function(){ };
	- this.onloaded = function(){ };
	- this.oninteractive = function(){ };
	- this.oncomplete = function(){ };
	- this.onabort = function(){ };
	- this.onerror = function(){ };
	-
	- this.url = '';
	- this.busy = false;
	- this.xmlhttp = null;
	- }
	-
	- // create HTMLHTTP object
	- this.build = function()
	- {
	- if (window.XMLHttpRequest)
	- this.xmlhttp = new XMLHttpRequest();
	- else if (window.ActiveXObject)
	- {
	- try { this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); }
	- catch(e) { this.xmlhttp = null; }
	- }
	- else
	- {
	-
	- }
	- }
	-
	- // send GET request
	- this.GET = function(url)
	- {
	- this.build();
	-
	- if (!this.xmlhttp)
	- {
	- this.onerror(this);
	- return false;
	- }
	-
	- var _ref = this;
	- this.url = url;
	- this.busy = true;
	-
	- this.xmlhttp.onreadystatechange = function(){ _ref.xmlhttp_onreadystatechange(); };
	- this.xmlhttp.open('GET', url, true);
	- this.xmlhttp.setRequestHeader('X-RoundCube-Referer', bw.get_cookie('roundcube_sessid'));
	- this.xmlhttp.send(null);
	- };
	-
	- this.POST = function(url, body, contentType)
	- {
	- // default value for contentType if not provided
	- if (typeof(contentType) == 'undefined')
	- contentType = 'application/x-www-form-urlencoded';
	-
	- this.build();
	-
	- if (!this.xmlhttp)
	- {
	- this.onerror(this);
	- return false;
	- }
	-
	- var req_body = body;
	- if (typeof(body) == 'object')
	- {
	- req_body = '';
	- for (var p in body)
	- req_body += (req_body ? '&' : '') + p+'='+urlencode(body[p]);
	- }
	-
	- var ref = this;
	- this.url = url;
	- this.busy = true;
	-
	- this.xmlhttp.onreadystatechange = function() { ref.xmlhttp_onreadystatechange(); };
	- this.xmlhttp.open('POST', url, true);
	- this.xmlhttp.setRequestHeader('Content-Type', contentType);
	- this.xmlhttp.setRequestHeader('X-RoundCube-Referer', bw.get_cookie('roundcube_sessid'));
	- this.xmlhttp.send(req_body);
	- };
	-
	- // handle onreadystatechange event
	- this.xmlhttp_onreadystatechange = function()
	- {
	- if(this.xmlhttp.readyState == 1)
	- this.onloading(this);
	-
	- else if(this.xmlhttp.readyState == 2)
	- this.onloaded(this);
	-
	- else if(this.xmlhttp.readyState == 3)
	- this.oninteractive(this);
	-
	- else if(this.xmlhttp.readyState == 4)
	- {
	- try {
	- if (this.xmlhttp.status == 0)
	- this.onabort(this);
	- else if(this.xmlhttp.status == 200)
	- this.oncomplete(this);
	- else
	- this.onerror(this);
	-
	- this.busy = false;
	- }
	- catch(err)
	- {
	- this.onerror(this);
	- this.busy = false;
	- }
	- }
	- }
	-
	- // getter method for HTTP headers
	- this.get_header = function(name)
	- {
	- return this.xmlhttp.getResponseHeader(name);
	- };
	-
	- this.get_text = function()
	- {
	- return this.xmlhttp.responseText;
	- };
	-
	- this.get_xml = function()
	- {
	- return this.xmlhttp.responseXML;
	- };
	-
	- this.reset();
	-
	- } // end class rcube_http_request
	-
	-// helper function to call the init method with a delay
	-function call_init(o)
	- {
	- window.setTimeout('if (window[\''+o+'\'] && window[\''+o+'\'].init) { '+o+'.init(); }',
	- bw.win ? 500 : 200);
	- }
	+// copy event engine prototype
	+rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;
	+rcube_webmail.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener;
	+rcube_webmail.prototype.triggerEvent = rcube_event_engine.prototype.triggerEvent;

	diff --git a/program/js/common.js b/program/js/common.js
	index bd699d924..407da4170 100644
	--- a/program/js/common.js
	+++ b/program/js/common.js
	@@ -1,679 +1,653 @@
	/*
	+-----------------------------------------------------------------------+
	\| RoundCube common js library \|
	\| \|
	\| This file is part of the RoundCube web development suite \|
	\| Copyright (C) 2005-2007, RoundCube Dev, - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$
	*/

	// Constants
	var CONTROL_KEY = 1;
	var SHIFT_KEY = 2;
	var CONTROL_SHIFT_KEY = 3;


	/**
	* Default browser check class
	* @construcotr
	*/
	function roundcube_browser()
	{
	this.ver = parseFloat(navigator.appVersion);
	this.appver = navigator.appVersion;
	this.agent = navigator.userAgent;
	this.name = navigator.appName;
	this.vendor = navigator.vendor ? navigator.vendor : '';
	this.vendver = navigator.vendorSub ? parseFloat(navigator.vendorSub) : 0;
	this.product = navigator.product ? navigator.product : '';
	this.platform = String(navigator.platform).toLowerCase();
	this.lang = (navigator.language) ? navigator.language.substring(0,2) :
	(navigator.browserLanguage) ? navigator.browserLanguage.substring(0,2) :
	(navigator.systemLanguage) ? navigator.systemLanguage.substring(0,2) : 'en';

	this.win = (this.platform.indexOf('win')>=0) ? true : false;
	this.mac = (this.platform.indexOf('mac')>=0) ? true : false;
	this.linux = (this.platform.indexOf('linux')>=0) ? true : false;
	this.unix = (this.platform.indexOf('unix')>=0) ? true : false;

	this.dom = document.getElementById ? true : false;
	this.dom2 = (document.addEventListener && document.removeEventListener);

	this.ie = (document.all) ? true : false;
	this.ie4 = (this.ie && !this.dom);
	this.ie5 = (this.dom && this.appver.indexOf('MSIE 5')>0);
	this.ie6 = (this.dom && this.appver.indexOf('MSIE 6')>0);
	this.ie7 = (this.dom && this.appver.indexOf('MSIE 7')>0);

	this.mz = (this.dom && this.ver>=5); // (this.dom && this.product=='Gecko')
	this.ns = ((this.ver<5 && this.name=='Netscape') \|\| (this.ver>=5 && this.vendor.indexOf('Netscape')>=0));
	this.ns6 = (this.ns && parseInt(this.vendver)==6); // (this.mz && this.ns) ? true : false;
	this.ns7 = (this.ns && parseInt(this.vendver)==7); // this.agent.indexOf('Netscape/7')>0);
	this.safari = (this.agent.toLowerCase().indexOf('safari')>0 \|\| this.agent.toLowerCase().indexOf('applewebkit')>0);
	this.konq = (this.agent.toLowerCase().indexOf('konqueror')>0);

	this.opera = (window.opera) ? true : false;

	if(this.opera && window.RegExp)
	this.vendver = (/opera(\s\|\/)([0-9\.]+)/i.test(navigator.userAgent)) ? parseFloat(RegExp.$2) : -1;
	else if(!this.vendver && this.safari)
	this.vendver = (/(safari\|applewebkit)\/([0-9]+)/i.test(this.agent)) ? parseInt(RegExp.$2) : 0;
	else if((!this.vendver && this.mz) \|\| this.agent.indexOf('Camino')>0)
	this.vendver = (/rv:([0-9\.]+)/.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
	else if(this.ie && window.RegExp)
	this.vendver = (/msie\s+([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;
	else if(this.konq && window.RegExp)
	this.vendver = (/khtml\/([0-9\.]+)/i.test(this.agent)) ? parseFloat(RegExp.$1) : 0;


	// get real language out of safari's user agent
	if(this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/i.test(this.agent)))
	this.lang = RegExp.$1;

	this.dhtml = ((this.ie4 && this.win) \|\| this.ie5 \|\| this.ie6 \|\| this.ns4 \|\| this.mz);
	this.vml = (this.win && this.ie && this.dom && !this.opera);
	this.pngalpha = (this.mz \|\| (this.opera && this.vendver>=6) \|\| (this.ie && this.mac && this.vendver>=5) \|\|
	(this.ie && this.win && this.vendver>=5.5) \|\| this.safari);
	this.opacity = (this.mz \|\| (this.ie && this.vendver>=5.5 && !this.opera) \|\| (this.safari && this.vendver>=100));
	this.cookies = navigator.cookieEnabled;

	// test for XMLHTTP support
	this.xmlhttp_test = function()
	{
	var activeX_test = new Function("try{var o=new ActiveXObject('Microsoft.XMLHTTP');return true;}catch(err){return false;}");
	this.xmlhttp = (window.XMLHttpRequest \|\| (window.ActiveXObject && activeX_test())) ? true : false;
	return this.xmlhttp;
	}
	}


	-// static functions for event handling
	+// static functions for DOM event handling
	var rcube_event = {

	/**
	* returns the event target element
	*/
	get_target: function(e)
	{
	e = e \|\| window.event;
	return e && e.target ? e.target : e.srcElement;
	},

	/**
	* returns the event key code
	*/
	get_keycode: function(e)
	{
	e = e \|\| window.event;
	return e && e.keyCode ? e.keyCode : (e && e.which ? e.which : 0);
	},

	/**
	* returns the event key code
	*/
	get_button: function(e)
	{
	e = e \|\| window.event;
	return e && (typeof e.button != 'undefined') ? e.button : (e && e.which ? e.which : 0);
	},

	/**
	* returns modifier key (constants defined at top of file)
	*/
	get_modifier: function(e)
	{
	var opcode = 0;
	e = e \|\| window.event;

	if (bw.mac && e)
	{
	opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
	return opcode;
	}
	if (e)
	{
	opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
	return opcode;
	}
	},

	/**
	* Return absolute mouse position of an event
	*/
	get_mouse_pos: function(e)
	{
	if (!e) e = window.event;
	var mX = (e.pageX) ? e.pageX : e.clientX;
	var mY = (e.pageY) ? e.pageY : e.clientY;

	if (document.body && document.all)
	{
	mX += document.body.scrollLeft;
	mY += document.body.scrollTop;
	}

	if (e._offset) {
	- mX += e._offset.x;
	- mY += e._offset.y;
	+ mX += e._offset.left;
	+ mY += e._offset.top;
	}

	return { x:mX, y:mY };
	},

	/**
	* Add an object method as event listener to a certain element
	*/
	add_listener: function(p)
	{
	if (!p.object \|\| !p.method) // not enough arguments
	return;
	if (!p.element)
	p.element = document;

	if (!p.object._rc_events)
	p.object._rc_events = [];

	var key = p.event + '*' + p.method;
	if (!p.object._rc_events[key])
	p.object._rc_events[key] = function(e){ return p.object[p.method](e); };

	if (p.element.addEventListener)
	p.element.addEventListener(p.event, p.object._rc_events[key], false);
	else if (p.element.attachEvent)
	{
	// IE allows multiple events with the same function to be applied to the same object
	// forcibly detach the event, then attach
	p.element.detachEvent('on'+p.event, p.object._rc_events[key]);
	p.element.attachEvent('on'+p.event, p.object._rc_events[key]);
	}
	else
	p.element['on'+p.event] = p.object._rc_events[key];
	},

	/**
	* Remove event listener
	*/
	remove_listener: function(p)
	{
	if (!p.element)
	p.element = document;

	var key = p.event + '*' + p.method;
	if (p.object && p.object._rc_events && p.object._rc_events[key]) {
	if (p.element.removeEventListener)
	p.element.removeEventListener(p.event, p.object._rc_events[key], false);
	else if (p.element.detachEvent)
	p.element.detachEvent('on'+p.event, p.object._rc_events[key]);
	else
	p.element['on'+p.event] = null;
	}
	},

	/**
	* Prevent event propagation and bubbeling
	*/
	cancel: function(evt)
	{
	var e = evt ? evt : window.event;
	if (e.preventDefault)
	e.preventDefault();
	if (e.stopPropagation)
	e.stopPropagation();

	e.cancelBubble = true;
	e.returnValue = false;
	return false;
	}

	};


	-var rcube_layer_objects = new Array();
	+/**
	+ * rcmail objects event interface
	+ */
	+function rcube_event_engine()
	+{
	+ this._events = {};
	+}
	+
	+rcube_event_engine.prototype = {
	+
	+/**
	+ * Setter for object event handlers
	+ *
	+ * @param {String} Event name
	+ * @param {Function} Handler function
	+ * @return Listener ID (used to remove this handler later on)
	+ */
	+addEventListener: function(evt, func, obj)
	+{
	+ if (!this._events)
	+ this._events = {};
	+ if (!this._events[evt])
	+ this._events[evt] = [];
	+
	+ var e = {func:func, obj:obj ? obj : window};
	+ this._events[evt][this._events[evt].length] = e;
	+},
	+
	+/**
	+ * Removes a specific event listener
	+ *
	+ * @param {String} Event name
	+ * @param {Int} Listener ID to remove
	+ */
	+removeEventListener: function(evt, func, obj)
	+{
	+ if (typeof obj == 'undefined')
	+ obj = window;
	+
	+ for (var h,i=0; this._events && this._events[evt] && i < this._events[evt].length; i++)
	+ if ((h = this._events[evt][i]) && h.func == func && h.obj == obj)
	+ this._events[evt][i] = null;
	+},
	+
	+/**
	+ * This will execute all registered event handlers
	+ *
	+ * @param {String} Event to trigger
	+ * @param {Object} Event object/arguments
	+ */
	+triggerEvent: function(evt, e)
	+{
	+ var ret, h;
	+ if (typeof e == 'undefined')
	+ e = {};
	+ if (typeof e == 'object')
	+ e.event = evt;
	+
	+ if (this._events && this._events[evt] && !this._event_exec) {
	+ this._event_exec = true;
	+ for (var i=0; i < this._events[evt].length; i++) {
	+ if ((h = this._events[evt][i])) {
	+ if (typeof h.func == 'function')
	+ ret = h.func.call ? h.func.call(h.obj, this, e) : h.func(this, e);
	+ else if (typeof h.obj[h.func] == 'function')
	+ ret = h.obj[h.func](this, e);
	+
	+ // cancel event execution
	+ if (typeof ret != 'undefined' && !ret)
	+ break;
	+ }
	+ }
	+ }
	+
	+ this._event_exec = false;
	+ return ret;
	+}
	+
	+} // end rcube_event_engine.prototype
	+


	/**
	* RoundCube generic layer (floating box) class
	*
	* @constructor
	*/
	function rcube_layer(id, attributes)
	- {
	+{
	this.name = id;

	// create a new layer in the current document
	this.create = function(arg)
	{
	var l = (arg.x) ? arg.x : 0;
	var t = (arg.y) ? arg.y : 0;
	var w = arg.width;
	var h = arg.height;
	var z = arg.zindex;
	var vis = arg.vis;
	var parent = arg.parent;
	var obj;

	obj = document.createElement('DIV');

	with(obj)
	{
	id = this.name;
	with(style)
	{
	position = 'absolute';
	visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden';
	left = l+'px';
	top = t+'px';
	if (w)
	width = w.toString().match(/\%$/) ? w : w+'px';
	if (h)
	height = h.toString().match(/\%$/) ? h : h+'px';
	if(z) zIndex = z;
	}
	}

	if (parent)
	parent.appendChild(obj);
	else
	document.body.appendChild(obj);

	this.elm = obj;
	};


	// create new layer
	if(attributes!=null)
	{
	this.create(attributes);
	this.name = this.elm.id;
	}
	else // just refer to the object
	this.elm = document.getElementById(id);


	if(!this.elm)
	return false;


	// ******* layer object properties *******

	this.css = this.elm.style;
	this.event = this.elm;
	this.width = this.elm.offsetWidth;
	this.height = this.elm.offsetHeight;
	this.x = parseInt(this.elm.offsetLeft);
	this.y = parseInt(this.elm.offsetTop);
	this.visible = (this.css.visibility=='visible' \|\| this.css.visibility=='show' \|\| this.css.visibility=='inherit') ? true : false;

	- this.id = rcube_layer_objects.length;
	- this.obj = 'rcube_layer_objects['+this.id+']';
	- rcube_layer_objects[this.id] = this;
	-

	// ******* layer object methods *******


	// move the layer to a specific position
	this.move = function(x, y)
	{
	this.x = x;
	this.y = y;
	this.css.left = Math.round(this.x)+'px';
	this.css.top = Math.round(this.y)+'px';
	}

	-
	- // move the layer for a specific step
	- this.shift = function(x,y)
	- {
	- x = Math.round(x*100)/100;
	- y = Math.round(y*100)/100;
	- this.move(this.x+x, this.y+y);
	- }
	-
	-
	// change the layers width and height
	this.resize = function(w,h)
	{
	this.css.width = w+'px';
	this.css.height = h+'px';
	this.width = w;
	this.height = h;
	}


	- // cut the layer (top,width,height,left)
	- this.clip = function(t,w,h,l)
	- {
	- this.css.clip='rect('+t+' '+w+' '+h+' '+l+')';
	- this.clip_height = h;
	- this.clip_width = w;
	- }
	-
	-
	// show or hide the layer
	this.show = function(a)
	{
	if(a==1)
	{
	this.css.visibility = 'visible';
	this.visible = true;
	}
	else if(a==2)
	{
	this.css.visibility = 'inherit';
	this.visible = true;
	}
	else
	{
	this.css.visibility = 'hidden';
	this.visible = false;
	}
	}


	// write new content into a Layer
	this.write = function(cont)
	{
	this.elm.innerHTML = cont;
	}

	-
	- // set the given color to the layer background
	- this.set_bgcolor = function(c)
	- {
	- if(!c \|\| c=='#')
	- c = 'transparent';
	-
	- this.css.backgroundColor = c;
	- }
	-
	-
	- // set the opacity of a layer to the given ammount (in %)
	- this.set_opacity = function(v)
	- {
	- if(!bw.opacity)
	- return;
	-
	- var op = v<=1 ? Math.round(v*100) : parseInt(v);
	-
	- if(bw.ie)
	- this.css.filter = 'alpha(opacity:'+op+')';
	- else if(bw.safari)
	- {
	- this.css.opacity = op/100;
	- this.css.KhtmlOpacity = op/100;
	- }
	- else if(bw.mz)
	- this.css.MozOpacity = op/100;
	- }
	- }
	+}


	// check if input is a valid email address
	// By Cal Henderson <cal@iamcal.com>
	// http://code.iamcal.com/php/rfc822/
	function rcube_check_email(input, inline)
	{
	if (input && window.RegExp)
	{
	var qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]';
	var dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]';
	var atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+';
	var quoted_pair = '\\x5c[\\x00-\\x7f]';
	var domain_literal = '\\x5b('+dtext+'\|'+quoted_pair+')*\\x5d';
	var quoted_string = '\\x22('+qtext+'\|'+quoted_pair+')*\\x22';
	var sub_domain = '('+atom+'\|'+domain_literal+')';
	var word = '('+atom+'\|'+quoted_string+')';
	var domain = sub_domain+'(\\x2e'+sub_domain+')*';
	var local_part = word+'(\\x2e'+word+')*';
	var addr_spec = local_part+'\\x40'+domain;
	var delim = '[,;\s\n]';
	var reg1 = inline ? new RegExp('(^\|<\|'+delim+')'+addr_spec+'($\|>\|'+delim+')', 'i') : new RegExp('^'+addr_spec+'$', 'i');
	return reg1.test(input) ? true : false;
	}
	return false;
	}


	// find a value in a specific array and returns the index
	function find_in_array()
	{
	var args = find_in_array.arguments;
	if(!args.length) return -1;

	var haystack = typeof(args[0])=='object' ? args[0] : args.length>1 && typeof(args[1])=='object' ? args[1] : new Array();
	var needle = typeof(args[0])!='object' ? args[0] : args.length>1 && typeof(args[1])!='object' ? args[1] : '';
	var nocase = args.length==3 ? args[2] : false;

	if(!haystack.length) return -1;

	for(var i=0; i<haystack.length; i++)
	if(nocase && haystack[i].toLowerCase()==needle.toLowerCase())
	return i;
	else if(haystack[i]==needle)
	return i;

	return -1;
	}


	// make a string URL safe
	function urlencode(str)
	{
	return window.encodeURIComponent ? encodeURIComponent(str) : escape(str);
	}


	// get any type of html objects by id/name
	function rcube_find_object(id, d)
	- {
	+{
	var n, f, obj, e;
	if(!d) d = document;

	if(d.getElementsByName && (e = d.getElementsByName(id)))
	obj = e[0];
	if(!obj && d.getElementById)
	obj = d.getElementById(id);
	if(!obj && d.all)
	obj = d.all[id];

	if(!obj && d.images.length)
	obj = d.images[id];

	- if(!obj && d.forms.length)
	- for(f=0; f<d.forms.length; f++)
	- {
	+ if (!obj && d.forms.length) {
	+ for (f=0; f<d.forms.length; f++) {
	if(d.forms[f].name == id)
	obj = d.forms[f];
	else if(d.forms[f].elements[id])
	obj = d.forms[f].elements[id];
	- }
	-
	- if(!obj && d.layers)
	- {
	- if(d.layers[id]) obj = d.layers[id];
	- for(n=0; !obj && n<d.layers.length; n++)
	- obj = rcube_find_object(id, d.layers[n].document);
	}
	-
	- return obj;
	}

	-
	-// return the absolute position of an object within the document
	-function rcube_get_object_pos(obj, relative)
	- {
	- if(typeof(obj)=='string')
	- obj = rcube_find_object(obj);
	-
	- if(!obj) return {x:0, y:0};
	-
	- var iX = (bw.layers) ? obj.x : obj.offsetLeft;
	- var iY = (bw.layers) ? obj.y : obj.offsetTop;
	-
	- if(!relative && (bw.ie \|\| bw.mz))
	- {
	- var elm = obj.offsetParent;
	- while(elm && elm!=null)
	- {
	- iX += elm.offsetLeft - (elm.parentNode && elm.parentNode.scrollLeft ? elm.parentNode.scrollLeft : 0);
	- iY += elm.offsetTop - (elm.parentNode && elm.parentNode.scrollTop ? elm.parentNode.scrollTop : 0);
	- elm = elm.offsetParent;
	- }
	- }
	-
	- return {x:iX, y:iY};
	+ if (!obj && d.layers) {
	+ if (d.layers[id]) obj = d.layers[id];
	+ for (n=0; !obj && n<d.layers.length; n++)
	+ obj = rcube_find_object(id, d.layers[n].document);
	}

	+ return obj;
	+}
	+
	// determine whether the mouse is over the given object or not
	function rcube_mouse_is_over(ev, obj)
	{
	var mouse = rcube_event.get_mouse_pos(ev);
	- var pos = rcube_get_object_pos(obj);
	-
	- return ((mouse.x >= pos.x) && (mouse.x < (pos.x + obj.offsetWidth)) &&
	- (mouse.y >= pos.y) && (mouse.y < (pos.y + obj.offsetHeight)));
	-}
	+ var pos = $(obj).offset();

	+ return ((mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) &&
	+ (mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight)));
	+}

	-/**
	- * Return the currently applied value of a css property
	- *
	- * @param {Object} html_element Node reference
	- * @param {String} css_property Property name to read in Javascript notation (eg. 'textAlign')
	- * @param {String} mozilla_equivalent Equivalent property name in CSS notation (eg. 'text-align')
	- * @return CSS property value
	- * @type String
	- */
	-function get_elements_computed_style(html_element, css_property, mozilla_equivalent)
	- {
	- if (arguments.length==2)
	- mozilla_equivalent = css_property;
	-
	- var el = html_element;
	- if (typeof(html_element)=='string')
	- el = rcube_find_object(html_element);
	-
	- if (el && el.currentStyle)
	- return el.currentStyle[css_property];
	- else if (el && document.defaultView && document.defaultView.getComputedStyle)
	- return document.defaultView.getComputedStyle(el, null).getPropertyValue(mozilla_equivalent);
	- else
	- return false;
	- }
	-

	// cookie functions by GoogieSpell
	function setCookie(name, value, expires, path, domain, secure)
	{
	var curCookie = name + "=" + escape(value) +
	(expires ? "; expires=" + expires.toGMTString() : "") +
	(path ? "; path=" + path : "") +
	(domain ? "; domain=" + domain : "") +
	(secure ? "; secure" : "");
	document.cookie = curCookie;
	}

	roundcube_browser.prototype.set_cookie = setCookie;

	function getCookie(name)
	{
	var dc = document.cookie;
	var prefix = name + "=";
	var begin = dc.indexOf("; " + prefix);
	if (begin == -1)
	{
	begin = dc.indexOf(prefix);
	if (begin != 0) return null;
	}
	else
	begin += 2;
	var end = document.cookie.indexOf(";", begin);
	if (end == -1)
	end = dc.length;
	return unescape(dc.substring(begin + prefix.length, end));
	}

	roundcube_browser.prototype.get_cookie = getCookie;

	// tiny replacement for Firebox functionality
	function rcube_console()
	{
	this.log = function(msg)
	{
	var box = rcube_find_object('console');

	if (box) {
	if (msg.charAt(msg.length-1)=='\n')
	- msg += '--------------------------------------\n';
	+ msg += '--------------------------------------\n';
	else
	msg += '\n--------------------------------------\n';

	// Konqueror doesn't allows to just change value of hidden element
	if (bw.konq) {
	box.innerText += msg;
	box.value = box.innerText;
	} else
	box.value += msg;
	}
	};

	this.reset = function()
	{
	var box = rcube_find_object('console');
	if (box)
	box.innerText = box.value = '';
	};
	}

	var bw = new roundcube_browser();
	-var console = new rcube_console();
	+if (!window.console)
	+ console = new rcube_console();


	// Add escape() method to RegExp object
	// http://dev.rubyonrails.org/changeset/7271
	RegExp.escape = function(str)
	{
	return String(str).replace(/([.*+?^=!:${}()\|[\]\/\\])/g, '\\$1');
	}


	// Make getElementById() case-sensitive on IE
	if (bw.ie)
	{
	document._getElementById = document.getElementById;
	document.getElementById = function(id)
	{
	var i = 0;
	var o = document._getElementById(id);

	if (!o \|\| o.id != id)
	while ((o = document.all[i]) && o.id != id)
	i++;

	return o;
	}
	}


	// Fire event on specified element
	function exec_event(element,event)
	{
	if (document.createEventObject) {
	// dispatch for IE
	var evt = document.createEventObject();
	return element.fireEvent('on'+event,evt)
	}
	else {
	// dispatch for firefox + others
	var evt = document.createEvent("HTMLEvents");
	evt.initEvent(event, true, true); // event type,bubbling,cancelable
	return !element.dispatchEvent(evt);
	}
	}
	diff --git a/program/js/editor.js b/program/js/editor.js
	index 6b847ba00..7f937b2b8 100644
	--- a/program/js/editor.js
	+++ b/program/js/editor.js
	@@ -1,98 +1,98 @@
	/*
	+-----------------------------------------------------------------------+
	\| RoundCube editor js library \|
	\| \|
	\| This file is part of the RoundCube web development suite \|
	\| Copyright (C) 2006, RoundCube Dev, - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Eric Stadtherr <estadtherr@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: editor.js 000 2006-05-18 19:12:28Z roundcube $
	*/

	// Initialize HTML editor
	function rcmail_editor_init(skin_path, editor_lang, spellcheck, mode)
	{
	if (mode == 'identity')
	tinyMCE.init({ mode : 'textareas',
	editor_selector : 'mce_editor',
	apply_source_formatting : true,
	theme : 'advanced',
	language : editor_lang,
	content_css : skin_path + '/editor_content.css',
	theme_advanced_toolbar_location : 'top',
	theme_advanced_toolbar_align : 'left',
	theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor',
	theme_advanced_buttons2 : ',fontselect,fontsizeselect',
	theme_advanced_buttons3 : '',
	relative_urls : false,
	remove_script_host : false,
	gecko_spellcheck : true
	});
	else // mail compose
	tinyMCE.init({
	mode : 'textareas',
	editor_selector : 'mce_editor',
	accessibility_focus : false,
	apply_source_formatting : true,
	theme : 'advanced',
	language : editor_lang,
	plugins : 'emotions,media,nonbreaking,table,searchreplace,visualchars,directionality' + (spellcheck ? ',spellchecker' : ''),
	theme_advanced_buttons1 : 'bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,link,unlink,emotions,charmap,code,forecolor,backcolor,fontselect,fontsizeselect, separator' + (spellcheck ? ',spellchecker' : '') + ',undo,redo,image,media,ltr,rtl',
	theme_advanced_buttons2 : '',
	theme_advanced_buttons3 : '',
	theme_advanced_toolbar_location : 'top',
	theme_advanced_toolbar_align : 'left',
	extended_valid_elements : 'font[face\|size\|color\|style],span[id\|class\|align\|style]',
	content_css : skin_path + '/editor_content.css',
	external_image_list_url : 'program/js/editor_images.js',
	spellchecker_languages : (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'),
	gecko_spellcheck : true,
	relative_urls : false,
	- remove_script_host : false ,
	- rc_client: rcube_webmail_client,
	+ remove_script_host : false,
	+ rc_client: rcmail,
	oninit : 'rcmail_editor_callback'
	});
	}

	// react to real individual tinyMCE editor init
	function rcmail_editor_callback(editor)
	{
	var input_from = rcube_find_object('_from');
	if(input_from && input_from.type=='select-one')
	rcmail.change_identity(input_from);
	}

	// switch html/plain mode
	function rcmail_toggle_editor(ishtml, textAreaId, flagElement)
	{
	var composeElement = document.getElementById(textAreaId);
	var flag;

	if (ishtml)
	{
	rcmail.display_spellcheck_controls(false);
	var htmlText = "<pre>" + composeElement.value + "</pre>";

	composeElement.value = htmlText;
	tinyMCE.execCommand('mceAddControl', true, textAreaId);
	if (flagElement && (flag = rcube_find_object(flagElement)))
	flag.value = '1';
	}
	else
	{
	if (!confirm(rcmail.get_label('editorwarning')))
	return false;

	var thisMCE = tinyMCE.get(textAreaId);
	var existingHtml = thisMCE.getContent();
	rcmail.html2plain(existingHtml, textAreaId);
	tinyMCE.execCommand('mceRemoveControl', true, textAreaId);
	rcmail.display_spellcheck_controls(true);
	if (flagElement && (flag = rcube_find_object(flagElement)))
	flag.value = '0';
	}
	};
	diff --git a/program/js/list.js b/program/js/list.js
	index 522af59ab..dabcecb92 100644
	--- a/program/js/list.js
	+++ b/program/js/list.js
	@@ -1,895 +1,837 @@
	/*
	+-----------------------------------------------------------------------+
	\| RoundCube List Widget \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2006-2009, RoundCube Dev, - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Authors: Thomas Bruederli <roundcube@gmail.com> \|
	\| Charles McNulty <charles@charlesmcnulty.com> \|
	+-----------------------------------------------------------------------+
	\| Requires: common.js \|
	+-----------------------------------------------------------------------+

	$Id$
	*/


	/**
	* RoundCube List Widget class
	* @contructor
	*/
	function rcube_list_widget(list, p)
	{
	// static contants
	this.ENTER_KEY = 13;
	this.DELETE_KEY = 46;
	this.BACKSPACE_KEY = 8;

	this.list = list ? list : null;
	this.frame = null;
	this.rows = [];
	this.selection = [];
	this.rowcount = 0;

	this.subject_col = -1;
	this.shiftkey = false;
	this.multiselect = false;
	this.multi_selecting = false;
	this.draggable = false;
	this.keyboard = false;
	this.toggleselect = false;

	this.dont_select = false;
	this.drag_active = false;
	this.last_selected = 0;
	this.shift_start = 0;
	this.in_selection_before = false;
	this.focused = false;
	this.drag_mouse_start = null;
	this.dblclick_time = 600;
	this.row_init = function(){};
	- this.events = { click:[], dblclick:[], select:[], keypress:[], dragstart:[], dragmove:[], dragend:[] };

	// overwrite default paramaters
	if (p && typeof(p)=='object')
	for (var n in p)
	this[n] = p[n];
	}


	rcube_list_widget.prototype = {


	/**
	* get all message rows from HTML table and init each row
	*/
	init: function()
	{
	if (this.list && this.list.tBodies[0])
	{
	this.rows = new Array();
	this.rowcount = 0;

	var row;
	for(var r=0; r<this.list.tBodies[0].childNodes.length; r++)
	{
	row = this.list.tBodies[0].childNodes[r];
	while (row && (row.nodeType != 1 \|\| row.style.display == 'none'))
	{
	row = row.nextSibling;
	r++;
	}

	this.init_row(row);
	this.rowcount++;
	}

	this.frame = this.list.parentNode;

	// set body events
	if (this.keyboard) {
	rcube_event.add_listener({element:document, event:'keyup', object:this, method:'key_press'});
	rcube_event.add_listener({element:document, event:'keydown', object:this, method:'key_down'});
	}
	}
	},


	/**
	*
	*/
	init_row: function(row)
	{
	// make references in internal array and set event handlers
	if (row && String(row.id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i))
	{
	var p = this;
	var uid = RegExp.$1;
	row.uid = uid;
	this.rows[uid] = {uid:uid, id:row.id, obj:row, classname:row.className};

	// set eventhandlers to table row
	row.onmousedown = function(e){ return p.drag_row(e, this.uid); };
	row.onmouseup = function(e){ return p.click_row(e, this.uid); };

	if (document.all)
	row.onselectstart = function() { return false; };

	this.row_init(this.rows[uid]);
	}
	},


	/**
	*
	*/
	clear: function(sel)
	{
	var tbody = document.createElement('TBODY');
	this.list.insertBefore(tbody, this.list.tBodies[0]);
	this.list.removeChild(this.list.tBodies[1]);
	this.rows = new Array();
	this.rowcount = 0;

	if (sel) this.clear_selection();
	},


	/**
	* 'remove' message row from list (just hide it)
	*/
	remove_row: function(uid, sel_next)
	{
	if (this.rows[uid].obj)
	this.rows[uid].obj.style.display = 'none';

	if (sel_next)
	this.select_next();

	this.rows[uid] = null;
	this.rowcount--;
	},


	/**
	*
	*/
	insert_row: function(row, attop)
	{
	var tbody = this.list.tBodies[0];
	+ if (!row.jquery)
	+ row = $(row);

	if (attop && tbody.rows.length)
	- tbody.insertBefore(row, tbody.firstChild);
	+ row.prependTo(tbody)
	else
	- tbody.appendChild(row);
	+ row.appendTo(tbody);

	- this.init_row(row);
	+ this.init_row(row[0]);
	this.rowcount++;
	},



	/**
	* Set focus to the list
	*/
	focus: function(e)
	{
	this.focused = true;
	for (var n=0; n<this.selection.length; n++)
	{
	id = this.selection[n];
	- if (this.rows[id] && this.rows[id].obj)
	- {
	- this.set_classname(this.rows[id].obj, 'selected', true);
	- this.set_classname(this.rows[id].obj, 'unfocused', false);
	+ if (this.rows[id] && this.rows[id].obj) {
	+ $(this.rows[id].obj).addClass('selected').removeClass('unfocused');
	}
	}

	if (e \|\| (e = window.event))
	rcube_event.cancel(e);
	},


	/**
	* remove focus from the list
	*/
	blur: function()
	{
	var id;
	this.focused = false;
	for (var n=0; n<this.selection.length; n++)
	{
	id = this.selection[n];
	- if (this.rows[id] && this.rows[id].obj)
	- {
	- this.set_classname(this.rows[id].obj, 'selected', false);
	- this.set_classname(this.rows[id].obj, 'unfocused', true);
	+ if (this.rows[id] && this.rows[id].obj) {
	+ $(this.rows[id].obj).removeClass('selected').addClass('unfocused');
	}
	}
	},


	/**
	* onmousedown-handler of message list row
	*/
	drag_row: function(e, id)
	{
	// don't do anything (another action processed before)
	var evtarget = rcube_event.get_target(e);
	if (this.dont_select \|\| (evtarget && (evtarget.tagName == 'INPUT' \|\| evtarget.tagName == 'IMG')))
	return true;

	// accept right-clicks
	if (rcube_event.get_button(e) == 2)
	return true;

	this.in_selection_before = this.in_selection(id) ? id : false;

	// selects currently unselected row
	if (!this.in_selection_before)
	{
	var mod_key = rcube_event.get_modifier(e);
	this.select_row(id, mod_key, false);
	}

	if (this.draggable && this.selection.length)
	{
	this.drag_start = true;
	this.drag_mouse_start = rcube_event.get_mouse_pos(e);
	rcube_event.add_listener({element:document, event:'mousemove', object:this, method:'drag_mouse_move'});
	rcube_event.add_listener({element:document, event:'mouseup', object:this, method:'drag_mouse_up'});

	// add listener for iframes
	var iframes = document.getElementsByTagName('IFRAME');
	this.iframe_events = Object();
	for (var n in iframes)
	{
	var iframedoc = null;
	if (iframes[n].contentDocument)
	iframedoc = iframes[n].contentDocument;
	else if (iframes[n].contentWindow)
	- iframedoc = iframes[n].contentWindow.document;
	+ iframedoc = iframes[n].contentWindow.document;
	else if (iframes[n].document)
	iframedoc = iframes[n].document;

	if (iframedoc)
	{
	- var list = this;
	- var pos = rcube_get_object_pos(document.getElementById(iframes[n].id));
	- this.iframe_events[n] = function(e) { e._offset = pos; return list.drag_mouse_move(e); }
	-
	- if (iframedoc.addEventListener)
	- iframedoc.addEventListener('mousemove', this.iframe_events[n], false);
	- else if (iframes[n].attachEvent)
	- iframedoc.attachEvent('onmousemove', this.iframe_events[n]);
	- else
	- iframedoc['onmousemove'] = this.iframe_events[n];
	+ var list = this;
	+ var pos = $('#'+iframes[n].id).offset();
	+ this.iframe_events[n] = function(e) { e._offset = pos; return list.drag_mouse_move(e); }
	+
	+ if (iframedoc.addEventListener)
	+ iframedoc.addEventListener('mousemove', this.iframe_events[n], false);
	+ else if (iframes[n].attachEvent)
	+ iframedoc.attachEvent('onmousemove', this.iframe_events[n]);
	+ else
	+ iframedoc['onmousemove'] = this.iframe_events[n];

	rcube_event.add_listener({element:iframedoc, event:'mouseup', object:this, method:'drag_mouse_up'});
	}
	- }
	+ }
	}

	return false;
	},


	/**
	* onmouseup-handler of message list row
	*/
	click_row: function(e, id)
	{
	var now = new Date().getTime();
	var mod_key = rcube_event.get_modifier(e);
	var evtarget = rcube_event.get_target(e);

	if ((evtarget && (evtarget.tagName == 'INPUT' \|\| evtarget.tagName == 'IMG')))
	return true;

	// don't do anything (another action processed before)
	if (this.dont_select)
	{
	this.dont_select = false;
	return false;
	}

	var dblclicked = now - this.rows[id].clicked < this.dblclick_time;

	// unselects currently selected row
	if (!this.drag_active && this.in_selection_before == id && !dblclicked)
	this.select_row(id, mod_key, false);

	this.drag_start = false;
	this.in_selection_before = false;

	// row was double clicked
	if (this.rows && dblclicked && this.in_selection(id))
	- this.trigger_event('dblclick');
	+ this.triggerEvent('dblclick');
	else
	- this.trigger_event('click');
	+ this.triggerEvent('click');

	if (!this.drag_active)
	rcube_event.cancel(e);

	this.rows[id].clicked = now;
	return false;
	},


	/**
	* get next/previous/last rows that are not hidden
	*/
	get_next_row: function()
	{
	if (!this.rows)
	return false;

	var last_selected_row = this.rows[this.last_selected];
	var new_row = last_selected_row ? last_selected_row.obj.nextSibling : null;
	while (new_row && (new_row.nodeType != 1 \|\| new_row.style.display == 'none'))
	new_row = new_row.nextSibling;

	return new_row;
	},

	get_prev_row: function()
	{
	if (!this.rows)
	return false;

	var last_selected_row = this.rows[this.last_selected];
	var new_row = last_selected_row ? last_selected_row.obj.previousSibling : null;
	while (new_row && (new_row.nodeType != 1 \|\| new_row.style.display == 'none'))
	new_row = new_row.previousSibling;

	return new_row;
	},

	get_last_row: function()
	{
	if (this.rowcount)
	{
	var rows = this.list.tBodies[0].rows;

	for(var i=rows.length-1; i>=0; i--)
	if(rows[i].id && String(rows[i].id).match(/rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
	return RegExp.$1;
	}

	return null;
	},


	/**
	* selects or unselects the proper row depending on the modifier key pressed
	*/
	select_row: function(id, mod_key, with_mouse)
	{
	var select_before = this.selection.join(',');
	if (!this.multiselect)
	mod_key = 0;

	if (!this.shift_start)
	this.shift_start = id

	if (!mod_key)
	{
	this.shift_start = id;
	this.highlight_row(id, false);
	this.multi_selecting = false;
	}
	else
	{
	switch (mod_key)
	{
	case SHIFT_KEY:
	this.shift_select(id, false);
	break;

	case CONTROL_KEY:
	if (!with_mouse)
	this.highlight_row(id, true);
	break;

	case CONTROL_SHIFT_KEY:
	this.shift_select(id, true);
	break;

	default:
	this.highlight_row(id, false);
	break;
	}
	this.multi_selecting = true;
	}

	// trigger event if selection changed
	if (this.selection.join(',') != select_before)
	- this.trigger_event('select');
	+ this.triggerEvent('select');

	if (this.last_selected != 0 && this.rows[this.last_selected])
	- this.set_classname(this.rows[this.last_selected].obj, 'focused', false);
	+ $(this.rows[this.last_selected].obj).removeClass('focused');

	// unselect if toggleselect is active and the same row was clicked again
	if (this.toggleselect && this.last_selected == id)
	{
	this.clear_selection();
	id = null;
	}
	else
	- this.set_classname(this.rows[id].obj, 'focused', true);
	+ $(this.rows[id].obj).addClass('focused');

	if (!this.selection.length)
	this.shift_start = null;

	this.last_selected = id;
	},


	/**
	* Alias method for select_row
	*/
	select: function(id)
	{
	this.select_row(id, false);
	this.scrollto(id);
	},


	/**
	* Select row next to the last selected one.
	* Either below or above.
	*/
	select_next: function()
	{
	var next_row = this.get_next_row();
	var prev_row = this.get_prev_row();
	var new_row = (next_row) ? next_row : prev_row;
	if (new_row)
	this.select_row(new_row.uid, false, false);
	},


	/**
	* Perform selection when shift key is pressed
	*/
	shift_select: function(id, control)
	{
	if (!this.rows[this.shift_start] \|\| !this.selection.length)
	this.shift_start = id;

	var from_rowIndex = this.rows[this.shift_start].obj.rowIndex;
	var to_rowIndex = this.rows[id].obj.rowIndex;

	var i = ((from_rowIndex < to_rowIndex)? from_rowIndex : to_rowIndex);
	var j = ((from_rowIndex > to_rowIndex)? from_rowIndex : to_rowIndex);

	// iterate through the entire message list
	for (var n in this.rows)
	{
	if ((this.rows[n].obj.rowIndex >= i) && (this.rows[n].obj.rowIndex <= j))
	{
	if (!this.in_selection(n))
	this.highlight_row(n, true);
	}
	else
	{
	if (this.in_selection(n) && !control)
	this.highlight_row(n, true);
	}
	}
	},


	/**
	* Check if given id is part of the current selection
	*/
	in_selection: function(id)
	{
	for(var n in this.selection)
	if (this.selection[n]==id)
	return true;

	return false;
	},


	/**
	* Select each row in list
	*/
	select_all: function(filter)
	{
	if (!this.rows \|\| !this.rows.length)
	return false;

	// reset but remember selection first
	var select_before = this.selection.join(',');
	this.selection = new Array();

	for (var n in this.rows)
	{
	if (!filter \|\| (this.rows[n] && this.rows[n][filter] == true))
	{
	this.last_selected = n;
	this.highlight_row(n, true);
	}
	else if (this.rows[n])
	{
	this.set_classname(this.rows[n].obj, 'selected', false);
	this.set_classname(this.rows[n].obj, 'unfocused', false);
	}
	}

	// trigger event if selection changed
	if (this.selection.join(',') != select_before)
	- this.trigger_event('select');
	+ this.triggerEvent('select');

	this.focus();

	return true;
	},


	/**
	* Unselect selected row(s)
	*/
	clear_selection: function(id)
	{
	var num_select = this.selection.length;

	// one row
	if (id)
	{
	for (var n=0; n<this.selection.length; n++)
	- if (this.selection[n] == id)
	- {
	- this.selection.splice(n,1);
	- break;
	- }
	+ if (this.selection[n] == id) {
	+ this.selection.splice(n,1);
	+ break;
	+ }
	}
	// all rows
	else
	{
	for (var n=0; n<this.selection.length; n++)
	- if (this.rows[this.selection[n]])
	- {
	- this.set_classname(this.rows[this.selection[n]].obj, 'selected', false);
	- this.set_classname(this.rows[this.selection[n]].obj, 'unfocused', false);
	+ if (this.rows[this.selection[n]]) {
	+ $(this.rows[this.selection[n]].obj).removeClass('selected').removeClass('unfocused');
	}

	this.selection = new Array();
	}

	if (num_select && !this.selection.length)
	- this.trigger_event('select');
	+ this.triggerEvent('select');
	},


	/**
	* Getter for the selection array
	*/
	get_selection: function()
	{
	return this.selection;
	},


	/**
	* Return the ID if only one row is selected
	*/
	get_single_selection: function()
	{
	if (this.selection.length == 1)
	return this.selection[0];
	else
	return null;
	},


	/**
	* Highlight/unhighlight a row
	*/
	highlight_row: function(id, multiple)
	{
	if (this.rows[id] && !multiple)
	{
	if (this.selection.length > 1 \|\| !this.in_selection(id))
	{
	this.clear_selection();
	this.selection[0] = id;
	- this.set_classname(this.rows[id].obj, 'selected', true);
	+ $(this.rows[id].obj).addClass('selected');
	}
	}
	else if (this.rows[id])
	{
	if (!this.in_selection(id)) // select row
	{
	this.selection[this.selection.length] = id;
	- this.set_classname(this.rows[id].obj, 'selected', true);
	+ $(this.rows[id].obj).addClass('selected');
	}
	else // unselect row
	{
	var p = find_in_array(id, this.selection);
	var a_pre = this.selection.slice(0, p);
	var a_post = this.selection.slice(p+1, this.selection.length);
	this.selection = a_pre.concat(a_post);
	- this.set_classname(this.rows[id].obj, 'selected', false);
	- this.set_classname(this.rows[id].obj, 'unfocused', false);
	+ $(this.rows[id].obj).removeClass('selected').removeClass('unfocused');
	}
	}
	},


	/**
	* Handler for keyboard events
	*/
	key_press: function(e)
	{
	if (this.focused != true)
	return true;

	var keyCode = rcube_event.get_keycode(e);
	var mod_key = rcube_event.get_modifier(e);
	switch (keyCode)
	{
	case 40:
	case 38:
	case 63233: // "down", in safari keypress
	case 63232: // "up", in safari keypress
	// Stop propagation so that the browser doesn't scroll
	rcube_event.cancel(e);
	return this.use_arrow_key(keyCode, mod_key);
	default:
	this.shiftkey = e.shiftKey;
	this.key_pressed = keyCode;
	- this.trigger_event('keypress');
	+ this.triggerEvent('keypress');

	if (this.key_pressed == this.BACKSPACE_KEY)
	return rcube_event.cancel(e);
	}

	return true;
	},

	/**
	* Handler for keydown events
	*/
	key_down: function(e)
	{
	switch (rcube_event.get_keycode(e))
	{
	case 40:
	case 38:
	case 63233:
	case 63232:
	if (!rcube_event.get_modifier(e) && this.focused)
	return rcube_event.cancel(e);

	default:
	}

	return true;
	},


	/**
	* Special handling method for arrow keys
	*/
	use_arrow_key: function(keyCode, mod_key)
	{
	var new_row;
	// Safari uses the nonstandard keycodes 63232/63233 for up/down, if we're
	// using the keypress event (but not the keydown or keyup event).
	if (keyCode == 40 \|\| keyCode == 63233) // down arrow key pressed
	new_row = this.get_next_row();
	else if (keyCode == 38 \|\| keyCode == 63232) // up arrow key pressed
	new_row = this.get_prev_row();

	if (new_row)
	{
	this.select_row(new_row.uid, mod_key, true);
	this.scrollto(new_row.uid);
	}

	return false;
	},


	/**
	* Try to scroll the list to make the specified row visible
	*/
	scrollto: function(id)
	{
	var row = this.rows[id].obj;
	if (row && this.frame)
	{
	var scroll_to = Number(row.offsetTop);

	if (scroll_to < Number(this.frame.scrollTop))
	this.frame.scrollTop = scroll_to;
	else if (scroll_to + Number(row.offsetHeight) > Number(this.frame.scrollTop) + Number(this.frame.offsetHeight))
	this.frame.scrollTop = (scroll_to + Number(row.offsetHeight)) - Number(this.frame.offsetHeight);
	}
	},


	/**
	* Handler for mouse move events
	*/
	drag_mouse_move: function(e)
	{
	if (this.drag_start)
	{
	// check mouse movement, of less than 3 pixels, don't start dragging
	var m = rcube_event.get_mouse_pos(e);

	if (!this.drag_mouse_start \|\| (Math.abs(m.x - this.drag_mouse_start.x) < 3 && Math.abs(m.y - this.drag_mouse_start.y) < 3))
	return false;

	if (!this.draglayer)
	- this.draglayer = new rcube_layer('rcmdraglayer', {x:0, y:0, vis:0, zindex:2000});
	+ this.draglayer = $('<div>').attr('id', 'rcmdraglayer').css({ position:'absolute', display:'none', 'z-index':2000 }).appendTo(document.body);

	// get subjects of selectedd messages
	var names = '';
	var c, i, node, subject, obj;
	for(var n=0; n<this.selection.length; n++)
	{
	if (n>12) // only show 12 lines
	{
	names += '...';
	break;
	}

	if (this.rows[this.selection[n]].obj)
	{
	obj = this.rows[this.selection[n]].obj;
	subject = '';

	for(c=0, i=0; i<obj.childNodes.length; i++)
	{
	if (obj.childNodes[i].nodeName == 'TD')
	{
	if (((node = obj.childNodes[i].firstChild) && (node.nodeType==3 \|\| node.nodeName=='A')) &&
	(this.subject_col < 0 \|\| (this.subject_col >= 0 && this.subject_col == c)))
	{
	+ if (n == 0)
	+ this.drag_start_pos = $(node).offset();
	+
	subject = node.nodeType==3 ? node.data : node.innerHTML;
	// remove leading spaces
	subject = subject.replace(/^\s+/i, '');
	// truncate line to 50 characters
	names += (subject.length > 50 ? subject.substring(0, 50)+'...' : subject) + '<br />';
	break;
	}
	c++;
	}
	}
	}
	}

	- this.draglayer.write(names);
	- this.draglayer.show(1);
	+ this.draglayer.html(names);
	+ this.draglayer.show();

	this.drag_active = true;
	- this.trigger_event('dragstart');
	+ this.triggerEvent('dragstart');
	}

	if (this.drag_active && this.draglayer)
	{
	var pos = rcube_event.get_mouse_pos(e);
	- this.draglayer.move(pos.x+20, bw.ie ? pos.y-5+document.documentElement.scrollTop : pos.y-5);
	- this.trigger_event('dragmove', e);
	+ this.draglayer.css({ left:(pos.x+20)+'px', top:(pos.y-5 + (bw.ie ? document.documentElement.scrollTop : 0))+'px' });
	+ this.triggerEvent('dragmove', e);
	}

	this.drag_start = false;

	return false;
	},


	/**
	* Handler for mouse up events
	*/
	drag_mouse_up: function(e)
	{
	document.onmousemove = null;

	- if (this.draglayer && this.draglayer.visible)
	- this.draglayer.show(0);
	+ if (this.draglayer && this.draglayer.is(':visible')) {
	+ if (this.drag_start_pos)
	+ this.draglayer.animate(this.drag_start_pos, 300, 'swing').hide(20);
	+ else
	+ this.draglayer.hide();
	+ }

	this.drag_active = false;
	- this.trigger_event('dragend');
	+ this.triggerEvent('dragend');

	rcube_event.remove_listener({element:document, event:'mousemove', object:this, method:'drag_mouse_move'});
	rcube_event.remove_listener({element:document, event:'mouseup', object:this, method:'drag_mouse_up'});

	var iframes = document.getElementsByTagName('IFRAME');
	for (var n in iframes) {
	var iframedoc;

	if (iframes[n].contentDocument)
	iframedoc = iframes[n].contentDocument;
	else if (iframes[n].contentWindow)
	iframedoc = iframes[n].contentWindow.document;
	else if (iframes[n].document)
	iframedoc = iframes[n].document;

	if (iframedoc) {
	if (this.iframe_events[n]) {
	if (iframedoc.removeEventListener)
	iframedoc.removeEventListener('mousemove', this.iframe_events[n], false);
	else if (iframedoc.detachEvent)
	iframedoc.detachEvent('onmousemove', this.iframe_events[n]);
	else
	iframedoc['onmousemove'] = null;
	}
	rcube_event.remove_listener({element:iframedoc, event:'mouseup', object:this, method:'drag_mouse_up'});
	}
	}

	return rcube_event.cancel(e);
	-},
	-
	-
	-
	-/**
	- * set/unset a specific class name
	- */
	-set_classname: function(obj, classname, set)
	-{
	- var reg = new RegExp('\s*'+classname, 'i');
	- if (!set && obj.className.match(reg))
	- obj.className = obj.className.replace(reg, '');
	- else if (set && !obj.className.match(reg))
	- obj.className += ' '+classname;
	-},
	-
	-
	-/**
	- * Setter for object event handlers
	- *
	- * @param {String} Event name
	- * @param {Function} Handler function
	- * @return Listener ID (used to remove this handler later on)
	- */
	-addEventListener: function(evt, handler)
	-{
	- if (this.events[evt]) {
	- var handle = this.events[evt].length;
	- this.events[evt][handle] = handler;
	- return handle;
	- }
	- else
	- return false;
	-},
	-
	-
	-/**
	- * Removes a specific event listener
	- *
	- * @param {String} Event name
	- * @param {Int} Listener ID to remove
	- */
	-removeEventListener: function(evt, handle)
	-{
	- if (this.events[evt] && this.events[evt][handle])
	- this.events[evt][handle] = null;
	-},
	-
	-
	-/**
	- * This will execute all registered event handlers
	- * @private
	- */
	-trigger_event: function(evt, p)
	-{
	- if (this.events[evt] && this.events[evt].length) {
	- for (var i=0; i<this.events[evt].length; i++)
	- if (typeof(this.events[evt][i]) == 'function')
	- this.events[evt][i](this, p);
	- }
	}

	-
	};

	+rcube_list_widget.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;
	+rcube_list_widget.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener;
	+rcube_list_widget.prototype.triggerEvent = rcube_event_engine.prototype.triggerEvent;
	diff --git a/program/lib/imap.inc b/program/lib/imap.inc
	index 995d82fb6..967b3f160 100644
	--- a/program/lib/imap.inc
	+++ b/program/lib/imap.inc
	@@ -1,2843 +1,2851 @@
	<?php
	/////////////////////////////////////////////////////////
	//
	// Iloha IMAP Library (IIL)
	//
	// (C)Copyright 2002 Ryo Chijiiwa <Ryo@IlohaMail.org>
	//
	// This file is part of IlohaMail. IlohaMail is free software released
	// under the GPL license. See enclosed file COPYING for details, or
	// see http://www.fsf.org/copyleft/gpl.html
	//
	/////////////////////////////////////////////////////////

	/********************************************************

	FILE: include/imap.inc
	PURPOSE:
	Provide alternative IMAP library that doesn't rely on the standard
	C-Client based version. This allows IlohaMail to function regardless
	of whether or not the PHP build it's running on has IMAP functionality
	built-in.
	USEAGE:
	Function containing "_C_" in name require connection handler to be
	passed as one of the parameters. To obtain connection handler, use
	iil_Connect()
	VERSION:
	IlohaMail-0.9-20050415
	CHANGES:
	File altered by Thomas Bruederli <roundcube@gmail.com>
	to fit enhanced equirements by the RoundCube Webmail:
	- Added list of server capabilites and check these before invoking commands
	- Added junk flag to iilBasicHeader
	- Enhanced error reporting on fsockopen()
	- Additional parameter for SORT command
	- Removed Call-time pass-by-reference because deprecated
	- Parse charset from content-type in iil_C_FetchHeaders()
	- Enhanced heaer sorting
	- Pass message as reference in iil_C_Append (to save memory)
	- Added BCC and REFERENCE to the list of headers to fetch in iil_C_FetchHeaders()
	- Leave messageID unchanged in iil_C_FetchHeaders()
	- Avoid stripslahes in iil_Connect()
	- Escape quotes and backslashes in iil_C_Login()
	- Added patch to iil_SortHeaders() by Richard Green
	- Removed <br> from error messages (better for logging)
	- Added patch to iil_C_Sort() enabling UID SORT commands
	- Added function iil_C_ID2UID()
	- Casting date parts in iil_StrToTime() to avoid mktime() warnings
	- Also acceppt LIST responses in iil_C_ListSubscribed()
	- Sanity check of $message_set in iil_C_FetchHeaders(), iil_C_FetchHeaderIndex(), iil_C_FetchThreadHeaders()
	- Implemented UID FETCH in iil_C_FetchHeaders()
	- Abort do-loop on socket errors (fgets returns false)
	- $ICL_SSL is not boolean anymore but contains the connection schema (ssl or tls)
	- Removed some debuggers (echo ...)
	File altered by Aleksander Machniak <alec@alec.pl>
	- trim(chop()) replaced by trim()
	- added iil_Escape()/iil_UnEscape() with support for " and \ in folder names
	- support \ character in username in iil_C_Login()
	- fixed iil_MultLine(): use iil_ReadBytes() instead of iil_ReadLine()
	- fixed iil_C_FetchStructureString() to handle many literal strings in response
	- removed hardcoded data size in iil_ReadLine()
	- added iil_PutLine() wrapper for fputs()
	- code cleanup and identation fixes
	- removed flush() calls in iil_C_HandlePartBody() to prevent from memory leak (#1485187)
	- don't return "??" from iil_C_GetQuota()
	- RFC3501 [7.1] don't call CAPABILITY if was returned in server
	optional resposne in iil_Connect(), added iil_C_GetCapability()
	- remove 'undisclosed-recipients' string from 'To' header
	- iil_C_HandlePartBody(): added 6th argument and fixed endless loop
	- added iil_PutLineC()
	- fixed iil_C_Sort() to support very long and/or divided responses
	- added BYE/BAD response simple support for endless loop prevention
	- added 3rd argument in iil_StartsWith* functions
	- fix iil_C_FetchPartHeader() in some cases by use of iil_C_HandlePartBody()
	- allow iil_C_HandlePartBody() to fetch whole message
	- optimize iil_C_FetchHeaders() to use only one FETCH command
	- added 4th argument to iil_Connect()
	- allow setting rootdir and delimiter before connect
	- support multiquota result
	- include BODYSTRUCTURE in iil_C_FetchHeaders()
	- added iil_C_FetchMIMEHeaders() function
	- added \* flag support

	********************************************************/

	/**
	* @todo Possibly clean up more CS.
	* @todo Try to replace most double-quotes with single-quotes.
	* @todo Split this file into smaller files.
	* @todo Refactor code.
	* @todo Replace echo-debugging (make it adhere to config setting and log)
	*/

	// changed path to work within roundcube webmail
	include_once 'lib/icl_commons.inc';


	if (!isset($IMAP_USE_HEADER_DATE) \|\| !$IMAP_USE_HEADER_DATE) {
	$IMAP_USE_INTERNAL_DATE = true;
	}

	/**
	* @todo Maybe use date() to generate this.
	*/
	$GLOBALS['IMAP_MONTHS'] = array("Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4,
	"May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10,
	"Nov" => 11, "Dec" => 12);

	$GLOBALS['IMAP_SERVER_TZ'] = date('Z');

	$GLOBALS['IMAP_FLAGS'] = array(
	'SEEN' => '\\Seen',
	'DELETED' => '\\Deleted',
	'RECENT' => '\\Recent',
	'ANSWERED' => '\\Answered',
	'DRAFT' => '\\Draft',
	'FLAGGED' => '\\Flagged',
	'FORWARDED' => '$Forwarded',
	'MDNSENT' => '$MDNSent',
	'' => '\\',
	);

	$iil_error;
	$iil_errornum;
	$iil_selected;

	/**
	* @todo Change class vars to public/private
	*/
	class iilConnection
	{
	var $fp;
	var $error;
	var $errorNum;
	var $selected;
	var $message;
	var $host;
	var $cache;
	var $uid_cache;
	var $do_cache;
	var $exists;
	var $recent;
	var $rootdir;
	var $delimiter;
	var $capability = array();
	var $permanentflags = array();
	var $capability_readed = false;
	}

	/**
	* @todo Change class vars to public/private
	*/
	class iilBasicHeader
	{
	var $id;
	var $uid;
	var $subject;
	var $from;
	var $to;
	var $cc;
	var $replyto;
	var $in_reply_to;
	var $date;
	var $messageID;
	var $size;
	var $encoding;
	var $charset;
	var $ctype;
	var $flags;
	var $timestamp;
	var $f;
	var $body_structure;
	var $internaldate;
	var $references;
	var $priority;
	var $mdn_to;
	var $mdn_sent = false;
	var $is_draft = false;
	var $seen = false;
	var $deleted = false;
	var $recent = false;
	var $answered = false;
	var $forwarded = false;
	var $junk = false;
	var $flagged = false;
	+ var $others = array();
	}

	/**
	* @todo Change class vars to public/private
	*/
	class iilThreadHeader
	{
	var $id;
	var $sbj;
	var $irt;
	var $mid;
	}

	function iil_xor($string, $string2) {
	$result = '';
	$size = strlen($string);
	for ($i=0; $i<$size; $i++) {
	$result .= chr(ord($string[$i]) ^ ord($string2[$i]));
	}
	return $result;
	}

	function iil_PutLine($fp, $string, $endln=true) {
	// console('C: '. rtrim($string));
	return fputs($fp, $string . ($endln ? "\r\n" : ''));
	}

	// iil_PutLine replacement with Command Continuation Requests (RFC3501 7.5) support
	function iil_PutLineC($fp, $string, $endln=true) {
	if ($endln)
	$string .= "\r\n";

	$res = 0;
	if ($parts = preg_split('/(\{[0-9]+\}\r\n)/m', $string, -1, PREG_SPLIT_DELIM_CAPTURE)) {
	for($i=0, $cnt=count($parts); $i<$cnt; $i++) {
	if(preg_match('/^\{[0-9]+\}\r\n$/', $parts[$i+1])) {
	$res += iil_PutLine($fp, $parts[$i].$parts[$i+1], false);
	$line = iil_ReadLine($fp, 1000);
	// handle error in command
	if ($line[0] != '+')
	return false;
	$i++;
	}
	else
	$res += iil_PutLine($fp, $parts[$i], false);
	}
	}
	return $res;
	}

	function iil_ReadLine($fp, $size) {
	$line = '';

	if (!$fp) {
	return $line;
	}

	if (!$size) {
	$size = 1024;
	}

	do {
	$buffer = fgets($fp, $size);
	if ($buffer === false) {
	break;
	}
	// console('S: '. chop($buffer));
	$line .= $buffer;
	} while ($buffer[strlen($buffer)-1] != "\n");

	return $line;
	}

	function iil_MultLine($fp, $line) {
	$line = chop($line);
	if (ereg('\{[0-9]+\}$', $line)) {
	$out = '';

	preg_match_all('/(.*)\{([0-9]+)\}$/', $line, $a);
	$bytes = $a[2][0];
	while (strlen($out) < $bytes) {
	$line = iil_ReadBytes($fp, $bytes);
	$out .= $line;
	}
	$line = $a[1][0] . "\"$out\"";
	// console('[...] '. $out);
	}
	return $line;
	}

	function iil_ReadBytes($fp, $bytes) {
	$data = '';
	$len = 0;
	do {
	$data .= fread($fp, $bytes-$len);
	if ($len == strlen($data)) {
	break; //nothing was read -> exit to avoid apache lockups
	}
	$len = strlen($data);
	} while ($len < $bytes);

	return $data;
	}

	function iil_ReadReply($fp) {
	do {
	$line = trim(iil_ReadLine($fp, 1024));
	} while ($line[0] == '*');

	return $line;
	}

	function iil_ParseResult($string) {
	$a = explode(' ', $string);
	if (count($a) > 2) {
	if (strcasecmp($a[1], 'OK') == 0) {
	return 0;
	} else if (strcasecmp($a[1], 'NO') == 0) {
	return -1;
	} else if (strcasecmp($a[1], 'BAD') == 0) {
	return -2;
	} else if (strcasecmp($a[1], 'BYE') == 0) {
	return -3;
	}
	}
	return -4;
	}

	// check if $string starts with $match (or * BYE/BAD)
	function iil_StartsWith($string, $match, $error=false) {
	$len = strlen($match);
	if ($len == 0) {
	return false;
	}
	if (strncmp($string, $match, $len) == 0) {
	return true;
	}
	if ($error && preg_match('/^\* (BYE\|BAD) /', $string)) {
	return true;
	}
	return false;
	}

	function iil_StartsWithI($string, $match, $bye=false) {
	$len = strlen($match);
	if ($len == 0) {
	return false;
	}
	if (strncasecmp($string, $match, $len) == 0) {
	return true;
	}
	if ($bye && strncmp($string, '* BYE ', 6) == 0) {
	return true;

	}
	return false;
	}

	function iil_Escape($string)
	{
	return strtr($string, array('"'=>'\\"', '\\' => '\\\\'));
	}

	function iil_UnEscape($string)
	{
	return strtr($string, array('\\"'=>'"', '\\\\' => '\\'));
	}

	function iil_C_GetCapability(&$conn, $name)
	{
	if (in_array($name, $conn->capability)) {
	return true;
	}
	else if ($conn->capability_readed) {
	return false;
	}

	// get capabilities (only once) because initial
	// optional CAPABILITY response may differ
	$conn->capability = array();

	iil_PutLine($conn->fp, "cp01 CAPABILITY");
	do {
	$line = trim(iil_ReadLine($conn->fp, 1024));
	$a = explode(' ', $line);
	if ($line[0] == '*') {
	while (list($k, $w) = each($a)) {
	if ($w != '*' && $w != 'CAPABILITY')
	$conn->capability[] = strtoupper($w);
	}
	}
	} while ($a[0] != 'cp01');

	$conn->capability_readed = true;

	if (in_array($name, $conn->capability)) {
	return true;
	}

	return false;
	}

	function iil_C_ClearCapability(&$conn)
	{
	$conn->capability = array();
	$conn->capability_readed = false;
	}

	function iil_C_Authenticate(&$conn, $user, $pass, $encChallenge) {

	$ipad = '';
	$opad = '';

	// initialize ipad, opad
	for ($i=0;$i<64;$i++) {
	$ipad .= chr(0x36);
	$opad .= chr(0x5C);
	}

	// pad $pass so it's 64 bytes
	$padLen = 64 - strlen($pass);
	for ($i=0;$i<$padLen;$i++) {
	$pass .= chr(0);
	}

	// generate hash
	$hash = md5(iil_xor($pass,$opad) . pack("H*", md5(iil_xor($pass, $ipad) . base64_decode($encChallenge))));

	// generate reply
	$reply = base64_encode($user . ' ' . $hash);

	// send result, get reply
	iil_PutLine($conn->fp, $reply);
	$line = iil_ReadLine($conn->fp, 1024);

	// process result
	$result = iil_ParseResult($line);
	if ($result == 0) {
	$conn->error .= '';
	$conn->errorNum = 0;
	return $conn->fp;
	}

	if ($result == -3) fclose($conn->fp); // BYE response

	$conn->error .= 'Authentication for ' . $user . ' failed (AUTH): "';
	$conn->error .= htmlspecialchars($line) . '"';
	$conn->errorNum = $result;

	return $result;
	}

	function iil_C_Login(&$conn, $user, $password) {

	iil_PutLine($conn->fp, 'a001 LOGIN "'.iil_Escape($user).'" "'.iil_Escape($password).'"');

	do {
	$line = iil_ReadReply($conn->fp);
	if ($line === false) {
	break;
	}
	} while (!iil_StartsWith($line, 'a001 ', true));

	// process result
	$result = iil_ParseResult($line);

	if ($result == 0) {
	$conn->error .= '';
	$conn->errorNum = 0;
	return $conn->fp;
	}

	fclose($conn->fp);

	$conn->error .= 'Authentication for ' . $user . ' failed (LOGIN): "';
	$conn->error .= htmlspecialchars($line)."\"";
	$conn->errorNum = $result;

	return $result;
	}

	function iil_ParseNamespace2($str, &$i, $len=0, $l) {
	if (!$l) {
	$str = str_replace('NIL', '()', $str);
	}
	if (!$len) {
	$len = strlen($str);
	}
	$data = array();
	$in_quotes = false;
	$elem = 0;
	for ($i;$i<$len;$i++) {
	$c = (string)$str[$i];
	if ($c == '(' && !$in_quotes) {
	$i++;
	$data[$elem] = iil_ParseNamespace2($str, $i, $len, $l++);
	$elem++;
	} else if ($c == ')' && !$in_quotes) {
	return $data;
	} else if ($c == '\\') {
	$i++;
	if ($in_quotes) {
	$data[$elem] .= $c.$str[$i];
	}
	} else if ($c == '"') {
	$in_quotes = !$in_quotes;
	if (!$in_quotes) {
	$elem++;
	}
	} else if ($in_quotes) {
	$data[$elem].=$c;
	}
	}
	return $data;
	}

	function iil_C_NameSpace(&$conn) {
	global $my_prefs;

	if (isset($my_prefs['rootdir']) && is_string($my_prefs['rootdir'])) {
	$conn->rootdir = $my_prefs['rootdir'];
	return true;
	}

	if (!iil_C_GetCapability($conn, 'NAMESPACE')) {
	return false;
	}

	iil_PutLine($conn->fp, "ns1 NAMESPACE");
	do {
	$line = iil_ReadLine($conn->fp, 1024);
	if (iil_StartsWith($line, '* NAMESPACE')) {
	$i = 0;
	$line = iil_UnEscape($line);
	$data = iil_ParseNamespace2(substr($line,11), $i, 0, 0);
	}
	} while (!iil_StartsWith($line, 'ns1', true));

	if (!is_array($data)) {
	return false;
	}

	$user_space_data = $data[0];
	if (!is_array($user_space_data)) {
	return false;
	}

	$first_userspace = $user_space_data[0];
	if (count($first_userspace)!=2) {
	return false;
	}

	$conn->rootdir = $first_userspace[0];
	$conn->delimiter = $first_userspace[1];
	$my_prefs['rootdir'] = substr($conn->rootdir, 0, -1);
	$my_prefs['delimiter'] = $conn->delimiter;

	return true;
	}

	function iil_Connect($host, $user, $password, $options=null) {
	global $iil_error, $iil_errornum;
	global $ICL_SSL, $ICL_PORT;
	global $IMAP_NO_CACHE;
	global $my_prefs, $IMAP_USE_INTERNAL_DATE;

	$iil_error = '';
	$iil_errornum = 0;

	// set some imap options
	if (is_array($options)) {
	foreach($options as $optkey => $optval) {
	if ($optkey == 'imap') {
	$auth_method = $optval;
	} else if ($optkey == 'rootdir') {
	$my_prefs['rootdir'] = $optval;
	} else if ($optkey == 'delimiter') {
	$my_prefs['delimiter'] = $optval;
	}
	}
	}

	if (empty($auth_method))
	$auth_method = 'check';

	$message = "INITIAL: $auth_method\n";

	$result = false;

	// initialize connection
	$conn = new iilConnection;
	$conn->error = '';
	$conn->errorNum = 0;
	$conn->selected = '';
	$conn->user = $user;
	$conn->host = $host;
	$conn->cache = array();
	$conn->do_cache = (function_exists("cache_write")&&!$IMAP_NO_CACHE);
	$conn->cache_dirty = array();

	if ($my_prefs['sort_field'] == 'INTERNALDATE') {
	$IMAP_USE_INTERNAL_DATE = true;
	} else if ($my_prefs['sort_field'] == 'DATE') {
	$IMAP_USE_INTERNAL_DATE = false;
	}
	//echo '<!-- conn sort_field: '.$my_prefs['sort_field'].' //-->';

	//check input
	if (empty($host)) {
	$iil_error = "Empty host";
	$iil_errornum = -1;
	return false;
	}
	if (empty($user)) {
	$iil_error = "Empty user";
	$iil_errornum = -1;
	return false;
	}
	if (empty($password)) {
	$iil_error = "Empty password";
	$iil_errornum = -1;
	return false;
	}

	if (!$ICL_PORT) {
	$ICL_PORT = 143;
	}
	//check for SSL
	if ($ICL_SSL && $ICL_SSL != 'tls') {
	$host = $ICL_SSL . '://' . $host;
	}

	$conn->fp = fsockopen($host, $ICL_PORT, $errno, $errstr, 10);
	if (!$conn->fp) {
	$iil_error = "Could not connect to $host at port $ICL_PORT: $errstr";
	$iil_errornum = -2;
	return false;
	}

	$iil_error .= "Socket connection established\r\n";
	$line = iil_ReadLine($conn->fp, 4096);

	// RFC3501 [7.1] optional CAPABILITY response
	if (preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
	$conn->capability = explode(' ', strtoupper($matches[1]));
	}

	$conn->message .= $line;

	// TLS connection
	if ($ICL_SSL == 'tls' && iil_C_GetCapability($conn, 'STARTTLS')) {
	if (version_compare(PHP_VERSION, '5.1.0', '>=')) {
	iil_PutLine($conn->fp, 'stls000 STARTTLS');

	$line = iil_ReadLine($conn->fp, 4096);
	if (!iil_StartsWith($line, 'stls000 OK')) {
	$iil_error = "Server responded to STARTTLS with: $line";
	$iil_errornum = -2;
	return false;
	}

	if (!stream_socket_enable_crypto($conn->fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
	$iil_error = "Unable to negotiate TLS";
	$iil_errornum = -2;
	return false;
	}

	// Now we're authenticated, capabilities need to be reread
	iil_C_ClearCapability($conn);
	}
	}

	if (strcasecmp($auth_method, "check") == 0) {
	//check for supported auth methods
	if (iil_C_GetCapability($conn, 'AUTH=CRAM-MD5') \|\| iil_C_GetCapability($conn, 'AUTH=CRAM_MD5')) {
	$auth_method = 'auth';
	}
	else {
	//default to plain text auth
	$auth_method = 'plain';
	}
	}

	if (strcasecmp($auth_method, 'auth') == 0) {
	$conn->message .= "Trying CRAM-MD5\n";

	//do CRAM-MD5 authentication
	iil_PutLine($conn->fp, "a000 AUTHENTICATE CRAM-MD5");
	$line = trim(iil_ReadLine($conn->fp, 1024));

	$conn->message .= "$line\n";

	if ($line[0] == '+') {
	$conn->message .= 'Got challenge: ' . htmlspecialchars($line) . "\n";

	//got a challenge string, try CRAM-5
	$result = iil_C_Authenticate($conn, $user, $password, substr($line,2));

	// stop if server sent BYE response
	if($result == -3) {
	$iil_error = $conn->error;
	$iil_errornum = $conn->errorNum;
	return false;
	}
	$conn->message .= "Tried CRAM-MD5: $result \n";
	} else {
	$conn->message .='No challenge ('.htmlspecialchars($line)."), try plain\n";
	$auth = 'plain';
	}
	}

	if ((!$result)\|\|(strcasecmp($auth, "plain") == 0)) {
	//do plain text auth
	$result = iil_C_Login($conn, $user, $password);
	$conn->message .= "Tried PLAIN: $result \n";
	}

	$conn->message .= $auth;

	if (!is_int($result)) {
	iil_C_Namespace($conn);
	return $conn;
	} else {
	$iil_error = $conn->error;
	$iil_errornum = $conn->errorNum;
	return false;
	}
	}

	function iil_Close(&$conn) {
	iil_C_WriteCache($conn);
	if (iil_PutLine($conn->fp, "I LOGOUT")) {
	fgets($conn->fp, 1024);
	fclose($conn->fp);
	$conn->fp = false;
	}
	}

	function iil_ClearCache($user, $host) {
	}

	function iil_C_WriteCache(&$conn) {
	//echo "<!-- doing iil_C_WriteCache //-->\n";
	if (!$conn->do_cache) return false;

	if (is_array($conn->cache)) {
	while (list($folder,$data)=each($conn->cache)) {
	if ($folder && is_array($data) && $conn->cache_dirty[$folder]) {
	$key = $folder.".imap";
	$result = cache_write($conn->user, $conn->host, $key, $data, true);
	//echo "<!-- writing $key $data: $result //-->\n";
	}
	}
	}
	}

	function iil_C_EnableCache(&$conn) {
	$conn->do_cache = true;
	}

	function iil_C_DisableCache(&$conn) {
	$conn->do_cache = false;
	}

	function iil_C_LoadCache(&$conn, $folder) {
	if (!$conn->do_cache) {
	return false;
	}

	$key = $folder.'.imap';
	if (!is_array($conn->cache[$folder])) {
	$conn->cache[$folder] = cache_read($conn->user, $conn->host, $key);
	$conn->cache_dirty[$folder] = false;
	}
	}

	function iil_C_ExpireCachedItems(&$conn, $folder, $message_set) {

	if (!$conn->do_cache) {
	return; //caching disabled
	}
	if (!is_array($conn->cache[$folder])) {
	return; //cache not initialized\|empty
	}
	if (count($conn->cache[$folder]) == 0) {
	return; //cache not initialized\|empty
	}

	$uids = iil_C_FetchHeaderIndex($conn, $folder, $message_set, 'UID');
	$num_removed = 0;
	if (is_array($uids)) {
	//echo "<!-- unsetting: ".implode(",",$uids)." //-->\n";
	while (list($n,$uid)=each($uids)) {
	unset($conn->cache[$folder][$uid]);
	//$conn->cache[$folder][$uid] = false;
	//$num_removed++;
	}
	$conn->cache_dirty[$folder] = true;

	//echo '<!--'."\n";
	//print_r($conn->cache);
	//echo "\n".'//-->'."\n";
	} else {
	echo "<!-- failed to get uids: $message_set //-->\n";
	}

	/*
	if ($num_removed>0) {
	$new_cache;
	reset($conn->cache[$folder]);
	while (list($uid,$item)=each($conn->cache[$folder])) {
	if ($item) $new_cache[$uid] = $conn->cache[$folder][$uid];
	}
	$conn->cache[$folder] = $new_cache;
	}
	*/
	}

	function iil_ExplodeQuotedString($delimiter, $string) {
	$quotes = explode('"', $string);
	while ( list($key, $val) = each($quotes)) {
	if (($key % 2) == 1) {
	$quotes[$key] = str_replace($delimiter, "_!@!_", $quotes[$key]);
	}
	}
	$string = implode('"', $quotes);

	$result = explode($delimiter, $string);
	while ( list($key, $val) = each($result) ) {
	$result[$key] = str_replace('_!@!_', $delimiter, $result[$key]);
	}

	return $result;
	}

	function iil_CheckForRecent($host, $user, $password, $mailbox) {
	if (empty($mailbox)) {
	$mailbox = 'INBOX';
	}

	$conn = iil_Connect($host, $user, $password, 'plain');
	$fp = $conn->fp;
	if ($fp) {
	iil_PutLine($fp, "a002 EXAMINE \"".iil_Escape($mailbox)."\"");
	do {
	$line=chop(iil_ReadLine($fp, 300));
	$a=explode(' ', $line);
	if (($a[0] == '*') && (strcasecmp($a[2], 'RECENT') == 0)) {
	$result = (int) $a[1];
	}
	} while (!iil_StartsWith($a[0], 'a002', true));

	iil_PutLine($fp, "a003 LOGOUT");
	fclose($fp);
	} else {
	$result = -2;
	}

	return $result;
	}

	function iil_C_Select(&$conn, $mailbox) {

	if (empty($mailbox)) {
	return false;
	}
	if (strcmp($conn->selected, $mailbox) == 0) {
	return true;
	}

	iil_C_LoadCache($conn, $mailbox);

	if (iil_PutLine($conn->fp, "sel1 SELECT \"".iil_Escape($mailbox).'"')) {
	do {
	$line = chop(iil_ReadLine($conn->fp, 300));
	$a = explode(' ', $line);
	if (count($a) == 3) {
	if (strcasecmp($a[2], 'EXISTS') == 0) {
	$conn->exists = (int) $a[1];
	}
	if (strcasecmp($a[2], 'RECENT') == 0) {
	$conn->recent = (int) $a[1];
	}
	}
	else if (preg_match('/\[?PERMANENTFLAGS\s+$([^$]+)\)\]/U', $line, $match)) {
	$conn->permanentflags = explode(' ', $match[1]);
	}
	} while (!iil_StartsWith($line, 'sel1', true));

	$a = explode(' ', $line);

	if (strcasecmp($a[1], 'OK') == 0) {
	$conn->selected = $mailbox;
	return true;
	}
	}
	return false;
	}

	function iil_C_CheckForRecent(&$conn, $mailbox) {
	if (empty($mailbox)) {
	$mailbox = 'INBOX';
	}

	iil_C_Select($conn, $mailbox);
	if ($conn->selected == $mailbox) {
	return $conn->recent;
	}
	return false;
	}

	function iil_C_CountMessages(&$conn, $mailbox, $refresh = false) {
	if ($refresh) {
	$conn->selected = '';
	}

	iil_C_Select($conn, $mailbox);
	if ($conn->selected == $mailbox) {
	return $conn->exists;
	}
	return false;
	}

	function iil_SplitHeaderLine($string) {
	$pos=strpos($string, ':');
	if ($pos>0) {
	$res[0] = substr($string, 0, $pos);
	$res[1] = trim(substr($string, $pos+1));
	return $res;
	}
	return $string;
	}

	function iil_StrToTime($str) {
	$IMAP_MONTHS = $GLOBALS['IMAP_MONTHS'];
	$IMAP_SERVER_TZ = $GLOBALS['IMAP_SERVER_TZ'];

	if ($str) {
	$time1 = strtotime($str);
	}
	if ($time1 && $time1 != -1) {
	return $time1-$IMAP_SERVER_TZ;
	}
	//echo '<!--'.$str.'//-->';

	//replace double spaces with single space
	$str = trim($str);
	$str = str_replace(' ', ' ', $str);

	//strip off day of week
	$pos = strpos($str, ' ');
	if (!is_numeric(substr($str, 0, $pos))) {
	$str = substr($str, $pos+1);
	}
	//explode, take good parts
	$a = explode(' ', $str);

	$month_str = $a[1];
	$month = $IMAP_MONTHS[$month_str];
	$day = (int)$a[0];
	$year = (int)$a[2];
	$time = $a[3];
	$tz_str = $a[4];
	$tz = substr($tz_str, 0, 3);
	$ta = explode(':', $time);
	$hour = (int)$ta[0]-(int)$tz;
	$minute = (int)$ta[1];
	$second = (int)$ta[2];

	//make UNIX timestamp
	$time2 = mktime($hour, $minute, $second, $month, $day, $year);
	//echo '<!--'.$time1.' '.$time2.' //-->'."\n";
	return $time2;
	}

	function iil_C_Sort(&$conn, $mailbox, $field, $add='', $is_uid=FALSE,
	$encoding = 'US-ASCII') {

	$field = strtoupper($field);
	if ($field == 'INTERNALDATE') {
	$field = 'ARRIVAL';
	}

	$fields = array('ARRIVAL' => 1,'CC' => 1,'DATE' => 1,
	'FROM' => 1, 'SIZE' => 1, 'SUBJECT' => 1, 'TO' => 1);

	if (!$fields[$field]) {
	return false;
	}

	/* Do "SELECT" command */
	if (!iil_C_Select($conn, $mailbox)) {
	return false;
	}

	$is_uid = $is_uid ? 'UID ' : '';

	if (!empty($add)) {
	$add = " $add";
	}

	$command = 's ' . $is_uid . 'SORT (' . $field . ') ';
	$command .= $encoding . ' ALL' . $add;
	$line = $data = '';

	if (!iil_PutLineC($conn->fp, $command)) {
	return false;
	}
	do {
	$line = chop(iil_ReadLine($conn->fp, 1024));
	if (iil_StartsWith($line, '* SORT')) {
	$data .= ($data ? ' ' : '') . substr($line, 7);
	} else if (preg_match('/^[0-9 ]+$/', $line)) {
	$data .= $line;
	}
	} while (!iil_StartsWith($line, 's ', true));

	$result_code = iil_ParseResult($line);

	if ($result_code != 0) {
	$conn->error = 'iil_C_Sort: ' . $line . "\n";
	return false;
	}

	$out = explode(' ',$data);
	return $out;
	}

	function iil_C_FetchHeaderIndex(&$conn, $mailbox, $message_set, $index_field,
	$normalize=true) {
	global $IMAP_USE_INTERNAL_DATE;

	$c=0;
	$result=array();
	$fp = $conn->fp;

	if (empty($index_field)) {
	$index_field = 'DATE';
	}
	$index_field = strtoupper($index_field);

	list($from_idx, $to_idx) = explode(':', $message_set);
	if (empty($message_set) \|\| (isset($to_idx)
	&& (int)$from_idx > (int)$to_idx)) {
	return false;
	}

	//$fields_a['DATE'] = ($IMAP_USE_INTERNAL_DATE?6:1);
	$fields_a['DATE'] = 1;
	$fields_a['INTERNALDATE'] = 6;
	$fields_a['FROM'] = 1;
	$fields_a['REPLY-TO'] = 1;
	$fields_a['SENDER'] = 1;
	$fields_a['TO'] = 1;
	$fields_a['SUBJECT'] = 1;
	$fields_a['UID'] = 2;
	$fields_a['SIZE'] = 2;
	$fields_a['SEEN'] = 3;
	$fields_a['RECENT'] = 4;
	$fields_a['DELETED'] = 5;

	$mode=$fields_a[$index_field];
	if (!($mode > 0)) {
	return false;
	}

	/* Do "SELECT" command */
	if (!iil_C_Select($conn, $mailbox)) {
	return false;
	}

	/* FETCH date,from,subject headers */
	if ($mode == 1) {
	$key = 'fhi' . ($c++);
	$request = $key . " FETCH $message_set (BODY.PEEK[HEADER.FIELDS ($index_field)])";
	if (!iil_PutLine($fp, $request)) {
	return false;
	}
	do {

	$line=chop(iil_ReadLine($fp, 200));
	$a=explode(' ', $line);
	if (($line[0] == '*') && ($a[2] == 'FETCH')
	&& ($line[strlen($line)-1] != ')')) {
	$id=$a[1];

	$str=$line=chop(iil_ReadLine($fp, 300));

	while ($line[0] != ')') { //caution, this line works only in this particular case
	$line=chop(iil_ReadLine($fp, 300));
	if ($line[0] != ')') {
	if (ord($line[0]) <= 32) { //continuation from previous header line
	$str.= ' ' . trim($line);
	}
	if ((ord($line[0]) > 32) \|\| (strlen($line[0]) == 0)) {
	list($field, $string) = iil_SplitHeaderLine($str);
	if (strcasecmp($field, 'date') == 0) {
	$result[$id] = iil_StrToTime($string);
	} else {
	$result[$id] = str_replace('"', '', $string);
	if ($normalize) {
	$result[$id] = strtoupper($result[$id]);
	}
	}
	$str=$line;
	}
	}
	}
	}
	/*
	$end_pos = strlen($line)-1;
	if (($line[0]=="*") && ($a[2]=="FETCH") && ($line[$end_pos]=="}")) {
	$id = $a[1];
	$pos = strrpos($line, "{")+1;
	$bytes = (int)substr($line, $pos, $end_pos-$pos);
	$received = 0;
	do {
	$line = iil_ReadLine($fp, 0);
	$received += strlen($line);
	$line = chop($line);

	if ($received>$bytes) {
	break;
	} else if (!$line) {
	continue;
	}

	list($field, $string) = explode(': ', $line);

	if (strcasecmp($field, 'date') == 0) {
	$result[$id] = iil_StrToTime($string);
	} else if ($index_field != 'DATE') {
	$result[$id]=strtoupper(str_replace('"', '', $string));
	}
	} while ($line[0] != ')');
	} else {
	//one line response, not expected so ignore
	}
	*/
	} while (!iil_StartsWith($line, $key, true));

	}else if ($mode == 6) {

	$key = 'fhi' . ($c++);
	$request = $key . " FETCH $message_set (INTERNALDATE)";
	if (!iil_PutLine($fp, $request)) {
	return false;
	}
	do {
	$line=chop(iil_ReadLine($fp, 200));
	if ($line[0] == '*') {
	/*
	* original:
	* "* 10 FETCH (INTERNALDATE "31-Jul-2002 09:18:02 -0500")"
	*/
	$paren_pos = strpos($line, '(');
	$foo = substr($line, 0, $paren_pos);
	$a = explode(' ', $foo);
	$id = $a[1];

	$open_pos = strpos($line, '"') + 1;
	$close_pos = strrpos($line, '"');
	if ($open_pos && $close_pos) {
	$len = $close_pos - $open_pos;
	$time_str = substr($line, $open_pos, $len);
	$result[$id] = strtotime($time_str);
	}
	} else {
	$a = explode(' ', $line);
	}
	} while (!iil_StartsWith($a[0], $key, true));
	} else {
	if ($mode >= 3) {
	$field_name = 'FLAGS';
	} else if ($index_field == 'SIZE') {
	$field_name = 'RFC822.SIZE';
	} else {
	$field_name = $index_field;
	}

	/* FETCH uid, size, flags */
	$key = 'fhi' .($c++);
	$request = $key . " FETCH $message_set ($field_name)";

	if (!iil_PutLine($fp, $request)) {
	return false;
	}
	do {
	$line=chop(iil_ReadLine($fp, 200));
	$a = explode(' ', $line);
	if (($line[0] == '*') && ($a[2] == 'FETCH')) {
	$line = str_replace('(', '', $line);
	$line = str_replace(')', '', $line);
	$a = explode(' ', $line);

	$id = $a[1];

	if (isset($result[$id])) {
	continue; //if we already got the data, skip forward
	}
	if ($a[3]!=$field_name) {
	continue; //make sure it's returning what we requested
	}

	/* Caution, bad assumptions, next several lines */
	if ($mode == 2) {
	$result[$id] = $a[4];
	} else {
	$haystack = strtoupper($line);
	$result[$id] = (strpos($haystack, $index_field) > 0 ? "F" : "N");
	}
	}
	} while (!iil_StartsWith($line, $key, true));
	}

	//check number of elements...
	list($start_mid, $end_mid) = explode(':', $message_set);
	if (is_numeric($start_mid) && is_numeric($end_mid)) {
	//count how many we should have
	$should_have = $end_mid - $start_mid +1;

	//if we have less, try and fill in the "gaps"
	if (count($result) < $should_have) {
	for ($i=$start_mid; $i<=$end_mid; $i++) {
	if (!isset($result[$i])) {
	$result[$i] = '';
	}
	}
	}
	}
	return $result;
	}

	function iil_CompressMessageSet($message_set) {
	//given a comma delimited list of independent mid's,
	//compresses by grouping sequences together

	//if less than 255 bytes long, let's not bother
	if (strlen($message_set)<255) {
	return $message_set;
	}

	//see if it's already been compress
	if (strpos($message_set, ':') !== false) {
	return $message_set;
	}

	//separate, then sort
	$ids = explode(',', $message_set);
	sort($ids);

	$result = array();
	$start = $prev = $ids[0];

	foreach ($ids as $id) {
	$incr = $id - $prev;
	if ($incr > 1) { //found a gap
	if ($start == $prev) {
	$result[] = $prev; //push single id
	} else {
	$result[] = $start . ':' . $prev; //push sequence as start_id:end_id
	}
	$start = $id; //start of new sequence
	}
	$prev = $id;
	}

	//handle the last sequence/id
	if ($start==$prev) {
	$result[] = $prev;
	} else {
	$result[] = $start.':'.$prev;
	}

	//return as comma separated string
	return implode(',', $result);
	}

	function iil_C_UIDsToMIDs(&$conn, $mailbox, $uids) {
	if (!is_array($uids) \|\| count($uids) == 0) {
	return array();
	}
	return iil_C_Search($conn, $mailbox, 'UID ' . implode(',', $uids));
	}

	function iil_C_UIDToMID(&$conn, $mailbox, $uid) {
	$result = iil_C_UIDsToMIDs($conn, $mailbox, array($uid));
	if (count($result) == 1) {
	return $result[0];
	}
	return false;
	}

	function iil_C_FetchUIDs(&$conn,$mailbox) {
	global $clock;

	$num = iil_C_CountMessages($conn, $mailbox);
	if ($num == 0) {
	return array();
	}
	$message_set = '1' . ($num>1?':' . $num:'');

	//if cache not enabled, just call iil_C_FetchHeaderIndex on 'UID' field
	if (!$conn->do_cache)
	return iil_C_FetchHeaderIndex($conn, $mailbox, $message_set, 'UID');

	//otherwise, let's check cache first
	$key = $mailbox.'.uids';
	$cache_good = true;
	if ($conn->uid_cache) {
	$data = $conn->uid_cache;
	} else {
	$data = cache_read($conn->user, $conn->host, $key);
	}

	//was anything cached at all?
	if ($data === false) {
	$cache_good = -1;
	}

	//make sure number of messages were the same
	if ($cache_good > 0 && $data['n'] != $num) {
	$cache_good = -2;
	}

	//if everything's okay so far...
	if ($cache_good > 0) {
	//check UIDs of highest mid with current and cached
	$temp = iil_C_Search($conn, $mailbox, 'UID ' . $data['d'][$num]);
	if (!$temp \|\| !is_array($temp) \|\| $temp[0] != $num) {
	$cache_good = -3;
	}
	}

	//if cached data's good, return it
	if ($cache_good > 0) {
	return $data['d'];
	}

	//otherwise, we need to fetch it
	$data = array('n' => $num, 'd' => array());
	$data['d'] = iil_C_FetchHeaderIndex($conn, $mailbox, $message_set, 'UID');

	cache_write($conn->user, $conn->host, $key, $data);
	$conn->uid_cache = $data;
	return $data['d'];
	}

	function iil_SortThreadHeaders($headers, $index_a, $uids) {
	asort($index_a);
	$result = array();
	foreach ($index_a as $mid=>$foobar) {
	$uid = $uids[$mid];
	$result[$uid] = $headers[$uid];
	}
	return $result;
	}

	function iil_C_FetchThreadHeaders(&$conn, $mailbox, $message_set) {
	global $clock;
	global $index_a;

	list($from_idx, $to_idx) = explode(':', $message_set);
	if (empty($message_set) \|\| (isset($to_idx)
	&& (int)$from_idx > (int)$to_idx)) {
	return false;
	}

	$result = array();
	$uids = iil_C_FetchUIDs($conn, $mailbox);
	$debug = false;

	/* Get cached records where possible */
	if ($conn->do_cache) {
	$cached = cache_read($conn->user, $conn->host, $mailbox.'.thhd');
	if ($cached && is_array($uids) && count($uids)>0) {
	$needed_set = '';
	foreach ($uids as $id=>$uid) {
	if ($cached[$uid]) {
	$result[$uid] = $cached[$uid];
	$result[$uid]->id = $id;
	} else {
	$needed_set .= ($needed_set ? ',' : '') . $id;
	}
	}
	if ($needed_set) {
	$message_set = $needed_set;
	} else {
	$message_set = '';
	}
	}
	}
	$message_set = iil_CompressMessageSet($message_set);
	if ($debug) {
	echo "Still need: ".$message_set;
	}

	/* if we're missing any, get them */
	if ($message_set) {
	/* FETCH date,from,subject headers */
	$key = 'fh';
	$fp = $conn->fp;
	$request = $key . " FETCH $message_set ";
	$request .= "(BODY.PEEK[HEADER.FIELDS (SUBJECT MESSAGE-ID IN-REPLY-TO)])";
	$mid_to_id = array();
	if (!iil_PutLine($fp, $request)) {
	return false;
	}
	do {
	$line = chop(iil_ReadLine($fp, 1024));
	if ($debug) {
	echo $line . "\n";
	}
	if (ereg('\{[0-9]+\}$', $line)) {
	$a = explode(' ', $line);
	$new = array();

	$new_thhd = new iilThreadHeader;
	$new_thhd->id = $a[1];
	do {
	$line = chop(iil_ReadLine($fp, 1024), "\r\n");
	if (iil_StartsWithI($line, 'Message-ID:')
	\|\| (iil_StartsWithI($line,'In-Reply-To:'))
	\|\| (iil_StartsWithI($line,'SUBJECT:'))) {

	$pos = strpos($line, ':');
	$field_name = substr($line, 0, $pos);
	$field_val = substr($line, $pos+1);

	$new[strtoupper($field_name)] = trim($field_val);

	} else if (ereg('^[[:space:]]', $line)) {
	$new[strtoupper($field_name)] .= trim($line);
	}
	} while ($line[0] != ')');

	$new_thhd->sbj = $new['SUBJECT'];
	$new_thhd->mid = substr($new['MESSAGE-ID'], 1, -1);
	$new_thhd->irt = substr($new['IN-REPLY-TO'], 1, -1);

	$result[$uids[$new_thhd->id]] = $new_thhd;
	}
	} while (!iil_StartsWith($line, 'fh'));
	}

	/* sort headers */
	if (is_array($index_a)) {
	$result = iil_SortThreadHeaders($result, $index_a, $uids);
	}

	/* write new set to cache */
	if ($conn->do_cache) {
	if (count($result)!=count($cached)) {
	cache_write($conn->user, $conn->host, $mailbox . '.thhd', $result);
	}
	}

	//echo 'iil_FetchThreadHeaders:'."\n";
	//print_r($result);

	return $result;
	}

	function iil_C_BuildThreads2(&$conn, $mailbox, $message_set, &$clock) {
	global $index_a;

	list($from_idx, $to_idx) = explode(':', $message_set);
	if (empty($message_set) \|\| (isset($to_idx)
	&& (int)$from_idx > (int)$to_idx)) {
	return false;
	}

	$result = array();
	$roots = array();
	$root_mids = array();
	$sub_mids = array();
	$strays = array();
	$messages = array();
	$fp = $conn->fp;
	$debug = false;

	$sbj_filter_pat = '[a-zA-Z]{2,3}(\[[0-9]\])?:([[:space:]])';

	/* Do "SELECT" command */
	if (!iil_C_Select($conn, $mailbox)) {
	return false;
	}

	/* FETCH date,from,subject headers */
	$mid_to_id = array();
	$messages = array();
	$headers = iil_C_FetchThreadHeaders($conn, $mailbox, $message_set);
	if ($clock) {
	$clock->register('fetched headers');
	}

	if ($debug) {
	print_r($headers);
	}

	/* go through header records */
	foreach ($headers as $header) {
	//$id = $header['i'];
	//$new = array('id'=>$id, 'MESSAGE-ID'=>$header['m'],
	// 'IN-REPLY-TO'=>$header['r'], 'SUBJECT'=>$header['s']);
	$id = $header->id;
	$new = array('id' => $id, 'MESSAGE-ID' => $header->mid,
	'IN-REPLY-TO' => $header->irt, 'SUBJECT' => $header->sbj);

	/* add to message-id -> mid lookup table */
	$mid_to_id[$new['MESSAGE-ID']] = $id;

	/* if no subject, use message-id */
	if (empty($new['SUBJECT'])) {
	$new['SUBJECT'] = $new['MESSAGE-ID'];
	}

	/* if subject contains 'RE:' or has in-reply-to header, it's a reply */
	$sbj_pre ='';
	$has_re = false;
	if (eregi($sbj_filter_pat, $new['SUBJECT'])) {
	$has_re = true;
	}
	if ($has_re\|\|$new['IN-REPLY-TO']) {
	$sbj_pre = 'RE:';
	}

	/* strip out 're:', 'fw:' etc */
	if ($has_re) {
	$sbj = ereg_replace($sbj_filter_pat, '', $new['SUBJECT']);
	} else {
	$sbj = $new['SUBJECT'];
	}
	$new['SUBJECT'] = $sbj_pre.$sbj;


	/* if subject not a known thread-root, add to list */
	if ($debug) {
	echo $id . ' ' . $new['SUBJECT'] . "\t" . $new['MESSAGE-ID'] . "\n";
	}
	$root_id = $roots[$sbj];

	if ($root_id && ($has_re \|\| !$root_in_root[$root_id])) {
	if ($debug) {
	echo "\tfound root: $root_id\n";
	}
	$sub_mids[$new['MESSAGE-ID']] = $root_id;
	$result[$root_id][] = $id;
	} else if (!isset($roots[$sbj]) \|\| (!$has_re && $root_in_root[$root_id])) {
	/* try to use In-Reply-To header to find root
	unless subject contains 'Re:' */
	if ($has_re&&$new['IN-REPLY-TO']) {
	if ($debug) {
	echo "\tlooking: ".$new['IN-REPLY-TO']."\n";
	}
	//reply to known message?
	$temp = $sub_mids[$new['IN-REPLY-TO']];

	if ($temp) {
	//found it, root:=parent's root
	if ($debug) {
	echo "\tfound parent: ".$new['SUBJECT']."\n";
	}
	$result[$temp][] = $id;
	$sub_mids[$new['MESSAGE-ID']] = $temp;
	$sbj = '';
	} else {
	//if we can't find referenced parent, it's a "stray"
	$strays[$id] = $new['IN-REPLY-TO'];
	}
	}

	//add subject as root
	if ($sbj) {
	if ($debug) {
	echo "\t added to root\n";
	}
	$roots[$sbj] = $id;
	$root_in_root[$id] = !$has_re;
	$sub_mids[$new['MESSAGE-ID']] = $id;
	$result[$id] = array($id);
	}
	if ($debug) {
	echo $new['MESSAGE-ID'] . "\t" . $sbj . "\n";
	}
	}
	}

	//now that we've gone through all the messages,
	//go back and try and link up the stray threads
	if (count($strays) > 0) {
	foreach ($strays as $id=>$irt) {
	$root_id = $sub_mids[$irt];
	if (!$root_id \|\| $root_id==$id) {
	continue;
	}
	$result[$root_id] = array_merge($result[$root_id],$result[$id]);
	unset($result[$id]);
	}
	}

	if ($clock) {
	$clock->register('data prepped');
	}

	if ($debug) {
	print_r($roots);
	}

	return $result;
	}

	function iil_SortThreads(&$tree, $index, $sort_order = 'ASC') {
	if (!is_array($tree) \|\| !is_array($index)) {
	return false;
	}

	//create an id to position lookup table
	$i = 0;
	foreach ($index as $id=>$val) {
	$i++;
	$index[$id] = $i;
	}
	$max = $i+1;

	//for each tree, set array key to position
	$itree = array();
	foreach ($tree as $id=>$node) {
	if (count($tree[$id])<=1) {
	//for "threads" with only one message, key is position of that message
	$n = $index[$id];
	$itree[$n] = array($n=>$id);
	} else {
	//for "threads" with multiple messages,
	$min = $max;
	$new_a = array();
	foreach ($tree[$id] as $mid) {
	$new_a[$index[$mid]] = $mid; //create new sub-array mapping position to id
	$pos = $index[$mid];
	if ($pos&&$pos<$min) {
	$min = $index[$mid]; //find smallest position
	}
	}
	$n = $min; //smallest position of child is thread position

	//assign smallest position to root level key
	//set children array to one created above
	ksort($new_a);
	$itree[$n] = $new_a;
	}
	}

	//sort by key, this basically sorts all threads
	ksort($itree);
	$i = 0;
	$out = array();
	foreach ($itree as $k=>$node) {
	$out[$i] = $itree[$k];
	$i++;
	}

	return $out;
	}

	function iil_IndexThreads(&$tree) {
	/* creates array mapping mid to thread id */

	if (!is_array($tree)) {
	return false;
	}

	$t_index = array();
	foreach ($tree as $pos=>$kids) {
	foreach ($kids as $kid) $t_index[$kid] = $pos;
	}

	return $t_index;
	}

	-function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false, $bodystr=false)
	+function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false, $bodystr=false, $add='')
	{
	global $IMAP_USE_INTERNAL_DATE;

	$result = array();
	$fp = $conn->fp;

	list($from_idx, $to_idx) = explode(':', $message_set);
	if (empty($message_set) \|\| (isset($to_idx)
	&& (int)$from_idx > (int)$to_idx)) {
	return false;
	}

	/* Do "SELECT" command */
	if (!iil_C_Select($conn, $mailbox)) {
	$conn->error = "Couldn't select $mailbox";
	return false;
	}

	/* Get cached records where possible */
	if ($conn->do_cache) {
	$uids = iil_C_FetchHeaderIndex($conn, $mailbox, $message_set, "UID");
	if (is_array($uids) && count($conn->cache[$mailbox]>0)) {
	$needed_set = '';
	while (list($id,$uid)=each($uids)) {
	if ($conn->cache[$mailbox][$uid]) {
	$result[$id] = $conn->cache[$mailbox][$uid];
	$result[$id]->id = $id;
	} else {
	$needed_set.=($needed_set ? ',': '') . $id;
	}
	}
	//echo "<!-- iil_C_FetchHeader\nMessage Set: $message_set\nNeeded Set:$needed_set\n//-->\n";
	if ($needed_set) {
	$message_set = iil_CompressMessageSet($needed_set);
	} else {
	return $result;
	}
	}
	}
	+
	+ if ($add)
	+ $add = ' '.strtoupper(trim($add));

	/* FETCH uid, size, flags and headers */
	$key = 'FH12';
	$request = $key . ($uidfetch ? ' UID' : '') . " FETCH $message_set ";
	$request .= "(UID RFC822.SIZE FLAGS INTERNALDATE ";
	if ($bodystr)
	$request .= "BODYSTRUCTURE ";
	$request .= "BODY.PEEK[HEADER.FIELDS ";
	$request .= "(DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC ";
	$request .= "CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID ";
	- $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY)])";
	+ $request .= "REFERENCES DISPOSITION-NOTIFICATION-TO X-PRIORITY".$add.")])";

	if (!iil_PutLine($fp, $request)) {
	return false;
	}
	do {
	$line = iil_ReadLine($fp, 1024);
	$line = iil_MultLine($fp, $line);

	$a = explode(' ', $line);
	if (($line[0] == '*') && ($a[2] == 'FETCH')) {
	$id = $a[1];

	$result[$id] = new iilBasicHeader;
	$result[$id]->id = $id;
	$result[$id]->subject = '';
	$result[$id]->messageID = 'mid:' . $id;

	$lines = array();
	$ln = 0;
	/*
	Sample reply line:
	* 321 FETCH (UID 2417 RFC822.SIZE 2730 FLAGS (\Seen)
	INTERNALDATE "16-Nov-2008 21:08:46 +0100" BODYSTRUCTURE (...)
	BODY[HEADER.FIELDS ...
	*/

	if (preg_match('/^\* [0-9]+ FETCH \((.*) BODY/s', $line, $matches)) {
	$str = $matches[1];

	// swap parents with quotes, then explode
	$str = eregi_replace("[()]", "\"", $str);
	$a = iil_ExplodeQuotedString(' ', $str);

	// did we get the right number of replies?
	$parts_count = count($a);
	if ($parts_count>=6) {
	for ($i=0; $i<$parts_count; $i=$i+2) {
	if (strcasecmp($a[$i],'UID') == 0)
	$result[$id]->uid = $a[$i+1];
	else if (strcasecmp($a[$i],'RFC822.SIZE') == 0)
	$result[$id]->size = $a[$i+1];
	else if (strcasecmp($a[$i],'INTERNALDATE') == 0)
	$time_str = $a[$i+1];
	else if (strcasecmp($a[$i],'FLAGS') == 0)
	$flags_str = $a[$i+1];
	}

	$time_str = str_replace('"', '', $time_str);

	// if time is gmt...
	$time_str = str_replace('GMT','+0000',$time_str);

	//get timezone
	$time_str = substr($time_str, 0, -1);
	$time_zone_str = substr($time_str, -5); // extract timezone
	$time_str = substr($time_str, 0, -5); // remove timezone
	$time_zone = (float)substr($time_zone_str, 1, 2); // get first two digits

	if ($time_zone_str[3] != '0') {
	$time_zone += 0.5; //handle half hour offset
	}
	if ($time_zone_str[0] == '-') {
	$time_zone = $time_zone * -1.0; //minus?
	}

	//calculate timestamp
	$timestamp = strtotime($time_str); //return's server's time
	$timestamp -= $time_zone * 3600; //compensate for tz, get GMT

	$result[$id]->internaldate = $time_str;
	$result[$id]->timestamp = $timestamp;
	$result[$id]->date = $time_str;
	}

	// BODYSTRUCTURE
	if($bodystr) {
	while (!preg_match('/ BODYSTRUCTURE (.*) BODY\[HEADER.FIELDS/s', $line, $m)) {
	$line2 = iil_ReadLine($fp, 1024);
	$line .= iil_MultLine($fp, $line2);
	}
	$result[$id]->body_structure = $m[1];
	}

	// the rest of the result
	preg_match('/ BODY\[HEADER.FIELDS $.$\]\s(.*)/s', $line, $m);
	$reslines = explode("\n", trim($m[1], '"'));
	// re-parse (see below)
	foreach ($reslines as $line) {
	if (ord($line[0])<=32) {
	$lines[$ln] .= (empty($lines[$ln])?'':"\n").trim($line);
	} else {
	$lines[++$ln] = trim($line);
	}
	}
	}

	/*
	Start parsing headers. The problem is, some header "lines" take up multiple lines.
	So, we'll read ahead, and if the one we're reading now is a valid header, we'll
	process the previous line. Otherwise, we'll keep adding the strings until we come
	to the next valid header line.
	*/

	do {
	$line = chop(iil_ReadLine($fp, 300), "\r\n");

	// The preg_match below works around communigate imap, which outputs " UID <number>)".
	// Without this, the while statement continues on and gets the "FH0 OK completed" message.
	// If this loop gets the ending message, then the outer loop does not receive it from radline on line 1249.
	// This in causes the if statement on line 1278 to never be true, which causes the headers to end up missing
	// If the if statement was changed to pick up the fh0 from this loop, then it causes the outer loop to spin
	// An alternative might be:
	// if (!preg_match("/:/",$line) && preg_match("/\)$/",$line)) break;
	// however, unsure how well this would work with all imap clients.
	if (preg_match("/^\s*UID [0-9]+\)$/", $line)) {
	break;
	}

	// handle FLAGS reply after headers (AOL, Zimbra?)
	if (preg_match('/\s+FLAGS $(.*)$\)$/', $line, $matches)) {
	$flags_str = $matches[1];
	break;
	}

	if (ord($line[0])<=32) {
	$lines[$ln] .= (empty($lines[$ln])?'':"\n").trim($line);
	} else {
	$lines[++$ln] = trim($line);
	}
	// patch from "Maksim Rubis" <siburny@hotmail.com>
	} while (trim($line[0]) != ')' && strncmp($line, $key, strlen($key)));

	if (strncmp($line, $key, strlen($key))) {
	// process header, fill iilBasicHeader obj.
	// initialize
	if (is_array($headers)) {
	reset($headers);
	while (list($k, $bar) = each($headers)) {
	$headers[$k] = '';
	}
	}

	// create array with header field:data
	while ( list($lines_key, $str) = each($lines) ) {
	list($field, $string) = iil_SplitHeaderLine($str);

	$field = strtolower($field);
	- $string = ereg_replace("\n[[:space:]]*"," ",$string);
	+ $string = ereg_replace("\n[[:space:]]*"," ",$string);

	switch ($field) {
	case 'date';
	if (!$IMAP_USE_INTERNAL_DATE) {
	$result[$id]->date = $string;
	$result[$id]->timestamp = iil_StrToTime($string);
	}
	break;
	case 'from':
	$result[$id]->from = $string;
	break;
	case 'to':
	$result[$id]->to = preg_replace('/undisclosed-recipients:[;,]*/', '', $string);
	break;
	case 'subject':
	$result[$id]->subject = $string;
	break;
	case 'reply-to':
	$result[$id]->replyto = $string;
	break;
	case 'cc':
	$result[$id]->cc = $string;
	break;
	case 'bcc':
	$result[$id]->bcc = $string;
	break;
	case 'content-transfer-encoding':
	$result[$id]->encoding = $string;
	break;
	case 'content-type':
	$ctype_parts = explode(";", $string);
	$result[$id]->ctype = array_shift($ctype_parts);
	foreach ($ctype_parts as $ctype_add) {
	if (preg_match('/charset="?([a-z0-9\-\.\_]+)"?/i',
	$ctype_add, $regs)) {
	$result[$id]->charset = $regs[1];
	}
	}
	break;
	case 'in-reply-to':
	$result[$id]->in_reply_to = ereg_replace("[\n<>]", '', $string);
	break;
	case 'references':
	$result[$id]->references = $string;
	break;
	case 'return-receipt-to':
	case 'disposition-notification-to':
	case 'x-confirm-reading-to':
	$result[$id]->mdn_to = $string;
	break;
	case 'message-id':
	$result[$id]->messageID = $string;
	break;
	case 'x-priority':
	if (preg_match('/^(\d+)/', $string, $matches))
	$result[$id]->priority = intval($matches[1]);
	break;
	+ default:
	+ if (strlen($field) > 2)
	+ $result[$id]->others[$field] = $string;
	+ break;
	} // end switch ()
	} // end while ()

	if ($conn->do_cache) {
	$uid = $result[$id]->uid;
	$conn->cache[$mailbox][$uid] = $result[$id];
	$conn->cache_dirty[$mailbox] = true;
	}
	} else {
	$a = explode(' ', $line);
	}

	// process flags
	if (!empty($flags_str)) {
	$flags_str = eregi_replace('[\\\"]', '', $flags_str);
	$flags_a = explode(' ', $flags_str);

	if (is_array($flags_a)) {
	reset($flags_a);
	while (list(,$val)=each($flags_a)) {
	if (strcasecmp($val,'Seen') == 0) {
	$result[$id]->seen = true;
	} else if (strcasecmp($val, 'Deleted') == 0) {
	$result[$id]->deleted=true;
	} else if (strcasecmp($val, 'Recent') == 0) {
	$result[$id]->recent = true;
	} else if (strcasecmp($val, 'Answered') == 0) {
	$result[$id]->answered = true;
	} else if (strcasecmp($val, '$Forwarded') == 0) {
	$result[$id]->forwarded = true;
	} else if (strcasecmp($val, 'Draft') == 0) {
	$result[$id]->is_draft = true;
	} else if (strcasecmp($val, '$MDNSent') == 0) {
	$result[$id]->mdn_sent = true;
	} else if (strcasecmp($val, 'Flagged') == 0) {
	$result[$id]->flagged = true;
	}
	}
	$result[$id]->flags = $flags_a;
	}
	}
	}
	} while (strcmp($a[0], $key) != 0);

	return $result;
	}

	-function iil_C_FetchHeader(&$conn, $mailbox, $id, $uidfetch=false, $bodystr=false) {
	+function iil_C_FetchHeader(&$conn, $mailbox, $id, $uidfetch=false, $bodystr=false, $add='') {

	- $a = iil_C_FetchHeaders($conn, $mailbox, $id, $uidfetch, $bodystr);
	+ $a = iil_C_FetchHeaders($conn, $mailbox, $id, $uidfetch, $bodystr, $add);
	if (is_array($a)) {
	return array_shift($a);
	}
	return false;
	}

	function iil_SortHeaders($a, $field, $flag) {
	if (empty($field)) {
	$field = 'uid';
	}
	$field = strtolower($field);
	if ($field == 'date' \|\| $field == 'internaldate') {
	$field = 'timestamp';
	}
	if (empty($flag)) {
	$flag = 'ASC';
	}

	$flag = strtoupper($flag);
	$stripArr = ($field=='subject') ? array('Re: ','Fwd: ','Fw: ','"') : array('"');

	$c=count($a);
	if ($c > 0) {
	/*
	Strategy:
	First, we'll create an "index" array.
	Then, we'll use sort() on that array,
	and use that to sort the main array.
	*/

	// create "index" array
	$index = array();
	reset($a);
	while (list($key, $val)=each($a)) {

	if ($field == 'timestamp') {
	$data = @strtotime($val->date);
	if ($data == false) {
	$data = $val->timestamp;
	}
	} else {
	$data = $val->$field;
	if (is_string($data)) {
	$data=strtoupper(str_replace($stripArr, '', $data));
	}
	}
	$index[$key]=$data;
	}

	// sort index
	$i = 0;
	if ($flag == 'ASC') {
	asort($index);
	} else {
	arsort($index);
	}

	// form new array based on index
	$result = array();
	reset($index);
	while (list($key, $val)=each($index)) {
	$result[$key]=$a[$key];
	$i++;
	}
	}

	return $result;
	}

	function iil_C_Expunge(&$conn, $mailbox) {

	if (iil_C_Select($conn, $mailbox)) {
	$c = 0;
	iil_PutLine($conn->fp, "exp1 EXPUNGE");
	do {
	$line=chop(iil_ReadLine($conn->fp, 100));
	if ($line[0] == '*') {
	$c++;
	}
	} while (!iil_StartsWith($line, 'exp1', true));

	if (iil_ParseResult($line) == 0) {
	$conn->selected = ''; //state has changed, need to reselect
	//$conn->exists-=$c;
	return $c;
	}
	$conn->error = $line;
	}

	return -1;
	}

	function iil_C_ModFlag(&$conn, $mailbox, $messages, $flag, $mod) {
	if ($mod != '+' && $mod != '-') {
	return -1;
	}

	$fp = $conn->fp;
	$flags = $GLOBALS['IMAP_FLAGS'];

	$flag = strtoupper($flag);
	$flag = $flags[$flag];

	if (iil_C_Select($conn, $mailbox)) {
	$c = 0;
	iil_PutLine($fp, "flg STORE $messages " . $mod . "FLAGS (" . $flag . ")");
	do {
	$line=chop(iil_ReadLine($fp, 100));
	if ($line[0] == '*') {
	$c++;
	}
	} while (!iil_StartsWith($line, 'flg', true));

	if (iil_ParseResult($line) == 0) {
	iil_C_ExpireCachedItems($conn, $mailbox, $messages);
	return $c;
	}
	$conn->error = $line;
	return -1;
	}
	$conn->error = 'Select failed';
	return -1;
	}

	function iil_C_Flag(&$conn, $mailbox, $messages, $flag) {
	return iil_C_ModFlag($conn, $mailbox, $messages, $flag, '+');
	}

	function iil_C_Unflag(&$conn, $mailbox, $messages, $flag) {
	return iil_C_ModFlag($conn, $mailbox, $messages, $flag, '-');
	}

	function iil_C_Delete(&$conn, $mailbox, $messages) {
	return iil_C_ModFlag($conn, $mailbox, $messages, 'DELETED', '+');
	}

	function iil_C_Undelete(&$conn, $mailbox, $messages) {
	return iil_C_ModFlag($conn, $mailbox, $messages, 'DELETED', '-');
	}

	function iil_C_Unseen(&$conn, $mailbox, $messages) {
	return iil_C_ModFlag($conn, $mailbox, $messages, 'SEEN', '-');
	}

	function iil_C_Copy(&$conn, $messages, $from, $to) {
	$fp = $conn->fp;

	if (empty($from) \|\| empty($to)) {
	return -1;
	}

	if (iil_C_Select($conn, $from)) {
	$c=0;

	iil_PutLine($fp, "cpy1 COPY $messages \"".iil_Escape($to)."\"");
	$line=iil_ReadReply($fp);
	return iil_ParseResult($line);
	} else {
	return -1;
	}
	}

	function iil_FormatSearchDate($month, $day, $year) {
	$month = (int) $month;
	$months = $GLOBALS['IMAP_MONTHS'];
	return $day . '-' . $months[$month] . '-' . $year;
	}

	function iil_C_CountUnseen(&$conn, $folder) {
	$index = iil_C_Search($conn, $folder, 'ALL UNSEEN');
	if (is_array($index)) {
	if (($cnt = count($index)) && $index[0] != '') {
	return $cnt;
	}
	}
	return false;
	}

	function iil_C_UID2ID(&$conn, $folder, $uid) {
	if ($uid > 0) {
	$id_a = iil_C_Search($conn, $folder, "UID $uid");
	if (is_array($id_a) && count($id_a) == 1) {
	return $id_a[0];
	}
	}
	return false;
	}

	function iil_C_ID2UID(&$conn, $folder, $id) {
	$fp = $conn->fp;
	if ($id == 0) {
	return -1;
	}
	$result = -1;
	if (iil_C_Select($conn, $folder)) {
	$key = 'FUID';
	if (iil_PutLine($fp, "$key FETCH $id (UID)")) {
	do {
	$line=chop(iil_ReadLine($fp, 1024));
	if (eregi("^\* $id FETCH $UID (.*)$", $line, $r)) {
	$result = $r[1];
	}
	} while (!preg_match("/^$key/", $line));
	}
	}
	return $result;
	}

	function iil_C_Search(&$conn, $folder, $criteria) {
	$fp = $conn->fp;
	if (iil_C_Select($conn, $folder)) {
	$c = 0;

	$query = 'srch1 SEARCH ' . chop($criteria);
	if (!iil_PutLineC($fp, $query)) {
	return false;
	}
	do {
	$line=trim(iil_ReadLine($fp, 10000));
	if (eregi("^\* SEARCH", $line)) {
	$str = trim(substr($line, 8));
	$messages = explode(' ', $str);
	}
	} while (!iil_StartsWith($line, 'srch1', true));

	$result_code = iil_ParseResult($line);
	if ($result_code == 0) {
	return $messages;
	}
	$conn->error = 'iil_C_Search: ' . $line . "\n";
	return false;
	}
	$conn->error = "iil_C_Search: Couldn't select \"$folder\"\n";
	return false;
	}

	function iil_C_Move(&$conn, $messages, $from, $to) {
	$fp = $conn->fp;

	if (!$from \|\| !$to) {
	return -1;
	}
	$r = iil_C_Copy($conn, $messages, $from,$to);
	if ($r==0) {
	return iil_C_Delete($conn, $from, $messages);
	}
	return $r;
	}

	/**
	* Gets the delimiter, for example:
	* INBOX.foo -> .
	* INBOX/foo -> /
	* INBOX\foo -> \
	*
	* @return mixed A delimiter (string), or false.
	* @param object $conn The current connection.
	* @see iil_Connect()
	*/
	function iil_C_GetHierarchyDelimiter(&$conn) {

	global $my_prefs;

	if ($conn->delimiter) {
	return $conn->delimiter;
	}
	if (!empty($my_prefs['delimiter'])) {
	return ($conn->delimiter = $my_prefs['delimiter']);
	}

	$fp = $conn->fp;
	$delimiter = false;

	//try (LIST "" ""), should return delimiter (RFC2060 Sec 6.3.8)
	if (!iil_PutLine($fp, 'ghd LIST "" ""')) {
	return false;
	}

	do {
	$line=iil_ReadLine($fp, 500);
	if ($line[0] == '*') {
	$line = rtrim($line);
	$a=iil_ExplodeQuotedString(' ', iil_UnEscape($line));
	if ($a[0] == '*') {
	$delimiter = str_replace('"', '', $a[count($a)-2]);
	}
	}
	} while (!iil_StartsWith($line, 'ghd', true));

	if (strlen($delimiter)>0) {
	return $delimiter;
	}

	//if that fails, try namespace extension
	//try to fetch namespace data
	iil_PutLine($conn->fp, "ns1 NAMESPACE");
	do {
	$line = iil_ReadLine($conn->fp, 1024);
	if (iil_StartsWith($line, '* NAMESPACE')) {
	$i = 0;
	$line = iil_UnEscape($line);
	$data = iil_ParseNamespace2(substr($line,11), $i, 0, 0);
	}
	} while (!iil_StartsWith($line, 'ns1', true));

	if (!is_array($data)) {
	return false;
	}

	//extract user space data (opposed to global/shared space)
	$user_space_data = $data[0];
	if (!is_array($user_space_data)) {
	return false;
	}

	//get first element
	$first_userspace = $user_space_data[0];
	if (!is_array($first_userspace)) {
	return false;
	}

	//extract delimiter
	$delimiter = $first_userspace[1];

	return $delimiter;
	}

	function iil_C_ListMailboxes(&$conn, $ref, $mailbox) {
	global $IGNORE_FOLDERS;

	$ignore = $IGNORE_FOLDERS[strtolower($conn->host)];

	$fp = $conn->fp;

	if (empty($mailbox)) {
	$mailbox = '*';
	}

	if (empty($ref) && $conn->rootdir) {
	$ref = $conn->rootdir;
	}

	// send command
	if (!iil_PutLine($fp, "lmb LIST \"".$ref."\" \"".iil_Escape($mailbox)."\"")) {
	return false;
	}

	$i = 0;
	// get folder list
	do {
	$line = iil_ReadLine($fp, 500);
	$line = iil_MultLine($fp, $line);

	$a = explode(' ', $line);
	if (($line[0] == '*') && ($a[1] == 'LIST')) {
	$line = rtrim($line);
	// split one line
	$a = iil_ExplodeQuotedString(' ', $line);
	// last string is folder name
	$folder = trim($a[count($a)-1], '"');

	if (empty($ignore) \|\| (!empty($ignore)
	&& !eregi($ignore, $folder))) {
	$folders[$i] = $folder;
	}

	// second from last is delimiter
	$delim = trim($a[count($a)-2], '"');
	// is it a container?
	$i++;
	}
	} while (!iil_StartsWith($line, 'lmb', true));

	if (is_array($folders)) {
	if (!empty($ref)) {
	// if rootdir was specified, make sure it's the first element
	// some IMAP servers (i.e. Courier) won't return it
	if ($ref[strlen($ref)-1]==$delim)
	$ref = substr($ref, 0, strlen($ref)-1);
	if ($folders[0]!=$ref)
	array_unshift($folders, $ref);
	}
	return $folders;
	} else if (iil_ParseResult($line) == 0) {
	return array('INBOX');
	} else {
	$conn->error = $line;
	return false;
	}
	}

	function iil_C_ListSubscribed(&$conn, $ref, $mailbox) {
	global $IGNORE_FOLDERS;

	$ignore = $IGNORE_FOLDERS[strtolower($conn->host)];

	$fp = $conn->fp;
	if (empty($mailbox)) {
	$mailbox = '*';
	}
	if (empty($ref) && $conn->rootdir) {
	$ref = $conn->rootdir;
	}
	$folders = array();

	// send command
	if (!iil_PutLine($fp, 'lsb LSUB "' . $ref . '" "' . iil_Escape($mailbox).'"')) {
	$conn->error = "Couldn't send LSUB command\n";
	return false;
	}

	$i = 0;

	// get folder list
	do {
	$line = iil_ReadLine($fp, 500);
	$line = iil_MultLine($fp, $line);
	$a = explode(' ', $line);

	if (($line[0] == '*') && ($a[1] == 'LSUB' \|\| $a[1] == 'LIST')) {
	$line = rtrim($line);

	// split one line
	$a = iil_ExplodeQuotedString(' ', $line);

	// last string is folder name
	//$folder = UTF7DecodeString(str_replace('"', '', $a[count($a)-1]));
	$folder = trim($a[count($a)-1], '"');

	if ((!in_array($folder, $folders)) && (empty($ignore)
	\|\| (!empty($ignore) && !eregi($ignore, $folder)))) {
	$folders[$i] = $folder;
	}

	// second from last is delimiter
	$delim = trim($a[count($a)-2], '"');

	// is it a container?
	$i++;
	}
	} while (!iil_StartsWith($line, 'lsb', true));

	if (is_array($folders)) {
	if (!empty($ref)) {
	// if rootdir was specified, make sure it's the first element
	// some IMAP servers (i.e. Courier) won't return it
	if ($ref[strlen($ref)-1]==$delim) {
	$ref = substr($ref, 0, strlen($ref)-1);
	}
	if ($folders[0]!=$ref) {
	array_unshift($folders, $ref);
	}
	}
	return $folders;
	}
	$conn->error = $line;
	return false;
	}

	function iil_C_Subscribe(&$conn, $folder) {
	$fp = $conn->fp;

	$query = 'sub1 SUBSCRIBE "' . iil_Escape($folder). '"';
	iil_PutLine($fp, $query);

	$line = trim(iil_ReadLine($fp, 10000));
	return iil_ParseResult($line);
	}

	function iil_C_UnSubscribe(&$conn, $folder) {
	$fp = $conn->fp;

	$query = 'usub1 UNSUBSCRIBE "' . iil_Escape($folder) . '"';
	iil_PutLine($fp, $query);

	$line = trim(iil_ReadLine($fp, 10000));
	return iil_ParseResult($line);
	}

	function iil_C_FetchMIMEHeaders(&$conn, $mailbox, $id, $parts) {

	$fp = $conn->fp;

	if (!iil_C_Select($conn, $mailbox)) {
	return false;
	}

	$result = false;
	$parts = (array) $parts;
	$key = 'fmh0';
	$peeks = '';
	$idx = 0;

	// format request
	foreach($parts as $part)
	$peeks[] = "BODY.PEEK[$part.MIME]";

	$request = "$key FETCH $id (" . implode(' ', $peeks) . ')';

	// send request
	if (!iil_PutLine($fp, $request)) {
	return false;
	}

	do {
	$line = iil_ReadLine($fp, 1000);
	$line = iil_MultLine($fp, $line);

	if (preg_match('/BODY\[([0-9\.]+)\.MIME\]/', $line, $matches)) {
	$idx = $matches[1];
	$result[$idx] = preg_replace('/^(\* '.$id.' FETCH \()?\s*BODY\['.$idx.'\.MIME\]\s+/', '', $line);
	$result[$idx] = trim($result[$idx], '"');
	$result[$idx] = rtrim($result[$idx], "\t\r\n\0\x0B");
	}
	} while (!iil_StartsWith($line, $key, true));

	return $result;
	}

	function iil_C_FetchPartHeader(&$conn, $mailbox, $id, $part) {

	$part = empty($part) ? 'HEADER' : $part.'.MIME';

	return iil_C_HandlePartBody($conn, $mailbox, $id, $part, 1);
	}

	function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part='', $mode=1, $file=NULL) {
	/* modes:
	1: return string (or write to $file pointer)
	2: print
	3: base64 and print (or write to $file pointer)
	*/

	$fp = $conn->fp;
	$result = false;

	if (iil_C_Select($conn, $mailbox)) {
	$reply_key = '* ' . $id;

	// format request
	$key = 'ftch' . ($c++) . ' ';
	$request = $key . "FETCH $id (BODY.PEEK[$part])";
	// send request
	if (!iil_PutLine($fp, $request)) {
	return false;
	}

	// receive reply line
	do {
	$line = chop(iil_ReadLine($fp, 1000));
	$a = explode(' ', $line);
	} while ($a[2] != 'FETCH');
	$len = strlen($line);

	// handle empty "* X FETCH ()" response
	if ($line[$len-1] == ')' && $line[$len-2] != '(') {
	// one line response, get everything between first and last quotes
	if (substr($line, -4, 3) == 'NIL') {
	// NIL response
	$result = '';
	} else {
	$from = strpos($line, '"') + 1;
	$to = strrpos($line, '"');
	$len = $to - $from;
	$result = substr($line, $from, $len);
	}

	if ($mode == 2) {
	echo $result;
	} else if ($mode == 3) {
	if ($file)
	fwrite($file, base64_decode($result));
	else
	echo base64_decode($result);
	}
	} else if ($line[$len-1] == '}') {
	//multi-line request, find sizes of content and receive that many bytes
	$from = strpos($line, '{') + 1;
	$to = strrpos($line, '}');
	$len = $to - $from;
	$sizeStr = substr($line, $from, $len);
	$bytes = (int)$sizeStr;
	$prev = '';

	while ($bytes > 0) {
	$line = iil_ReadLine($fp, 1024);
	$len = strlen($line);

	if ($len > $bytes) {
	$line = substr($line, 0, $bytes);
	}
	$bytes -= strlen($line);

	$line = rtrim($line, "\t\r\n\0\x0B");

	if ($mode == 1) {
	if ($file)
	fwrite($file, $line . "\n");
	else
	$result .= $line . "\n";
	} else if ($mode == 2) {
	echo $line . "\n";
	} else if ($mode == 3) {
	// create chunks with proper length for base64 decoding
	$line = $prev.$line;
	$length = strlen($line);
	if ($length % 4) {
	$length = floor($length / 4) * 4;
	$prev = substr($line, $length);
	$line = substr($line, 0, $length);
	}
	else
	$prev = '';

	if ($file)
	fwrite($file, base64_decode($line));
	else
	echo base64_decode($line);
	}
	}
	}
	// read in anything up until last line
	do {
	$line = iil_ReadLine($fp, 1024);
	} while (!iil_StartsWith($line, $key, true));

	if ($mode == 3 && $file) {
	return true;
	}

	if ($result) {
	$result = rtrim($result, "\t\r\n\0\x0B");
	if ($file) {
	fwrite($file, $result);
	return true;
	}
	return $result; // substr($result, 0, strlen($result)-1);
	}

	return false;
	} else {
	echo 'Select failed.';
	}

	if ($mode==1) {
	if ($file) {
	fwrite($file, $result);
	return true;
	}
	return $result;
	}

	return false;
	}

	function iil_C_FetchPartBody(&$conn, $mailbox, $id, $part, $file=NULL) {
	return iil_C_HandlePartBody($conn, $mailbox, $id, $part, 1, $file);
	}

	function iil_C_PrintPartBody(&$conn, $mailbox, $id, $part) {
	iil_C_HandlePartBody($conn, $mailbox, $id, $part, 2);
	}

	function iil_C_PrintBase64Body(&$conn, $mailbox, $id, $part) {
	iil_C_HandlePartBody($conn, $mailbox, $id, $part, 3);
	}

	function iil_C_CreateFolder(&$conn, $folder) {
	$fp = $conn->fp;
	if (iil_PutLine($fp, 'c CREATE "' . iil_Escape($folder) . '"')) {
	do {
	$line=iil_ReadLine($fp, 300);
	} while ($line[0] != 'c');
	$conn->error = $line;
	return (iil_ParseResult($line) == 0);
	}
	return false;
	}

	function iil_C_RenameFolder(&$conn, $from, $to) {
	$fp = $conn->fp;
	if (iil_PutLine($fp, 'r RENAME "' . iil_Escape($from) . '" "' . iil_Escape($to) . '"')) {
	do {
	$line = iil_ReadLine($fp, 300);
	} while ($line[0] != 'r');
	return (iil_ParseResult($line) == 0);
	}
	return false;
	}

	function iil_C_DeleteFolder(&$conn, $folder) {
	$fp = $conn->fp;
	if (iil_PutLine($fp, 'd DELETE "' . iil_Escape($folder). '"')) {
	do {
	$line=iil_ReadLine($fp, 300);
	} while ($line[0] != 'd');
	return (iil_ParseResult($line) == 0);
	}
	$conn->error = "Couldn't send command\n";
	return false;
	}

	function iil_C_Append(&$conn, $folder, &$message) {
	if (!$folder) {
	return false;
	}
	$fp = $conn->fp;

	$message = str_replace("\r", '', $message);
	$message = str_replace("\n", "\r\n", $message);

	$len = strlen($message);
	if (!$len) {
	return false;
	}

	$request = 'A APPEND "' . iil_Escape($folder) .'" (\\Seen) {' . $len . '}';

	if (iil_PutLine($fp, $request)) {
	$line=iil_ReadLine($fp, 100);
	$sent = fwrite($fp, $message."\r\n");
	do {
	$line=iil_ReadLine($fp, 1000);
	} while ($line[0] != 'A');

	$result = (iil_ParseResult($line) == 0);
	if (!$result) {
	$conn->error .= $line . "\n";
	}
	return $result;
	}

	$conn->error .= "Couldn't send command \"$request\"\n";
	return false;
	}

	function iil_C_AppendFromFile(&$conn, $folder, $path) {
	if (!$folder) {
	return false;
	}

	//open message file
	$in_fp = false;
	if (file_exists(realpath($path))) {
	$in_fp = fopen($path, 'r');
	}
	if (!$in_fp) {
	$conn->error .= "Couldn't open $path for reading\n";
	return false;
	}

	$fp = $conn->fp;
	$len = filesize($path);
	if (!$len) {
	return false;
	}

	//send APPEND command
	$request = 'A APPEND "' . iil_Escape($folder) . '" (\\Seen) {' . $len . '}';
	$bytes_sent = 0;
	if (iil_PutLine($fp, $request)) {
	$line = iil_ReadLine($fp, 100);

	//send file
	while (!feof($in_fp)) {
	$buffer = fgets($in_fp, 4096);
	$bytes_sent += strlen($buffer);
	iil_PutLine($fp, $buffer, false);
	}
	fclose($in_fp);

	iil_PutLine($fp, '');

	//read response
	do {
	$line = iil_ReadLine($fp, 1000);
	} while ($line[0] != 'A');

	$result = (iil_ParseResult($line) == 0);
	if (!$result) {
	$conn->error .= $line . "\n";
	}

	return $result;
	}

	$conn->error .= "Couldn't send command \"$request\"\n";
	return false;
	}

	function iil_C_FetchStructureString(&$conn, $folder, $id) {
	$fp = $conn->fp;
	$result = false;

	if (iil_C_Select($conn, $folder)) {
	$key = 'F1247';

	if (iil_PutLine($fp, "$key FETCH $id (BODYSTRUCTURE)")) {
	do {
	$line = iil_ReadLine($fp, 5000);
	$line = iil_MultLine($fp, $line);
	list(, $index, $cmd, $rest) = explode(' ', $line);
	if ($cmd != 'FETCH' \|\| $index == $id \|\| preg_match("/^$key/", $line))
	$result .= $line;
	} while (!preg_match("/^$key/", $line));

	$result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, -(strlen($result)-strrpos($result, $key)+1)));
	}
	}
	return $result;
	}

	function iil_C_PrintSource(&$conn, $folder, $id, $part) {
	$header = iil_C_FetchPartHeader($conn, $folder, $id, $part);
	//echo str_replace("\r", '', $header);
	echo $header;
	echo iil_C_PrintPartBody($conn, $folder, $id, $part);
	}

	function iil_C_GetQuota(&$conn) {
	/*
	* GETQUOTAROOT "INBOX"
	* QUOTAROOT INBOX user/rchijiiwa1
	* QUOTA user/rchijiiwa1 (STORAGE 654 9765)
	* OK Completed
	*/
	$fp = $conn->fp;
	$result = false;
	$quota_lines = array();

	// get line(s) containing quota info
	if (iil_PutLine($fp, 'QUOT1 GETQUOTAROOT "INBOX"')) {
	do {
	$line=chop(iil_ReadLine($fp, 5000));
	if (iil_StartsWith($line, '* QUOTA ')) {
	$quota_lines[] = $line;
	}
	} while (!iil_StartsWith($line, 'QUOT1', true));
	}

	// return false if not found, parse if found
	$min_free = PHP_INT_MAX;
	foreach ($quota_lines as $key => $quota_line) {
	$quota_line = eregi_replace('[()]', '', $quota_line);
	$parts = explode(' ', $quota_line);
	$storage_part = array_search('STORAGE', $parts);

	if (!$storage_part) continue;

	$used = intval($parts[$storage_part+1]);
	$total = intval($parts[$storage_part+2]);
	$free = $total - $used;

	// return lowest available space from all quotas
	if ($free < $min_free) {
	$min_free = $free;
	$result['used'] = $used;
	$result['total'] = $total;
	$result['percent'] = min(100, round(($used/max(1,$total))*100));
	$result['free'] = 100 - $result['percent'];
	}
	}
	return $result;
	}

	function iil_C_ClearFolder(&$conn, $folder) {
	$num_in_trash = iil_C_CountMessages($conn, $folder);
	if ($num_in_trash > 0) {
	iil_C_Delete($conn, $folder, '1:' . $num_in_trash);
	}
	return (iil_C_Expunge($conn, $folder) >= 0);
	}

	?>
	diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
	index 33dfad646..e3d7606cb 100644
	--- a/program/steps/addressbook/func.inc
	+++ b/program/steps/addressbook/func.inc
	@@ -1,212 +1,212 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/func.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2007, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Provide addressbook functionality and GUI objects \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	// instantiate a contacts object according to the given source
	$CONTACTS = $RCMAIL->get_address_book(($source = get_input_value('_source', RCUBE_INPUT_GPC)));

	$CONTACTS->set_pagesize($CONFIG['pagesize']);

	// set list properties and session vars
	if (!empty($_GET['_page']))
	$CONTACTS->set_page(($_SESSION['page'] = intval($_GET['_page'])));
	else
	$CONTACTS->set_page(isset($_SESSION['page']) ?$_SESSION['page'] : 1);

	// set message set for search result
	if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
	$CONTACTS->set_search_set($_SESSION['search'][$_REQUEST['_search']]);

	// set data source env
	$OUTPUT->set_env('source', $source ? $source : '0');
	$OUTPUT->set_env('readonly', $CONTACTS->readonly, false);

	// add list of address sources to client env
	$js_list = array();
	if (strtolower($CONFIG['address_book_type']) != 'ldap') {
	// We are using the DB address book, add it.
	- $js_list = array("0" => array('id' => 0, 'readonly' => false));
	+ $js_list['0'] = array('id' => 0, 'name' => rcube_label('personaladrbook'), 'readonly' => false);
	}
	if (is_array($CONFIG['ldap_public'])) {
	foreach ($CONFIG['ldap_public'] as $id => $prop)
	- $js_list[$id] = array('id' => $id, 'readonly' => !$prop['writable']);
	+ $js_list[$id] = array('id' => $id, 'name' => $prop['name'], 'readonly' => !$prop['writable']);
	}
	-$OUTPUT->set_env('address_sources', $js_list);
	+
	+$plugin = $RCMAIL->plugins->exec_hook('address_sources', array('sources' => $js_list));
	+$OUTPUT->set_env('address_sources', $plugin['sources']);


	function rcmail_directory_list($attrib)
	{
	- global $CONFIG, $OUTPUT;
	+ global $RCMAIL, $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmdirectorylist';

	$out = '';
	$local_id = '0';
	$current = get_input_value('_source', RCUBE_INPUT_GPC);
	$line_templ = html::tag('li', array('id' => 'rcmli%s', 'class' => '%s'),
	html::a(array('href' => '%s', 'onclick' => "return ".JS_OBJECT_NAME.".command('list','%s',this)"), '%s'));
	-
	- if (strtolower($CONFIG['address_book_type']) != 'ldap') {
	- $out .= sprintf($line_templ, $local_id, (!$current ? 'selected' : ''),
	- Q(rcmail_url(null, array('_source' => $local_id))), $local_id, rcube_label('personaladrbook'));
	- } // end if
	- else {
	+
	+ if (!$current && strtolower($RCMAIL->config->get('address_book_type', 'sql')) != 'ldap') {
	+ $current = '0';
	+ }
	+ else if (!$current) {
	// DB address book not used, see if a source is set, if not use the
	// first LDAP directory.
	- if (!$current) {
	- $current = key((array)$CONFIG['ldap_public']);
	- } // end if
	- } // end else
	-
	- foreach ((array)$CONFIG['ldap_public'] as $id => $prop) {
	+ $current = key((array)$RCMAIL->config->get('ldap_public', array()));
	+ }
	+
	+ foreach ((array)$OUTPUT->env['address_sources'] as $j => $source) {
	+ $id = $source['id'] ? $source['id'] : $j;
	$js_id = JQ($id);
	$dom_id = preg_replace('/[^a-z0-9\-_]/i', '', $id);
	$out .= sprintf($line_templ, $dom_id, ($current == $id ? 'selected' : ''),
	- Q(rcmail_url(null, array('_source' => $id))), $js_id, (!empty($prop['name']) ? Q($prop['name']) : Q($id)));
	+ Q(rcmail_url(null, array('_source' => $id))), $js_id, (!empty($source['name']) ? Q($source['name']) : Q($id)));
	}
	-
	+
	$OUTPUT->add_gui_object('folderlist', $attrib['id']);

	return html::tag('ul', $attrib, $out, html::$common_attrib);
	}


	// return the message list as HTML table
	function rcmail_contacts_list($attrib)
	{
	global $CONTACTS, $OUTPUT;

	// count contacts for this user
	$result = $CONTACTS->list_records();

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmAddressList';

	// define list of cols to be displayed
	$a_show_cols = array('name');

	// create XHTML table
	$out = rcube_table_output($attrib, $result->records, $a_show_cols, $CONTACTS->primary_key);

	// set client env
	$OUTPUT->add_gui_object('contactslist', $attrib['id']);
	$OUTPUT->set_env('current_page', (int)$CONTACTS->list_page);
	$OUTPUT->set_env('pagecount', ceil($result->count/$CONTACTS->page_size));
	$OUTPUT->include_script('list.js');

	// add some labels to client
	$OUTPUT->add_label('deletecontactconfirm');

	return $out;
	}


	function rcmail_js_contacts_list($result, $prefix='')
	{
	global $OUTPUT;

	if (empty($result) \|\| $result->count == 0)
	return;

	// define list of cols to be displayed
	$a_show_cols = array('name');

	while ($row = $result->next())
	{
	$a_row_cols = array();

	// format each col
	foreach ($a_show_cols as $col)
	$a_row_cols[$col] = Q($row[$col]);

	$OUTPUT->command($prefix.'add_contact_row', $row['ID'], $a_row_cols);
	}
	}


	// similar function as /steps/settings/identities.inc::rcmail_identity_frame()
	function rcmail_contact_frame($attrib)
	{
	global $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmcontactframe';

	$attrib['name'] = $attrib['id'];

	$OUTPUT->set_env('contentframe', $attrib['name']);
	$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');

	return html::iframe($attrib);
	}


	function rcmail_rowcount_display($attrib)
	{
	global $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmcountdisplay';

	$OUTPUT->add_gui_object('countdisplay', $attrib['id']);

	return html::span($attrib, rcmail_get_rowcount_text());
	}



	function rcmail_get_rowcount_text()
	{
	global $CONTACTS;

	// read nr of contacts
	$result = $CONTACTS->get_result();
	if (!$result)
	$result = $CONTACTS->count();

	if ($result->count == 0)
	$out = rcube_label('nocontactsfound');
	else
	$out = rcube_label(array(
	'name' => 'contactsfromto',
	'vars' => array(
	'from' => $result->first + 1,
	'to' => min($result->count, $result->first + $CONTACTS->page_size),
	'count' => $result->count)
	));

	return $out;
	}


	$OUTPUT->set_pagetitle(rcube_label('addressbook'));

	// register UI objects
	$OUTPUT->add_handlers(array(
	'directorylist' => 'rcmail_directory_list',
	'addresslist' => 'rcmail_contacts_list',
	'addressframe' => 'rcmail_contact_frame',
	'recordscountdisplay' => 'rcmail_rowcount_display',
	'searchform' => array($OUTPUT, 'search_form')
	));

	?>
	diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
	index f6e29f9d7..6d58edc8e 100644
	--- a/program/steps/mail/attachments.inc
	+++ b/program/steps/mail/attachments.inc
	@@ -1,132 +1,136 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/attachments.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Upload, remove, display attachments in compose form \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id: compose.inc 2081 2008-11-23 12:38:44Z thomasb $

	*/


	if (!$_SESSION['compose']) {
	die("Invalid session var!");
	}


	// remove an attachment
	if ($RCMAIL->action=='remove-attachment')
	{
	- if (preg_match('/^rcmfile([0-9]+)$/', $_POST['_file'], $regs))
	- {
	+ $id = 'undefined';
	+ if (preg_match('/^rcmfile(\w+)$/', $_POST['_file'], $regs))
	$id = $regs[1];
	- if (is_array($_SESSION['compose']['attachments'][$id]))
	- {
	- @unlink($_SESSION['compose']['attachments'][$id]['path']);
	+ if ($attachment = $_SESSION['compose']['attachments'][$id])
	+ $attachment = $RCMAIL->plugins->exec_hook('remove_attachment', $attachment);
	+ if ($attachment['status']) {
	+ if (is_array($_SESSION['compose']['attachments'][$id])) {
	unset($_SESSION['compose']['attachments'][$id]);
	$OUTPUT->command('remove_from_attachment_list', "rcmfile$id");
	- $OUTPUT->send();
	}
	}
	+
	+ $OUTPUT->send();
	exit;
	}

	if ($RCMAIL->action=='display-attachment')
	{
	- if (preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs))
	- {
	+ $id = 'undefined';
	+ if (preg_match('/^rcmfile(\w+)$/', $_GET['_file'], $regs))
	$id = $regs[1];
	- if (is_array($_SESSION['compose']['attachments'][$id]))
	- {
	- $apath = $_SESSION['compose']['attachments'][$id]['path'];
	- header('Content-Type: ' . $_SESSION['compose']['attachments'][$id]['mimetype']);
	- header('Content-Length: ' . filesize($apath));
	- readfile($apath);
	- }
	+ if ($attachment = $_SESSION['compose']['attachments'][$id])
	+ $attachment = $RCMAIL->plugins->exec_hook('display_attachment', $attachment);
	+
	+ if ($attachment['status']) {
	+ $size = $attachment['data'] ? strlen($attachment['data']) : @filesize($attachment['path']);
	+ header('Content-Type: ' . $attachment['mimetype']);
	+ header('Content-Length: ' . $size);
	+
	+ if ($attachment['data'])
	+ echo $attachment['data'];
	+ else if ($attachment['path'])
	+ readfile($attachment['path']);
	}
	exit;
	}

	// attachment upload action

	-// use common temp dir for file uploads
	-$temp_dir = unslashify($CONFIG['temp_dir']);
	-
	-// #1484529: we need absolute path on Windows for move_uploaded_file()
	-if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
	- $temp_dir = realpath($temp_dir);
	-}
	-
	if (!is_array($_SESSION['compose']['attachments'])) {
	$_SESSION['compose']['attachments'] = array();
	}

	// clear all stored output properties (like scripts and env vars)
	$OUTPUT->reset();

	if (is_array($_FILES['_attachments']['tmp_name'])) {
	foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
	- $tmpfname = tempnam($temp_dir, 'rcmAttmnt');
	- if (move_uploaded_file($filepath, $tmpfname) && file_exists($tmpfname)) {
	- $id = count($_SESSION['compose']['attachments']);
	- $_SESSION['compose']['attachments'][] = array(
	- 'name' => $_FILES['_attachments']['name'][$i],
	- 'mimetype' => rc_mime_content_type($tmpfname, $_FILES['_attachments']['name'][$i], $_FILES['_attachments']['type'][$i]),
	- 'path' => $tmpfname,
	- );
	-
	+ $attachment = array(
	+ 'path' => $filepath,
	+ 'name' => $_FILES['_attachments']['name'][$i],
	+ 'mimetype' => rc_mime_content_type($tmpfname, $_FILES['_attachments']['type'][$i])
	+ );
	+
	+ $attachment = $RCMAIL->plugins->exec_hook('upload_attachment', $attachment);
	+ if ($attachment['status']) {
	+ $id = $attachment['id'];
	+
	+ // store new attachment in session
	+ unset($attachment['status']);
	+ $_SESSION['compose']['attachments'][$id] = $attachment;
	+
	if (is_file($icon = $CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) {
	$button = html::img(array(
	'src' => $icon,
	'alt' => rcube_label('delete'),
	'style' => "padding-right:2px;vertical-align:middle",
	));
	}
	else {
	$button = Q(rcube_label('delete'));
	}

	$content = html::a(array(
	'href' => "#delete",
	- 'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%d', this)", JS_OBJECT_NAME, $id),
	+ 'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id),
	'title' => rcube_label('delete'),
	), $button);
	-
	- $content .= Q($_FILES['_attachments']['name'][$i]);
	+
	+ $content .= Q($attachment['name']);

	$OUTPUT->command('add2attachment_list', "rcmfile$id", $content);
	}
	else { // upload failed
	$err = $_FILES['_attachments']['error'][$i];
	if ($err == UPLOAD_ERR_INI_SIZE \|\| $err == UPLOAD_ERR_FORM_SIZE) {
	$msg = rcube_label(array('name' => 'filesizeerror', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
	}
	else {
	$msg = rcube_label('fileuploaderror');
	}

	$OUTPUT->command('display_message', $msg, 'error');
	}
	}
	}
	else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
	$OUTPUT->command('display_message', rcube_label('fileuploaderror'), 'error');
	}

	// send html page with JS calls as response
	$OUTPUT->command('show_attachment_form', false);
	$OUTPUT->command('auto_save_start', false);
	$OUTPUT->send('iframe');

	?>
	diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
	index 49c4c3011..c93fa9be2 100644
	--- a/program/steps/mail/compose.inc
	+++ b/program/steps/mail/compose.inc
	@@ -1,921 +1,911 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/compose.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Compose a new mail message with all headers and attachments \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	// define constants for message compose mode
	define('RCUBE_COMPOSE_REPLY', 0x0106);
	define('RCUBE_COMPOSE_FORWARD', 0x0107);
	define('RCUBE_COMPOSE_DRAFT', 0x0108);

	$MESSAGE_FORM = NULL;
	$MESSAGE = NULL;

	// Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or
	// if a compose-ID is given (i.e. when the compose step is opened in a new window/tab).
	// Since there are many ways to leave the compose page improperly, it seems necessary to clean-up an old
	// compose when a "new/forward/reply/draft" is called - otherwise the old session attachments will appear

	if (!is_array($_SESSION['compose']) \|\| $_SESSION['compose']['id'] != get_input_value('_id', RCUBE_INPUT_GET))
	{
	rcmail_compose_cleanup();
	$_SESSION['compose'] = array('id' => uniqid(rand()), 'param' => array_map('strip_tags', $_GET));

	// process values like "mailto:foo@bar.com?subject=new+message&cc=another"
	if ($_SESSION['compose']['param']['_to']) {
	$mailto = explode('?', $_SESSION['compose']['param']['_to']);
	if (count($mailto) > 1) {
	$_SESSION['compose']['param']['_to'] = $mailto[0];
	parse_str($mailto[1], $query);
	foreach ($query as $f => $val)
	$_SESSION['compose']['param']["_$f"] = $val;
	}
	}

	// redirect to a unique URL with all parameters stored in session
	$OUTPUT->redirect(array('_action' => 'compose', '_id' => $_SESSION['compose']['id']));
	}

	// add some labels to client
	$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning',
	'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved',
	'converting', 'editorwarning', 'searching');

	// add config parameters to client script
	if (!empty($CONFIG['drafts_mbox'])) {
	$OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
	$OUTPUT->set_env('draft_autosave', $CONFIG['draft_autosave']);
	}
	// set current mailbox in client environment
	$OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name());

	// get reference message and set compose mode
	if ($msg_uid = $_SESSION['compose']['param']['_reply_uid'])
	$compose_mode = RCUBE_COMPOSE_REPLY;
	else if ($msg_uid = $_SESSION['compose']['param']['_forward_uid'])
	$compose_mode = RCUBE_COMPOSE_FORWARD;
	else if ($msg_uid = $_SESSION['compose']['param']['_draft_uid']) {
	$RCMAIL->imap->set_mailbox($CONFIG['drafts_mbox']);
	$compose_mode = RCUBE_COMPOSE_DRAFT;
	}

	if (!empty($msg_uid))
	{
	// similar as in program/steps/mail/show.inc
	$MESSAGE = new rcube_message($msg_uid);

	if (!empty($MESSAGE->headers->charset))
	$IMAP->set_charset($MESSAGE->headers->charset);

	if ($compose_mode == RCUBE_COMPOSE_REPLY)
	{
	$_SESSION['compose']['reply_uid'] = $msg_uid;
	$_SESSION['compose']['reply_msgid'] = $MESSAGE->headers->messageID;
	$_SESSION['compose']['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID);

	if (!empty($_SESSION['compose']['param']['_all']))
	$MESSAGE->reply_all = 1;
	}
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
	{
	if($MESSAGE->headers->in_reply_to)
	{
	// TODO: how to get reply_uid/forward_uid value, maybe we must set X-Reply-UID/X-Forward-UID
	// $_SESSION['compose']['reply_uid'] = ?
	// $_SESSION['compose']['forward_uid'] = ?
	$_SESSION['compose']['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>';
	}
	$_SESSION['compose']['references'] = $MESSAGE->headers->references;
	}
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
	{
	$_SESSION['compose']['forward_uid'] = $msg_uid;
	}
	}

	/**** compose mode functions ******/


	function rcmail_compose_headers($attrib)
	{
	global $IMAP, $MESSAGE, $DB, $compose_mode;
	static $sa_recipients = array();

	list($form_start, $form_end) = get_form_tags($attrib);

	$out = '';
	$part = strtolower($attrib['part']);

	switch ($part)
	{
	case 'from':
	return rcmail_compose_header_from($attrib);

	case 'to':
	$fname = '_to';
	$header = 'to';

	// we have a set of recipients stored is session
	if (($mailto_id = $_SESSION['compose']['param']['_mailto']) && $_SESSION['mailto'][$mailto_id])
	$fvalue = urldecode($_SESSION['mailto'][$mailto_id]);

	case 'cc':
	if (!$fname)
	{
	$fname = '_cc';
	$header = 'cc';
	}
	case 'bcc':
	if (!$fname)
	{
	$fname = '_bcc';
	$header = 'bcc';
	}

	$allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex');
	$field_type = 'html_textarea';
	break;

	case 'replyto':
	case 'reply-to':
	$fname = '_replyto';
	$allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
	$field_type = 'html_inputfield';
	break;
	}

	if ($fname && !empty($_POST[$fname]))
	$fvalue = get_input_value($fname, RCUBE_INPUT_POST, TRUE);
	else if ($fname && !$fvalue && !empty($_SESSION['compose']['param'][$fname]))
	$fvalue = $_SESSION['compose']['param'][$fname];

	else if ($header && $compose_mode == RCUBE_COMPOSE_REPLY)
	{
	// get recipent address(es) out of the message headers
	if ($header=='to' && !empty($MESSAGE->headers->replyto))
	$fvalue = $MESSAGE->headers->replyto;

	else if ($header=='to' && !empty($MESSAGE->headers->from))
	$fvalue = $MESSAGE->headers->from;

	// add recipent of original message if reply to all
	else if ($header=='cc' && !empty($MESSAGE->reply_all))
	{
	if ($v = $MESSAGE->headers->to)
	$fvalue .= $v;

	if ($v = $MESSAGE->headers->cc)
	$fvalue .= (!empty($fvalue) ? ', ' : '') . $v;
	}

	// split recipients and put them back together in a unique way
	if (!empty($fvalue))
	{
	$to_addresses = $IMAP->decode_address_list($fvalue);
	$fvalue = '';

	foreach ($to_addresses as $addr_part)
	{
	if (!empty($addr_part['mailto'])
	&& !in_array($addr_part['mailto'], $sa_recipients)
	&& (!$MESSAGE->compose_from
	\|\| !in_array_nocase($addr_part['mailto'], $MESSAGE->compose_from)
	\|\| (count($to_addresses)==1 && $header=='to'))) // allow reply to yourself
	{
	$fvalue .= (strlen($fvalue) ? ', ':'').$addr_part['string'];
	$sa_recipients[] = $addr_part['mailto'];
	}
	}
	}
	}
	else if ($header && $compose_mode == RCUBE_COMPOSE_DRAFT)
	{
	// get drafted headers
	if ($header=='to' && !empty($MESSAGE->headers->to))
	$fvalue = $MESSAGE->get_header('to');

	if ($header=='cc' && !empty($MESSAGE->headers->cc))
	$fvalue = $MESSAGE->get_header('cc');

	if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
	$fvalue = $MESSAGE->get_header('bcc');
	}


	if ($fname && $field_type)
	{
	// pass the following attributes to the form class
	$field_attrib = array('name' => $fname, 'spellcheck' => 'false');
	foreach ($attrib as $attr => $value)
	if (in_array($attr, $allow_attrib))
	$field_attrib[$attr] = $value;

	// create teaxtarea object
	$input = new $field_type($field_attrib);
	$out = $input->show($fvalue);
	}

	if ($form_start)
	$out = $form_start.$out;

	return $out;
	}



	function rcmail_compose_header_from($attrib)
	{
	global $IMAP, $MESSAGE, $DB, $USER, $OUTPUT, $compose_mode;

	// pass the following attributes to the form class
	$field_attrib = array('name' => '_from');
	foreach ($attrib as $attr => $value)
	if (in_array($attr, array('id', 'class', 'style', 'size', 'tabindex')))
	$field_attrib[$attr] = $value;

	// extract all recipients of the reply-message
	$a_recipients = array();
	if ($compose_mode == RCUBE_COMPOSE_REPLY && is_object($MESSAGE->headers))
	{
	$MESSAGE->compose_from = array();

	$a_to = $IMAP->decode_address_list($MESSAGE->headers->to);
	foreach ($a_to as $addr)
	{
	if (!empty($addr['mailto']))
	$a_recipients[] = rc_strtolower($addr['mailto']);
	}

	if (!empty($MESSAGE->headers->cc))
	{
	$a_cc = $IMAP->decode_address_list($MESSAGE->headers->cc);
	foreach ($a_cc as $addr)
	{
	if (!empty($addr['mailto']))
	$a_recipients[] = rc_strtolower($addr['mailto']);
	}
	}
	}

	// get this user's identities
	$sql_result = $USER->list_identities();

	if ($DB->num_rows($sql_result))
	{
	$from_id = 0;
	$a_signatures = array();

	$field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)";
	$select_from = new html_select($field_attrib);

	while ($sql_arr = $DB->fetch_assoc($sql_result))
	{
	$identity_id = $sql_arr['identity_id'];
	$select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $identity_id);

	// add signature to array
	if (!empty($sql_arr['signature']))
	{
	$a_signatures[$identity_id]['text'] = $sql_arr['signature'];
	$a_signatures[$identity_id]['is_html'] = ($sql_arr['html_signature'] == 1) ? true : false;
	if ($a_signatures[$identity_id]['is_html'])
	{
	$h2t = new html2text($a_signatures[$identity_id]['text'], false, false);
	$a_signatures[$identity_id]['plain_text'] = trim($h2t->get_text());
	}
	}

	if ($compose_mode == RCUBE_COMPOSE_REPLY && is_array($MESSAGE->compose_from))
	$MESSAGE->compose_from[] = $sql_arr['email'];

	if (empty($_POST['_from']))
	{
	// set draft's identity
	if ($compose_mode == RCUBE_COMPOSE_DRAFT && strstr($MESSAGE->headers->from, $sql_arr['email']))
	$from_id = $sql_arr['identity_id'];
	// set identity if it's one of the reply-message recipients (with prio for default identity)
	else if (in_array(rc_strtolower($sql_arr['email']), $a_recipients) && (empty($from_id) \|\| $sql_arr['standard']))
	$from_id = $sql_arr['identity_id'];
	}
	}

	// overwrite identity selection with post parameter
	if (!empty($_POST['_from']))
	$from_id = get_input_value('_from', RCUBE_INPUT_POST);

	$out = $select_from->show($from_id);

	// add signatures to client
	$OUTPUT->set_env('signatures', $a_signatures);
	}
	else
	{
	$input_from = new html_inputfield($field_attrib);
	$out = $input_from->show($_POST['_from']);
	}

	if ($form_start)
	$out = $form_start.$out;

	return $out;
	}


	function rcmail_compose_body($attrib)
	{
	global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	if (empty($attrib['id']))
	$attrib['id'] = 'rcmComposeMessage';

	$attrib['name'] = '_message';

	if ($CONFIG['htmleditor'])
	$isHtml = true;
	else
	$isHtml = false;

	$body = '';

	// use posted message body
	if (!empty($_POST['_message']))
	{
	$body = get_input_value('_message', RCUBE_INPUT_POST, true);
	}
	else if ($compose_mode)
	{
	if ($isHtml && $MESSAGE->has_html_part())
	{
	$body = $MESSAGE->first_html_part();
	$isHtml = true;
	}
	else
	{
	$body = $MESSAGE->first_text_part();
	$isHtml = false;
	}

	// compose reply-body
	if ($compose_mode == RCUBE_COMPOSE_REPLY)
	$body = rcmail_create_reply_body($body, $isHtml);
	// forward message body inline
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
	$body = rcmail_create_forward_body($body, $isHtml);
	// load draft message body
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
	$body = rcmail_create_draft_body($body, $isHtml);
	}
	else if (!empty($_SESSION['compose']['param']['_body']))
	{
	$body = $_SESSION['compose']['param']['_body'];
	}

	$out = $form_start ? "$form_start\n" : '';

	$saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE->headers->messageID) : ''));
	$out .= $saveid->show();

	$drafttoggle = new html_hiddenfield(array('name' => '_draft', 'value' => 'yes'));
	$out .= $drafttoggle->show();

	$msgtype = new html_hiddenfield(array('name' => '_is_html', 'value' => ($isHtml?"1":"0")));
	$out .= $msgtype->show();

	// If desired, set this textarea to be editable by TinyMCE
	if ($isHtml) $attrib['class'] = 'mce_editor';
	$textarea = new html_textarea($attrib);
	$out .= $textarea->show($body);
	$out .= $form_end ? "\n$form_end" : '';

	// include HTML editor
	rcube_html_editor();

	// include GoogieSpell
	if (!empty($CONFIG['enable_spellcheck'])) {

	$lang = strtolower(substr($_SESSION['language'], 0, 2));

	$spellcheck_langs = (array)$RCMAIL->config->get('spellcheck_languages', array('da'=>'Dansk', 'de'=>'Deutsch', 'en' => 'English', 'es'=>'Español', 'fr'=>'Français', 'it'=>'Italiano', 'nl'=>'Nederlands', 'pl'=>'Polski', 'pt'=>'Português', 'fi'=>'Suomi', 'sv'=>'Svenska'));
	if (!$spellcheck_langs[$lang])
	$lang = 'en';

	$editor_lang_set = array();
	foreach ($spellcheck_langs as $key => $name) {
	$editor_lang_set[] = ($key == $lang ? '+' : '') . JQ($name).'='.JQ($key);
	}

	$OUTPUT->include_script('googiespell.js');
	$OUTPUT->add_script(sprintf(
	"var googie = new GoogieSpell('\$__skin_path/images/googiespell/','%s&_action=spell&lang=');\n".
	"googie.lang_chck_spell = \"%s\";\n".
	"googie.lang_rsm_edt = \"%s\";\n".
	"googie.lang_close = \"%s\";\n".
	"googie.lang_revert = \"%s\";\n".
	"googie.lang_no_error_found = \"%s\";\n".
	"googie.setLanguages(%s);\n".
	"googie.setCurrentLanguage('%s');\n".
	"googie.decorateTextarea('%s');\n".
	"%s.set_env('spellcheck', googie);",
	$RCMAIL->comm_path,
	JQ(Q(rcube_label('checkspelling'))),
	JQ(Q(rcube_label('resumeediting'))),
	JQ(Q(rcube_label('close'))),
	JQ(Q(rcube_label('revertto'))),
	JQ(Q(rcube_label('nospellerrors'))),
	json_serialize($spellcheck_langs),
	$lang,
	$attrib['id'],
	JS_OBJECT_NAME), 'foot');

	$OUTPUT->add_label('checking');
	$OUTPUT->set_env('spellcheck_langs', join(',', $editor_lang_set));
	}

	$out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;border:none;visibility:hidden;"></iframe>';

	return $out;
	}


	function rcmail_create_reply_body($body, $bodyIsHtml)
	{
	global $IMAP, $MESSAGE, $OUTPUT;

	if (! $bodyIsHtml)
	{
	// try to remove the signature
	if (($sp = strrpos($body, '-- ')) !== false && ($sp == 0 \|\| $body{$sp-1} == "\n"))
	{
	if ($body{$sp+3}==' ' \|\| $body{$sp+3}=="\n" \|\| $body{$sp+3}=="\r")
	$body = substr($body, 0, max(0, $sp-1));
	}

	// soft-wrap message first
	$body = rcmail_wrap_quoted($body, 75);

	$body = rtrim($body, "\r\n");

	if ($body) {
	// split body into single lines
	$a_lines = preg_split('/\r?\n/', $body);

	// add > to each line
	for($n=0; $n<sizeof($a_lines); $n++) {
	if (strpos($a_lines[$n], '>')===0)
	$a_lines[$n] = '>'.$a_lines[$n];
	else
	$a_lines[$n] = '> '.$a_lines[$n];
	}

	$body = join("\n", $a_lines);
	}

	// add title line(s)
	$prefix = rc_wordwrap(sprintf("On %s, %s wrote:\n",
	$MESSAGE->headers->date,
	$MESSAGE->get_header('from')), 76);

	$suffix = '';
	}
	else
	{
	// save inline images to files
	$cid_map = rcmail_write_inline_attachments($MESSAGE);
	// set is_safe flag (we need this for html body washing)
	rcmail_check_safe($MESSAGE);
	// clean up html tags
	$body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map);

	// build reply (quote content)
	$prefix = sprintf("On %s, %s wrote:<br />\n",
	$MESSAGE->headers->date,
	htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset()));
	$prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">';
	$suffix = "</blockquote><p></p>";
	}

	return $prefix.$body.$suffix;
	}


	function rcmail_create_forward_body($body, $bodyIsHtml)
	{
	global $IMAP, $MESSAGE, $OUTPUT;

	// add attachments
	if (!isset($_SESSION['compose']['forward_attachments']) && is_array($MESSAGE->mime_parts))
	$cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);

	if (!$bodyIsHtml)
	{
	$prefix = "\n\n\n-------- Original Message --------\n";
	$prefix .= 'Subject: ' . $MESSAGE->subject . "\n";
	$prefix .= 'Date: ' . $MESSAGE->headers->date . "\n";
	$prefix .= 'From: ' . $MESSAGE->get_header('from') . "\n";
	$prefix .= 'To: ' . $MESSAGE->get_header('to') . "\n";
	if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
	$prefix .= 'Reply-To: ' . $MESSAGE->get_header('replyto') . "\n";
	$prefix .= "\n";
	}
	else
	{
	// set is_safe flag (we need this for html body washing)
	rcmail_check_safe($MESSAGE);
	// clean up html tags
	$body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map);

	$prefix = sprintf(
	"<br><br>-------- Original Message --------" .
	"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Subject: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Date: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">From: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">To: </th><td>%s</td></tr>",
	Q($MESSAGE->subject),
	Q($MESSAGE->headers->date),
	htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset(), true),
	htmlspecialchars(Q($MESSAGE->get_header('to'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset(), true));

	if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Reply-To: </th><td>%s</td></tr>",
	htmlspecialchars(Q($MESSAGE->get_header('replyto'), 'replace'), ENT_COMPAT, $OUTPUT->get_charset(), true));

	$prefix .= "</tbody></table><br>";
	}

	return $prefix.$body;
	}


	function rcmail_create_draft_body($body, $bodyIsHtml)
	{
	global $MESSAGE, $OUTPUT;

	/**
	* add attachments
	* sizeof($MESSAGE->mime_parts can be 1 - e.g. attachment, but no text!
	*/
	if (!isset($_SESSION['compose']['forward_attachments'])
	&& is_array($MESSAGE->mime_parts)
	&& count($MESSAGE->mime_parts) > 0)
	{
	$cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);

	// replace cid with href in inline images links
	if ($cid_map)
	$body = str_replace(array_keys($cid_map), array_values($cid_map), $body);
	}

	return $body;
	}


	function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
	{
	global $OUTPUT;

	$cid_map = array();
	- $id = 0;
	-
	foreach ((array)$message->mime_parts as $pid => $part)
	{
	if (($part->ctype_primary != 'message' \|\| !$bodyIsHtml) &&
	($part->disposition=='attachment' \|\| $part->disposition=='inline' \|\| $part->headers['content-id']
	\|\| (empty($part->disposition) && $part->filename)))
	{
	if ($attachment = rcmail_save_attachment($message, $pid)) {
	- $_SESSION['compose']['attachments'][$id] = $attachment;
	- if ($bodyIsHtml && $part->filename && $part->content_id) {
	- $cid_map['cid:'.$part->content_id] =
	- $OUTPUT->app->comm_path.'&_action=display-attachment&_file=rcmfile'.$id;
	+ $_SESSION['compose']['attachments'][$attachment['id']] = $attachment;
	+ if ($bodyIsHtml && $part->filename && $part->content_id) {
	+ $cid_map['cid:'.$part->content_id] = $OUTPUT->app->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'];
	}
	- $id++;
	}
	}
	}
	-
	+
	$_SESSION['compose']['forward_attachments'] = true;

	return $cid_map;
	}


	function rcmail_write_inline_attachments(&$message)
	{
	global $OUTPUT;

	$cid_map = array();
	- $id = 0;
	-
	foreach ((array)$message->mime_parts as $pid => $part) {
	if ($part->content_id && $part->filename) {
	if ($attachment = rcmail_save_attachment($message, $pid)) {
	- $_SESSION['compose']['attachments'][$id] = $attachment;
	- $cid_map['cid:'.$part->content_id] =
	- $OUTPUT->app->comm_path.'&_action=display-attachment&_file=rcmfile'.$id;
	- $id++;
	+ $_SESSION['compose']['attachments'][$attachment['id']] = $attachment;
	+ $cid_map['cid:'.$part->content_id] = $OUTPUT->app->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id'];
	}
	}
	}

	return $cid_map;
	}

	function rcmail_save_attachment(&$message, $pid)
	{
	- global $RCMAIL;
	-
	- $temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
	- $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
	$part = $message->mime_parts[$pid];

	- if ($fp = fopen($tmp_path, 'w'))
	- {
	- $message->get_part_content($pid, $fp);
	- fclose($fp);
	-
	- return array(
	- 'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
	- 'name' => $part->filename,
	- 'path' => $tmp_path,
	- 'content_id' => $part->content_id
	- );
	+ $attachment = array(
	+ 'name' => $part->filename,
	+ 'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
	+ 'content_id' => $part->content_id,
	+ 'data' => $message->get_part_content($pid),
	+ );
	+
	+ $attachment = rcmail::get_instance()->plugins->exec_hook('save_attachment', $attachment);
	+ if ($attachment['status']) {
	+ unset($attachment['data'], $attachment['status']);
	+ return $attachment;
	}
	+
	+ return false;
	}


	function rcmail_compose_subject($attrib)
	{
	global $MESSAGE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_subject';
	$attrib['spellcheck'] = 'true';
	$textfield = new html_inputfield($attrib);

	$subject = '';

	// use subject from post
	if (isset($_POST['_subject'])) {
	$subject = get_input_value('_subject', RCUBE_INPUT_POST, TRUE);
	}
	// create a reply-subject
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	if (eregi('^re:', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Re: '.$MESSAGE->subject;
	}
	// create a forward-subject
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
	if (eregi('^fwd:', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Fwd: '.$MESSAGE->subject;
	}
	// creeate a draft-subject
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT) {
	$subject = $MESSAGE->subject;
	}
	else if (!empty($_SESSION['compose']['param']['_subject'])) {
	$subject = $_SESSION['compose']['param']['_subject'];
	}

	$out = $form_start ? "$form_start\n" : '';
	$out .= $textfield->show($subject);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_compose_attachment_list($attrib)
	{
	global $OUTPUT, $CONFIG;

	// add ID if not given
	if (!$attrib['id'])
	$attrib['id'] = 'rcmAttachmentList';

	$out = "\n";

	if (is_array($_SESSION['compose']['attachments']))
	{
	if ($attrib['deleteicon'])
	$button = html::img(array(
	'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
	'alt' => rcube_label('delete'),
	'style' => "padding-right:2px;vertical-align:middle"));
	else
	$button = Q(rcube_label('delete'));

	foreach ($_SESSION['compose']['attachments'] as $id => $a_prop)
	{
	if (empty($a_prop))
	continue;

	$out .= html::tag('li', array('id' => "rcmfile".$id),
	html::a(array(
	'href' => "#delete",
	'title' => rcube_label('delete'),
	- 'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%d', this)", JS_OBJECT_NAME, $id)),
	+ 'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id)),
	$button) . Q($a_prop['name']));
	}
	}

	$OUTPUT->add_gui_object('attachmentlist', $attrib['id']);

	return html::tag('ul', $attrib, $out, html::$common_attrib);
	}


	function rcmail_compose_attachment_form($attrib)
	{
	global $OUTPUT;

	// add ID if not given
	if (!$attrib['id'])
	$attrib['id'] = 'rcmUploadbox';

	$button = new html_inputfield(array('type' => 'button', 'class' => 'button'));

	$out = html::div($attrib,
	$OUTPUT->form_tag(array('name' => 'form', 'method' => 'post', 'enctype' => 'multipart/form-data'),
	html::div(null, rcmail_compose_attachment_field(array())) .
	html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize'))))))) .
	html::div('buttons',
	$button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) . ' ' .
	$button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
	)
	)
	);

	$OUTPUT->add_gui_object('uploadbox', $attrib['id']);
	return $out;
	}


	function rcmail_compose_attachment_field($attrib)
	{
	$attrib['type'] = 'file';
	$attrib['name'] = '_attachments[]';
	$field = new html_inputfield($attrib);
	return $field->show();
	}


	function rcmail_priority_selector($attrib)
	{
	global $MESSAGE;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	$attrib['name'] = '_priority';
	$selector = new html_select($attrib);

	$selector->add(array(rcube_label('lowest'),
	rcube_label('low'),
	rcube_label('normal'),
	rcube_label('high'),
	rcube_label('highest')),
	array(5, 4, 0, 2, 1));

	$sel = isset($_POST['_priority']) ? $_POST['_priority'] : intval($MESSAGE->headers->priority);

	$out = $form_start ? "$form_start\n" : '';
	$out .= $selector->show($sel);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_receipt_checkbox($attrib)
	{
	global $MESSAGE, $compose_mode;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	if (!isset($attrib['id']))
	$attrib['id'] = 'receipt';

	$attrib['name'] = '_receipt';
	$attrib['value'] = '1';
	$checkbox = new html_checkbox($attrib);

	$out = $form_start ? "$form_start\n" : '';
	$out .= $checkbox->show(
	$compose_mode == RCUBE_COMPOSE_DRAFT && $MESSAGE->headers->mdn_to ? 1 : 0);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_editor_selector($attrib)
	{
	global $CONFIG, $MESSAGE, $compose_mode;

	$choices = array(
	'html' => 'htmltoggle',
	'plain' => 'plaintoggle'
	);

	// determine whether HTML or plain text should be checked
	$useHtml = $CONFIG['htmleditor'] ? true : false;

	if ($compose_mode)
	$useHtml = ($useHtml && $MESSAGE->has_html_part());

	$editorid = empty($attrib['editorid']) ? 'rcmComposeMessage' : $attrib['editorid'];

	$selector = '';
	$chosenvalue = $useHtml ? 'html' : 'plain';
	$radio = new html_radiobutton(array('name' => '_editorSelect',
	'onclick' => "return rcmail_toggle_editor(this.value=='html', '$editorid', '_is_html')"));

	foreach ($choices as $value => $text)
	{
	$attrib['id'] = '_' . $value;
	$attrib['value'] = $value;
	$selector .= $radio->show($chosenvalue, $attrib) . html::label($attrib['id'], Q(rcube_label($text)));
	}

	return $selector;
	}


	function rcmail_store_target_selection($attrib)
	{
	$attrib['name'] = '_store_target';
	$select = rcmail_mailbox_select(array_merge($attrib, array('noselection' => '- '.rcube_label('dontsave').' -')));
	return $select->show(rcmail::get_instance()->config->get('sent_mbox'), $attrib);
	}


	function get_form_tags($attrib)
	{
	global $RCMAIL, $MESSAGE_FORM;

	$form_start = '';
	if (!strlen($MESSAGE_FORM))
	{
	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
	$hiddenfields->add(array('name' => '_action', 'value' => 'send'));

	$form_start = empty($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
	$form_start .= $hiddenfields->show();
	}

	$form_end = (strlen($MESSAGE_FORM) && !strlen($attrib['form'])) ? '</form>' : '';
	$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';

	if (!strlen($MESSAGE_FORM))
	$RCMAIL->output->add_gui_object('messageform', $form_name);

	$MESSAGE_FORM = $form_name;

	return array($form_start, $form_end);
	}


	// register UI objects
	$OUTPUT->add_handlers(array(
	'composeheaders' => 'rcmail_compose_headers',
	'composesubject' => 'rcmail_compose_subject',
	'composebody' => 'rcmail_compose_body',
	'composeattachmentlist' => 'rcmail_compose_attachment_list',
	'composeattachmentform' => 'rcmail_compose_attachment_form',
	'composeattachment' => 'rcmail_compose_attachment_field',
	'priorityselector' => 'rcmail_priority_selector',
	'editorselector' => 'rcmail_editor_selector',
	'receiptcheckbox' => 'rcmail_receipt_checkbox',
	'storetarget' => 'rcmail_store_target_selection',
	));

	$OUTPUT->send('compose');

	?>
	diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
	index 8931cfa4e..28ae70ca3 100644
	--- a/program/steps/mail/func.inc
	+++ b/program/steps/mail/func.inc
	@@ -1,1462 +1,1470 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/func.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Provide webmail functionality and GUI objects \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	require_once('include/rcube_smtp.inc');

	$EMAIL_ADDRESS_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]@[a-z0-9]([a-z0-9\-][.]?)[a-z0-9]\\.[a-z]{2,5})';

	// actions that do not require imap connection
	$NOIMAP_ACTIONS = array('spell', 'addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment');


	// log in to imap server
	if (!in_array($RCMAIL->action, $NOIMAP_ACTIONS) && !$RCMAIL->imap_connect()) {
	$RCMAIL->kill_session();

	if ($OUTPUT->ajax_call)
	$OUTPUT->redirect(array(), 2000);

	$OUTPUT->set_env('task', 'login');
	$OUTPUT->send('login');
	}


	// set imap properties and session vars
	if ($mbox = get_input_value('_mbox', RCUBE_INPUT_GPC))
	$IMAP->set_mailbox(($_SESSION['mbox'] = $mbox));
	else
	$_SESSION['mbox'] = $IMAP->get_mailbox_name();

	if (!empty($_GET['_page']))
	$IMAP->set_page(($_SESSION['page'] = intval($_GET['_page'])));

	// set default sort col/order to session
	if (!isset($_SESSION['sort_col']))
	$_SESSION['sort_col'] = $CONFIG['message_sort_col'];
	if (!isset($_SESSION['sort_order']))
	$_SESSION['sort_order'] = $CONFIG['message_sort_order'];

	// set message set for search result
	if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
	{
	$IMAP->set_search_set($_SESSION['search'][$_REQUEST['_search']]);
	$OUTPUT->set_env('search_request', $_REQUEST['_search']);
	$OUTPUT->set_env('search_text', $_SESSION['last_text_search']);
	}

	// set main env variables, labels and page title
	if (empty($RCMAIL->action) \|\| $RCMAIL->action == 'list')
	{
	$mbox_name = $IMAP->get_mailbox_name();

	if (empty($RCMAIL->action))
	{
	// initialize searching result if search_filter is used
	if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL')
	{
	$search_request = md5($mbox_name.$_SESSION['search_filter']);

	$IMAP->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $_SESSION['sort_col']);
	$_SESSION['search'][$search_request] = $IMAP->get_search_set();
	$OUTPUT->set_env('search_request', $search_request);
	}

	// make sure the message count is refreshed (for default view)
	$IMAP->messagecount($mbox_name, 'ALL', true);
	}

	// set current mailbox in client environment
	$OUTPUT->set_env('mailbox', $mbox_name);
	$OUTPUT->set_env('quota', $IMAP->get_capability('quota'));
	$OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter());

	if ($CONFIG['trash_mbox'])
	$OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
	if ($CONFIG['drafts_mbox'])
	$OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
	if ($CONFIG['junk_mbox'])
	$OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']);

	if (!$OUTPUT->ajax_call)
	$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');

	$OUTPUT->set_pagetitle(rcmail_localize_foldername($mbox_name));
	}


	/**
	* return the message list as HTML table
	*/
	function rcmail_message_list($attrib)
	{
	global $IMAP, $CONFIG, $COMM_PATH, $OUTPUT;

	$skin_path = $CONFIG['skin_path'];
	$image_tag = '<img src="%s%s" alt="%s" />';

	// check to see if we have some settings for sorting
	$sort_col = $_SESSION['sort_col'];
	$sort_order = $_SESSION['sort_order'];

	// add some labels to client
	$OUTPUT->add_label('from', 'to');

	// get message headers
	$a_headers = $IMAP->list_headers('', '', $sort_col, $sort_order);

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcubemessagelist';

	// allow the following attributes to be added to the <table> tag
	$attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));

	$out = '<table' . $attrib_str . ">\n";

	// define list of cols to be displayed based on parameter or config
	if (empty($attrib['columns']))
	$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
	else
	$a_show_cols = preg_split('/[\s,;]+/', strip_quotes($attrib['columns']));

	// store column list in a session-variable
	$_SESSION['list_columns'] = $a_show_cols;

	// define sortable columns
	$a_sort_cols = array('subject', 'date', 'from', 'to', 'size');

	$mbox = $IMAP->get_mailbox_name();

	// show 'to' instead of from in sent messages
	if (($mbox==$CONFIG['sent_mbox'] \|\| $mbox==$CONFIG['drafts_mbox']) && ($f = array_search('from', $a_show_cols))
	&& !array_search('to', $a_show_cols))
	$a_show_cols[$f] = 'to';

	// add col definition
	$out .= '<colgroup>';
	$out .= '<col class="icon" />';

	foreach ($a_show_cols as $col)
	$out .= ($col!='attachment') ? sprintf('<col class="%s" />', $col) : '<col class="icon" />';

	$out .= "</colgroup>\n";

	// add table title
	$out .= "<thead><tr>\n<td class=\"icon\"> </td>\n";

	$javascript = '';
	foreach ($a_show_cols as $col)
	{
	// get column name
	switch ($col)
	{
	case 'flag':
	$col_name = sprintf($image_tag, $skin_path, $attrib['unflaggedicon'], '');
	break;
	case 'attachment':
	$col_name = sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '');
	break;
	default:
	$col_name = Q(rcube_label($col));
	}

	// make sort links
	$sort = '';
	if (in_array($col, $a_sort_cols))
	{
	// have buttons configured
	if (!empty($attrib['sortdescbutton']) \|\| !empty($attrib['sortascbutton']))
	{
	$sort = '  ';

	// asc link
	if (!empty($attrib['sortascbutton']))
	{
	$sort .= $OUTPUT->button(array(
	'command' => 'sort',
	'prop' => $col.'_ASC',
	'image' => $attrib['sortascbutton'],
	'align' => 'absmiddle',
	'title' => 'sortasc'));
	}

	// desc link
	if (!empty($attrib['sortdescbutton']))
	{
	$sort .= $OUTPUT->button(array(
	'command' => 'sort',
	'prop' => $col.'_DESC',
	'image' => $attrib['sortdescbutton'],
	'align' => 'absmiddle',
	'title' => 'sortdesc'));
	}
	}
	// just add a link tag to the header
	else
	{
	$col_name = sprintf(
	'<a href="./#sort" onclick="return %s.command(\'sort\',\'%s\',this)" title="%s">%s</a>',
	JS_OBJECT_NAME,
	$col,
	rcube_label('sortby'),
	$col_name);
	}
	}

	$sort_class = $col==$sort_col ? " sorted$sort_order" : '';

	// put it all together
	if ($col!='attachment')
	$out .= '<td class="'.$col.$sort_class.'" id="rcm'.$col.'">' . "$col_name$sort</td>\n";
	else
	$out .= '<td class="icon" id="rcm'.$col.'">' . "$col_name$sort</td>\n";
	}

	$out .= "</tr></thead>\n<tbody>\n";

	// no messages in this mailbox
	if (!sizeof($a_headers))
	$OUTPUT->show_message('nomessagesfound', 'notice');


	$a_js_message_arr = array();

	// create row for each message
	foreach ($a_headers as $i => $header) //while (list($i, $header) = each($a_headers))
	{
	$message_icon = $attach_icon = $flagged_icon = '';
	$js_row_arr = array();
	$zebra_class = $i%2 ? ' even' : ' odd';

	// set messag attributes to javascript array
	if ($header->deleted)
	$js_row_arr['deleted'] = true;
	if (!$header->seen)
	$js_row_arr['unread'] = true;
	if ($header->answered)
	$js_row_arr['replied'] = true;
	if ($header->forwarded)
	$js_row_arr['forwarded'] = true;
	if ($header->flagged)
	$js_row_arr['flagged'] = true;

	// set message icon
	if ($attrib['deletedicon'] && $header->deleted)
	$message_icon = $attrib['deletedicon'];
	else if ($attrib['repliedicon'] && $header->answered)
	{
	if ($attrib['forwardedrepliedicon'] && $header->forwarded)
	$message_icon = $attrib['forwardedrepliedicon'];
	else
	$message_icon = $attrib['repliedicon'];
	}
	else if ($attrib['forwardedicon'] && $header->forwarded)
	$message_icon = $attrib['forwardedicon'];
	else if ($attrib['unreadicon'] && !$header->seen)
	$message_icon = $attrib['unreadicon'];
	else if ($attrib['messageicon'])
	$message_icon = $attrib['messageicon'];

	if ($attrib['flaggedicon'] && $header->flagged)
	$flagged_icon = $attrib['flaggedicon'];
	else if ($attrib['unflaggedicon'] && !$header->flagged)
	$flagged_icon = $attrib['unflaggedicon'];

	// set attachment icon
	if ($attrib['attachmenticon'] && preg_match("/multipart\/m/i", $header->ctype))
	$attach_icon = $attrib['attachmenticon'];

	$out .= sprintf('<tr id="rcmrow%d" class="message%s%s%s%s">'."\n",
	$header->uid,
	$header->seen ? '' : ' unread',
	$header->deleted ? ' deleted' : '',
	$header->flagged ? ' flagged' : '',
	$zebra_class);

	$out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : '');


	$IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']);

	// format each col
	foreach ($a_show_cols as $col)
	{
	if ($col=='from' \|\| $col=='to')
	$cont = Q(rcmail_address_string($header->$col, 3, false, $attrib['addicon']), 'show');
	else if ($col=='subject')
	{
	$action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
	$uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draft_uid' : '_uid';
	$cont = abbreviate_string(trim($IMAP->decode_header($header->$col)), 160);
	if (empty($cont)) $cont = rcube_label('nosubject');
	$cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), Q($cont));
	}
	else if ($col=='flag')
	$cont = $flagged_icon ? sprintf($image_tag, $skin_path, $flagged_icon, '') : '';
	else if ($col=='size')
	$cont = show_bytes($header->$col);
	else if ($col=='date')
	$cont = format_date($header->date);
	else
	$cont = Q($header->$col);

	if ($col!='attachment')
	$out .= '<td class="'.$col.'">' . $cont . "</td>\n";
	else
	$out .= sprintf("<td class=\"icon\">%s</td>\n", $attach_icon ? sprintf($image_tag, $skin_path, $attach_icon, '') : ' ');
	}

	$out .= "</tr>\n";

	if (sizeof($js_row_arr))
	$a_js_message_arr[$header->uid] = $js_row_arr;
	}

	// complete message table
	$out .= "</tbody></table>\n";

	$message_count = $IMAP->messagecount();

	// set client env
	$OUTPUT->add_gui_object('mailcontframe', 'mailcontframe');
	$OUTPUT->add_gui_object('messagelist', $attrib['id']);
	$OUTPUT->set_env('messagecount', $message_count);
	$OUTPUT->set_env('current_page', $IMAP->list_page);
	$OUTPUT->set_env('pagecount', ceil($message_count/$IMAP->page_size));
	$OUTPUT->set_env('sort_col', $sort_col);
	$OUTPUT->set_env('sort_order', $sort_order);

	if ($attrib['messageicon'])
	$OUTPUT->set_env('messageicon', $skin_path . $attrib['messageicon']);
	if ($attrib['deletedicon'])
	$OUTPUT->set_env('deletedicon', $skin_path . $attrib['deletedicon']);
	if ($attrib['unreadicon'])
	$OUTPUT->set_env('unreadicon', $skin_path . $attrib['unreadicon']);
	if ($attrib['repliedicon'])
	$OUTPUT->set_env('repliedicon', $skin_path . $attrib['repliedicon']);
	if ($attrib['forwardedicon'])
	$OUTPUT->set_env('forwardedicon', $skin_path . $attrib['forwardedicon']);
	if ($attrib['forwardedrepliedicon'])
	$OUTPUT->set_env('forwardedrepliedicon', $skin_path . $attrib['forwardedrepliedicon']);
	if ($attrib['attachmenticon'])
	$OUTPUT->set_env('attachmenticon', $skin_path . $attrib['attachmenticon']);
	if ($attrib['flaggedicon'])
	$OUTPUT->set_env('flaggedicon', $skin_path . $attrib['flaggedicon']);
	if ($attrib['unflaggedicon'])
	$OUTPUT->set_env('unflaggedicon', $skin_path . $attrib['unflaggedicon']);

	$OUTPUT->set_env('messages', $a_js_message_arr);
	$OUTPUT->set_env('coltypes', $a_show_cols);

	$OUTPUT->include_script('list.js');

	return $out;
	}


	/**
	* return javascript commands to add rows to the message list
	*/
	function rcmail_js_message_list($a_headers, $insert_top=FALSE)
	{
	global $CONFIG, $IMAP, $OUTPUT;

	if (empty($_SESSION['list_columns']))
	$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
	else
	$a_show_cols = $_SESSION['list_columns'];

	$mbox = $IMAP->get_mailbox_name();

	// show 'to' instead of from in sent messages
	if (($mbox == $CONFIG['sent_mbox'] \|\| $mbox == $CONFIG['drafts_mbox'])
	&& (($f = array_search('from', $a_show_cols)) !== false) && array_search('to', $a_show_cols) === false)
	$a_show_cols[$f] = 'to';

	$OUTPUT->command('set_message_coltypes', $a_show_cols);

	// loop through message headers
	foreach ($a_headers as $n => $header)
	{
	$a_msg_cols = array();
	$a_msg_flags = array();

	if (empty($header))
	continue;

	$IMAP->set_charset(!empty($header->charset) ? $header->charset : $CONFIG['default_charset']);

	// remove 'attachment' and 'flag' columns, we don't need them here
	if(($key = array_search('attachment', $a_show_cols)) !== FALSE)
	unset($a_show_cols[$key]);
	if(($key = array_search('flag', $a_show_cols)) !== FALSE)
	unset($a_show_cols[$key]);

	// format each col; similar as in rcmail_message_list()
	foreach ($a_show_cols as $col)
	{
	if ($col=='from' \|\| $col=='to')
	$cont = Q(rcmail_address_string($header->$col, 3), 'show');
	else if ($col=='subject')
	{
	$action = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
	$uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draft_uid' : '_uid';
	$cont = abbreviate_string(trim($IMAP->decode_header($header->$col)), 160);
	if (!$cont) $cont = rcube_label('nosubject');
	$cont = sprintf('<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>', Q(rcmail_url($action, array($uid_param=>$header->uid, '_mbox'=>$mbox))), Q($cont));
	}
	else if ($col=='size')
	$cont = show_bytes($header->$col);
	else if ($col=='date')
	$cont = format_date($header->date);
	else
	$cont = Q($header->$col);

	$a_msg_cols[$col] = $cont;
	}

	$a_msg_flags['deleted'] = $header->deleted ? 1 : 0;
	$a_msg_flags['unread'] = $header->seen ? 0 : 1;
	$a_msg_flags['replied'] = $header->answered ? 1 : 0;
	$a_msg_flags['forwarded'] = $header->forwarded ? 1 : 0;
	$a_msg_flags['flagged'] = $header->flagged ? 1 : 0;

	$OUTPUT->command('add_message_row',
	$header->uid,
	$a_msg_cols,
	$a_msg_flags,
	preg_match("/multipart\/m/i", $header->ctype),
	$insert_top);
	}
	}


	/**
	* return an HTML iframe for loading mail content
	*/
	function rcmail_messagecontent_frame($attrib)
	{
	global $OUTPUT;

	if (empty($attrib['id']))
	$attrib['id'] = 'rcmailcontentwindow';

	$attrib['name'] = $attrib['id'];

	$OUTPUT->set_env('contentframe', $attrib['id']);
	$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');

	return html::iframe($attrib);
	}


	/**
	*
	*/
	function rcmail_messagecount_display($attrib)
	{
	global $IMAP, $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmcountdisplay';

	$OUTPUT->add_gui_object('countdisplay', $attrib['id']);

	return html::span($attrib, rcmail_get_messagecount_text());
	}


	/**
	*
	*/
	function rcmail_quota_display($attrib)
	{
	global $OUTPUT, $COMM_PATH;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmquotadisplay';

	if(isset($attrib['display']))
	$_SESSION['quota_display'] = $attrib['display'];

	$OUTPUT->add_gui_object('quotadisplay', $attrib['id']);

	return html::span($attrib, rcmail_quota_content(NULL, $attrib));
	}


	/**
	*
	*/
	function rcmail_quota_content($quota=NULL, $attrib=NULL)
	{
	global $IMAP, $COMM_PATH, $RCMAIL;

	$display = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';

	if (is_array($quota) && !empty($quota['used']) && !empty($quota['total']))
	{
	if (!isset($quota['percent']))
	$quota['percent'] = $quota['used'] / $quota['total'];
	}
	elseif (!$IMAP->get_capability('QUOTA'))
	return rcube_label('unknown');
	else
	$quota = $IMAP->get_quota();

	if ($quota && !($quota['total']==0 && $RCMAIL->config->get('quota_zero_as_unlimited')))
	{
	$quota_text = sprintf('%s / %s (%.0f%%)',
	show_bytes($quota['used'] * 1024),
	show_bytes($quota['total'] * 1024),
	$quota['percent']);

	// show quota as image (by Brett Patterson)
	if ($display == 'image' && function_exists('imagegif'))
	{
	if (!$attrib['width'])
	$attrib['width'] = isset($_SESSION['quota_width']) ? $_SESSION['quota_width'] : 100;
	else
	$_SESSION['quota_width'] = $attrib['width'];

	if (!$attrib['height'])
	$attrib['height'] = isset($_SESSION['quota_height']) ? $_SESSION['quota_height'] : 14;
	else
	$_SESSION['quota_height'] = $attrib['height'];

	$quota_text = sprintf('<img src="./bin/quotaimg.php?u=%s&q=%d&w=%d&h=%d" width="%d" height="%d" alt="%s" title="%s / %s" />',
	$quota['used'], $quota['total'],
	$attrib['width'], $attrib['height'],
	$attrib['width'], $attrib['height'],
	$quota_text,
	show_bytes($quota['used'] * 1024),
	show_bytes($quota['total'] * 1024));
	}
	}
	else
	$quota_text = rcube_label('unlimited');

	return $quota_text;
	}


	/**
	*
	*/
	function rcmail_get_messagecount_text($count=NULL, $page=NULL)
	{
	global $IMAP, $MESSAGE;

	if (isset($MESSAGE->index))
	{
	return rcube_label(array('name' => 'messagenrof',
	'vars' => array('nr' => $MESSAGE->index+1,
	'count' => $count!==NULL ? $count : $IMAP->messagecount())));
	}

	if ($page===NULL)
	$page = $IMAP->list_page;

	$start_msg = ($page-1) * $IMAP->page_size + 1;
	$max = $count!==NULL ? $count : $IMAP->messagecount();

	if ($max==0)
	$out = rcube_label('mailboxempty');
	else
	$out = rcube_label(array('name' => 'messagesfromto',
	'vars' => array('from' => $start_msg,
	'to' => min($max, $start_msg + $IMAP->page_size - 1),
	'count' => $max)));

	return Q($out);
	}

	/**
	*
	*/
	function rcmail_mailbox_name_display($attrib)
	{
	global $RCMAIL;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmmailboxname';

	$RCMAIL->output->add_gui_object('mailboxname', $attrib['id']);

	return html::span($attrib, rcmail_get_mailbox_name_text());
	}

	function rcmail_get_mailbox_name_text()
	{
	global $RCMAIL;
	return rcmail_localize_foldername($RCMAIL->imap->get_mailbox_name());
	}

	/**
	* Sets message is_safe flag according to 'show_images' option value
	*
	* @param object rcube_message Message
	*/
	function rcmail_check_safe(&$message)
	{
	global $RCMAIL;

	$show_images = $RCMAIL->config->get('show_images');
	if (!$message->is_safe
	&& !empty($show_images)
	&& $message->has_html_part())
	{
	switch($show_images) {
	case '1': // known senders only
	$CONTACTS = new rcube_contacts($RCMAIL->db, $_SESSION['user_id']);
	if ($CONTACTS->search('email', $message->sender['mailto'], true, false)->count) {
	$message->set_safe(true);
	}
	break;
	case '2': // always
	$message->set_safe(true);
	break;
	}
	}
	}

	/**
	* Cleans up the given message HTML Body (for displaying)
	*
	* @param string HTML
	* @param array Display parameters
	* @param array CID map replaces (inline images)
	* @return string Clean HTML
	*/
	function rcmail_wash_html($html, $p = array(), $cid_replaces)
	{
	global $REMOTE_OBJECTS;

	$p += array('safe' => false, 'inline_html' => true);

	// special replacements (not properly handled by washtml class)
	$html_search = array(
	'/(<\/nobr>)(\s+)(<nobr>)/i', // space(s) between <NOBR>
	'/(<[\/]*st1:[^>]+>)/i', // Microsoft's Smart Tags <ST1>
	'/<\/?rte_text>/i', // Rich Text Editor tags (#1485647)
	'/<title>.*<\/title>/i', // PHP bug #32547 workaround: remove title tag
	'/<html[^>]*>/im', // malformed html: remove html tags (#1485139)
	'/<\/html>/i', // malformed html: remove html tags (#1485139)
	'/^(\0\0\xFE\xFF\|\xFF\xFE\0\0\|\xFE\xFF\|\xFF\xFE\|\xEF\xBB\xBF)/', // byte-order mark (only outlook?)
	);
	$html_replace = array(
	'\\1'.'   '.'\\3',
	'',
	'',
	'',
	'',
	'',
	'',
	);
	$html = preg_replace($html_search, $html_replace, $html);

	// charset was converted to UTF-8 in rcube_imap::get_message_part() -> change charset specification in HTML accordingly
	$charset_pattern = '/(\s+content=[\'"]?\w+\/\w+;\s*charset)=([a-z0-9-_]+)/i';
	if (preg_match($charset_pattern, $html)) {
	$html = preg_replace($charset_pattern, '\\1='.RCMAIL_CHARSET, $html);
	}
	else {
	// add head for malformed messages, washtml cannot work without that
	if (!preg_match('/<head[^>]>(.)<\/head>/Uims', $html))
	$html = '<head></head>'. $html;
	$html = substr_replace($html, '<meta http-equiv="content-type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '<head>')+6), 0);
	}

	// turn relative into absolute urls
	$html = rcmail_resolve_base($html);

	// clean HTML with washhtml by Frederic Motte
	$wash_opts = array(
	'show_washed' => false,
	'allow_remote' => $p['safe'],
	'blocked_src' => "./program/blocked.gif",
	'charset' => RCMAIL_CHARSET,
	'cid_map' => $cid_replaces,
	'html_elements' => array('body'),
	);

	if (!$p['inline_html']) {
	$wash_opts['html_elements'] = array('html','head','title','body');
	}
	if ($p['safe']) {
	$wash_opts['html_elements'][] = 'link';
	$wash_opts['html_attribs'] = array('rel','type');
	}

	$washer = new washtml($wash_opts);
	$washer->add_callback('form', 'rcmail_washtml_callback');

	if ($p['safe']) { // allow CSS styles, will be sanitized by rcmail_washtml_callback()
	$washer->add_callback('style', 'rcmail_washtml_callback');
	}

	$html = $washer->wash($html);
	$REMOTE_OBJECTS = $washer->extlinks;

	return $html;
	}


	/**
	* Convert the given message part to proper HTML
	* which can be displayed the message view
	*
	* @param object rcube_message_part Message part
	* @param array Display parameters array
	* @return string Formatted HTML string
	*/
	function rcmail_print_body($part, $p = array())
	{
	- $p += array('safe' => false, 'plain' => false, 'inline_html' => true);
	+ global $RCMAIL;
	+
	+ // trigger plugin hook
	+ $data = $RCMAIL->plugins->exec_hook('message_part_before',
	+ array('type' => $part->ctype_secondary, 'body' => $part->body) + $p + array('safe' => false, 'plain' => false, 'inline_html' => true));

	// convert html to text/plain
	- if ($part->ctype_secondary == 'html' && $p['plain']) {
	- $txt = new html2text($part->body, false, true);
	+ if ($data['type'] == 'html' && $data['plain']) {
	+ $txt = new html2text($data['body'], false, true);
	$body = $txt->get_text();
	$part->ctype_secondary = 'plain';
	}
	// text/html
	- else if ($part->ctype_secondary == 'html') {
	- return rcmail_wash_html($part->body, $p, $part->replaces);
	+ else if ($data['type'] == 'html') {
	+ $body = rcmail_wash_html($data['body'], $data, $part->replaces);
	+ $part->ctype_secondary = $data['type'];
	}
	// text/enriched
	- else if ($part->ctype_secondary=='enriched') {
	+ else if ($data['type'] == 'enriched') {
	$part->ctype_secondary = 'html';
	require_once('lib/enriched.inc');
	- return Q(enriched_to_html($part->body), 'show');
	+ $body = Q(enriched_to_html($data['body']), 'show');
	}
	- else
	+ else {
	+ // assert plaintext
	$body = $part->body;
	+ $part->ctype_secondary = $data['type'] = 'plain';
	+ }
	+
	+ // free some memory (hopefully)
	+ unset($data['body']);


	- /** assert plaintext **/
	-
	- // make links and email-addresses clickable
	- $replacements = new rcube_string_replacer;
	-
	- $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:;';
	- $url_chars_within = '\?\.~,!';
	-
	- // search for patterns like links and e-mail addresses
	- $body = preg_replace_callback("/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/i", array($replacements, 'link_callback'), $body);
	- $body = preg_replace_callback("/([^\/:]\|\s)(www\.)([a-z0-9\-]{2,}[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/i", array($replacements, 'link_callback'), $body);
	- $body = preg_replace_callback('/([a-z0-9][a-z0-9\-\.\+\_]@[a-z0-9]([a-z0-9\-][.]?)[a-z0-9]\\.[a-z]{2,5})/i', array($replacements, 'mailto_callback'), $body);
	-
	- // split body into single lines
	- $a_lines = preg_split('/\r?\n/', $body);
	- $quote_level = 0;
	-
	- // colorize quoted parts
	- for ($n=0; $n < sizeof($a_lines); $n++) {
	- $line = $a_lines[$n];
	- $quotation = '';
	- $q = 0;
	+ // plaintext postprocessing
	+ if ($part->ctype_secondary == 'plain') {
	+ // make links and email-addresses clickable
	+ $replacements = new rcube_string_replacer;
	+
	+ $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:;';
	+ $url_chars_within = '\?\.~,!';
	+
	+ // search for patterns like links and e-mail addresses
	+ $body = preg_replace_callback("/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/i", array($replacements, 'link_callback'), $body);
	+ $body = preg_replace_callback("/([^\/:]\|\s)(www\.)([a-z0-9\-]{2,}[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/i", array($replacements, 'link_callback'), $body);
	+ $body = preg_replace_callback('/([a-z0-9][a-z0-9\-\.\+\_]@[a-z0-9]([a-z0-9\-][.]?)[a-z0-9]\\.[a-z]{2,5})/i', array($replacements, 'mailto_callback'), $body);
	+
	+ // split body into single lines
	+ $a_lines = preg_split('/\r?\n/', $body);
	+ $quote_level = 0;
	+
	+ // colorize quoted parts
	+ for ($n=0; $n < count($a_lines); $n++) {
	+ $line = $a_lines[$n];
	+ $quotation = '';
	+ $q = 0;

	- if (preg_match('/^(>+\s*)+/', $line, $regs)) {
	- $q = strlen(preg_replace('/\s/', '', $regs[0]));
	- $line = substr($line, strlen($regs[0]));
	-
	- if ($q > $quote_level)
	- $quotation = str_repeat('<blockquote>', $q - $quote_level);
	- else if ($q < $quote_level)
	- $quotation = str_repeat("</blockquote>", $quote_level - $q);
	+ if (preg_match('/^(>+\s*)+/', $line, $regs)) {
	+ $q = strlen(preg_replace('/\s/', '', $regs[0]));
	+ $line = substr($line, strlen($regs[0]));
	+
	+ if ($q > $quote_level)
	+ $quotation = str_repeat('<blockquote>', $q - $quote_level);
	+ else if ($q < $quote_level)
	+ $quotation = str_repeat("</blockquote>", $quote_level - $q);
	+ }
	+ else if ($quote_level > 0)
	+ $quotation = str_repeat("</blockquote>", $quote_level);
	+
	+ $quote_level = $q;
	+ $a_lines[$n] = $quotation . Q($line, 'replace', false); // htmlquote plaintext
	}
	- else if ($quote_level > 0)
	- $quotation = str_repeat("</blockquote>", $quote_level);

	- $quote_level = $q;
	- $a_lines[$n] = $quotation . Q($line, 'replace', false); // htmlquote plaintext
	+ // insert the links for urls and mailtos
	+ $body = $replacements->resolve(join("\n", $a_lines));
	}
	+
	+ // allow post-processing of the message body
	+ $data = $RCMAIL->plugins->exec_hook('message_part_after', array('type' => $part->ctype_secondary, 'body' => $body) + $data);

	- // insert the links for urls and mailtos
	- $body = $replacements->resolve(join("\n", $a_lines));
	-
	- return html::tag('pre', array(), $body);
	+ return $data['type'] == 'html' ? $data['body'] : html::tag('pre', array(), $data['body']);
	}


	/**
	* add a string to the replacement array and return a replacement string
	*/
	function rcmail_str_replacement($str, &$rep)
	{
	static $count = 0;
	$rep[$count] = stripslashes($str);
	return "##string_replacement{".($count++)."}##";
	}


	/**
	* Callback function for washtml cleaning class
	*/
	function rcmail_washtml_callback($tagname, $attrib, $content)
	{
	switch ($tagname) {
	case 'form':
	$out = html::div('form', $content);
	break;

	case 'style':
	// decode all escaped entities and reduce to ascii strings
	$stripped = preg_replace('/[^a-zA-Z\(:]/', '', rcmail_xss_entitiy_decode($content));

	// now check for evil strings like expression, behavior or url()
	if (!preg_match('/expression\|behavior\|url\(\|import/', $stripped)) {
	$out = html::tag('style', array('type' => 'text/css'), $content);
	break;
	}

	default:
	$out = '';
	}

	return $out;
	}


	/**
	* return table with message headers
	*/
	function rcmail_message_headers($attrib, $headers=NULL)
	{
	- global $IMAP, $OUTPUT, $MESSAGE, $PRINT_MODE, $CONFIG;
	+ global $IMAP, $OUTPUT, $MESSAGE, $PRINT_MODE, $RCMAIL;
	static $sa_attrib;

	// keep header table attrib
	if (is_array($attrib) && !$sa_attrib)
	$sa_attrib = $attrib;
	else if (!is_array($attrib) && is_array($sa_attrib))
	$attrib = $sa_attrib;

	-
	if (!isset($MESSAGE))
	return FALSE;

	// get associative array of headers object
	if (!$headers)
	$headers = is_object($MESSAGE->headers) ? get_object_vars($MESSAGE->headers) : $MESSAGE->headers;

	- $header_count = 0;
	-
	- // allow the following attributes to be added to the <table> tag
	- $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
	- $out = '<table' . $attrib_str . ">\n";
	-
	// show these headers
	$standard_headers = array('subject', 'from', 'to', 'cc', 'bcc', 'replyto', 'date');
	+ $output_headers = array();

	- foreach ($standard_headers as $hkey)
	- {
	+ foreach ($standard_headers as $hkey) {
	if (!$headers[$hkey])
	continue;

	- if ($hkey == 'date')
	- {
	+ if ($hkey == 'date') {
	if ($PRINT_MODE)
	- $header_value = format_date($headers[$hkey], $CONFIG['date_long'] ? $CONFIG['date_long'] : 'x');
	+ $header_value = format_date($headers[$hkey], $RCMAIL->config->get('date_long', 'x'));
	else
	$header_value = format_date($headers[$hkey]);
	- }
	- else if ($hkey == 'replyto')
	- {
	+ }
	+ else if ($hkey == 'replyto') {
	if ($headers['replyto'] != $headers['from'])
	- $header_value = Q(rcmail_address_string($headers['replyto'], null, true, $attrib['addicon']), 'show');
	+ $header_value = rcmail_address_string($headers['replyto'], null, true, $attrib['addicon']);
	else
	continue;
	- }
	+ }
	else if (in_array($hkey, array('from', 'to', 'cc', 'bcc')))
	- $header_value = Q(rcmail_address_string($headers[$hkey], null, true, $attrib['addicon']), 'show');
	+ $header_value = rcmail_address_string($headers[$hkey], null, true, $attrib['addicon']);
	else if ($hkey == 'subject' && empty($headers[$hkey]))
	- $header_value = Q(rcube_label('nosubject'));
	+ $header_value = rcube_label('nosubject');
	else
	- $header_value = Q(trim($IMAP->decode_header($headers[$hkey])));
	-
	- $out .= "\n<tr>\n";
	- $out .= '<td class="header-title">'.Q(rcube_label($hkey)).": </td>\n";
	- $out .= '<td class="'.$hkey.'" width="90%">'.$header_value."</td>\n</tr>";
	- $header_count++;
	- }
	+ $header_value = trim($IMAP->decode_header($headers[$hkey]));
	+
	+ $output_headers[$hkey] = array('title' => rcube_label($hkey), 'value' => $header_value, 'raw' => $headers[$hkey]);
	+ }
	+
	+ $plugin = $RCMAIL->plugins->exec_hook('message_headers_output', array('output' => $output_headers, 'headers' => $MESSAGE->headers));
	+
	+ // compose html table
	+ $table = new html_table(array('cols' => 2));
	+
	+ foreach ($plugin['output'] as $hkey => $row) {
	+ $table->add(array('class' => 'header-title'), Q($row['title']));
	+ $table->add(array('class' => $hkey, 'width' => "90%"), Q($row['value'], ($hkey == 'subject' ? 'strict' : 'show')));
	+ }

	// all headers division
	- $out .= "\n".'<tr><td colspan="2" class="more-headers show-headers"
	- onclick="return '.JS_OBJECT_NAME.'.command(\'load-headers\', \'\', this)"></td></tr>';
	- $out .= "\n".'<tr id="all-headers"><td colspan="2" class="all"><div id="headers-source"></div></td></tr>';
	-
	+ $table->add(array('colspan' => 2, 'class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('load-headers','',this)"), '');
	+ $table->add_row(array('id' => "all-headers"));
	+ $table->add(array('colspan' => 2, 'class' => "all"), html::div(array('id' => 'headers-source'), ''));
	+
	$OUTPUT->add_gui_object('all_headers_row', 'all-headers');
	$OUTPUT->add_gui_object('all_headers_box', 'headers-source');

	- $out .= "\n</table>\n\n";
	-
	- return $header_count ? $out : '';
	+ return $table->show($attrib);
	}


	/**
	* Handler for the 'messagebody' GUI object
	*
	* @param array Named parameters
	* @return string HTML content showing the message body
	*/
	function rcmail_message_body($attrib)
	{
	global $CONFIG, $OUTPUT, $MESSAGE, $IMAP, $REMOTE_OBJECTS;

	if (!is_array($MESSAGE->parts) && empty($MESSAGE->body))
	return '';

	if (!$attrib['id'])
	$attrib['id'] = 'rcmailMsgBody';

	$safe_mode = $MESSAGE->is_safe \|\| intval($_GET['_safe']);
	$out = '';

	$header_attrib = array();
	foreach ($attrib as $attr => $value)
	if (preg_match('/^headertable([a-z]+)$/i', $attr, $regs))
	$header_attrib[$regs[1]] = $value;

	if (!empty($MESSAGE->parts))
	{
	foreach ($MESSAGE->parts as $i => $part)
	{
	if ($part->type == 'headers')
	$out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part->headers);
	else if ($part->type == 'content')
	{
	if (empty($part->ctype_parameters) \|\| empty($part->ctype_parameters['charset']))
	$part->ctype_parameters['charset'] = $MESSAGE->headers->charset;

	// fetch part if not available
	if (!isset($part->body))
	$part->body = $MESSAGE->get_part_content($part->mime_id);

	$body = rcmail_print_body($part, array('safe' => $safe_mode, 'plain' => !$CONFIG['prefer_html']));

	if ($part->ctype_secondary == 'html')
	$out .= html::div('message-htmlpart', rcmail_html4inline($body, $attrib['id']));
	else
	$out .= html::div('message-part', $body);
	}
	}
	}
	else
	$out .= html::div('message-part', html::tag('pre', array(), Q($MESSAGE->body)));


	$ctype_primary = strtolower($MESSAGE->structure->ctype_primary);
	$ctype_secondary = strtolower($MESSAGE->structure->ctype_secondary);

	// list images after mail body
	if ($CONFIG['inline_images']
	&& $ctype_primary == 'multipart'
	&& !empty($MESSAGE->attachments)
	&& !strstr($message_body, '<html'))
	{
	foreach ($MESSAGE->attachments as $attach_prop) {
	if (strpos($attach_prop->mimetype, 'image/') === 0) {
	$out .= html::tag('hr') . html::p(array('align' => "center"),
	html::img(array(
	'src' => $MESSAGE->get_part_url($attach_prop->mime_id),
	'title' => $attach_prop->filename,
	'alt' => $attach_prop->filename,
	)));
	}
	}
	}

	// tell client that there are blocked remote objects
	if ($REMOTE_OBJECTS && !$safe_mode)
	$OUTPUT->set_env('blockedobjects', true);

	return html::div($attrib, $out);
	}


	/**
	* Convert all relative URLs according to a <base> in HTML
	*/
	function rcmail_resolve_base($body)
	{
	// check for <base href=...>
	if (preg_match('!(<base.*href=["\']?)([hftps]{3,5}://[a-z0-9/.%-]+)!i', $body, $regs)) {
	$replacer = new rcube_base_replacer($regs[2]);

	// replace all relative paths
	$body = preg_replace_callback('/(src\|background\|href)=(["\']?)([\.\/]+[^"\'\s]+)(\2\|\s\|>)/Ui', array($replacer, 'callback'), $body);
	$body = preg_replace_callback('/(url\s*$)(["\']?)([\.\/]+[^"\'$\s]+)(\2)\)/Ui', array($replacer, 'callback'), $body);
	}

	return $body;
	}

	/**
	* modify a HTML message that it can be displayed inside a HTML page
	*/
	function rcmail_html4inline($body, $container_id)
	{
	$last_style_pos = 0;
	$body_lc = strtolower($body);

	// find STYLE tags
	while (($pos = strpos($body_lc, '<style', $last_style_pos)) && ($pos2 = strpos($body_lc, '</style>', $pos)))
	{
	$pos = strpos($body_lc, '>', $pos)+1;

	// replace all css definitions with #container [def]
	$styles = rcmail_mod_css_styles(substr($body, $pos, $pos2-$pos), $container_id);

	$body = substr($body, 0, $pos) . $styles . substr($body, $pos2);
	$body_lc = strtolower($body);
	$last_style_pos = $pos2;
	}

	// modify HTML links to open a new window if clicked
	$GLOBALS['rcmail_html_container_id'] = $container_id;
	$body = preg_replace_callback('/<(a\|link)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body);
	unset($GLOBALS['rcmail_html_container_id']);

	// add comments arround html and other tags
	$out = preg_replace(array(
	'/(<!DOCTYPE[^>]*>)/i',
	'/(<\?xml[^>]*>)/i',
	'/(<\/?html[^>]*>)/i',
	'/(<\/?head[^>]*>)/i',
	'/(<title[^>]>.<\/title>)/Ui',
	'/(<\/?meta[^>]*>)/i'),
	'<!--\\1-->',
	$body);

	$out = preg_replace(
	array('/<body([^>]*)>/i', '/<\/body>/i'),
	array('<div class="rcmBody"\\1>', '</div>'),
	$out);

	// quote <? of php and xml files that are specified as text/html
	$out = preg_replace(array('/<\?/', '/\?>/'), array('<?', '?>'), $out);

	return $out;
	}


	/**
	* parse link attributes and set correct target
	*/
	function rcmail_alter_html_link($matches)
	{
	global $EMAIL_ADDRESS_PATTERN;

	$tag = $matches[1];
	$attrib = parse_attrib_string($matches[2]);
	$end = '>';

	if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
	$attrib['href'] = "./bin/modcss.php?u=" . urlencode($attrib['href']) . "&c=" . urlencode($GLOBALS['rcmail_html_container_id']);
	$end = ' />';
	}
	else if (preg_match("/^mailto:$EMAIL_ADDRESS_PATTERN/i", $attrib['href'], $mailto)) {
	$attrib['href'] = $mailto[0];
	$attrib['onclick'] = sprintf(
	"return %s.command('compose','%s',this)",
	JS_OBJECT_NAME,
	JQ($mailto[1]));
	}
	else if (!empty($attrib['href']) && $attrib['href'][0] != '#') {
	$attrib['target'] = '_blank';
	}

	return "<$tag" . html::attrib_string($attrib, array('href','name','target','onclick','id','class','style','title','rel','type','media')) . $end;
	}


	/**
	* decode address string and re-format it as HTML links
	*/
	function rcmail_address_string($input, $max=null, $linked=false, $addicon=null)
	{
	global $IMAP, $PRINT_MODE, $CONFIG, $OUTPUT, $EMAIL_ADDRESS_PATTERN;

	$a_parts = $IMAP->decode_address_list($input);

	if (!sizeof($a_parts))
	return $input;

	$c = count($a_parts);
	$j = 0;
	$out = '';

	foreach ($a_parts as $part) {
	$j++;
	if ($PRINT_MODE) {
	$out .= sprintf('%s <%s>', Q($part['name']), $part['mailto']);
	}
	else if (preg_match("/$EMAIL_ADDRESS_PATTERN/i", $part['mailto'])) {
	if ($linked) {
	$out .= html::a(array(
	'href' => 'mailto:'.$part['mailto'],
	'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($part['mailto'])),
	'title' => $part['mailto'],
	'class' => "rcmContactAddress",
	),
	Q($part['name']));
	}
	else {
	$out .= html::span(array('title' => $part['mailto'], 'class' => "rcmContactAddress"), Q($part['name']));
	}

	if ($addicon) {
	$out .= ' ' . html::a(array(
	'href' => "#add",
	'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($part['string'])),
	'title' => rcube_label('addtoaddressbook'),
	),
	html::img(array(
	'src' => $CONFIG['skin_path'] . $addicon,
	'alt' => "Add contact",
	)));
	}
	}
	else {
	if ($part['name'])
	$out .= Q($part['name']);
	if ($part['mailto'])
	$out .= (strlen($out) ? ' ' : '') . sprintf('<%s>', Q($part['mailto']));
	}

	if ($c>$j)
	$out .= ','.($max ? ' ' : ' ');

	if ($max && $j==$max && $c>$j) {
	$out .= '...';
	break;
	}
	}

	return $out;
	}


	/**
	* Wrap text to a given number of characters per line
	* but respect the mail quotation of replies messages (>)
	*
	* @param string Text to wrap
	* @param int The line width
	* @return string The wrapped text
	*/
	function rcmail_wrap_quoted($text, $max = 76)
	{
	// Rebuild the message body with a maximum of $max chars, while keeping quoted message.
	$lines = preg_split('/\r?\n/', trim($text));
	$out = '';

	foreach ($lines as $line) {
	if (strlen($line) > $max) {
	if (preg_match('/^([>\s]+)/', $line, $regs)) {
	$length = strlen($regs[0]);
	$prefix = substr($line, 0, $length);

	// Remove '> ' from the line, then wordwrap() the line
	$line = rc_wordwrap(substr($line, $length), $max - $length);

	// Rebuild the line with '> ' at the beginning of each 'subline'
	$newline = '';
	foreach (explode("\n", $line) as $l) {
	$newline .= $prefix . $l . "\n";
	}

	// Remove the righest newline char
	$line = rtrim($newline);
	}
	else {
	$line = rc_wordwrap($line, $max);
	}
	}

	// Append the line
	$out .= $line . "\n";
	}

	return $out;
	}


	function rcmail_message_part_controls()
	{
	global $MESSAGE;

	$part = asciiwords(get_input_value('_part', RCUBE_INPUT_GPC));
	if (!is_object($MESSAGE) \|\| !is_array($MESSAGE->parts) \|\| !($_GET['_uid'] && $_GET['_part']) \|\| !$MESSAGE->mime_parts[$part])
	return '';

	$part = $MESSAGE->mime_parts[$part];
	$table = new html_table(array('cols' => 3));

	if (!empty($part->filename)) {
	$table->add('title', Q(rcube_label('filename')));
	$table->add(null, Q($part->filename));
	$table->add(null, '[' . html::a('?'.str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']), Q(rcube_label('download'))) . ']');
	}

	if (!empty($part->size)) {
	$table->add('title', Q(rcube_label('filesize')));
	$table->add(null, Q(show_bytes($part->size)));
	}

	return $table->show($attrib);
	}



	function rcmail_message_part_frame($attrib)
	{
	global $MESSAGE;

	$part = $MESSAGE->mime_parts[asciiwords(get_input_value('_part', RCUBE_INPUT_GPC))];
	$ctype_primary = strtolower($part->ctype_primary);

	$attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']);

	return html::iframe($attrib);
	}


	/**
	* clear message composing settings
	*/
	function rcmail_compose_cleanup()
	{
	if (!isset($_SESSION['compose']))
	return;

	- // remove attachment files from temp dir
	- if (is_array($_SESSION['compose']['attachments']))
	- foreach ($_SESSION['compose']['attachments'] as $attachment)
	- @unlink($attachment['path']);
	+ rcmail::get_instance()->plugins->exec_hook('cleanup_attachments',array());

	unset($_SESSION['compose']);
	}


	/**
	* Send the given message compose object using the configured method
	*/
	function rcmail_deliver_message(&$message, $from, $mailto)
	{
	global $CONFIG, $RCMAIL;

	$msg_body = $message->get();
	$headers = $message->headers();

	// send thru SMTP server using custom SMTP library
	if ($CONFIG['smtp_server'])
	{
	// generate list of recipients
	$a_recipients = array($mailto);

	if (strlen($headers['Cc']))
	$a_recipients[] = $headers['Cc'];
	if (strlen($headers['Bcc']))
	$a_recipients[] = $headers['Bcc'];

	// clean Bcc from header for recipients
	$send_headers = $headers;
	unset($send_headers['Bcc']);
	// here too, it because txtHeaders() below use $message->_headers not only $send_headers
	unset($message->_headers['Bcc']);

	// send message
	$smtp_response = array();
	$sent = smtp_mail($from, $a_recipients, ($foo = $message->txtHeaders($send_headers, true)), $msg_body, $smtp_response);

	// log error
	if (!$sent)
	raise_error(array('code' => 800, 'type' => 'smtp', 'line' => __LINE__, 'file' => __FILE__,
	'message' => "SMTP error: ".join("\n", $smtp_response)), TRUE, FALSE);
	}

	// send mail using PHP's mail() function
	else
	{
	// unset some headers because they will be added by the mail() function
	$headers_enc = $message->headers($headers);
	$headers_php = $message->_headers;
	unset($headers_php['To'], $headers_php['Subject']);

	// reset stored headers and overwrite
	$message->_headers = array();
	$header_str = $message->txtHeaders($headers_php);

	// #1485779
	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
	if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) {
	$headers_enc['To'] = implode(', ', $m[1]);
	}
	}

	if (ini_get('safe_mode'))
	$sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str);
	else
	$sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from");
	}

	if ($sent)
	{
	// remove MDN headers after sending
	unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);

	if ($CONFIG['smtp_log'])
	write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s",
	$RCMAIL->user->get_username(),
	$_SERVER['REMOTE_ADDR'],
	$mailto,
	!empty($smtp_response) ? join('; ', $smtp_response) : ''));
	}

	$message->_headers = array();
	$message->headers($headers);

	return $sent;
	}


	function rcmail_send_mdn($uid)
	{
	global $RCMAIL, $IMAP;

	$message = new rcube_message($uid);

	if ($message->headers->mdn_to && !$message->headers->mdn_sent &&
	($IMAP->check_permflag('MDNSENT') \|\| $IMAP->check_permflag('*')))
	{
	$identity = $RCMAIL->user->get_identity();
	$sender = format_email_recipient($identity['email'], $identity['name']);
	$recipient = array_shift($IMAP->decode_address_list($message->headers->mdn_to));
	$mailto = $recipient['mailto'];

	$compose = new rcube_mail_mime($RCMAIL->config->header_delimiter());
	$compose->setParam(array(
	'text_encoding' => 'quoted-printable',
	'html_encoding' => 'quoted-printable',
	'head_encoding' => 'quoted-printable',
	'head_charset' => RCMAIL_CHARSET,
	'html_charset' => RCMAIL_CHARSET,
	'text_charset' => RCMAIL_CHARSET,
	));

	// compose headers array
	$headers = array(
	'Date' => date('r'),
	'From' => $sender,
	'To' => $message->headers->mdn_to,
	'Subject' => rcube_label('receiptread') . ': ' . $message->subject,
	'Message-ID' => sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), $RCMAIL->config->mail_domain($_SESSION['imap_host'])),
	'X-Sender' => $identity['email'],
	'Content-Type' => 'multipart/report; report-type=disposition-notification',
	);

	if ($agent = $RCMAIL->config->get('useragent'))
	$headers['User-Agent'] = $agent;

	$body = rcube_label("yourmessage") . "\r\n\r\n" .
	"\t" . rcube_label("to") . ': ' . rcube_imap::decode_mime_string($message->headers->to, $message->headers->charset) . "\r\n" .
	"\t" . rcube_label("subject") . ': ' . $message->subject . "\r\n" .
	"\t" . rcube_label("sent") . ': ' . format_date($message->headers->date, $RCMAIL->config->get('date_long')) . "\r\n" .
	"\r\n" . rcube_label("receiptnote") . "\r\n";

	$ua = $RCMAIL->config->get('useragent', "RoundCube Webmail (Version ".RCMAIL_VERSION.")");
	$report = "Reporting-UA: $ua\r\n";

	if ($message->headers->to)
	$report .= "Original-Recipient: {$message->headers->to}\r\n";

	$report .= "Final-Recipient: rfc822; {$identity['email']}\r\n" .
	"Original-Message-ID: {$message->headers->messageID}\r\n" .
	"Disposition: manual-action/MDN-sent-manually; displayed\r\n";

	$compose->headers($headers);
	$compose->setTXTBody(rc_wordwrap($body, 75, "\r\n"));
	$compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline');

	$sent = rcmail_deliver_message($compose, $identity['email'], $mailto);

	if ($sent)
	{
	$IMAP->set_flag($message->uid, 'MDNSENT');
	return true;
	}
	}

	return false;
	}


	function rcmail_search_filter($attrib)
	{
	global $OUTPUT;

	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmlistfilter';

	$attrib['onchange'] = JS_OBJECT_NAME.'.filter_mailbox(this.value)';

	/*
	RFC3501 (6.4.4): 'ALL', 'RECENT',
	'ANSWERED', 'DELETED', 'FLAGGED', 'SEEN',
	'UNANSWERED', 'UNDELETED', 'UNFLAGGED', 'UNSEEN',
	'NEW', // = (RECENT UNSEEN)
	'OLD' // = NOT RECENT
	*/

	$select_filter = new html_select($attrib);
	$select_filter->add(rcube_label('all'), 'ALL');
	$select_filter->add(rcube_label('unread'), 'UNSEEN');
	$select_filter->add(rcube_label('flagged'), 'FLAGGED');
	$select_filter->add(rcube_label('unanswered'), 'UNANSWERED');

	$out = $select_filter->show($_SESSION['search_filter']);

	$OUTPUT->add_gui_object('search_filter', $attrib['id']);

	return $out;
	}

	// register UI objects
	$OUTPUT->add_handlers(array(
	'mailboxlist' => 'rcmail_mailbox_list',
	'messages' => 'rcmail_message_list',
	'messagecountdisplay' => 'rcmail_messagecount_display',
	'quotadisplay' => 'rcmail_quota_display',
	'mailboxname' => 'rcmail_mailbox_name_display',
	'messageheaders' => 'rcmail_message_headers',
	'messagebody' => 'rcmail_message_body',
	'messagecontentframe' => 'rcmail_messagecontent_frame',
	'messagepartframe' => 'rcmail_message_part_frame',
	'messagepartcontrols' => 'rcmail_message_part_controls',
	'searchfilter' => 'rcmail_search_filter',
	'searchform' => array($OUTPUT, 'search_form'),
	));

	?>
	diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
	index 9607619e9..34e2c0904 100644
	--- a/program/steps/mail/sendmail.inc
	+++ b/program/steps/mail/sendmail.inc
	@@ -1,515 +1,524 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/sendmail.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Compose a new mail message with all headers and attachments \|
	\| and send it using the PEAR::Net_SMTP class or with PHP mail() \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/


	// remove all scripts and act as called in frame
	$OUTPUT->reset();
	$OUTPUT->framed = TRUE;

	$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;

	/**** checks ******/

	if (!isset($_SESSION['compose']['id'])) {
	raise_error(array('code' => 500, 'type' => 'smtp', 'file' => __FILE__, 'message' => "Invalid compose ID"), true, false);
	console("Sendmail error", $_SESSION['compose']);
	$OUTPUT->show_message("An internal error occured. Please try again.", 'error');
	$OUTPUT->send('iframe');
	}

	if (!$savedraft) {
	if (empty($_POST['_to']) && empty($_POST['_cc']) && empty($_POST['_bcc'])
	&& empty($_POST['_subject']) && $_POST['_message']) {
	$OUTPUT->show_message('sendingfailed', 'error');
	$OUTPUT->send('iframe');
	}

	if(!empty($CONFIG['sendmail_delay'])) {
	$wait_sec = time() - intval($CONFIG['sendmail_delay']) - intval($CONFIG['last_message_time']);
	if($wait_sec < 0) {
	$OUTPUT->show_message('senttooquickly', 'error', array('sec' => $wait_sec * -1));
	$OUTPUT->send('iframe');
	}
	}
	}


	/**** message sending functions ******/

	// get identity record
	function rcmail_get_identity($id)
	{
	global $USER, $OUTPUT;

	if ($sql_arr = $USER->get_identity($id))
	{
	$out = $sql_arr;
	$out['mailto'] = $sql_arr['email'];

	// Special chars as defined by RFC 822 need to in quoted string (or escaped).
	if (preg_match('/[\<\>\\\.\[\]@,;:"]/', $sql_arr['name']))
	$name = '"' . addcslashes($sql_arr['name'], '"') . '"';
	else
	$name = $sql_arr['name'];

	$out['string'] = rcube_charset_convert($name, RCMAIL_CHARSET, $OUTPUT->get_charset());
	if ($sql_arr['email'])
	$out['string'] .= ' <' . $sql_arr['email'] . '>';

	return $out;
	}

	return FALSE;
	}

	/**
	* go from this:
	* <img src=".../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
	*
	* to this:
	*
	* <IMG src="cid:smiley-cool.gif"/>
	* ...
	* ------part...
	* Content-Type: image/gif
	* Content-Transfer-Encoding: base64
	* Content-ID: <smiley-cool.gif>
	*/
	function rcmail_attach_emoticons(&$mime_message)
	{
	global $CONFIG;

	$body = $mime_message->getHtmlBody();

	// remove any null-byte characters before parsing
	$body = preg_replace('/\x00/', '', $body);

	$searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
	$offset = 0;

	// keep track of added images, so they're only added once
	$included_images = array();

	if (preg_match_all('# src=[\'"]([^\'"]+)#', $body, $matches, PREG_OFFSET_CAPTURE)) {
	foreach ($matches[1] as $m) {
	// find emoticon image tags
	if (preg_match('#'.$searchstr.'(.*)$#', $m[0], $imatches)) {
	$image_name = $imatches[1];

	// sanitize image name so resulting attachment doesn't leave images dir
	$image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i', '', $image_name);
	$img_file = INSTALL_PATH . '/' . $searchstr . $image_name;

	if (! in_array($image_name, $included_images)) {
	// add the image to the MIME message
	if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name))
	$OUTPUT->show_message("emoticonerror", 'error');
	array_push($included_images, $image_name);
	}

	$body = substr_replace($body, $img_file, $m[1] + $offset, strlen($m[0]));
	$offset += strlen($img_file) - strlen($m[0]);
	}
	}
	}

	$mime_message->setHTMLBody($body);

	return $body;
	}

	// parse email address input
	function rcmail_mailto_format($mailto)
	{
	$regexp = array('/[,;]\s[\r\n]+/', '/[\r\n]+/', '/[,;]\s$/m', '/;/', '/(\S{1})(<\S+@\S+>)/U');
	$replace = array(', ', ', ', '', ',', '\\1 \\2');

	// replace new lines and strip ending ', ', make address input more valid
	$mailto = trim(preg_replace($regexp, $replace, $mailto));

	$result = array();
	$items = rcube_explode_quoted_string(',', $mailto);

	foreach($items as $item) {
	$item = trim($item);
	// address in brackets without name (do nothing)
	if (preg_match('/^<\S+@\S+>$/', $item)) {
	$result[] = $item;
	// address without brackets and without name (add brackets)
	} else if (preg_match('/^\S+@\S+$/', $item)) {
	$result[] = '<'.$item.'>';
	// address with name (handle name)
	} else if (preg_match('/\S+@\S+>*$/', $item, $matches)) {
	$address = $matches[0];
	$name = str_replace($address, '', $item);
	$name = trim($name);
	if ($name && ($name[0] != '"' \|\| $name[strlen($name)-1] != '"')
	&& preg_match('/[\<\>\\\.\[\]@,;:"]/', $name)) {
	$name = '"'.addcslashes($name, '"').'"';
	}
	if (!preg_match('/^<\S+@\S+>$/', $address))
	$address = '<'.$address.'>';

	$result[] = $name.' '.$address;
	} else if (trim($item)) {
	// @TODO: handle errors
	}
	}

	return implode(', ', $result);
	}

	/**** compose message ******/

	if (strlen($_POST['_draft_saveid']) > 3)
	$olddraftmessageid = get_input_value('_draft_saveid', RCUBE_INPUT_POST);

	$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), $RCMAIL->config->mail_domain($_SESSION['imap_host']));

	// set default charset
	$input_charset = $OUTPUT->get_charset();
	$message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $input_charset;

	$mailto = rcmail_mailto_format(get_input_value('_to', RCUBE_INPUT_POST, TRUE, $message_charset));
	$mailcc = rcmail_mailto_format(get_input_value('_cc', RCUBE_INPUT_POST, TRUE, $message_charset));
	$mailbcc = rcmail_mailto_format(get_input_value('_bcc', RCUBE_INPUT_POST, TRUE, $message_charset));

	if (empty($mailto) && !empty($mailcc)) {
	$mailto = $mailcc;
	$mailcc = null;
	}
	else if (empty($mailto))
	$mailto = 'undisclosed-recipients:;';

	// get sender name and address
	$from = get_input_value('_from', RCUBE_INPUT_POST);
	$identity_arr = rcmail_get_identity($from);

	if ($identity_arr)
	$from = $identity_arr['mailto'];

	if (empty($identity_arr['string']))
	$identity_arr['string'] = $from;

	// compose headers array
	$headers = array('Date' => date('r'),
	'From' => rcube_charset_convert($identity_arr['string'], RCMAIL_CHARSET, $message_charset),
	'To' => $mailto);

	// additional recipients
	if (!empty($mailcc))
	$headers['Cc'] = $mailcc;

	if (!empty($mailbcc))
	$headers['Bcc'] = $mailbcc;

	if (!empty($identity_arr['bcc']))
	$headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];

	// add subject
	$headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, FALSE, $message_charset));

	if (!empty($identity_arr['organization']))
	$headers['Organization'] = $identity_arr['organization'];

	if (!empty($_POST['_replyto']))
	$headers['Reply-To'] = rcmail_mailto_format(get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
	else if (!empty($identity_arr['reply-to']))
	$headers['Reply-To'] = $identity_arr['reply-to'];

	if (!empty($_SESSION['compose']['reply_msgid']))
	$headers['In-Reply-To'] = $_SESSION['compose']['reply_msgid'];

	if (!empty($_SESSION['compose']['references']))
	$headers['References'] = $_SESSION['compose']['references'];

	if (!empty($_POST['_priority']))
	{
	$priority = intval($_POST['_priority']);
	$a_priorities = array(1=>'highest', 2=>'high', 4=>'low', 5=>'lowest');
	if ($str_priority = $a_priorities[$priority])
	$headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($str_priority));
	}

	if (!empty($_POST['_receipt']))
	{
	$headers['Return-Receipt-To'] = $identity_arr['string'];
	$headers['Disposition-Notification-To'] = $identity_arr['string'];
	}

	// additional headers
	if ($CONFIG['http_received_header'])
	{
	$nldlm = $RCMAIL->config->header_delimiter() . "\t";
	$headers['Received'] = wordwrap('from ' . (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
	gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR'].']'.$nldlm.' via ' : '') .
	gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR'].']'.$nldlm.'with ' .
	$_SERVER['SERVER_PROTOCOL'].' ('.$_SERVER['REQUEST_METHOD'].'); ' . date('r'),
	69, $nldlm);
	}

	$headers['Message-ID'] = $message_id;
	$headers['X-Sender'] = $from;

	if (!empty($CONFIG['useragent']))
	$headers['User-Agent'] = $CONFIG['useragent'];

	$isHtmlVal = strtolower(get_input_value('_is_html', RCUBE_INPUT_POST));
	$isHtml = ($isHtmlVal == "1");

	// fetch message body
	$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);

	if (!$savedraft) {
	// remove signature's div ID
	if ($isHtml)
	$message_body = preg_replace('/\s*id="_rc_sig"/', '', $message_body);

	// generic footer for all messages
	if (!empty($CONFIG['generic_message_footer'])) {
	$footer = file_get_contents(realpath($CONFIG['generic_message_footer']));
	$footer = rcube_charset_convert($footer, 'UTF-8', $message_charset);
	}
	}

	// create extended PEAR::Mail_mime instance
	$MAIL_MIME = new rcube_mail_mime($RCMAIL->config->header_delimiter());

	// For HTML-formatted messages, construct the MIME message with both
	// the HTML part and the plain-text part

	-if ($isHtml)
	- {
	- $MAIL_MIME->setHTMLBody($message_body . ($footer ? "\r\n<pre>".$footer.'</pre>' : ''));
	+if ($isHtml) {
	+ $plugin = $RCMAIL->plugins->exec_hook('outgoing_message_body', array('body' => $message_body, 'type' => 'html', 'message' => $MAIL_MIME));
	+ $MAIL_MIME->setHTMLBody($plugin['body'] . ($footer ? "\r\n<pre>".$footer.'</pre>' : ''));

	// add a plain text version of the e-mail as an alternative part.
	- $h2t = new html2text($message_body, false, true, 0);
	- $plainTextPart = rc_wordwrap($h2t->get_text(), 75, "\r\n"). ($footer ? "\r\n".$footer : '');
	+ $h2t = new html2text($plugin['body'], false, true, 0);
	+ $plainTextPart = rc_wordwrap($h2t->get_text(), 75, "\r\n") . ($footer ? "\r\n".$footer : '');
	$plainTextPart = wordwrap($plainTextPart, 998, "\r\n", true);
	- if (!strlen($plainTextPart))
	- {
	+ if (!strlen($plainTextPart)) {
	// empty message body breaks attachment handling in drafts
	$plainTextPart = "\r\n";
	- }
	- $MAIL_MIME->setTXTBody($plainTextPart);
	+ }
	+ $plugin = $RCMAIL->plugins->exec_hook('outgoing_message_body', array('body' => $plainTextPart, 'type' => 'alternative', 'message' => $MAIL_MIME));
	+ $MAIL_MIME->setTXTBody($plugin['body']);

	// look for "emoticon" images from TinyMCE and copy into message as attachments
	$message_body = rcmail_attach_emoticons($MAIL_MIME);
	- }
	+}
	else
	{
	$message_body = rc_wordwrap($message_body, 75, "\r\n");
	if ($footer)
	$message_body .= "\r\n" . $footer;
	$message_body = wordwrap($message_body, 998, "\r\n", true);
	- if (!strlen($message_body))
	- {
	+ if (!strlen($message_body)) {
	// empty message body breaks attachment handling in drafts
	$message_body = "\r\n";
	- }
	- $MAIL_MIME->setTXTBody($message_body, FALSE, TRUE);
	}
	+ $plugin = $RCMAIL->plugins->exec_hook('outgoing_message_body', array('body' => $message_body, 'type' => 'plain', 'message' => $MAIL_MIME));
	+ $MAIL_MIME->setTXTBody($plugin['body'], false, true);
	+}

	// chose transfer encoding
	$charset_7bit = array('ASCII', 'ISO-2022-JP', 'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-15');
	$transfer_encoding = in_array(strtoupper($message_charset), $charset_7bit) ? '7bit' : '8bit';

	// add stored attachments, if any
	-if (is_array($_SESSION['compose']['attachments']))
	- foreach ($_SESSION['compose']['attachments'] as $id => $attachment)
	- {
	- $dispurl = '/\ssrc\s=\s[\'"]\S+display-attachment\S+file=rcmfile' . $id . '[\s\'"]\s/';
	- $match = preg_match($dispurl, $message_body, $matches);
	- if ($isHtml && ($match > 0))
	- {
	+if (is_array($_SESSION['compose']['attachments'])) {
	+ foreach ($_SESSION['compose']['attachments'] as $id => $attachment) {
	+ // This hook retrieves the attachment contents from the file storage backend
	+ $attachment = $RCMAIL->plugins->exec_hook('get_attachment', $attachment);
	+
	+ $dispurl = '/\ssrc\s=\s[\'"]\S+display-attachment\S+file=rcmfile' . preg_quote($attachment['id']) . '[\s\'"]\s/';
	+ $message_body = $MAIL_MIME->getHTMLBody();
	+ if ($isHtml && (preg_match($dispurl, $message_body) > 0)) {
	$message_body = preg_replace($dispurl, ' src="'.$attachment['name'].'" ', $message_body);
	$MAIL_MIME->setHTMLBody($message_body);
	- $MAIL_MIME->addHTMLImage($attachment['path'], $attachment['mimetype'], $attachment['name']);
	+
	+ if ($attachment['data'])
	+ $MAIL_MIME->addHTMLImage($attachment['data'], $attachment['mimetype'], $attachment['name'], false);
	+ else
	+ $MAIL_MIME->addHTMLImage($attachment['path'], $attachment['mimetype'], $attachment['name'], true);
	}
	- else
	- {
	+ else {
	$ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914
	+ $file = $attachment['data'] ? $attachment['data'] : $attachment['path'];

	// .eml attachments send inline
	- $MAIL_MIME->addAttachment($attachment['path'],
	+ $MAIL_MIME->addAttachment($file,
	$ctype,
	- $attachment['name'], true,
	+ $attachment['name'],
	+ ($attachment['data'] ? false : true),
	($ctype == 'message/rfc822' ? $transfer_encoding : 'base64'),
	($ctype == 'message/rfc822' ? 'inline' : 'attachment'),
	$message_charset, '', '',
	- $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
	- $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL
	- );
	+ $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
	+ $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL
	+ );
	}
	}
	+}

	// add submitted attachments
	-if (is_array($_FILES['_attachments']['tmp_name']))
	- foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
	- {
	+if (is_array($_FILES['_attachments']['tmp_name'])) {
	+ foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
	$ctype = $files['type'][$i];
	$ctype = str_replace('image/pjpeg', 'image/jpeg', $ctype); // #1484914

	$MAIL_MIME->addAttachment($filepath, $ctype, $files['name'][$i], true,
	- $ctype == 'message/rfc822' ? $transfer_encoding : 'base64',
	- 'attachment', $message_charset, '', '',
	- $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
	- $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL
	- );
	- }
	-
	+ $ctype == 'message/rfc822' ? $transfer_encoding : 'base64',
	+ 'attachment', $message_charset, '', '',
	+ $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
	+ $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL
	+ );
	+ }
	+}

	// encoding settings for mail composing
	$MAIL_MIME->setParam(array(
	'text_encoding' => $transfer_encoding,
	'html_encoding' => 'quoted-printable',
	'head_encoding' => 'quoted-printable',
	'head_charset' => $message_charset,
	'html_charset' => $message_charset,
	'text_charset' => $message_charset,
	));

	+$data = $RCMAIL->plugins->exec_hook('outgoing_message_headers', array('headers' => $headers));
	+$headers = $data['headers'];
	+
	// encoding subject header with mb_encode provides better results with asian characters
	if (function_exists("mb_encode_mimeheader"))
	{
	mb_internal_encoding($message_charset);
	$headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset, 'Q');
	mb_internal_encoding(RCMAIL_CHARSET);
	}

	// pass headers to message object
	$MAIL_MIME->headers($headers);

	// Begin SMTP Delivery Block
	if (!$savedraft)
	{
	// check for 'From' address (identity may be incomplete)
	if ($identity_arr && !$identity_arr['mailto']) {
	$OUTPUT->show_message('nofromaddress', 'error');
	$OUTPUT->send('iframe');
	}

	$sent = rcmail_deliver_message($MAIL_MIME, $from, $mailto);

	// return to compose page if sending failed
	if (!$sent)
	{
	$OUTPUT->show_message("sendingfailed", 'error');
	$OUTPUT->send('iframe');
	}

	// save message sent time
	if (!empty($CONFIG['sendmail_delay']))
	$RCMAIL->user->save_prefs(array('last_message_time' => time()));

	// set replied/forwarded flag
	if ($_SESSION['compose']['reply_uid'])
	$IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED');
	else if ($_SESSION['compose']['forward_uid'])
	$IMAP->set_flag($_SESSION['compose']['forward_uid'], 'FORWARDED');

	} // End of SMTP Delivery Block



	// Determine which folder to save message
	if ($savedraft)
	$store_target = $CONFIG['drafts_mbox'];
	else
	$store_target = isset($_POST['_store_target']) ? get_input_value('_store_target', RCUBE_INPUT_POST) : $CONFIG['sent_mbox'];

	if ($store_target)
	{
	// check if mailbox exists
	if (!in_array_nocase($store_target, $IMAP->list_mailboxes()))
	{
	// folder may be existing but not subscribed (#1485241)
	if (!in_array_nocase($store_target, $IMAP->list_unsubscribed()))
	$store_folder = $IMAP->create_mailbox($store_target, TRUE);
	else if ($IMAP->subscribe($store_target))
	$store_folder = TRUE;
	}
	else
	$store_folder = TRUE;

	// append message to sent box
	if ($store_folder)
	$saved = $IMAP->save_message($store_target, $MAIL_MIME->getMessage());

	// raise error if saving failed
	if (!$saved)
	{
	raise_error(array('code' => 800, 'type' => 'imap', 'file' => __FILE__,
	'message' => "Could not save message in $store_target"), TRUE, FALSE);

	if ($savedraft) {
	$OUTPUT->show_message('errorsaving', 'error');
	$OUTPUT->send('iframe');
	}
	}

	if ($olddraftmessageid)
	{
	// delete previous saved draft
	$a_deleteid = $IMAP->search($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$olddraftmessageid);

	$deleted = $IMAP->delete_message($IMAP->get_uid($a_deleteid[0], $CONFIG['drafts_mbox']), $CONFIG['drafts_mbox']);

	// raise error if deletion of old draft failed
	if (!$deleted)
	raise_error(array('code' => 800, 'type' => 'imap', 'file' => __FILE__,
	'message' => "Could not delete message from ".$CONFIG['drafts_mbox']), TRUE, FALSE);
	}
	}

	if ($savedraft)
	{
	$msgid = strtr($message_id, array('>' => '', '<' => ''));

	// remember new draft-uid
	$draftids = $IMAP->search($CONFIG['drafts_mbox'], 'HEADER Message-ID '.$msgid);
	$_SESSION['compose']['param']['_draft_uid'] = $IMAP->get_uid($draftids[0], $CONFIG['drafts_mbox']);

	// display success
	$OUTPUT->show_message('messagesaved', 'confirmation');

	// update "_draft_saveid" and the "cmp_hash" to prevent "Unsaved changes" warning
	$OUTPUT->command('set_draft_id', $msgid);
	$OUTPUT->command('compose_field_hash', true);

	// start the auto-save timer again
	$OUTPUT->command('auto_save_start');

	$OUTPUT->send('iframe');
	}
	else
	{
	rcmail_compose_cleanup();

	if ($store_folder && !$saved)
	$OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'));
	else
	$OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'));
	$OUTPUT->send('iframe');
	}

	?>
	diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
	index fd31fa91c..9beb42521 100644
	--- a/program/steps/mail/show.inc
	+++ b/program/steps/mail/show.inc
	@@ -1,220 +1,222 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/show.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Display a mail message similar as a usual mail application does \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	$PRINT_MODE = $RCMAIL->action=='print' ? TRUE : FALSE;

	// similar code as in program/steps/mail/get.inc
	if ($_GET['_uid']) {
	$MESSAGE = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET));

	// set message charset as default
	if (!empty($MESSAGE->headers->charset))
	$IMAP->set_charset($MESSAGE->headers->charset);

	// go back to list if message not found (wrong UID)
	if (empty($MESSAGE->headers)) {
	$OUTPUT->show_message('messageopenerror', 'error');
	if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
	$OUTPUT->send('messagepreview');
	else {
	rcmail_overwrite_action('');
	return;
	}
	}

	$mbox_name = $IMAP->get_mailbox_name();

	// show images?
	rcmail_check_safe($MESSAGE);

	// calculate Etag for this request
	$etag = md5($MESSAGE->uid.$mbox_name.session_id()
	.intval($MESSAGE->headers->mdn_sent)
	.intval($MESSAGE->is_safe)
	.(!empty($MESSAGE->attachments) ? intval($CONFIG['inline_images']) : '')
	.intval($PRINT_MODE));

	// allow caching, unless remote images are present
	if ((bool)$MESSAGE->is_safe)
	send_nocacheing_headers();
	else if (empty($CONFIG['devel_mode']))
	send_modified_header($_SESSION['login_time'], $etag, !$MESSAGE->headers->seen);

	$OUTPUT->set_pagetitle($MESSAGE->subject);

	// give message uid to the client
	$OUTPUT->set_env('uid', $MESSAGE->uid);
	// set environement
	$OUTPUT->set_env('safemode', $MESSAGE->is_safe);
	$OUTPUT->set_env('sender', $MESSAGE->sender['string']);
	$OUTPUT->set_env('permaurl', rcmail_url('show', array('_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));
	$OUTPUT->set_env('mailbox', $mbox_name);
	if ($CONFIG['trash_mbox'])
	$OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
	if (!$OUTPUT->ajax_call)
	$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');

	// check for unset disposition notification
	if ($MESSAGE->headers->mdn_to &&
	!$MESSAGE->headers->mdn_sent && !$MESSAGE->headers->seen &&
	($IMAP->check_permflag('MDNSENT') \|\| $IMAP->check_permflag('*')) &&
	$mbox_name != $CONFIG['drafts_mbox'] &&
	$mbox_name != $CONFIG['sent_mbox'])
	{
	if (intval($CONFIG['mdn_requests']) === 1)
	{
	if (rcmail_send_mdn($MESSAGE->uid))
	$OUTPUT->show_message('receiptsent', 'confirmation');
	else
	$OUTPUT->show_message('errorsendingreceipt', 'error');
	}
	else if (empty($CONFIG['mdn_requests']))
	{
	$OUTPUT->add_label('mdnrequest');
	$OUTPUT->set_env('mdn_request', true);
	}
	}

	// get previous, first, next and last message UID
	if ($RCMAIL->action != 'preview' && $RCMAIL->action != 'print')
	{
	$next = $prev = $first = $last = -1;

	if ((!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') &&
	$IMAP->get_capability('sort')) \|\| !empty($_REQUEST['_search']))
	{
	// Only if we use custom sorting
	$a_msg_index = $IMAP->message_index(NULL, $_SESSION['sort_col'], $_SESSION['sort_order']);

	$MESSAGE->index = array_search($IMAP->get_id($MESSAGE->uid), $a_msg_index);

	$prev = isset($a_msg_index[$MESSAGE->index-1]) ? $IMAP->get_uid($a_msg_index[$MESSAGE->index-1]) : -1 ;
	$first = count($a_msg_index)>0 ? $IMAP->get_uid($a_msg_index[0]) : -1;
	$next = isset($a_msg_index[$MESSAGE->index+1]) ? $IMAP->get_uid($a_msg_index[$MESSAGE->index+1]) : -1 ;
	$last = count($a_msg_index)>0 ? $IMAP->get_uid($a_msg_index[count($a_msg_index)-1]) : -1;
	}
	else
	{
	// this assumes that we are sorted by date_DESC
	$cnt = $IMAP->messagecount();
	$seq = $IMAP->get_id($MESSAGE->uid);
	$MESSAGE->index = $cnt - $seq;

	$prev = $IMAP->get_uid($seq + 1);
	$first = $IMAP->get_uid($cnt);
	$next = $IMAP->get_uid($seq - 1);
	$last = $IMAP->get_uid(1);
	}

	if ($prev > 0)
	$OUTPUT->set_env('prev_uid', $prev);
	if ($first > 0)
	$OUTPUT->set_env('first_uid', $first);
	if ($next > 0)
	$OUTPUT->set_env('next_uid', $next);
	if ($last > 0)
	$OUTPUT->set_env('last_uid', $last);
	}

	// mark message as read
	- if (!$MESSAGE->headers->seen)
	+ if (!$MESSAGE->headers->seen) {
	$IMAP->set_flag($MESSAGE->uid, 'SEEN');
	+ $RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid, 'mailbox' => $IMAP->mailbox, 'message' => $MESSAGE));
	}
	+}



	function rcmail_message_attachments($attrib)
	{
	global $PRINT_MODE, $MESSAGE;

	$out = $ol = '';

	if (sizeof($MESSAGE->attachments)) {
	foreach ($MESSAGE->attachments as $attach_prop) {
	if ($PRINT_MODE) {
	$ol .= html::tag('li', null, sprintf("%s (%s)", Q($attach_prop->filename), Q(show_bytes($attach_prop->size))));
	}
	else {
	if (rc_strlen($attach_prop->filename) > 50) {
	$filename = abbreviate_string($attach_prop->filename, 50);
	$title = $attach_prop->filename;
	}
	else {
	$filename = $attach_prop->filename;
	$title = '';
	}

	$ol .= html::tag('li', null,
	html::a(array(
	'href' => $MESSAGE->get_part_url($attach_prop->mime_id),
	'onclick' => sprintf(
	'return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)',
	JS_OBJECT_NAME,
	$attach_prop->mime_id,
	$attach_prop->mimetype),
	'title' => Q($title),
	),
	Q($filename)));
	}
	}

	$out = html::tag('ul', $attrib, $ol, html::$common_attrib);
	}

	return $out;
	}



	function rcmail_remote_objects_msg($attrib)
	{
	global $MESSAGE, $RCMAIL;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmremoteobjmsg';

	$msg = Q(rcube_label('blockedimages')) . ' ';
	$msg .= html::a(array('href' => "#loadimages", 'onclick' => JS_OBJECT_NAME.".command('load-images')"), Q(rcube_label('showimages')));

	// add link to save sender in addressbook and reload message
	if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('show_images') == 1) {
	$msg .= ' ' . html::a(array('href' => "#alwaysload", 'onclick' => JS_OBJECT_NAME.".command('always-load')", 'style' => "white-space:nowrap"),
	Q(rcube_label(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto'])))));
	}

	$RCMAIL->output->add_gui_object('remoteobjectsmsg', $attrib['id']);
	return html::div($attrib, $msg);
	}


	$OUTPUT->add_handlers(array(
	'messageattachments' => 'rcmail_message_attachments',
	'mailboxname' => 'rcmail_mailbox_name_display',
	'blockedobjects' => 'rcmail_remote_objects_msg'));


	if ($RCMAIL->action=='print' && $OUTPUT->template_exists('printmessage'))
	$OUTPUT->send('printmessage');
	else if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
	$OUTPUT->send('messagepreview');
	else
	$OUTPUT->send('message');
	?>
	diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
	index 3f0357717..6eda4dba3 100644
	--- a/program/steps/settings/func.inc
	+++ b/program/steps/settings/func.inc
	@@ -1,479 +1,491 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/func.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2007, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Provide functionality for user's settings & preferences \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	if (!$OUTPUT->ajax_call)
	$OUTPUT->set_pagetitle(rcube_label('preferences'));

	function rcmail_user_prefs_form($attrib)
	{
	global $RCMAIL;

	$no_override = array_flip($RCMAIL->config->get('dont_override', array()));
	$blocks = $attrib['parts'] ? preg_split('/[\s,;]+/', strip_quotes($attrib['parts'])) : array('general','mailbox','compose','mailview','folders','server');

	// add some labels to client
	$RCMAIL->output->add_label('nopagesizewarning');

	list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs');
	unset($attrib['form']);

	$out = $form_start;

	foreach ($blocks as $part)
	$out .= rcmail_user_prefs_block($part, $no_override, $attrib);

	return $out . $form_end;
	}

	function rcmail_user_prefs_block($part, $no_override, $attrib)
	{
	global $RCMAIL;
	$config = $RCMAIL->config->all();

	switch ($part)
	{
	// General UI settings
	case 'general':
	$table = new html_table(array('cols' => 2));

	// show language selection
	if (!isset($no_override['language'])) {
	$a_lang = $RCMAIL->list_languages();
	asort($a_lang);

	$field_id = 'rcmfd_lang';
	$select_lang = new html_select(array('name' => '_language', 'id' => $field_id));
	$select_lang->add(array_values($a_lang), array_keys($a_lang));

	$table->add('title', html::label($field_id, Q(rcube_label('language'))));
	$table->add(null, $select_lang->show($RCMAIL->user->language));
	}

	// show page size selection
	if (!isset($no_override['timezone'])) {
	$field_id = 'rcmfd_timezone';
	$select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id, 'onchange' => "document.getElementById('rcmfd_dst').disabled=this.selectedIndex==0"));
	$select_timezone->add(rcube_label('autodetect'), 'auto');
	$select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11');
	$select_timezone->add('(GMT -10:00) Hawaii', '-10');
	$select_timezone->add('(GMT -9:30) Marquesas Islands', '-9.5');
	$select_timezone->add('(GMT -9:00) Alaska', '-9');
	$select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8');
	$select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7');
	$select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6');
	$select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
	$select_timezone->add('(GMT -4:30) Caracas', '-4.5');
	$select_timezone->add('(GMT -4:00) Atlantic Time (Canada), La Paz', '-4');
	$select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5');
	$select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
	$select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
	$select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
	$select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
	$select_timezone->add('(GMT +1:00) Central European Time', '1');
	$select_timezone->add('(GMT +2:00) EET: Tallinn, Helsinki, Kaliningrad, South Africa', '2');
	$select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3');
	$select_timezone->add('(GMT +3:30) Tehran', '3.5');
	$select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4');
	$select_timezone->add('(GMT +4:30) Kabul', '4.5');
	$select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5');
	$select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5');
	$select_timezone->add('(GMT +5:45) Kathmandu', '5.75');
	$select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
	$select_timezone->add('(GMT +6:30) Cocos Islands, Myanmar', '6.5');
	$select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
	$select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
	$select_timezone->add('(GMT +8:45) Caiguna, Eucla, Border Village', '8.75');
	$select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
	$select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5');
	$select_timezone->add('(GMT +10:00) EAST/AEST: Sydney, Guam, Vladivostok', '10');
	$select_timezone->add('(GMT +10:30) New South Wales', '10.5');
	$select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
	$select_timezone->add('(GMT +11:30) Norfolk Island', '11.5');
	$select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
	$select_timezone->add('(GMT +12:45) Chatham Islands', '12.75');
	$select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13');
	$select_timezone->add('(GMT +14:00) Kiribati', '14');

	$table->add('title', html::label($field_id, Q(rcube_label('timezone'))));
	$table->add(null, $select_timezone->show((string)$config['timezone']));
	}

	// daylight savings
	if (!isset($no_override['dst_active'])) {
	$field_id = 'rcmfd_dst';
	$input_dst = new html_checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1, 'disabled' => ($config['timezone'] === 'auto')));

	$table->add('title', html::label($field_id, Q(rcube_label('dstactive'))));
	$table->add(null, $input_dst->show($config['dst_active']));
	}

	// MM: Show checkbox for toggling 'pretty dates'
	if (!isset($no_override['prettydate'])) {
	$field_id = 'rcmfd_prettydate';
	$input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));

	$table->add('title', html::label($field_id, Q(rcube_label('prettydate'))));
	$table->add(null, $input_prettydate->show($config['prettydate']?1:0));
	}

	// show page size selection
	if (!isset($no_override['pagesize'])) {
	$field_id = 'rcmfd_pgsize';
	$input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));

	$table->add('title', html::label($field_id, Q(rcube_label('pagesize'))));
	$table->add(null, $input_pagesize->show($config['pagesize']));
	}

	// show drop-down for available skins
	if (!isset($no_override['skin'])) {
	$skins = rcmail_get_skins();

	if (count($skins) > 1) {
	$field_id = 'rcmfd_skin';
	$input_skin = new html_select(array('name'=>'_skin', 'id'=>$field_id));

	foreach($skins as $skin)
	$input_skin->add($skin, $skin);

	$table->add('title', html::label($field_id, Q(rcube_label('skin'))));
	$table->add(null, $input_skin->show($config['skin']));
	}
	}

	+ $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
	+
	if ($table->size())
	$out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('uisettings'))) . $table->show($attrib));
	break;


	// Mailbox view (mail screen)
	case 'mailbox':
	$table = new html_table(array('cols' => 2));

	if (!isset($no_override['focus_on_new_message'])) {
	$field_id = 'rcmfd_focus_on_new_message';
	$input_focus_on_new_message = new html_checkbox(array('name' => '_focus_on_new_message', 'id' => $field_id, 'value' => 1));
	$table->add('title', html::label($field_id, Q(rcube_label('focusonnewmessage'))));
	$table->add(null, $input_focus_on_new_message->show($config['focus_on_new_message']?1:0));
	}

	// show config parameter for preview pane
	if (!isset($no_override['preview_pane'])) {
	$field_id = 'rcmfd_preview';
	$input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1));

	$table->add('title', html::label($field_id, Q(rcube_label('previewpane'))));
	$table->add(null, $input_preview->show($config['preview_pane']?1:0));
	}

	if (!isset($no_override['mdn_requests'])) {
	$field_id = 'rcmfd_mdn_requests';
	$select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
	$select_mdn_requests->add(rcube_label('askuser'), 0);
	$select_mdn_requests->add(rcube_label('autosend'), 1);
	$select_mdn_requests->add(rcube_label('ignore'), 2);

	$table->add('title', html::label($field_id, Q(rcube_label('mdnrequests'))));
	$table->add(null, $select_mdn_requests->show($config['mdn_requests']));
	}

	if (!isset($no_override['keep_alive'])) {
	$field_id = 'rcmfd_keep_alive';
	$select_keep_alive = new html_select(array('name' => '_keep_alive', 'id' => $field_id));

	foreach(array(1, 3, 5, 10, 15, 30, 60) as $min)
	if((!$config['min_keep_alive'] \|\| $config['min_keep_alive'] <= $min * 60)
	&& (!$config['session_lifetime'] \|\| $config['session_lifetime'] > $min)) {
	$select_keep_alive->add(rcube_label(array('name' => 'keepaliveevery', 'vars' => array('n' => $min))), $min);
	}

	$table->add('title', html::label($field_id, Q(rcube_label('keepalive'))));
	$table->add(null, $select_keep_alive->show($config['keep_alive']/60));
	}

	if (!isset($no_override['check_all_folders'])) {
	$field_id = 'rcmfd_check_all_folders';
	$input_check_all = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));
	$table->add('title', html::label($field_id, Q(rcube_label('checkallfolders'))));
	$table->add(null, $input_check_all->show($config['check_all_folders']?1:0));
	}

	+ $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
	+
	if ($table->size())
	$out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('mailboxview'))) . $table->show($attrib));
	break;


	// Message viewing
	case 'mailview':
	$table = new html_table(array('cols' => 2));

	// show checkbox for HTML/plaintext messages
	if (!isset($no_override['prefer_html'])) {
	$field_id = 'rcmfd_htmlmsg';
	$input_preferhtml = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
	'onchange' => JS_OBJECT_NAME.'.toggle_prefer_html(this)'));

	$table->add('title', html::label($field_id, Q(rcube_label('preferhtml'))));
	$table->add(null, $input_preferhtml->show($config['prefer_html']?1:0));
	}

	if (!isset($no_override['show_images'])) {
	$field_id = 'rcmfd_show_images';
	$input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id));
	$input_show_images->add(rcube_label('never'), 0);
	$input_show_images->add(rcube_label('fromknownsenders'), 1);
	$input_show_images->add(rcube_label('always'), 2);

	$table->add('title', html::label($field_id, Q(rcube_label('showremoteimages'))));
	$table->add(null, $input_show_images->show($config['show_images']));
	}

	if (!isset($no_override['inline_images'])) {
	$field_id = 'rcmfd_inline_images';
	$input_inline_images = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));

	$table->add('title', html::label($field_id, Q(rcube_label('showinlineimages'))));
	$table->add(null, $input_inline_images->show($config['inline_images']?1:0));
	}

	+ $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
	+
	if ($table->size())
	$out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagesdisplaying'))) . $table->show($attrib));
	break;


	// Mail composition
	case 'compose':
	$table = new html_table(array('cols' => 2));

	// Show checkbox for HTML Editor
	if (!isset($no_override['htmleditor'])) {
	$field_id = 'rcmfd_htmleditor';
	$input_htmleditor = new html_checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));

	$table->add('title', html::label($field_id, Q(rcube_label('htmleditor'))));
	$table->add(null, $input_htmleditor->show($config['htmleditor']?1:0));
	}

	if (!isset($no_override['draft_autosave'])) {
	$field_id = 'rcmfd_autosave';
	$select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));
	$select_autosave->add(rcube_label('never'), 0);
	foreach (array(3, 5, 10) as $i => $min)
	$select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60);

	$table->add('title', html::label($field_id, Q(rcube_label('autosavedraft'))));
	$table->add(null, $select_autosave->show($config['draft_autosave']));
	}

	if (!isset($no_override['mime_param_folding'])) {
	$field_id = 'rcmfd_param_folding';
	$select_param_folding = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));
	$select_param_folding->add(rcube_label('2231folding'), 0);
	$select_param_folding->add(rcube_label('miscfolding'), 1);
	$select_param_folding->add(rcube_label('2047folding'), 2);

	$table->set_row_attribs('advanced');
	$table->add('title', html::label($field_id, Q(rcube_label('mimeparamfolding'))));
	$table->add(null, $select_param_folding->show($config['mime_param_folding']));
	}

	+ $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
	+
	if ($table->size())
	$out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagescomposition'))) . $table->show($attrib));
	break;


	// Special IMAP folders
	case 'folders':
	// Configure special folders
	if (!isset($no_override['default_imap_folders'])) {
	$RCMAIL->imap_init(true);
	$select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, 'maxlength' => 30));

	$table = new html_table(array('cols' => 2));

	if (!isset($no_override['drafts_mbox'])) {
	$table->add('title', Q(rcube_label('drafts')));
	$table->add(null, $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox", 'onchange' => "document.getElementById('rcmfd_autosave').disabled=this.selectedIndex==0")));
	}

	if (!isset($no_override['sent_mbox'])) {
	$table->add('title', Q(rcube_label('sent')));
	$table->add(null, $select->show($config['sent_mbox'], array('name' => "_sent_mbox")));
	}

	if (!isset($no_override['junk_mbox'])) {
	$table->add('title', Q(rcube_label('junk')));
	$table->add(null, $select->show($config['junk_mbox'], array('name' => "_junk_mbox")));
	}

	if (!isset($no_override['trash_mbox'])) {
	$table->add('title', Q(rcube_label('trash')));
	$table->add(null, $select->show($config['trash_mbox'], array('name' => "_trash_mbox")));
	}

	+ $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
	+
	$out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('specialfolders'))) . $table->show($attrib));
	}
	break;


	// Server settings
	case 'server':
	$table = new html_table(array('cols' => 2));

	if (!isset($no_override['read_when_deleted'])) {
	$field_id = 'rcmfd_read_deleted';
	$input_readdeleted = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));

	$table->add('title', html::label($field_id, Q(rcube_label('readwhendeleted'))));
	$table->add(null, $input_readdeleted->show($config['read_when_deleted']?1:0));
	}

	if (!isset($no_override['flag_for_deletion'])) {
	$field_id = 'rcmfd_flag_for_deletion';
	$input_flagfordeletion = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));

	$table->add('title', html::label($field_id, Q(rcube_label('flagfordeletion'))));
	$table->add(null, $input_flagfordeletion->show($config['flag_for_deletion']?1:0));
	}

	// don't show deleted messages
	if (!isset($no_override['skip_deleted'])) {
	$field_id = 'rcmfd_skip_deleted';
	$input_purge = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));

	$table->add('title', html::label($field_id, Q(rcube_label('skipdeleted'))));
	$table->add(null, $input_purge->show($config['skip_deleted']?1:0));
	}

	// Trash purging on logout
	if (!isset($no_override['logout_purge'])) {
	$field_id = 'rcmfd_logout_purge';
	$input_purge = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));

	$table->add('title', html::label($field_id, Q(rcube_label('logoutclear'))));
	$table->add(null, $input_purge->show($config['logout_purge']?1:0));
	}

	// INBOX compacting on logout
	if (!isset($no_override['logout_expunge'])) {
	$field_id = 'rcmfd_logout_expunge';
	$input_expunge = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));

	$table->add('title', html::label($field_id, Q(rcube_label('logoutcompact'))));
	$table->add(null, $input_expunge->show($config['logout_expunge']?1:0));
	}

	+ $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
	+
	if ($table->size())
	$out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('serversettings'))) . $table->show($attrib));
	break;


	default:
	$out = '';
	}

	return $out;
	}


	function rcmail_identities_list($attrib)
	{
	global $OUTPUT, $USER;

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmIdentitiesList';

	// define list of cols to be displayed
	$a_show_cols = array('name', 'email');

	// create XHTML table
	$out = rcube_table_output($attrib, $USER->list_identities(), $a_show_cols, 'identity_id');

	// set client env
	$OUTPUT->add_gui_object('identitieslist', $attrib['id']);

	return $out;
	}



	// similar function as in /steps/addressbook/edit.inc
	function get_form_tags($attrib, $action, $add_hidden=array())
	{
	global $EDIT_FORM, $RCMAIL;

	$form_start = '';
	if (!strlen($EDIT_FORM))
	{
	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
	$hiddenfields->add(array('name' => '_action', 'value' => $action));

	if ($add_hidden)
	$hiddenfields->add($add_hidden);

	$form_start = !strlen($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
	$form_start .= $hiddenfields->show();
	}

	$form_end = (!strlen($EDIT_FORM) && !strlen($attrib['form'])) ? '</form>' : '';
	$form_name = strlen($attrib['form']) ? $attrib['form'] : 'form';

	if (!strlen($EDIT_FORM))
	$RCMAIL->output->add_gui_object('editform', $form_name);

	$EDIT_FORM = $form_name;

	return array($form_start, $form_end);
	}

	function rcmail_get_skins()
	{
	$path = 'skins';
	$skins = array();

	$dir = opendir($path);

	if (!$dir)
	return false;

	while (($file = readdir($dir)) !== false)
	{
	$filename = $path.'/'.$file;
	if (is_dir($filename) && is_readable($filename)
	&& !in_array($file, array('.', '..', '.svn')))
	$skins[] = $file;
	}

	closedir($dir);

	return $skins;
	}


	// register UI objects
	$OUTPUT->add_handlers(array(
	'userprefs' => 'rcmail_user_prefs_form',
	'identitieslist' => 'rcmail_identities_list',
	'itentitieslist' => 'rcmail_identities_list' // keep this for backward compatibility
	));

	?>
	diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
	index 9affded98..79d313c37 100644
	--- a/program/steps/settings/manage_folders.inc
	+++ b/program/steps/settings/manage_folders.inc
	@@ -1,352 +1,353 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/manage_folders.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Provide functionality to create/delete/rename folders \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	// WARNING: folder names in UI are encoded with UTF-8

	// init IMAP connection
	$RCMAIL->imap_init(true);

	// subscribe to one or more mailboxes
	if ($RCMAIL->action=='subscribe')
	{
	if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF-7'))
	$IMAP->subscribe(array($mbox));
	}

	// unsubscribe one or more mailboxes
	else if ($RCMAIL->action=='unsubscribe')
	{
	if ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST, false, 'UTF-7'))
	$IMAP->unsubscribe(array($mbox));
	}

	// create a new mailbox
	else if ($RCMAIL->action=='create-folder')
	{
	if (!empty($_POST['_name']))
	{
	$name = trim(get_input_value('_name', RCUBE_INPUT_POST, FALSE, 'UTF-7'));
	$create = $IMAP->create_mailbox($name, TRUE);
	}

	if ($create && $OUTPUT->ajax_call)
	{
	$delimiter = $IMAP->get_hierarchy_delimiter();
	$folderlist = $IMAP->list_unsubscribed();
	$index = array_search($create, $folderlist);
	$before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF-7') : false;

	$create = rcube_charset_convert($create, 'UTF-7');
	$foldersplit = explode($delimiter, $create);
	$display_create = str_repeat('    ', substr_count($create, $delimiter)) . $foldersplit[count($foldersplit)-1];

	$OUTPUT->command('add_folder_row', $create, $display_create, false, $before);
	}
	else if (!$create)
	{
	$OUTPUT->show_message('errorsaving', 'error');
	}
	}

	// rename a mailbox
	else if ($RCMAIL->action=='rename-folder')
	{
	if (!empty($_POST['_folder_oldname']) && !empty($_POST['_folder_newname']))
	{
	$name_utf8 = trim(get_input_value('_folder_newname', RCUBE_INPUT_POST));
	$oldname_utf8 = get_input_value('_folder_oldname', RCUBE_INPUT_POST);
	$name = rcube_charset_convert($name_utf8, 'UTF-8', 'UTF-7');
	$oldname = rcube_charset_convert($oldname_utf8, 'UTF-8', 'UTF-7');

	$rename = $IMAP->rename_mailbox($oldname, $name);
	}

	if ($rename && $OUTPUT->ajax_call)
	{
	$folderlist = $IMAP->list_unsubscribed();
	$delimiter = $IMAP->get_hierarchy_delimiter();

	$regexp = '/^' . preg_quote($rename . $delimiter, '/') . '/';

	// subfolders
	for ($x=sizeof($folderlist)-1; $x>=0; $x--)
	{
	if (preg_match($regexp, $folderlist[$x]))
	{
	$oldfolder = $oldname . $delimiter . preg_replace($regexp, '', $folderlist[$x]);
	$foldersplit = explode($delimiter, $folderlist[$x]);
	$level = count($foldersplit) - 1;
	$display_rename = str_repeat('    ', $level)
	. rcube_charset_convert($foldersplit[$level], 'UTF-7');

	$before = isset($folderlist[$x+1]) ? rcube_charset_convert($folderlist[$x+1], 'UTF-7') : false;

	$OUTPUT->command('replace_folder_row', rcube_charset_convert($oldfolder, 'UTF-7'),
	rcube_charset_convert($folderlist[$x], 'UTF-7'), $display_rename, $before);
	}
	}

	$foldersplit = explode($delimiter, $rename);
	$level = count($foldersplit) - 1;
	$display_rename = str_repeat('    ', $level) . rcube_charset_convert($foldersplit[$level], 'UTF-7');
	$index = array_search($rename, $folderlist);
	$before = $index !== false && isset($folderlist[$index+1]) ? rcube_charset_convert($folderlist[$index+1], 'UTF-7') : false;

	$OUTPUT->command('replace_folder_row', $oldname_utf8, rcube_charset_convert($rename, 'UTF-7'), $display_rename, $before);

	$OUTPUT->command('reset_folder_rename');
	}
	else if (!$rename && $OUTPUT->ajax_call)
	{
	$OUTPUT->command('reset_folder_rename');
	$OUTPUT->show_message('errorsaving', 'error');
	}
	else if (!$rename)
	$OUTPUT->show_message('errorsaving', 'error');
	}

	// delete an existing IMAP mailbox
	else if ($RCMAIL->action=='delete-folder')
	{
	$a_mboxes = $IMAP->list_unsubscribed();
	$delimiter = $IMAP->get_hierarchy_delimiter();

	$mboxes_utf8 = get_input_value('_mboxes', RCUBE_INPUT_POST);
	$mboxes = rcube_charset_convert($mboxes_utf8, 'UTF-8', 'UTF-7');

	if ($mboxes)
	$deleted = $IMAP->delete_mailbox(array($mboxes));

	if ($OUTPUT->ajax_call && $deleted)
	{
	$OUTPUT->command('remove_folder_row', $mboxes_utf8);
	foreach ($a_mboxes as $mbox)
	{
	if (preg_match('/^'. preg_quote($mboxes.$delimiter, '/') .'/', $mbox))
	{
	$OUTPUT->command('remove_folder_row', rcube_charset_convert($mbox, 'UTF-7'));
	}
	}
	$OUTPUT->show_message('folderdeleted', 'confirmation');
	}
	else if (!$deleted)
	{
	$OUTPUT->show_message('errorsaving', 'error');
	}
	}

	if ($OUTPUT->ajax_call)
	$OUTPUT->send();


	// build table with all folders listed by server
	function rcube_subscription_form($attrib)
	{
	global $IMAP, $CONFIG, $OUTPUT;

	list($form_start, $form_end) = get_form_tags($attrib, 'folders');
	unset($attrib['form']);

	if (!$attrib['id'])
	$attrib['id'] = 'rcmSubscriptionlist';

	$table = new html_table();

	// add table header
	$table->add_header('name', rcube_label('foldername'));
	$table->add_header('msgcount', rcube_label('messagecount'));
	$table->add_header('subscribed', rcube_label('subscribed'));
	$table->add_header('rename', ' ');
	$table->add_header('delete', ' ');


	// get folders from server
	$IMAP->clear_cache('mailboxes');

	$a_unsubscribed = $IMAP->list_unsubscribed();
	$a_subscribed = $IMAP->list_mailboxes();
	$delimiter = $IMAP->get_hierarchy_delimiter();
	$a_js_folders = $seen_folders = $list_folders = array();

	// pre-process folders list
	foreach ($a_unsubscribed as $i => $folder) {
	$foldersplit = explode($delimiter, $folder);
	$name = rcube_charset_convert(array_pop($foldersplit), 'UTF-7');
	$parent_folder = join($delimiter, $foldersplit);
	$level = count($foldersplit);

	// add any necessary "virtual" parent folders
	if ($parent_folder && !$seen[$parent_folder]) {
	for ($i=1; $i<=$level; $i++) {
	$ancestor_folder = join($delimiter, array_slice($foldersplit, 0, $i));
	if ($ancestor_folder && !$seen[$ancestor_folder]++) {
	$ancestor_name = rcube_charset_convert($foldersplit[$i-1], 'UTF-7');
	$list_folders[] = array('id' => $ancestor_folder, 'name' => $ancestor_name, 'level' => $i-1, 'virtual' => true);
	}
	}
	}

	$list_folders[] = array('id' => $folder, 'name' => $name, 'level' => $level);
	$seen[$folder]++;
	}

	$checkbox_subscribe = new html_checkbox(array(
	'name' => '_subscribed[]',
	'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)",
	));

	if (!empty($attrib['deleteicon']))
	$del_button = html::img(array('src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 'alt' => rcube_label('delete')));
	else
	$del_button = rcube_label('delete');

	if (!empty($attrib['renameicon']))
	$edit_button = html::img(array('src' => $CONFIG['skin_path'] . $attrib['renameicon'], 'alt' => rcube_label('rename')));
	else
	$edit_button = rcube_label('rename');

	// create list of available folders
	foreach ($list_folders as $i => $folder) {
	$idx = $i + 1;
	$subscribed = in_array($folder['id'], $a_subscribed);
	$protected = ($CONFIG['protect_default_folders'] == true && in_array($folder['id'], $CONFIG['default_imap_folders']));
	$classes = array($i%2 ? 'even' : 'odd');
	$folder_js = JQ($folder['id']);
	$display_folder = str_repeat('    ', $folder['level']) . ($protected ? rcmail_localize_foldername($folder['id']) : $folder['name']);
	$folder_utf8 = rcube_charset_convert($folder['id'], 'UTF-7');

	if ($folder['virtual'])
	$classes[] = 'virtual';

	$table->add_row(array('id' => 'rcmrow'.$idx, 'class' => join(' ', $classes)));

	$table->add('name', Q($display_folder));
	$table->add('msgcount', ($folder['virtual'] ? '' : $IMAP->messagecount($folder['id'])));
	$table->add('subscribed', ($protected \|\| $folder['virtual']) ? ($subscribed ? ' •' : ' ') :
	$checkbox_subscribe->show(($subscribed ? $folder_utf8 : ''), array('value' => $folder_utf8)));

	// add rename and delete buttons
	if (!$protected && !$folder['virtual']) {
	$table->add('rename', html::a(array('href' => "#rename", 'title' => rcube_label('renamefolder')), $edit_button));
	$table->add('delete', html::a(array('href' => "#delete", 'title' => rcube_label('deletefolder')), $del_button));
	}
	else {
	$table->add('rename', ' ');
	$table->add('delete', ' ');
	}

	$a_js_folders['rcmrow'.$idx] = array($folder_utf8, $display_folder, $protected \|\| $folder['virtual']);
	}

	+ rcmail::get_instance()->plugins->exec_hook('manage_folders', array('table'=>$table));

	$OUTPUT->add_gui_object('subscriptionlist', $attrib['id']);
	$OUTPUT->set_env('subscriptionrows', $a_js_folders);
	$OUTPUT->set_env('defaultfolders', $CONFIG['default_imap_folders']);
	$OUTPUT->set_env('delimiter', $delimiter);

	return $form_start . $table->show($attrib) . $form_end;
	}


	function rcube_create_folder_form($attrib)
	{
	global $OUTPUT;

	list($form_start, $form_end) = get_form_tags($attrib, 'create-folder');
	unset($attrib['form']);

	if ($attrib['hintbox'])
	$OUTPUT->add_gui_object('createfolderhint', $attrib['hintbox']);

	// return the complete edit form as table
	$out = "$form_start\n";

	$input = new html_inputfield(array('name' => '_folder_name'));
	$out .= $input->show();

	if (get_boolean($attrib['button']))
	{
	$button = new html_inputfield(array('type' => 'button',
	'value' => rcube_label('create'),
	'onclick' => JS_OBJECT_NAME.".command('create-folder',this.form)"));
	$out .= $button->show();
	}

	$out .= "\n$form_end";

	return $out;
	}

	function rcube_rename_folder_form($attrib)
	{
	global $CONFIG, $IMAP;

	list($form_start, $form_end) = get_form_tags($attrib, 'rename-folder');
	unset($attrib['form']);

	// return the complete edit form as table
	$out = "$form_start\n";

	$a_unsubscribed = $IMAP->list_unsubscribed();
	$select_folder = new html_select(array('name' => '_folder_oldname', 'id' => 'rcmfd_oldfolder'));

	foreach ($a_unsubscribed as $i => $folder)
	{
	if ($CONFIG['protect_default_folders'] == TRUE && in_array($folder,$CONFIG['default_imap_folders']))
	continue;

	$select_folder->add($folder);
	}

	$out .= $select_folder->show();

	$out .= " to ";
	$inputtwo = new html_inputfield(array('name' => '_folder_newname'));
	$out .= $inputtwo->show();

	if (get_boolean($attrib['button']))
	{
	$button = new html_inputfield(array('type' => 'button',
	'value' => rcube_label('rename'),
	'onclick' => JS_OBJECT_NAME.".command('rename-folder',this.form)"));
	$out .= $button->show();
	}

	$out .= "\n$form_end";

	return $out;
	}

	$OUTPUT->set_pagetitle(rcube_label('folders'));
	$OUTPUT->include_script('list.js');

	// register UI objects
	$OUTPUT->add_handlers(array(
	'foldersubscription' => 'rcube_subscription_form',
	'createfolder' => 'rcube_create_folder_form',
	'renamefolder' => 'rcube_rename_folder_form'
	));

	// add some labels to client
	$OUTPUT->add_label('deletefolderconfirm','addsubfolderhint','forbiddencharacter','folderdeleting','folderrenaming','foldercreating','foldermoving');

	$OUTPUT->send('managefolders');
	?>
	diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
	index 09cf63d6f..c5afd5b0c 100644
	--- a/program/steps/settings/save_prefs.inc
	+++ b/program/steps/settings/save_prefs.inc
	@@ -1,97 +1,100 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/save_prefs.inc \|
	\| \|
	\| This file is part of the RoundCube Webmail client \|
	\| Copyright (C) 2005-2007, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Save user preferences to DB and to the current session \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	$a_user_prefs = array(
	'language' => isset($_POST['_language']) ? get_input_value('_language', RCUBE_INPUT_POST) : $CONFIG['language'],
	'timezone' => isset($_POST['_timezone']) ? (is_numeric($_POST['_timezone']) ? floatval($_POST['_timezone']) : get_input_value('_timezone', RCUBE_INPUT_POST)) : $CONFIG['timezone'],
	'dst_active' => isset($_POST['_dst_active']) ? TRUE : FALSE,
	'pagesize' => is_numeric($_POST['_pagesize']) ? max(2, intval($_POST['_pagesize'])) : $CONFIG['pagesize'],
	'prettydate' => isset($_POST['_pretty_date']) ? TRUE : FALSE,
	'prefer_html' => isset($_POST['_prefer_html']) ? TRUE : FALSE,
	'htmleditor' => isset($_POST['_htmleditor']) ? TRUE : FALSE,
	'inline_images' => isset($_POST['_inline_images']) ? TRUE : FALSE,
	'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
	'focus_on_new_message' => isset($_POST['_focus_on_new_message']) ? TRUE : FALSE,
	'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE,
	'skip_deleted' => isset($_POST['_skip_deleted']) ? TRUE : FALSE,
	'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? TRUE : FALSE,
	'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE,
	'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
	'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
	'show_images' => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0,
	'keep_alive' => isset($_POST['_keep_alive']) ? intval($_POST['_keep_alive'])*60 : $CONFIG['keep_alive'],
	'check_all_folders' => isset($_POST['_check_all_folders']) ? TRUE : FALSE,
	'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
	'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
	'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
	'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST),
	'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST),
	'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST),
	'trash_mbox' => get_input_value('_trash_mbox', RCUBE_INPUT_POST),
	);

	+$data = rcmail::get_instance()->plugins->exec_hook('save_preferences', array('prefs' => $a_user_prefs));
	+$a_user_prefs = $data['prefs'];
	+
	// don't override these parameters
	foreach ((array)$CONFIG['dont_override'] as $p)
	$a_user_prefs[$p] = $CONFIG[$p];

	// special handling for 'default_imap_folders'
	if (in_array('default_imap_folders', (array)$CONFIG['dont_override'])) {
	foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p)
	$a_user_prefs[$p] = $CONFIG[$p];
	}
	else {
	$a_user_prefs['default_imap_folders'] = array('INBOX');
	foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
	if ($a_user_prefs[$p])
	$a_user_prefs['default_imap_folders'][] = $a_user_prefs[$p];
	}
	}

	// switch UI language
	if (isset($_POST['_language'])) {
	$RCMAIL->load_language($a_user_prefs['language']);
	}

	// switch skin
	$OUTPUT->set_skin($a_user_prefs['skin']);

	// force min size
	if ($a_user_prefs['pagesize'] < 1)
	$a_user_prefs['pagesize'] = 10;

	if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['pagesize'] > $CONFIG['max_pagesize']))
	$a_user_prefs['pagesize'] = (int) $CONFIG['max_pagesize'];

	// force keep_alive
	if (isset($a_user_prefs['keep_alive'])) {
	$a_user_prefs['keep_alive'] = max(60, $CONFIG['min_keep_alive'], $a_user_prefs['keep_alive']);
	if (!empty($CONFIG['session_lifetime']))
	$a_user_prefs['keep_alive'] = min($CONFIG['session_lifetime']*60, $a_user_prefs['keep_alive']);
	}


	if ($USER->save_prefs($a_user_prefs))
	$OUTPUT->show_message('successfullysaved', 'confirmation');

	// go to next step
	rcmail_overwrite_action('preferences');

	?>
	diff --git a/skins/default/common.css b/skins/default/common.css
	index 34ea1d2b8..631321c72 100644
	--- a/skins/default/common.css
	+++ b/skins/default/common.css
	@@ -1,452 +1,459 @@
	/*** RoundCube\|Mail basic styles ***/

	body
	{
	margin: 8px;
	background-color: #F6F6F6; /* #EBEBEB; */
	color: #000000;
	}

	body.iframe
	{
	margin: 0px;
	background-color: #FFF;
	}

	body.extwin
	{
	margin: 10px;
	}

	body, td, th, div, p, h3
	{
	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
	font-size: 12px;
	color: #000000;
	}

	th
	{
	font-weight: normal;
	}

	h3
	{
	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
	font-size: 18px;
	color: #000000;
	}

	a, a:active, a:visited
	{
	color: #000000;
	outline: none;
	}

	a.button, a.button:visited, a.tab, a.tab:visited, a.axislist
	{
	color: #000000;
	text-decoration: none;
	}

	a.tab
	{
	width: 80px;
	display: block;
	text-align: center;
	}

	hr
	{
	height: 1px;
	background-color: #666666;
	border-style: none;
	}

	input[type="text"],
	input[type="button"],
	input[type="password"],
	textarea
	{
	font-size: 9pt;
	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
	padding: 1px;
	padding-left: 3px;
	padding-right: 3px;
	border: 1px solid #666666;
	color: #333333;
	background-color: #ffffff;
	}

	input, textarea
	{
	font-size: 9pt;
	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
	color: #333333;
	padding-left: 3px;
	padding-right: 3px;
	/* IE hacks for input elements */
	border-style: expression(this.type=='checkbox' \|\| this.type=='radio' \|\| this.id=='quicksearchbox' ? 'none' : 'solid');
	border-width: expression(this.type=='checkbox' \|\| this.type=='radio' ? '0' : '1px');
	border-color: expression(this.type=='checkbox' \|\| this.type=='radio' ? '' : '#666666');
	background-color: expression(this.type=='checkbox' \|\| this.type=='radio' ? 'transparent' : '#ffffff');
	}

	input.button
	{
	height: 20px;
	color: #333333;
	font-size: 12px;
	padding-left: 8px;
	padding-right: 8px;
	background: url(images/buttons/bg.gif) repeat-x #f0f0f0;
	border: 1px solid #a4a4a4;
	}

	input.button:hover
	{
	color: black;
	}

	input.mainaction
	{
	font-weight: bold;
	border: 1px solid #999;
	}

	img
	{
	behavior: url('skins/default/pngbehavior.htc');
	border: 0;
	}

	.alttext
	{
	font-size: 11px;
	}

	.hint
	{
	color: #666;
	font-size: 11px;
	}

	/** common user interface objects */

	#header
	{
	position: absolute;
	top: 10px;
	left: 20px;
	width: 170px;
	height: 40px;
	z-index: 100;
	}

	#taskbar
	{
	position: absolute;
	top: 0px;
	right: 0px;
	width: 600px;
	height: 37px;
	background: url(images/taskbar.gif) top right no-repeat;
	padding: 10px 4px 10px 0px;
	text-align: right;
	white-space: nowrap;
	z-index: 2;
	}

	#taskbar a,
	#taskbar a:active,
	#taskbar a:visited
	{
	font-size: 11px;
	color: #666666;
	text-decoration: none;
	padding: 6px 16px 6px 25px;
	background-repeat: no-repeat;
	}

	#taskbar a:hover
	{
	color: #333333;
	}

	a.button-mail
	{
	background-image: url(images/buttons/mail.gif);
	}

	a.button-addressbook
	{
	background-image: url(images/buttons/addressbook.gif);
	}

	a.button-settings
	{
	background-image: url(images/buttons/settings.gif);
	}

	a.button-logout
	{
	background-image: url(images/buttons/logout.gif);
	}


	#message
	{
	position: absolute;
	display: none;
	top: -1px;
	left: 200px;
	right: 200px;
	z-index: 5000;
	opacity: 0.85;
	/* IE */
	filter: alpha(opacity=85);
	}

	#message div
	{
	width: 400px;
	margin: 0px auto;
	height: 24px;
	min-height: 24px;
	padding: 8px 10px 8px 46px;
	}

	#message div.notice,
	#remote-objects-message
	{
	background: url(images/display/info.png) 6px 3px no-repeat;
	background-color: #F7FDCB;
	border: 1px solid #C2D071;
	}

	#message div.error,
	#message div.warning
	{
	background: url(images/display/warning.png) 6px 3px no-repeat;
	background-color: #EF9398;
	border: 1px solid #DC5757;
	}

	#message div.confirmation
	{
	background: url(images/display/confirm.png) 6px 3px no-repeat;
	background-color: #A6EF7B;
	border: 1px solid #76C83F;
	}

	#message div.loading
	{
	background: url(images/display/loading.gif) 6px 3px no-repeat;
	background-color: #EBEBEB;
	border: 1px solid #CCCCCC;
	}

	+#pagecontent
	+{
	+ position: absolute;
	+ top: 95px;
	+ left: 20px;
	+}
	+
	.splitter
	{
	user-select: none;
	-moz-user-select: none;
	-khtml-user-select: none;
	position: absolute;
	background: url(images/dimple.png) center no-repeat;
	}

	.splitter-h
	{
	cursor: n-resize;
	background-position: center 2px;
	}

	.splitter-v
	{
	cursor: e-resize;
	background-position: 2px center;
	}

	.boxtitle
	{
	height: 12px !important;
	padding: 4px 20px 3px 20px;
	border-bottom: 1px solid #999;
	color: #333;
	font-size: 11px;
	font-weight: bold;
	background-color: #EBEBEB;
	background-image: url(images/listheader_aqua.gif);
	}

	.radios-left label
	{
	padding-left: 0.3em;
	}

	/*** common table settings ****/

	table.records-table thead tr td
	{
	height: 20px;
	padding: 0px 4px 0px 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;
	}

	table.records-table tbody tr td
	{
	height: 16px;
	padding: 2px 4px 2px 4px;
	font-size: 11px;
	white-space: nowrap;
	border-bottom: 1px solid #EBEBEB;
	overflow: hidden;
	text-align: left;
	}

	table.records-table tr
	{
	background-color: #FFFFFF;
	}

	table.records-table tr.selected td
	{
	color: #FFFFFF;
	background-color: #CC3333;
	}

	table.records-table tr.focused td
	{
	}

	table.records-table tr.unfocused td
	{
	color: #FFFFFF;
	background-color: #929292;
	}


	/*** mac-style quicksearch field ***/

	#quicksearchbar
	{
	position: absolute;
	top: 55px;
	right: 20px;
	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;
	}

	#quicksearchbar img
	{
	vertical-align: middle;
	}

	#quicksearchbox
	{
	position: absolute;
	top: 2px;
	left: 20px;
	width: 140px;
	height: 15px;
	font-size: 11px;
	padding: 0px;
	border: none;
	}


	/*** roundcube webmail pre-defined classes ***/

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

	#rcmdraglayer
	{
	min-width: 300px;
	width: auto !important;
	width: 300px;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	padding-left: 8px;
	padding-right: 8px;
	padding-top: 3px;
	padding-bottom: 3px;
	font-size: 11px;
	white-space: nowrap;
	opacity: 0.7;
	-moz-opacity: 0.7;
	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
	}

	a.rcmContactAddress
	{
	text-decoration: none;
	}

	a.rcmContactAddress:hover
	{
	text-decoration: underline;
	}

	#rcmKSearchpane
	{
	background-color: #F9F9F9;
	border: 1px solid #CCCCCC;
	}

	#rcmKSearchpane ul
	{
	margin: 0px;
	padding: 2px;
	list-style-image: none;
	list-style-type: none;
	}

	#rcmKSearchpane ul li
	{
	display: block;
	height: 16px;
	font-size: 11px;
	padding-left: 6px;
	padding-top: 2px;
	padding-right: 6px;
	white-space: nowrap;
	cursor: pointer;
	}

	#rcmKSearchpane ul li.selected
	{
	color: #ffffff;
	background-color: #CC3333;
	}

	diff --git a/skins/default/functions.js b/skins/default/functions.js
	index 9e71f6f9a..fd6e612ee 100644
	--- a/skins/default/functions.js
	+++ b/skins/default/functions.js
	@@ -1,169 +1,161 @@
	/**
	* RoundCube functions for default skin interface
	*/

	/**
	* Settings
	*/

	function rcube_init_settings_tabs()
	{
	+ var tab = '#settingstabdefault';
	if (window.rcmail && rcmail.env.action)
	- {
	- var action = rcmail.env.action=='preferences' ? 'default' : (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action);
	- var tab = document.getElementById('settingstab'+action);
	- }
	- else
	- var tab = document.getElementById('settingstabdefault');
	-
	- if (tab)
	- tab.className = 'tablink-selected';
	+ tab = '#settingstab' + (rcmail.env.action=='preferences' ? 'default' : (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action.replace(/\./g, '')));
	+
	+ $(tab).addClass('tablink-selected');
	}

	function rcube_show_advanced(visible)
	{
	- var rows = document.getElementsByTagName('TR');
	- for(var i=0; i<rows.length; i++)
	- if(rows[i].className && rows[i].className.match(/advanced/))
	- rows[i].style.display = visible ? (bw.ie ? 'block' : 'table-row') : 'none';
	+ $('tr.advanced').css('display', (visible ? (bw.ie ? 'block' : 'table-row') : 'none'));
	}

	/**
	* Mail Composing
	*/

	function rcmail_show_header_form(id)
	{
	var link, row, parent, ns, ps;

	link = document.getElementById(id + '-link');
	parent = link.parentNode;

	if ((ns = rcmail_next_sibling(link)))
	ns.style.display = 'none';
	else if ((ps = rcmail_prev_sibling(link)))
	ps.style.display = 'none';

	link.style.display = 'none';

	if (row = document.getElementById('compose-' + id))
	{
	var div = document.getElementById('compose-div');
	var headers_div = document.getElementById('compose-headers-div');
	row.style.display = (document.all && !window.opera) ? 'block' : 'table-row';
	div.style.top = (parseInt(headers_div.offsetHeight)) + 'px';
	}

	return false;
	}

	function rcmail_hide_header_form(id)
	{
	var row, parent, ns, ps, link, links;

	link = document.getElementById(id + '-link');
	link.style.display = '';

	parent = link.parentNode;
	links = parent.getElementsByTagName('A');

	for (var i=0; i<links.length; i++)
	if (links[i].style.display != 'none')
	for (var j=i+1; j<links.length; j++)
	if (links[j].style.display != 'none')
	if ((ns = rcmail_next_sibling(links[i]))) {
	ns.style.display = '';
	break;
	}

	document.getElementById('_' + id).value = '';

	if (row = document.getElementById('compose-' + id))
	{
	var div = document.getElementById('compose-div');
	var headers_div = document.getElementById('compose-headers-div');
	row.style.display = 'none';
	div.style.top = (parseInt(headers_div.offsetHeight)) + 'px';
	}

	return false;
	}

	function rcmail_next_sibling(elm)
	{
	var ns = elm.nextSibling;
	while (ns && ns.nodeType == 3)
	ns = ns.nextSibling;
	return ns;
	}

	function rcmail_prev_sibling(elm)
	{
	var ps = elm.previousSibling;
	while (ps && ps.nodeType == 3)
	ps = ps.previousSibling;
	return ps;
	}

	function rcmail_init_compose_form()
	{
	var cc_field = document.getElementById('_cc');
	if (cc_field && cc_field.value!='')
	rcmail_show_header_form('cc');

	var bcc_field = document.getElementById('_bcc');
	if (bcc_field && bcc_field.value!='')
	rcmail_show_header_form('bcc');

	// prevent from form data loss when pressing ESC key in IE
	if (bw.ie) {
	var form = rcube_find_object('form');
	form.onkeydown = function (e) { if (rcube_event.get_keycode(e) == 27) rcube_event.cancel(e); };
	}
	}

	/**
	* Mailbox view
	*/

	function rcube_mail_ui()
	{
	- this.markmenu = new rcube_layer('markmessagemenu');
	+ this.markmenu = $('#markmessagemenu');
	}

	rcube_mail_ui.prototype = {

	show_markmenu: function(show)
	{
	if (typeof show == 'undefined')
	- show = this.markmenu.visible ? false : true;
	+ show = this.markmenu.is(':visible') ? false : true;

	var ref = rcube_find_object('markreadbutton');
	if (show && ref)
	- this.markmenu.move(ref.offsetLeft, ref.offsetTop + ref.offsetHeight);
	+ this.markmenu.css({ left:ref.offsetLeft, top:(ref.offsetTop + ref.offsetHeight) });

	- this.markmenu.show(show);
	+ this.markmenu[show?'show':'hide']();
	},

	body_mouseup: function(evt, p)
	{
	- if (this.markmenu && this.markmenu.visible && rcube_event.get_target(evt) != rcube_find_object('markreadbutton'))
	+ if (this.markmenu && this.markmenu.is(':visible') && rcube_event.get_target(evt) != rcube_find_object('markreadbutton'))
	this.show_markmenu(false);
	},

	body_keypress: function(evt, p)
	{
	- if (rcube_event.get_keycode(evt) == 27 && this.markmenu && this.markmenu.visible)
	+ if (rcube_event.get_keycode(evt) == 27 && this.markmenu && this.markmenu.is(':visible'))
	this.show_markmenu(false);
	}

	};

	var rcmail_ui;

	function rcube_init_mail_ui()
	{
	rcmail_ui = new rcube_mail_ui();
	rcube_event.add_listener({ object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
	rcube_event.add_listener({ object:rcmail_ui, method:'body_keypress', event:'keypress' });
	}
	diff --git a/skins/default/includes/settingstabs.html b/skins/default/includes/settingstabs.html
	index 5121ba19b..ce6d23407 100644
	--- a/skins/default/includes/settingstabs.html
	+++ b/skins/default/includes/settingstabs.html
	@@ -1,5 +1,7 @@
	<div id="tabsbar">
	<span id="settingstabdefault" class="tablink"><roundcube:button command="preferences" type="link" label="preferences" title="editpreferences" /></span>
	<span id="settingstabfolders" class="tablink"><roundcube:button command="folders" type="link" label="folders" title="managefolders" class="tablink" /></span>
	<span id="settingstabidentities" class="tablink"><roundcube:button command="identities" type="link" label="identities" title="manageidentities" class="tablink" /></span>
	+<roundcube:container name="tabs" id="tabsbar" />
	+<script type="text/javascript"> if (window.rcmail) rcmail.add_onload(rcube_init_settings_tabs); </script>
	</div>
	diff --git a/skins/default/includes/taskbar.html b/skins/default/includes/taskbar.html
	index ef1aa8268..c2841a606 100644
	--- a/skins/default/includes/taskbar.html
	+++ b/skins/default/includes/taskbar.html
	@@ -1,6 +1,7 @@
	<div id="taskbar">
	+<roundcube:container name="taskbar" id="taskbar" />
	<roundcube:button command="mail" label="mail" class="button-mail" />
	<roundcube:button command="addressbook" label="addressbook" class="button-addressbook" />
	<roundcube:button command="settings" label="settings" class="button-settings" />
	<roundcube:button command="logout" label="logout" class="button-logout" />
	</div>
	\ No newline at end of file
	diff --git a/skins/default/mail.css b/skins/default/mail.css
	index 5a4e57bfe..ab4579eb9 100644
	--- a/skins/default/mail.css
	+++ b/skins/default/mail.css
	@@ -1,1095 +1,1095 @@
	/*** RoundCube\|Mail mail task styles ***/


	#messagetoolbar
	{
	position: absolute;
	top: 47px;
	left: 200px;
	right: 200px;
	height: 35px;
	white-space: nowrap;
	/* border: 1px solid #cccccc; */
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-400)+'px');
	}

	#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: 8px;
	}

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

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

	#markmessagemenu
	{
	position: absolute;
	top: 32px;
	left: 90px;
	width: auto;
	- visibility: hidden;
	+ display: none;
	background-color: #F9F9F9;
	border: 1px solid #CCC;
	padding: 1px;
	opacity: 0.9;
	filter:alpha(opacity=90);
	z-index: 240;
	}

	ul.toolbarmenu
	{
	margin: 0;
	padding: 0;
	list-style: none;
	}

	ul.toolbarmenu li
	{
	font-size: 11px;
	white-space: nowrap;
	min-width: 130px;
	width: auto !important;
	width: 130px;
	}

	ul.toolbarmenu li a
	{
	display: block;
	color: #a0a0a0;
	padding: 2px 8px 3px 12px;
	text-decoration: none;
	}

	ul.toolbarmenu li a.active:hover
	{
	background-color: #ddd;
	}

	#searchfilter
	{
	position: absolute;
	right: 18px;
	top: 8px;
	text-align: right;
	}

	#searchfilter label
	{
	font-size: 11px;
	}

	#listcontrols a,
	#listcontrols a:active,
	#listcontrols a:visited,
	#mailboxcontrols a,
	#mailboxcontrols a:active,
	#mailboxcontrols a:visited,
	td.formlinks a,
	td.formlinks 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,
	ul.toolbarmenu li a.active,
	ul.toolbarmenu li a.active:active,
	ul.toolbarmenu li a.active:visited,
	td.formlinks a,
	td.formlinks a:visited
	{
	color: #CC0000;
	}

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

	#listcontrols,
	#mailboxcontrols
	{
	padding-right: 2em;
	}

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

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

	#mainscreen
	{
	position: absolute;
	top: 85px;
	right: 20px;
	bottom: 40px;
	left: 20px;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
	height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
	}

	#mailrightcontainer
	{
	position: absolute;
	top: 0px;
	left: 170px;
	bottom: 0px;
	right: 0px;
	/* css hack for IE */
	width: expression((parseInt(this.parentNode.offsetWidth)-170)+'px');
	height: expression(parseInt(this.parentNode.offsetHeight)+'px');
	}

	#messagepartcontainer
	{
	position: absolute;
	top: 80px;
	left: 20px;
	right: 20px;
	bottom: 20px;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
	height: expression((parseInt(document.documentElement.clientHeight)-100)+'px');
	}

	#mailcontframe
	{
	position: absolute;
	width: 100%;
	top: 0px;
	bottom: 0px;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	overflow: auto;
	/* css hack for IE */
	height: expression(parseInt(this.parentNode.offsetHeight)+'px');
	}

	#mailpreviewframe
	{
	position: absolute;
	width: 100%;
	top: 205px;
	bottom: 0px;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	/* css hack for IE */
	height: expression((parseInt(this.parentNode.offsetHeight)-205)+'px');
	}

	#messagecontframe
	{
	position: relative;
	top: 0px;
	left: 0px;
	right: 0px;
	bottom: 0px;
	width: 100%;
	height: 100%;
	}

	#messagepartframe
	{
	width: 100%;
	height: 100%;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	}


	#partheader
	{
	position: absolute;
	top: 10px;
	left: 220px;
	right: 20px;
	height: 40px;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
	}

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

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


	/** mailbox list styles */

	#mailboxlist-header
	{
	display: block;
	height: 12px;
	margin: 0;
	padding: 3px 10px 4px 10px;
	background-color: #EBEBEB;
	background-image: url(images/listheader_aqua.gif);
	border-bottom: 1px solid #999;
	color: #333333;
	font-size: 11px;
	font-weight: bold;
	}

	#mailboxlist-container
	{
	position: absolute;
	top: 0px;
	left: 0px;
	width: 160px;
	bottom: 0px;
	border: 1px solid #999;
	background-color: #F9F9F9;
	overflow: auto;
	/* css hack for IE */
	height: expression(parseInt(this.parentNode.offsetHeight)+'px');
	}

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

	#mailboxlist li
	{
	display: block;
	position: relative;
	font-size: 11px;
	background: url(images/icons/folder-closed.png) no-repeat;
	background-position: 5px 1px;
	border-bottom: 1px solid #EBEBEB;
	}

	#mailboxlist li div
	{
	position: absolute;
	left: 8px !important;
	left: -16px;
	top: 2px;
	width: 14px;
	height: 16px;
	}

	#mailboxlist li div.collapsed,
	#mailboxlist li div.expanded
	{
	cursor: pointer;
	}

	#mailboxlist li div.collapsed
	{
	background: url(images/icons/collapsed.png) bottom right no-repeat;
	}

	#mailboxlist li div.expanded
	{
	background: url(images/icons/expanded.png) bottom right no-repeat;
	}

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

	#mailboxlist li.drafts
	{
	background-image: url(images/icons/folder-drafts.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
	{
	cursor: default;
	display: block;
	position: relative;
	padding-left: 25px;
	padding-top: 2px;
	padding-bottom: 2px;
	text-decoration: none;
	}

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

	#mailboxlist li.virtual > a
	{
	color: #666;
	}

	#mailboxlist li.selected,
	#mailboxlist li.droptarget li.selected
	{
	background-color: #929292;
	}

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

	#mailboxlist li.droptarget
	{
	background-color: #FFFFA6;
	}

	/* styles for nested folders */
	#mailboxlist ul {
	list-style: none;
	padding: 0;
	margin:0;
	border-top: 1px solid #EBEBEB;
	padding-left: 15px;
	background-position: 25px 1px;
	background-color: #F9F9F9;
	color: blue;
	font-weight: normal;
	}


	#mailfooter
	{
	position: absolute;
	left: 20px;
	right: 20px;
	bottom: 18px;
	height: 20px;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
	}

	#mailfooter table tr td
	{
	white-space: nowrap;
	vertical-align: bottom;
	}

	#mailboxcontrols,
	#listcontrols,
	#countcontrols,
	#quotabox
	{
	white-space: nowrap;
	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('auto');
	}

	#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
	{
	display: block;
	width: auto !important;
	width: 100%;
	color: #333333;
	text-decoration: none;
	}

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

	#messagelist tbody tr td a
	{
	color: #000;
	text-decoration: none;
	white-space: nowrap;
	cursor: inherit;
	}

	#messagelist tbody tr td.subject a
	{
	cursor: default;
	}

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

	#messagelist tr td.icon,
	#messagelist tr td.flag
	{
	width: 16px;
	vertical-align: middle;
	cursor: pointer;
	}

	#messagelist tbody tr td.flag img:hover,
	#messagelist thead tr td.flag img
	{
	background: url(images/icons/unflagged.png) center no-repeat;
	}

	#messagelist tr td.subject
	{
	overflow: hidden;
	vertical-align: middle;
	}

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

	#messagelist thead tr td.size
	{
	text-align: left;
	}

	#messagelist tr td.from,
	#messagelist tr td.to
	{
	width: 180px;
	vertical-align: middle;
	}

	#messagelist tr td.date
	{
	width: 118px;
	vertical-align: middle;
	}

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

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

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

	#messagelist tr.flagged td,
	#messagelist tr.flagged td a
	{
	color: #CC0000;
	}

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

	#messagelist tr.unfocused td
	{
	color: #FFFFFF;
	background-color: #929292;
	}

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

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

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

	/* safari hacks \*/
	html>body*#messagelist[id$="messagelist"]:not([class="none"]) { width: 99.8%; }
	html>body*#messagelist[id$="messagelist"]:not([class="none"]) tr td.flag,
	html>body*#messagelist[id$="messagelist"]:not([class="none"]) tr td.icon { width: 20px; }
	html>body*input[type$="file"]:not([class="none"]) { background-color: transparent; border: 0; }
	/**/

	#quotadisplay
	{
	color: #666666;
	font-size: 11px;
	}

	#quotadisplay img
	{
	vertical-align: middle;
	margin-left: 4px;
	border: 1px solid #999;
	}


	/** message view styles */

	#messageframe
	{
	position: absolute;
	top: 0px;
	left: 170px;
	right: 0px;
	bottom: 0px;
	border: 1px solid #999;
	background-color: #FFF;
	overflow: auto;
	/* css hack for IE */
	width: expression((parseInt(this.parentNode.offsetWidth)-170)+'px');
	height: expression((parseInt(this.parentNode.offsetHeight))+'px');
	}

	#messagecanvas
	{
	/* css hack for IE */
	width: expression((parseInt(this.parentNode.offsetWidth)-20)+'px');
	}

	#printmessageframe
	{
	position: absolute;
	top: 0px;
	left: 0px;
	right: 0px;
	bottom: 0px;
	border: 1px solid #999;
	background-color: #FFF;
	overflow: auto;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-220)+'px');
	height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
	}

	div.messageheaderbox
	{
	margin: 6px 8px 0px 8px;
	border: 1px solid #ccc;
	}

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

	#messagebody table.headers-table
	{
	width: auto;
	margin: 6px 8px;
	background-color: #F4F4F4;
	border: 1px solid #ccc;
	}

	#messageframe table.headers-table
	{
	border-bottom: 1px solid #ccc;
	}

	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: 90%;
	font-weight: bold;
	}

	table.headers-table tr td.all
	{
	width: 100%;
	color: #666666;
	text-align: left;
	padding-right: 10px;
	vertical-align: center;
	text-align: center;
	}

	#attachment-list
	{
	margin: 0px;
	padding: 0px 0px 0px 72px;
	min-height: 16px;
	list-style-image: none;
	list-style-type: none;
	background: url(images/icons/attachment.png) 60px 2px no-repeat #DFDFDF;
	/* IE6 hack */
	_height: expression(Math.min(16, parseInt(document.documentElement.clientHeight))+'px');
	}

	#attachment-list:after
	{
	content: ".";
	display: block;
	height: 0;
	font-size: 0;
	clear: both;
	visibility: hidden;
	}

	#attachment-list li
	{
	float: left;
	height: 18px;
	font-size: 11px;
	padding: 2px 0px 0px 15px;
	white-space: nowrap;
	}

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

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

	#messagebody
	{
	position:relative;
	padding-bottom: 10px;
	background-color: #FFFFFF;
	}

	div.message-part
	{
	padding: 10px 8px;
	border-top: 1px solid #ccc;
	/* overflow: hidden; */
	}

	#messagebody div:first-child
	{
	border-top: 0;
	}

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

	div.message-part pre,
	div.message-htmlpart pre,
	div.message-part div.pre
	{
	margin: 0px;
	padding: 0px;
	font-family: monospace;
	white-space: -moz-pre-wrap !important;
	white-space: -o-pre-wrap !important;
	white-space: pre-wrap !important;
	white-space: pre;
	word-wrap: break-word; /* IE (and Safari) */
	}

	div.message-part blockquote
	{
	color: blue;
	border-left: 2px solid blue;
	border-right: 2px solid blue;
	background-color: #F6F6F6;
	margin: 2px 0px 2px 0px;
	padding: 1px 8px 1px 10px;
	}

	div.message-part blockquote blockquote
	{
	color: green;
	border-left: 2px solid green;
	border-right: 2px solid green;
	}

	div.message-part blockquote blockquote blockquote
	{
	color: #990000;
	border-left: 2px solid #bb0000;
	border-right: 2px solid #bb0000;
	}

	body.iframe
	{
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth))+'px');
	}

	body.iframe div.message-htmlpart
	{
	margin: 8px;
	}

	div.message-htmlpart div.rcmBody
	{
	margin: 8px;
	}

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

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

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

	#messageviewlink
	{
	position: absolute;
	top: 8px;
	right: 10px;
	width: 15px;
	height: 15px;
	border: 0;
	}

	/** message compose styles */

	#compose-toolbar
	{
	white-space: nowrap;
	}

	#priority-selector,
	#receipt-selector
	{
	padding-left: 30px;
	}

	#compose-container
	{
	position: absolute;
	top: 90px;
	left: 190px;
	right: 25px;
	bottom: 30px;
	margin: 0px;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-210)+'px');
	height: expression((parseInt(document.documentElement.clientHeight)-120)+'px');
	}

	#compose-div
	{
	position: absolute;
	top: 110px;
	bottom: 40px;
	width: 100%;
	vertical-align: top;
	}

	#compose-headers
	{
	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-body,
	#compose-headers td textarea,
	#compose-headers td input
	{
	width: 100%;
	width: expression('99%');
	}

	#compose-headers td textarea
	{
	height: 38px;
	}

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

	#compose-body
	{
	min-height: 100px;
	height: 100%;
	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: 2px;
	padding-top: 2px;
	padding-right: 4px;
	border-bottom: 1px solid #EBEBEB;
	white-space: nowrap;
	overflow: hidden;
	}

	#attachment-title
	{
	background: url(images/icons/attachment.png) top left no-repeat;
	padding: 0px 0px 3px 22px;
	}

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

	#attachment-form div
	{
	padding: 2px;
	}

	#attachment-form div.buttons
	{
	margin-top: 4px;
	}

	table.headers-table tr td.more-headers
	{
	cursor: pointer;
	width: 100%;
	height: 8px;
	border-bottom: 0;
	}

	table.headers-table tr td.all
	{
	padding: 2px 6px 4px 6px;
	border-bottom: 0;
	}

	td.show-headers
	{
	background: url(images/icons/down_small.gif) no-repeat center;
	}

	td.hide-headers
	{
	background: url(images/icons/up_small.gif) no-repeat center;
	}

	#all-headers
	{
	height: 150px;
	display: none;
	}

	#headers-source
	{
	margin: 0 5px;
	padding: 0.5em;
	height: 145px;
	background: white;
	overflow: auto;
	font-size: 11px;
	white-space: nowrap;
	border: 1px solid #999999;
	display: none;
	text-align: left;
	color: #333;
	}

	font.bold
	{
	font-weight: bold;
	}
	diff --git a/skins/default/splitter.js b/skins/default/splitter.js
	index 3ed0eb62a..fae3ca5cb 100644
	--- a/skins/default/splitter.js
	+++ b/skins/default/splitter.js
	@@ -1,238 +1,238 @@

	/**
	* RoundCube splitter GUI class
	*
	* @constructor
	*/
	function rcube_splitter(attrib)
	{
	this.p1id = attrib.p1;
	this.p2id = attrib.p2;
	this.id = attrib.id ? attrib.id : this.p1id + '_' + this.p2id + '_splitter';
	this.orientation = attrib.orientation;
	this.horizontal = (this.orientation == 'horizontal' \|\| this.orientation == 'h');
	this.offset = bw.ie6 ? 2 : 0;
	this.pos = attrib.start ? attrib.start * 1 : 0;
	this.relative = attrib.relative ? true : false;
	this.drag_active = false;

	this.init = function()
	{
	this.p1 = document.getElementById(this.p1id);
	this.p2 = document.getElementById(this.p2id);

	// create and position the handle for this splitter
	- this.p1pos = rcube_get_object_pos(this.p1, this.relative);
	- this.p2pos = rcube_get_object_pos(this.p2, this.relative);
	+ this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
	+ this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();

	if (this.horizontal)
	{
	- var top = this.p1pos.y + this.p1.offsetHeight;
	+ var top = this.p1pos.top + this.p1.offsetHeight;
	this.layer = new rcube_layer(this.id, {x: 0, y: top, height: 10,
	width: '100%', vis: 1, parent: this.p1.parentNode});
	}
	else
	{
	- var left = this.p1pos.x + this.p1.offsetWidth;
	+ var left = this.p1pos.left + this.p1.offsetWidth;
	this.layer = new rcube_layer(this.id, {x: left, y: 0, width: 10,
	height: '100%', vis: 1, parent: this.p1.parentNode});
	}

	this.elm = this.layer.elm;
	this.elm.className = 'splitter '+(this.horizontal ? 'splitter-h' : 'splitter-v');
	this.elm.unselectable = 'on';

	// add the mouse event listeners
	rcube_event.add_listener({element: this.elm, event:'mousedown', object:this, method:'onDragStart'});
	if (bw.ie)
	rcube_event.add_listener({element: window, event:'resize', object:this, method:'onResize'});

	// read saved position from cookie
	var cookie = bw.get_cookie(this.id);
	if (cookie && !isNaN(cookie))
	{
	this.pos = parseFloat(cookie);
	this.resize();
	}
	else if (this.pos)
	{
	this.resize();
	this.set_cookie();
	}
	};

	/**
	* Set size and position of all DOM objects
	* according to the saved splitter position
	*/
	this.resize = function()
	{
	if (this.horizontal)
	{
	var lh = this.layer.height - this.offset * 2;
	- this.p1.style.height = Math.floor(this.pos - this.p1pos.y - lh / 2) + 'px';
	+ this.p1.style.height = Math.floor(this.pos - this.p1pos.top - lh / 2) + 'px';
	this.p2.style.top = Math.ceil(this.pos + lh / 2) + 'px';
	- this.layer.move(this.layer.x, Math.round(this.pos - lh / 2 + 1));
	+ this.layer.move(this.layer.x, Math.round(this.pos - lh / 2 + 1));
	if (bw.ie)
	- {
	+ {
	var new_height = (parseInt(this.p2.parentNode.offsetHeight) - parseInt(this.p2.style.top));
	this.p2.style.height = (new_height > 0 ? new_height : 0) +'px';
	}
	}
	else
	{
	- this.p1.style.width = Math.floor(this.pos - this.p1pos.x - this.layer.width / 2) + 'px';
	+ this.p1.style.width = Math.floor(this.pos - this.p1pos.left - this.layer.width / 2) + 'px';
	this.p2.style.left = Math.ceil(this.pos + this.layer.width / 2) + 'px';
	this.layer.move(Math.round(this.pos - this.layer.width / 2 + 1), this.layer.y);
	if (bw.ie)
	this.p2.style.width = (parseInt(this.p2.parentNode.offsetWidth) - parseInt(this.p2.style.left))+'px';
	}
	};

	/**
	* Handler for mousedown events
	*/
	this.onDragStart = function(e)
	{
	- this.p1pos = rcube_get_object_pos(this.p1, this.relative);
	- this.p2pos = rcube_get_object_pos(this.p2, this.relative);
	+ this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
	+ this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
	this.drag_active = true;

	// start listening to mousemove events
	rcube_event.add_listener({element:document, event:'mousemove', object:this, method:'onDrag'});
	rcube_event.add_listener({element:document, event:'mouseup', object:this, method:'onDragStop'});

	// need to listen in any iframe documents too, b/c otherwise the splitter stops moving when we move over an iframe
	var iframes = document.getElementsByTagName('IFRAME');
	this.iframe_events = Object();
	for (var n in iframes)
	{
	var iframedoc = null;
	if (iframes[n].contentDocument)
	iframedoc = iframes[n].contentDocument;
	else if (iframes[n].contentWindow)
	iframedoc = iframes[n].contentWindow.document;
	else if (iframes[n].document)
	iframedoc = iframes[n].document;
	if (iframedoc)
	{
	// I don't use the add_listener function for this one because I need to create closures to fetch
	// the position of each iframe when the event is received
	var s = this;
	- var id = iframes[n].id;
	- this.iframe_events[n] = function(e){ e._offset = rcube_get_object_pos(document.getElementById(id)); return s.onDrag(e); }
	+ var id = '#'+iframes[n].id;
	+ this.iframe_events[n] = function(e){ e._offset = $(id).offset(); return s.onDrag(e); }

	if (iframedoc.addEventListener)
	iframedoc.addEventListener('mousemove', this.iframe_events[n], false);
	else if (iframes[n].attachEvent)
	iframedoc.attachEvent('onmousemove', this.iframe_events[n]);
	else
	iframedoc['onmousemove'] = this.iframe_events[n];

	rcube_event.add_listener({element:iframedoc, event:'mouseup', object:this, method:'onDragStop'});
	}
	}
	}

	/**
	* Handler for mousemove events
	*/
	this.onDrag = function(e)
	{
	if (!this.drag_active) return false;

	var pos = rcube_event.get_mouse_pos(e);

	if (this.relative)
	{
	- var parent = rcube_get_object_pos(this.p1.parentNode);
	- pos.x -= parent.x;
	- pos.y -= parent.y;
	+ var parent = $(this.p1.parentNode).offset();
	+ pos.x -= parent.left;
	+ pos.y -= parent.top;
	}

	if (this.horizontal)
	{
	- if (((pos.y - this.layer.height * 1.5) > this.p1pos.y) && ((pos.y + this.layer.height * 1.5) < (this.p2pos.y + this.p2.offsetHeight)))
	+ if (((pos.y - this.layer.height * 1.5) > this.p1pos.top) && ((pos.y + this.layer.height * 1.5) < (this.p2pos.top + this.p2.offsetHeight)))
	{
	this.pos = pos.y;
	this.resize();
	}
	}
	else
	{
	- if (((pos.x - this.layer.width * 1.5) > this.p1pos.x) && ((pos.x + this.layer.width * 1.5) < (this.p2pos.x + this.p2.offsetWidth)))
	+ if (((pos.x - this.layer.width * 1.5) > this.p1pos.left) && ((pos.x + this.layer.width * 1.5) < (this.p2pos.left + this.p2.offsetWidth)))
	{
	this.pos = pos.x;
	this.resize();
	}
	}

	- this.p1pos = rcube_get_object_pos(this.p1, this.relative);
	- this.p2pos = rcube_get_object_pos(this.p2, this.relative);
	+ this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
	+ this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
	return false;
	};

	/**
	* Handler for mouseup events
	*/
	this.onDragStop = function(e)
	{
	// cancel the listening for drag events
	rcube_event.remove_listener({element:document, event:'mousemove', object:this, method:'onDrag'});
	rcube_event.remove_listener({element:document, event:'mouseup', object:this, method:'onDragStop'});
	this.drag_active = false;

	var iframes = document.getElementsByTagName('IFRAME');

	for (var n in iframes)
	{
	var iframedoc;
	if (iframes[n].contentDocument)
	iframedoc = iframes[n].contentDocument;
	else if (iframes[n].contentWindow)
	iframedoc = iframes[n].contentWindow.document;
	else if (iframes[n].document)
	iframedoc = iframes[n].document;
	if (iframedoc)
	{
	if (this.iframe_events[n]) {
	if (iframedoc.removeEventListener)
	iframedoc.removeEventListener('mousemove', this.iframe_events[n], false);
	- else if (iframedoc.detachEvent)
	+ else if (iframedoc.detachEvent)
	iframedoc.detachEvent('onmousemove', this.iframe_events[n]);
	else
	iframedoc['onmousemove'] = null;
	}

	rcube_event.remove_listener({element:iframedoc, event:'mouseup', object:this, method:'onDragStop'});
	}
	}

	this.set_cookie();

	return bw.safari ? true : rcube_event.cancel(e);
	};

	/**
	* Handler for window resize events
	*/
	this.onResize = function(e)
	{
	if (this.horizontal)
	{
	var new_height = (parseInt(this.p2.parentNode.offsetHeight) - parseInt(this.p2.style.top));
	this.p2.style.height = (new_height > 0 ? new_height : 0) +'px';
	}
	else
	this.p2.style.width = (parseInt(this.p2.parentNode.offsetWidth) - parseInt(this.p2.style.left))+'px';
	};

	this.set_cookie = function()
	{
	// save state in cookie
	var exp = new Date();
	exp.setYear(exp.getFullYear() + 1);
	bw.set_cookie(this.id, this.pos, exp);
	}

	} // end class rcube_splitter
	diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
	index ce295567b..431c0589e 100644
	--- a/skins/default/templates/addressbook.html
	+++ b/skins/default/templates/addressbook.html
	@@ -1,80 +1,80 @@
	<!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="/addresses.css" />
	<script type="text/javascript" src="/splitter.js"></script>

	<style type="text/css">
	-<roundcube:if condition="config:ldap_public == false" />
	+<roundcube:if condition="count(env:address_sources) <= 1" />
	#abookcountbar { left: 20px;}
	#mainscreen { left:20px; /* IE hack */ width:expression((parseInt(document.documentElement.clientWidth)-40)+'px') }
	#addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
	#contacts-box {
	left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
	/* IE hack */
	width:expression((parseInt(mainscreen.offsetWidth)-<roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />)+'px')
	}
	<roundcube:else />
	#addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
	#contacts-box {
	left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
	/* IE hack */
	width:expression((parseInt(mainscreen.offsetWidth)-<roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />)+'px')
	}
	<roundcube:endif />
	</style>

	</head>
	<body>

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

	<div id="abooktoolbar">
	<roundcube:button command="add" imageSel="/images/buttons/add_contact_sel.png" imageAct="/images/buttons/add_contact_act.png" imagePas="/images/buttons/add_contact_pas.png" width="32" height="32" title="newcontact" />
	<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletecontact" />
	<roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="composeto" />
	<roundcube:button command="import" imageSel="/images/buttons/adr_import_sel.png" imageAct="/images/buttons/adr_import_act.png" imagePas="/images/buttons/adr_import_pas.png" width="32" height="32" title="importcontacts" />
	<roundcube:button command="export" imageSel="/images/buttons/download_sel.png" imageAct="/images/buttons/download_act.png" imagePas="/images/buttons/download_pas.png" width="32" height="32" title="exportvcards" />
	</div>

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

	-<roundcube:if condition="config:ldap_public" />
	+<roundcube:if condition="count(env:address_sources) > 1" />
	<div id="directorylist">
	<div id="groups-title"><roundcube:label name="groups" /></div>
	<roundcube:object name="directorylist" id="directories-list" />
	</div>
	<roundcube:endif />

	<div id="mainscreen">

	<div id="addresslist">
	<roundcube:object name="addresslist" id="contacts-table" class="records-table" cellspacing="0" summary="Contacts list" />
	</div>

	<script type="text/javascript">
	var addrviewsplit = new rcube_splitter({id:'addressviewsplitter', p1: 'addresslist', p2: 'contacts-box', orientation: 'v', relative: true, start: 250});
	rcmail.add_onload('addrviewsplit.init()');
	</script>

	<div id="contacts-box">
	<roundcube:object name="addressframe" id="contact-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
	</div>

	</div>

	<div id="abookcountbar">
	<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstpage" />
	<roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previouspage" />
	<roundcube:object name="recordsCountDisplay" />
	<roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextpage" />
	<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastpage" />
	</div>

	</body>
	</html>
	diff --git a/skins/default/templates/identities.html b/skins/default/templates/identities.html
	index 9799bc576..30d33a38b 100644
	--- a/skins/default/templates/identities.html
	+++ b/skins/default/templates/identities.html
	@@ -1,30 +1,30 @@
	<!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="/settings.css" />
	<script type="text/javascript" src="/functions.js"></script>
	</head>
	-<body onload="rcube_init_settings_tabs()">
	+<body>

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

	<div id="identities-list">
	<roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" />
	</div>

	<p id="listbuttons">
	<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:identities_level:0<2" />
	</p>

	<div id="identity-details">
	<div style="margin:10px auto; text-align:center">
	<img src="/images/watermark.gif" width="260" height="228" alt="RoundCube" />
	</div>
	</div>

	</body>
	</html>
	diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
	index 96be0f65e..4e1d7ce3a 100644
	--- a/skins/default/templates/mail.html
	+++ b/skins/default/templates/mail.html
	@@ -1,143 +1,144 @@
	<!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" />
	<script type="text/javascript" src="/splitter.js"></script>
	<script type="text/javascript" src="/functions.js"></script>
	<style type="text/css">
	<roundcube:if condition="config:preview_pane == true" />
	#mailcontframe { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-5 : 195" />px; }
	#mailpreviewframe {
	top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />px;
	/* css hack for IE */
	height: expression((parseInt(this.parentNode.offsetHeight)-<roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />)+'px');
	}
	<roundcube:endif />
	#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; }
	#mailrightcontainer {
	left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px;
	/* css hack for IE */
	width: expression((parseInt(this.parentNode.offsetWidth)-<roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />)+'px');
	}
	</style>
	</head>
	<body onload="rcube_init_mail_ui()">

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

	<div id="mainscreen">

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

	<script type="text/javascript">
	var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'mailrightcontainer', orientation: 'v', relative: true, start: 165});
	rcmail.add_onload('mailviewsplitv.init()');
	</script>

	<div id="mailrightcontainer">

	<div id="mailcontframe">
	<roundcube:object name="messages"
	id="messagelist"
	cellspacing="0"
	columns=""
	summary="Message list"
	messageIcon="/images/icons/dot.png"
	unreadIcon="/images/icons/unread.png"
	deletedIcon="/images/icons/deleted.png"
	repliedIcon="/images/icons/replied.png"
	forwardedIcon="/images/icons/forwarded.png"
	forwardedrepliedIcon="/images/icons/forwarded_replied.png"
	attachmentIcon="/images/icons/attachment.png"
	flaggedIcon="/images/icons/flagged.png"
	unflaggedIcon="/images/icons/blank.gif" />
	</div>

	<roundcube:if condition="config:preview_pane == true" />

	<script type="text/javascript">
	var mailviewsplit = new rcube_splitter({id:'mailviewsplitter', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h', relative: true, start: 200});
	rcmail.add_onload('mailviewsplit.init()');
	</script>

	<div id="mailpreviewframe">
	<roundcube:object name="messagecontentframe" id="messagecontframe" width="100%" height="100%" frameborder="0" src="/watermark.html" />
	</div>

	<roundcube:endif />

	</div>

	</div>

	<div id="mailfooter">
	<table cellpadding="1" cellspacing="0">
	<tr>
	<td width="99%">
	<span id="mailboxcontrols">
	<roundcube:label name="folder" />:
	<roundcube:button command="expunge" label="compact" classAct="active" />
	<roundcube:button command="purge" label="empty" classAct="active" />
	</span>
	<span 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" />
	</span>
	<roundcube:if condition="env:quota" />
	<span id="quotabox">
	<roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" />
	</span>
	<roundcube:endif />
	</td>
	<td width="1%">
	<span id="countcontrols">
	<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" />
	<roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" 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" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
	<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" />
	</span>
	</td>
	</tr>
	</table>
	</div>

	<div id="messagetoolbar">
	<roundcube:button command="checkmail" imageSel="/images/buttons/inbox_sel.png" imageAct="/images/buttons/inbox_act.png" imagePas="/images/buttons/inbox_pas.png" width="32" height="32" title="checkmail" />
	<roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
	<roundcube:button name="markreadbutton" id="markreadbutton" image="/images/buttons/markread_act.png" width="32" height="32" title="markmessages" onclick="rcmail_ui.show_markmenu();return false" />
	<roundcube:button command="reply" imageSel="/images/buttons/reply_sel.png" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
	<roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
	<roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
	<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
	<roundcube:button command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
	+<roundcube:container name="toolbar" id="messagetoolbar" />

	<div id="markmessagemenu">
	<ul class="toolbarmenu">
	<li><roundcube:button command="mark" prop="read" label="markread" classAct="active" /></li>
	<li><roundcube:button command="mark" prop="unread" label="markunread" classAct="active" /></li>
	<li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="active" /></li>
	<li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="active" /></li>
	</ul>
	</div>

	<div id="searchfilter">
	<label for="rcmlistfilter"><roundcube:label name="filter" /></label>:
	<roundcube:object name="searchfilter" class="searchfilter" />
	</div>
	</div>

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

	</body>
	</html>
	diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
	index 5da5c22f1..925bc2c81 100644
	--- a/skins/default/templates/managefolders.html
	+++ b/skins/default/templates/managefolders.html
	@@ -1,41 +1,41 @@
	<!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="/settings.css" />
	<script type="text/javascript" src="/functions.js"></script>
	</head>
	-<body onload="rcube_init_settings_tabs()">
	+<body>

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

	<form name="subscriptionform" action="./" onsubmit="rcmail.command('create-folder');return false;">

	<div id="folder-manager">
	<roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
	cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table"
	deleteIcon="/images/icons/folder-trash.png"
	renameIcon="/images/icons/rename.png" />
	</div>

	<div id="bottomboxes">
	<div class="settingsbox">
	<div class="boxtitle"><roundcube:label name="createfolder" /></div>

	<div class="settingspart">
	<roundcube:label name="foldername" />:
	<roundcube:object name="createfolder" form="subscriptionform" hintbox="rcmailaddfolderhint" />
	<roundcube:button command="create-folder" type="input" class="button" label="create" />
	<div id="rcmailaddfolderhint" class="hint" style="margin-top:1em; height:16px"></div>
	</div>
	</div>

	</div>

	</form>

	</body>
	</html>
	diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
	index b8d66c1be..7d42ef73f 100644
	--- a/skins/default/templates/message.html
	+++ b/skins/default/templates/message.html
	@@ -1,66 +1,67 @@
	<!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" />
	<script type="text/javascript" src="/splitter.js"></script>
	<style type="text/css">
	#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; }
	#messageframe {
	left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px;
	width: expression((parseInt(this.parentNode.offsetWidth)-<roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />)+'px');
	}
	</style>
	</head>
	<body>

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

	<div id="messagecountbar">
	<roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessage" />
	<roundcube:button command="previousmessage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessage" />
	<roundcube:object name="messageCountDisplay" />
	<roundcube:button command="nextmessage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessage" />
	<roundcube:button command="lastmessage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessage" />
	</div>

	<div id="messagetoolbar">
	<roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />
	<roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
	<roundcube:button command="reply" imageSel="/images/buttons/reply_sel.png" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
	<roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
	<roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
	<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
	<roundcube:button command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
	<roundcube:button command="viewsource" imageSel="/images/buttons/source_sel.png" imageAct="/images/buttons/source_act.png" imagePas="/images/buttons/source_pas.png" width="32" height="32" title="viewsource" />
	<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" />
	+<roundcube:container name="toolbar" id="messagetoolbar" />
	</div>

	<div id="mainscreen">

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

	<div id="messageframe">
	<div id="messagecanvas">
	<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" />
	<roundcube:object name="messageAttachments" id="attachment-list" />

	<roundcube:object name="blockedObjects" id="remote-objects-message" />
	<roundcube:object name="messageBody" id="messagebody" />
	</div>
	</div>

	</div>

	<script type="text/javascript">
	var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'messageframe', orientation: 'v', relative: true, start: 165});
	rcmail.add_onload('mailviewsplitv.init()');
	</script>

	</body>
	</html>
	diff --git a/skins/default/templates/plugin.html b/skins/default/templates/plugin.html
	new file mode 100644
	index 000000000..9725fe4d8
	--- /dev/null
	+++ b/skins/default/templates/plugin.html
	@@ -0,0 +1,24 @@
	+<!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="/<roundcube:var name='env:task'/>.css" />
	+<script type="text/javascript" src="/functions.js"></script>
	+</head>
	+<body>
	+
	+<roundcube:include file="/includes/taskbar.html" />
	+<roundcube:include file="/includes/header.html" />
	+<roundcube:if condition="env:task == 'settings'" />
	+ <roundcube:include file="/includes/settingstabs.html" />
	+<roundcube:endif />
	+
	+<div id="pagecontent">
	+<roundcube:object name="plugin.body" />
	+</div>
	+
	+<roundcube:object name="plugin.footer" />
	+
	+</body>
	+</html>
	diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
	index a3f5298cd..0abe7fa41 100644
	--- a/skins/default/templates/settings.html
	+++ b/skins/default/templates/settings.html
	@@ -1,43 +1,45 @@
	<!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="/settings.css" />
	<script type="text/javascript" src="/functions.js"></script>
	</head>
	-<body onload="rcube_init_settings_tabs()">
	+<body>

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

	<form name="form" action="./" method="post">

	<div id="userprefs-box">
	<div id="userprefs-title"><roundcube:label name="userpreferences" /></div>

	-<div style="padding:15px 0 15px 15px">
	+<div id="userprefscontainer" style="padding:15px 0 15px 15px">
	<div class="userprefs-block">
	<roundcube:object name="userprefs" form="form" parts="general,mailbox,mailview" />
	</div>
	<div class="userprefs-block">
	<roundcube:object name="userprefs" form="form" parts="compose,folders,server" />
	</div>
	<div style="clear:left"></div>
	+
	+<roundcube:container name="userprefs" id="userprefscontainer" />
	</div>
	</div>

	<p id="listbuttons">
	<roundcube:button command="save" type="input" class="button mainaction" label="save" />
	</p>

	</form>

	<div class="advswitch">
	<label for="advswitch"><roundcube:label name="advancedoptions"></label>
	<input type="checkbox" id="advswitch" name="_advanced" value="0" onclick="rcube_show_advanced(this.checked)" />
	</div>

	</body>
	</html>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 1:14 PM (2 h, 17 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 167125
Default Alt Text: (919 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions