No OneTemporary
Actions

Size

928 KB

Referenced Files

None

Subscribers

None

View Options

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

This document is not UTF8. It was detected as ISO-8859-1 (Latin 1) and converted to UTF8 for display.

	diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
	index 2ee4ccd27..dafee72f1 100644
	--- a/config/main.inc.php.dist
	+++ b/config/main.inc.php.dist
	@@ -1,866 +1,872 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| Main configuration file \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2011, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+

	*/

	$rcmail_config = array();

	// ----------------------------------
	// LOGGING/DEBUGGING
	// ----------------------------------

	// system error reporting, sum of: 1 = log; 4 = show, 8 = trace
	$rcmail_config['debug_level'] = 1;

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

	// date format for log entries
	// (read http://php.net/manual/en/function.date.php for all format characters)
	$rcmail_config['log_date_format'] = 'd-M-Y H:i:s O';

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

	// Log sent messages to <log_dir>/sendmail or to syslog
	$rcmail_config['smtp_log'] = true;

	// Log successful logins to <log_dir>/userlogins or to syslog
	$rcmail_config['log_logins'] = false;

	// Log session authentication errors to <log_dir>/session or to syslog
	$rcmail_config['log_session'] = false;

	// Log SQL queries to <log_dir>/sql or to syslog
	$rcmail_config['sql_debug'] = false;

	// Log IMAP conversation to <log_dir>/imap or to syslog
	$rcmail_config['imap_debug'] = false;

	// Log LDAP conversation to <log_dir>/ldap or to syslog
	$rcmail_config['ldap_debug'] = false;

	// Log SMTP conversation to <log_dir>/smtp or to syslog
	$rcmail_config['smtp_debug'] = false;

	// ----------------------------------
	// IMAP
	// ----------------------------------

	// 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://
	// Supported replacement variables:
	// %n - hostname ($_SERVER['SERVER_NAME'])
	// %t - hostname without the first part
	// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
	// %s - domain name after the '@' from e-mail address provided at login screen
	// For example %n = mail.domain.tld, %t = domain.tld
	$rcmail_config['default_host'] = '';

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

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

	// If you know your imap's folder delimiter, you can specify it here.
	// Otherwise it will be determined automatically
	$rcmail_config['imap_delimiter'] = null;

	// If IMAP server doesn't support NAMESPACE extension, but you're
	// using shared folders or personal root folder is non-empty, you'll need to
	// set these options. All can be strings or arrays of strings.
	// Folders need to be ended with directory separator, e.g. "INBOX."
	// (special directory "~" is an exception to this rule)
	// These can be used also to overwrite server's namespaces
	$rcmail_config['imap_ns_personal'] = null;
	$rcmail_config['imap_ns_other'] = null;
	$rcmail_config['imap_ns_shared'] = null;

	// By default IMAP capabilities are readed after connection to IMAP server
	// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list
	// after login. Set to True if you've got this case.
	$rcmail_config['imap_force_caps'] = false;

	// By default list of subscribed folders is determined using LIST-EXTENDED
	// extension if available. Some servers (dovecot 1.x) returns wrong results
	// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225
	// Enable this option to force LSUB command usage instead.
	$rcmail_config['imap_force_lsub'] = false;

	// Some server configurations (e.g. Courier) doesn't list folders in all namespaces
	// Enable this option to force listing of folders in all namespaces
	$rcmail_config['imap_force_ns'] = false;

	// IMAP connection timeout, in seconds. Default: 0 (no limit)
	$rcmail_config['imap_timeout'] = 0;

	// Optional IMAP authentication identifier to be used as authorization proxy
	$rcmail_config['imap_auth_cid'] = null;

	// Optional IMAP authentication password to be used for imap_auth_cid
	$rcmail_config['imap_auth_pw'] = null;

	// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'.
	$rcmail_config['imap_cache'] = null;

	// Enables messages cache. Only 'db' cache is supported.
	$rcmail_config['messages_cache'] = false;


	// ----------------------------------
	// SMTP
	// ----------------------------------

	// SMTP server host (for sending mails).
	// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
	// If left blank, the PHP mail() function is used
	// Supported replacement variables:
	// %h - user's IMAP hostname
	// %n - hostname ($_SERVER['SERVER_NAME'])
	// %t - hostname without the first part
	// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
	// %z - IMAP domain (IMAP hostname without the first part)
	// For example %n = mail.domain.tld, %t = domain.tld
	$rcmail_config['smtp_server'] = '';

	// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
	// deprecated SSL over SMTP (aka SMTPS))
	$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'] = '';

	// Optional SMTP authentication identifier to be used as authorization proxy
	$rcmail_config['smtp_auth_cid'] = null;

	// Optional SMTP authentication password to be used for smtp_auth_cid
	$rcmail_config['smtp_auth_pw'] = null;

	// 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'] = '';

	// SMTP connection timeout, in seconds. Default: 0 (no limit)
	$rcmail_config['smtp_timeout'] = 0;

	// ----------------------------------
	// SYSTEM
	// ----------------------------------

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

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

	// provide an URL where a user can get support for this Roundcube installation
	// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
	$rcmail_config['support_url'] = '';

	// replace Roundcube logo with this image
	// specify an URL relative to the document root of this Roundcube installation
	$rcmail_config['skin_logo'] = null;

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

	// Enables possibility to log in using email address from user identities
	$rcmail_config['user_aliases'] = false;

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

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

	// enforce connections over https
	// with this option enabled, all non-secure connections will be redirected.
	// set the port for the ssl connection as value of this option if it differs from the default 443
	$rcmail_config['force_https'] = false;

	// tell PHP that it should work as under secure connection
	// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set)
	// e.g. when you're running Roundcube behind a https proxy
	// this option is mutually exclusive to 'force_https' and only either one of them should be set to true.
	$rcmail_config['use_https'] = false;

	// Allow browser-autocompletion on login form.
	// 0 - disabled, 1 - username and host only, 2 - username, host, password
	$rcmail_config['login_autocomplete'] = 0;

	// Forces conversion of logins to lower case.
	// 0 - disabled, 1 - only domain part, 2 - domain and local part.
	// If users authentication is case-insensitive this must be enabled.
	// Note: After enabling it all user records need to be updated, e.g. with query:
	// UPDATE users SET username = LOWER(username);
	$rcmail_config['login_lc'] = 2;

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

	// display software version on login screen
	$rcmail_config['display_version'] = false;

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

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

	// Session name. Default: 'roundcube_sessid'
	$rcmail_config['session_name'] = null;

	// Session path. Defaults to PHP session.cookie_path setting.
	$rcmail_config['session_path'] = null;

	// Backend to use for session storage. Can either be 'db' (default) or 'memcache'
	// If set to memcache, a list of servers need to be specified in 'memcache_hosts'
	// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed
	$rcmail_config['session_storage'] = 'db';

	// Use these hosts for accessing memcached
	// Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
	$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' );

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

	// check referer of incoming requests
	$rcmail_config['referer_check'] = false;

	// X-Frame-Options HTTP header value sent to prevent from Clickjacking.
	// Possible values: sameorigin\|deny. Set to false in order to disable sending them
	$rcmail_config['x_frame_options'] = 'sameorigin';

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

	// 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
	// Supported replacement variables:
	// %h - user's IMAP hostname
	// %n - hostname ($_SERVER['SERVER_NAME'])
	// %t - hostname without the first part
	// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
	// %z - IMAP domain (IMAP hostname without the first part)
	// For example %n = mail.domain.tld, %t = domain.tld
	$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
	// Supported replacement variables:
	// %h - user's IMAP hostname
	// %n - http hostname ($_SERVER['SERVER_NAME'])
	// %d - domain (http hostname without the first part)
	// %z - IMAP domain (IMAP hostname without the first part)
	// For example %n = mail.domain.tld, %t = domain.tld
	$rcmail_config['mail_domain'] = '';

	// Password charset.
	// Use it if your authentication backend doesn't support UTF-8.
	// Defaults to ISO-8859-1 for backward compatibility
	$rcmail_config['password_charset'] = 'ISO-8859-1';

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

	// Maximum number of recipients per message. Default: 0 (no limit)
	$rcmail_config['max_recipients'] = 0;

	// Maximum allowednumber of members of an address group. Default: 0 (no limit)
	// If 'max_recipients' is set this value should be less or equal
	$rcmail_config['max_group_members'] = 0;

	// add this user-agent to message headers when sending
	$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION;

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

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

	// 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'] = '';

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

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

	// Whether or not to encrypt the IP address and the host name
	// these could, in some circles, be considered as sensitive information;
	// however, for the administrator, these could be invaluable help
	// when tracking down issues.
	$rcmail_config['http_received_header_encrypt'] = false;

	// This string is used as a delimiter for message headers when sending
	// a message via mail() function. Leave empty for auto-detection
	$rcmail_config['mail_header_delimiter'] = NULL;

	// number of chars allowed for line when wrapping text.
	// text wrapping is done when composing/sending messages
	$rcmail_config['line_length'] = 72;

	// send plaintext messages as format=flowed
	$rcmail_config['send_format_flowed'] = true;

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

	// Mimetypes supported by the browser.
	// attachments of these types will open in a preview window
	// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf'
	$rcmail_config['client_mimetypes'] = null; # null == default

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

	// path to imagemagick identify binary
	$rcmail_config['im_identify_path'] = null;

	// path to imagemagick convert binary
	$rcmail_config['im_convert_path'] = null;

	// maximum size of uploaded contact photos in pixel
	$rcmail_config['contact_photo_size'] = 160;

	// Enable DNS checking for e-mail address validation
	$rcmail_config['email_dns_check'] = false;

	// Disables saving sent messages in Sent folder (like gmail) (Default: false)
	// Note: useful when SMTP server stores sent mail in user mailbox
	$rcmail_config['no_save_sent_messages'] = false;

	// ----------------------------------
	// PLUGINS
	// ----------------------------------

	// List of active plugins (in plugins/ directory)
	$rcmail_config['plugins'] = array();

	// ----------------------------------
	// USER INTERFACE
	// ----------------------------------

	// default messages sort column. Use empty value for default server's sorting,
	// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc'
	$rcmail_config['message_sort_col'] = '';

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

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

	// 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 date display (date or strftime format)
	$rcmail_config['date_format'] = 'Y-m-d';

	// give this choice of date formats to the user to select from
	$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');

	// use this format for time display (date or strftime format)
	$rcmail_config['time_format'] = 'H:i';

	// give this choice of time formats to the user to select from
	$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A');

	// use this format for short date display (derived from date_format and time_format)
	$rcmail_config['date_short'] = 'D H:i';

	// use this format for detailed date/time formatting (derived from date_format and time_format)
	$rcmail_config['date_long'] = 'Y-m-d H:i';

	// store draft message is this mailbox
	// leave blank if draft messages should not be stored
	// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
	$rcmail_config['drafts_mbox'] = 'Drafts';

	// store spam messages in this mailbox
	// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
	$rcmail_config['junk_mbox'] = 'Junk';

	// store sent message is this mailbox
	// leave blank if sent messages should not be stored
	// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
	$rcmail_config['sent_mbox'] = 'Sent';

	// move messages to this folder when deleting them
	// leave blank if they should be deleted directly
	// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
	$rcmail_config['trash_mbox'] = 'Trash';

	// display these folders separately in the mailbox list.
	// these folders will also be displayed with localized names
	// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
	$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');

	// automatically create the above listed default folders on first 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;

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

	// Enables spellchecker exceptions dictionary.
	// Setting it to 'shared' will make the dictionary shared by all users.
	$rcmail_config['spellcheck_dictionary'] = false;

	// 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 available language.
	$rcmail_config['spellcheck_languages'] = NULL;

	// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE)
	$rcmail_config['spellcheck_ignore_caps'] = false;

	// Makes that words with numbers will be ignored (e.g. g00gle)
	$rcmail_config['spellcheck_ignore_nums'] = false;

	// Makes that words with symbols will be ignored (e.g. g@@gle)
	$rcmail_config['spellcheck_ignore_syms'] = false;

	// Use this char/string to separate recipients when composing a new message
	$rcmail_config['recipients_separator'] = ',';

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

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

	// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option.
	// By default refresh time is set to 1 second. You can set this value to true
	// or any integer value indicating number of seconds.
	$rcmail_config['upload_progress'] = false;

	// Specifies for how many seconds the Undo button will be available
	// after object delete action. Currently used with supporting address book sources.
	// Setting it to 0, disables the feature.
	$rcmail_config['undo_timeout'] = 0;

	// ----------------------------------
	// ADDRESSBOOK SETTINGS
	// ----------------------------------

	// This indicates which type of address book to use. Possible choises:
	// 'sql' (default), 'ldap' and ''.
	// 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.
	// If set to '' then no address book will be displayed or only the
	// addressbook which is created by a plugin (like CardDAV).
	$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.
	// Array key must contain only safe characters, ie. a-zA-Z0-9_
	$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',
	// Replacement variables supported in host names:
	// %h - user's IMAP hostname
	// %n - hostname ($_SERVER['SERVER_NAME'])
	// %t - hostname without the first part
	// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
	// %z - IMAP domain (IMAP hostname without the first part)
	// For example %n = mail.domain.tld, %t = domain.tld
	'hosts' => array('directory.verisign.com'),
	'port' => 389,
	'use_tls' => false,
	'ldap_version' => 3, // using LDAPv3
	'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 '@'.
	// %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
	// %dn - DN found by ldap search when search_filter/search_base_dn are used
	'base_dn' => '',
	'bind_dn' => '',
	'bind_pass' => '',
	// It's possible to bind for an individual address book
	// The login name is used to search for the DN to bind with
	'search_base_dn' => '',
	'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))'
	// DN and password to bind as before searching for bind DN, if anonymous search is not allowed
	'search_bind_dn' => '',
	'search_bind_pw' => '',
	// Default for %dn variable if search doesn't return DN value
	'search_dn_default' => '',
	// Optional authentication identifier to be used as SASL authorization proxy
	// bind_dn need to be empty
	'auth_cid' => '',
	// SASL authentication method (for proxy auth), e.g. DIGEST-MD5
	'auth_method' => '',
	// Indicates if the addressbook shall be hidden from the list.
	// With this option enabled you can still search/view contacts.
	'hidden' => false,
	// Indicates if the addressbook shall not list contacts but only allows searching.
	'searchonly' => 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
	'writable' => false,
	// To create a new contact these are the object classes to specify
	// (or any other classes you wish to use).
	'LDAP_Object_Classes' => array('top', 'inetOrgPerson'),
	// 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_rdn' => 'cn',
	// 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).
	'required_fields' => array('cn', 'sn', 'mail'),
	'search_fields' => array('mail', 'cn'), // fields to search in
	// mapping of contact fields to directory attributes
	// for every attribute one can specify the number of values (limit) allowed.
	// default is 1, a wildcard * means unlimited
	'fieldmap' => array(
	// Roundcube => LDAP:limit
	'name' => 'cn',
	'surname' => 'sn',
	'firstname' => 'givenName',
	'jobtitle' => 'title',
	'email' => 'mail:*',
	'phone:home' => 'homePhone',
	'phone:work' => 'telephoneNumber',
	'phone:mobile' => 'mobile',
	'phone:pager' => 'pager',
	'street' => 'street',
	'zipcode' => 'postalCode',
	'region' => 'st',
	'locality' => 'l',
	// if you country is a complex object, you need to configure 'sub_fields' below
	'country' => 'c',
	'organization' => 'o',
	'department' => 'ou',
	'jobtitle' => 'title',
	'notes' => 'description',
	// these currently don't work:
	// 'phone:workfax' => 'facsimileTelephoneNumber',
	// 'photo' => 'jpegPhoto',
	// 'manager' => 'manager',
	// 'assistant' => 'secretary',
	),
	// Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country'
	'sub_fields' => array(),
	'sort' => 'cn', // The field to sort the listing by.
	'scope' => 'sub', // search mode: sub\|base\|list
	'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
	'fuzzy_search' => true, // server allows wildcard search
	'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it)
	'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting
	'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit.
	'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit.
	'referrals' => true\|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups

	// definition for contact groups (uncomment if no groups are supported)
	// for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above)
	// if the groups base_dn is empty, the contact base_dn is used for the groups as well
	// -> in this case, assure that groups and contacts are separated due to the concernig filters!
	'groups' => array(
	'base_dn' => '',
	'scope' => 'sub', // search mode: sub\|base\|list
	'filter' => '(objectClass=groupOfNames)',
	'object_classes' => array("top", "groupOfNames"),
	'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember
	'name_attr' => 'cn', // attribute to be used as group name
	),
	);
	*/

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

	// The minimum number of characters required to be typed in an autocomplete field
	// before address books will be searched. Most useful for LDAP directories that
	// may need to do lengthy results building given overly-broad searches
	$rcmail_config['autocomplete_min_length'] = 1;

	// Number of parallel autocomplete requests.
	// If there's more than one address book, n parallel (async) requests will be created,
	// where each request will search in one address book. By default (0), all address
	// books are searched in one request.
	$rcmail_config['autocomplete_threads'] = 0;

	// Max. numer of entries in autocomplete popup. Default: 15.
	$rcmail_config['autocomplete_max'] = 15;

	// show address fields in this order
	// available placeholders: {street}, {locality}, {zipcode}, {country}, {region}
	$rcmail_config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';

	// Matching mode for addressbook search (including autocompletion)
	// 0 - partial (abc), default
	// 1 - strict (abc)
	// 2 - prefix (abc*)
	// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode
	$rcmail_config['addressbook_search_mode'] = 0;

	// ----------------------------------
	// USER PREFERENCES
	// ----------------------------------

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

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

	// show up to X items in messages list view
	$rcmail_config['mail_pagesize'] = 50;

	// show up to X items in contacts list view
	$rcmail_config['addressbook_pagesize'] = 50;

	// sort contacts by this col (preferably either one of name, firstname, surname)
	$rcmail_config['addressbook_sort_col'] = 'surname';

	// the way how contact names are displayed in the list
	// 0: display name
	// 1: (prefix) firstname middlename surname (suffix)
	// 2: (prefix) surname firstname middlename (suffix)
	// 3: (prefix) surname, firstname middlename (suffix)
	$rcmail_config['addressbook_name_listing'] = 0;

	// use this timezone to display date/time
	// valid timezone identifers are listed here: php.net/manual/en/timezones.php
	// 'auto' will use the browser's timezone settings
	$rcmail_config['timezone'] = 'auto';

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

	+// open messages in new window
	+$rcmail_config['message_extwin'] = false;
	+
	+// open message compose form in new window
	+$rcmail_config['compose_extwin'] = false;
	+
	// compose html formatted messages by default
	// 0 - never, 1 - always, 2 - on reply to HTML message, 3 - on forward or reply to HTML message
	$rcmail_config['htmleditor'] = 0;

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

	// Mark as read when viewed in preview pane (delay in seconds)
	// Set to -1 if messages in preview pane should not be marked as read
	$rcmail_config['preview_pane_mark_read'] = 0;

	// 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'] = 1;

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

	// Set to true to never delete messages immediately
	// Use 'Purge' to remove messages marked as deleted
	$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;

	// If true, after message delete/move, the next message will be displayed
	$rcmail_config['display_next'] = true;

	// 0 - Do not expand threads
	// 1 - Expand all threads automatically
	// 2 - Expand only threads with unread messages
	$rcmail_config['autoexpand_threads'] = 0;

	// When replying:
	// -1 - don't cite the original message
	// 0 - place cursor below the original message
	// 1 - place cursor above original message (top posting)
	$rcmail_config['reply_mode'] = 0;

	// When replying strip original signature from message
	$rcmail_config['strip_existing_sig'] = true;

	// Show signature:
	// 0 - Never
	// 1 - Always
	// 2 - New messages only
	// 3 - Forwards and Replies only
	$rcmail_config['show_sig'] = 1;

	// When replying or forwarding place sender's signature above existing message
	$rcmail_config['sig_above'] = false;

	// Use MIME encoding (quoted-printable) for 8bit characters in message body
	$rcmail_config['force_7bit'] = false;

	// Defaults of the search field configuration.
	// The array can contain a per-folder list of header fields which should be considered when searching
	// The entry with key '*' stands for all folders which do not have a specific list set.
	// Please note that folder names should to be in sync with $rcmail_config['default_folders']
	$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1));

	// Defaults of the addressbook search field configuration.
	$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1);

	// 'Delete always'
	// This setting reflects if mail should be always deleted
	// when moving to Trash fails. This is necessary in some setups
	// when user is over quota and Trash is included in the quota.
	$rcmail_config['delete_always'] = false;

	// Directly delete messages in Junk instead of moving to Trash
	$rcmail_config['delete_junk'] = 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)
	// 3 = send automatically if sender is in addressbook, otherwise ask the user
	// 4 = send automatically if sender is in addressbook, otherwise ignore
	$rcmail_config['mdn_requests'] = 0;

	// Return receipt checkbox default state
	$rcmail_config['mdn_default'] = 0;

	// Delivery Status Notification checkbox default state
	$rcmail_config['dsn_default'] = 0;

	// Place replies in the folder of the message being replied to
	$rcmail_config['reply_same_folder'] = false;

	// Sets default mode of Forward feature to "forward as attachment"
	$rcmail_config['forward_attachment'] = false;

	// Defines address book (internal index) to which new contacts will be added
	// By default it is the first writeable addressbook.
	// Note: Use '0' for built-in address book.
	$rcmail_config['default_addressbook'] = null;

	// Enables spell checking before sending a message.
	$rcmail_config['spellcheck_before_send'] = false;

	// Skip alternative email addresses in autocompletion (show one address per contact)
	$rcmail_config['autocomplete_single'] = false;

	// Default font for composed HTML message.
	// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New,
	// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana
	$rcmail_config['default_font'] = '';

	// end of config file
	diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
	index d15cc7577..38d18171c 100644
	--- a/program/include/rcube_message.php
	+++ b/program/include/rcube_message.php
	@@ -1,770 +1,760 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcube_message.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-2010, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Logical representation of a mail message with all its data \|
	\| and related functions \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Logical representation of a mail message with all its data
	* and related functions
	*
	* @package Mail
	* @author Thomas Bruederli <roundcube@gmail.com>
	*/
	class rcube_message
	{
	/**
	* Instace of framework class.
	*
	* @var rcube
	*/
	private $app;

	/**
	* Instance of storage class
	*
	* @var rcube_storage
	*/
	private $storage;

	/**
	* Instance of mime class
	*
	* @var rcube_mime
	*/
	private $mime;
	private $opt = array();
	private $parse_alternative = false;

	public $uid;
	public $folder;
	public $headers;
	public $parts = array();
	public $mime_parts = array();
	public $inline_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.
	* @param string $folder Folder name
	*
	* @see self::$app, self::$storage, self::$opt, self::$parts
	*/
	function __construct($uid, $folder = null)
	{
	$this->uid = $uid;
	$this->app = rcube::get_instance();
	$this->storage = $this->app->get_storage();
	$this->folder = strlen($folder) ? $folder : $this->storage->get_folder();
	$this->storage->set_options(array('all_headers' => true));

	// Set current folder
	$this->storage->set_folder($this->folder);

	$this->headers = $this->storage->get_message($uid);

	if (!$this->headers)
	return;

	$this->mime = new rcube_mime($this->headers->charset);

	$this->subject = $this->mime->decode_mime_string($this->headers->subject);
	list(, $this->sender) = each($this->mime->decode_address_list($this->headers->from, 1));

	$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' => $this->app->url(array(
	'action' => 'get',
	'mbox' => $this->storage->get_folder(),
	'uid' => $uid))
	);

	if (!empty($this->headers->structure)) {
	$this->get_mime_numbers($this->headers->structure);
	$this->parse_structure($this->headers->structure);
	}
	else {
	$this->body = $this->storage->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 $name Header name
	* @param bool $row Don't mime-decode the value
	* @return string Header value
	*/
	public function get_header($name, $raw = false)
	{
	if (empty($this->headers))
	return null;

	if ($this->headers->$name)
	$value = $this->headers->$name;
	else if ($this->headers->others[$name])
	$value = $this->headers->others[$name];

	return $raw ? $value : $this->mime->decode_header($value);
	}


	/**
	* Set is_safe var and session data
	*
	* @param bool $safe 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 $mime_id Part MIME-ID
	* @return string URL or false if part does not exist
	*/
	public function get_part_url($mime_id, $embed = false)
	{
	if ($this->mime_parts[$mime_id])
	return $this->opt['get_url'] . '&_part=' . $mime_id . ($embed ? '&_embed=1' : '');
	else
	return false;
	}


	/**
	* Get content of a specific part of this message
	*
	* @param string $mime_id Part MIME-ID
	* @param resource $fp File pointer to save the message part
	* @param boolean $skip_charset_conv Disables charset conversion
	*
	* @return string Part content
	*/
	public function get_part_content($mime_id, $fp = null, $skip_charset_conv = false)
	{
	if ($part = $this->mime_parts[$mime_id]) {
	// stored in message structure (winmail/inline-uuencode)
	if (!empty($part->body) \|\| $part->encoding == 'stream') {
	if ($fp) {
	fwrite($fp, $part->body);
	}
	return $fp ? true : $part->body;
	}

	// get from IMAP
	$this->storage->set_folder($this->folder);

	return $this->storage->get_message_part($this->uid, $mime_id, $part, NULL, $fp, $skip_charset_conv);
	}
	}


	/**
	* Determine if the message contains a HTML part
	*
	* @param bool $recursive Enables checking in all levels of the structure
	*
	* @return bool True if a HTML is available, False if not
	*/
	function has_html_part($recursive = true)
	{
	// check all message parts
	foreach ($this->parts as $part) {
	if ($part->mimetype == 'text/html') {
	// Level check, we'll skip e.g. HTML attachments
	if (!$recursive) {
	$level = explode('.', $part->mime_id);

	- // Level too high
	- if (count($level) > 2) {
	+ // Skip if level too deep or part has a file name
	+ if (count($level) > 2 \|\| $part->filename) {
	continue;
	}

	// HTML part can be on the lower level, if not...
	if (count($level) > 1) {
	- // It can be an alternative or related message part
	- // find parent part
	- $parent = null;
	- foreach ($this->mime_parts as $part) {
	- if ($part->mime_id == $level[0]) {
	- $parent = $part;
	- }
	- }
	-
	- if (!$parent) {
	- continue;
	- }
	-
	+ array_pop($level);
	+ $parent = $this->mime_parts[join('.', $level)];
	+ // ... parent isn't multipart/alternative or related
	if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
	continue;
	}
	}
	}

	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 $pid => $part) {
	if ($part->mimetype == 'text/html') {
	return $this->get_part_content($pid);
	}
	}
	}


	/**
	* Return the first text part of this message
	*
	* @param rcube_message_part $part Reference to the part if found
	* @return string Plain text message/part content
	*/
	function first_text_part(&$part=null)
	{
	// no message structure, return complete body
	if (empty($this->parts))
	return $this->body;

	// check all message parts
	foreach ($this->mime_parts as $mime_id => $part) {
	if ($part->mimetype == 'text/plain') {
	return $this->get_part_content($mime_id);
	}
	else if ($part->mimetype == 'text/html') {
	$out = $this->get_part_content($mime_id);

	// remove special chars encoding
	$trans = array_flip(get_html_translation_table(HTML_ENTITIES));
	$out = strtr($out, $trans);

	// create instance of html2text class
	$txt = new html2text($out);
	return $txt->get_text();
	}
	}

	$part = null;
	return null;
	}


	/**
	* Checks if part of the message is an attachment (or part of it)
	*
	* @param rcube_message_part $part Message part
	*
	* @return bool True if the part is an attachment part
	*/
	public function is_attachment($part)
	{
	foreach ($this->attachments as $att_part) {
	if ($att_part->mime_id == $part->mime_id) {
	return true;
	}

	// check if the part is a subpart of another attachment part (message/rfc822)
	if ($att_part->mimetype == 'message/rfc822') {
	if (in_array($part, (array)$att_part->parts)) {
	return true;
	}
	}
	}

	return false;
	}


	/**
	* Read the message structure returend by the IMAP server
	* and build flat lists of content parts and attachments
	*
	* @param rcube_message_part $structure Message structure node
	* @param bool $recursive True when called recursively
	*/
	private function parse_structure($structure, $recursive = false)
	{
	// real content-type of message/rfc822 part
	if ($structure->mimetype == 'message/rfc822' && $structure->real_mimetype)
	$mimetype = $structure->real_mimetype;
	else
	$mimetype = $structure->mimetype;

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

	// Allow plugins to handle message parts
	$plugin = $this->app->plugins->exec_hook('message_part_structure',
	array('object' => $this, 'structure' => $structure,
	'mimetype' => $mimetype, 'recursive' => $recursive));

	if ($plugin['abort'])
	return;

	$structure = $plugin['structure'];
	list($message_ctype_primary, $message_ctype_secondary) = explode('/', $plugin['mimetype']);

	// print body if message doesn't have multiple parts
	if ($message_ctype_primary == 'text' && !$recursive) {
	$structure->type = 'content';
	$this->parts[] = &$structure;

	// Parse simple (plain text) message body
	if ($message_ctype_secondary == 'plain')
	foreach ((array)$this->uu_decode($structure) as $uupart) {
	$this->mime_parts[$uupart->mime_id] = $uupart;
	$this->attachments[] = $uupart;
	}
	}
	// the same for pgp signed messages
	else if ($mimetype == 'application/pgp' && !$recursive) {
	$structure->type = 'content';
	$this->parts[] = &$structure;
	}
	// message contains (more than one!) alternative parts
	else if ($mimetype == 'multipart/alternative'
	&& is_array($structure->parts) && count($structure->parts) > 1
	) {
	// get html/plaintext parts
	$plain_part = $html_part = $print_part = $related_part = null;

	foreach ($structure->parts as $p => $sub_part) {
	$sub_mimetype = $sub_part->mimetype;

	// skip empty text parts
	if (!$sub_part->size && preg_match('#^text/(plain\|html\|enriched)$#', $sub_mimetype)) {
	continue;
	}

	// check if sub part is
	if ($sub_mimetype == 'text/plain')
	$plain_part = $p;
	else if ($sub_mimetype == 'text/html')
	$html_part = $p;
	else if ($sub_mimetype == 'text/enriched')
	$enriched_part = $p;
	else if (in_array($sub_mimetype, array('multipart/related', 'multipart/mixed', 'multipart/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->ctype_primary = 'text';
	$c->ctype_secondary = 'plain';
	$c->mimetype = 'text/plain';
	$c->realtype = 'text/html';

	$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->mimetype = 'text/html';

	$this->attachments[] = $html_part;
	}
	}
	// this is an ecrypted message -> create a plaintext body with the according message
	else if ($mimetype == 'multipart/encrypted') {
	$p = new stdClass;
	$p->type = 'content';
	$p->ctype_primary = 'text';
	$p->ctype_secondary = 'plain';
	$p->mimetype = 'text/plain';
	$p->realtype = 'multipart/encrypted';

	$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 = $mail_part->ctype_primary;
	$secondary_type = $mail_part->ctype_secondary;

	// real content-type of message/rfc822
	if ($mail_part->real_mimetype) {
	$part_orig_mimetype = $mail_part->mimetype;
	$part_mimetype = $mail_part->real_mimetype;
	list($primary_type, $secondary_type) = explode('/', $part_mimetype);
	}
	else
	$part_mimetype = $mail_part->mimetype;

	// multipart/alternative
	if ($primary_type == 'multipart') {
	$this->parse_structure($mail_part, true);

	// list message/rfc822 as attachment as well (mostly .eml)
	if ($part_orig_mimetype == 'message/rfc822' && !empty($mail_part->filename))
	$this->attachments[] = $mail_part;
	}
	// part text/[plain\|html] or delivery status
	else if ((($part_mimetype == 'text/plain' \|\| $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') \|\|
	in_array($part_mimetype, array('message/delivery-status', 'text/rfc822-headers', 'message/disposition-notification'))
	) {
	// Allow plugins to handle also this part
	$plugin = $this->app->plugins->exec_hook('message_part_structure',
	array('object' => $this, 'structure' => $mail_part,
	'mimetype' => $part_mimetype, 'recursive' => true));

	if ($plugin['abort'])
	continue;

	if ($part_mimetype == 'text/html') {
	$got_html_part = true;
	}

	$mail_part = $plugin['structure'];
	list($primary_type, $secondary_type) = explode('/', $plugin['mimetype']);

	// add text part 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;
	}
	// list html part as attachment (here the part is most likely inside a multipart/related part)
	else if ($this->parse_alternative && ($secondary_type == 'html' && !$this->opt['prefer_html'])) {
	$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 ($part_mimetype == 'application/ms-tnef') {
	foreach ((array)$this->tnef_decode($mail_part) as $tpart) {
	$this->mime_parts[$tpart->mime_id] = $tpart;
	$this->attachments[] = $tpart;
	}
	}
	// part is a file/attachment
	else if (preg_match('/^(inline\|attach)/', $mail_part->disposition) \|\|
	$mail_part->headers['content-id'] \|\|
	($mail_part->filename &&
	(empty($mail_part->disposition) \|\| preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
	) {
	// skip apple resource forks
	if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
	continue;

	// part belongs to a related message and is linked
	if ($mimetype == 'multipart/related'
	&& ($mail_part->headers['content-id'] \|\| $mail_part->headers['content-location'])) {
	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'];

	$this->inline_parts[] = $mail_part;
	}
	// attachment encapsulated within message/rfc822 part needs further decoding (#1486743)
	else if ($part_orig_mimetype == 'message/rfc822') {
	$this->parse_structure($mail_part, true);

	// list as attachment as well (mostly .eml)
	if (!empty($mail_part->filename))
	$this->attachments[] = $mail_part;
	}
	// regular attachment with valid content type
	// (content-type name regexp according to RFC4288.4.2)
	else if (preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) {
	if (!$mail_part->filename)
	$mail_part->filename = 'Part '.$mail_part->mime_id;

	$this->attachments[] = $mail_part;
	}
	// attachment with invalid content type
	// replace malformed content type with application/octet-stream (#1487767)
	else if ($mail_part->filename) {
	$mail_part->ctype_primary = 'application';
	$mail_part->ctype_secondary = 'octet-stream';
	$mail_part->mimetype = 'application/octet-stream';

	$this->attachments[] = $mail_part;
	}
	}
	// attachment part as message/rfc822 (#1488026)
	else if ($mail_part->mimetype == 'message/rfc822') {
	$this->parse_structure($mail_part);
	}
	}

	// if this was a related part try to resolve references
	if ($mimetype == 'multipart/related' && sizeof($this->inline_parts)) {
	$a_replaces = array();
	$img_regexp = '/^image\/(gif\|jpe?g\|png\|tiff\|bmp\|svg)/';

	foreach ($this->inline_parts as $inline_object) {
	$part_url = $this->get_part_url($inline_object->mime_id, true);
	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;
	}

	if (!empty($inline_object->filename)) {
	// MS Outlook sends sometimes non-related attachments as related
	// In this case multipart/related message has only one text part
	// We'll add all such attachments to the attachments list
	if (!isset($got_html_part) && empty($inline_object->content_id)) {
	$this->attachments[] = $inline_object;
	}
	// MS Outlook sometimes also adds non-image attachments as related
	// We'll add all such attachments to the attachments list
	// Warning: some browsers support pdf in <img/>
	else if (!preg_match($img_regexp, $inline_object->mimetype)) {
	$this->attachments[] = $inline_object;
	}
	// @TODO: we should fetch HTML body and find attachment's content-id
	// to handle also image attachments without reference in the body
	// @TODO: should we list all image attachments in text mode?
	}
	}

	// 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 a single part non-text
	else if ($structure->filename) {
	$this->attachments[] = $structure;
	}
	// message is a single part non-text (without filename)
	else if (preg_match('/application\//i', $mimetype)) {
	$structure->filename = 'Part '.$structure->mime_id;
	$this->attachments[] = $structure;
	}
	}


	/**
	* Fill aflat array with references to all parts, indexed by part numbers
	*
	* @param rcube_message_part $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]);
	}


	/**
	* Decode a Microsoft Outlook TNEF part (winmail.dat)
	*
	* @param rcube_message_part $part Message part to decode
	* @return array
	*/
	function tnef_decode(&$part)
	{
	// @TODO: attachment may be huge, hadle it via file
	if (!isset($part->body)) {
	$this->storage->set_folder($this->folder);
	$part->body = $this->storage->get_message_part($this->uid, $part->mime_id, $part);
	}

	$parts = array();
	$tnef = new tnef_decoder;
	$tnef_arr = $tnef->decompress($part->body);

	foreach ($tnef_arr as $pid => $winatt) {
	$tpart = new rcube_message_part;

	$tpart->filename = trim($winatt['name']);
	$tpart->encoding = 'stream';
	$tpart->ctype_primary = trim(strtolower($winatt['type']));
	$tpart->ctype_secondary = trim(strtolower($winatt['subtype']));
	$tpart->mimetype = $tpart->ctype_primary . '/' . $tpart->ctype_secondary;
	$tpart->mime_id = 'winmail.' . $part->mime_id . '.' . $pid;
	$tpart->size = $winatt['size'];
	$tpart->body = $winatt['stream'];

	$parts[] = $tpart;
	unset($tnef_arr[$pid]);
	}

	return $parts;
	}


	/**
	* Parse message body for UUencoded attachments bodies
	*
	* @param rcube_message_part $part Message part to decode
	* @return array
	*/
	function uu_decode(&$part)
	{
	// @TODO: messages may be huge, hadle body via file
	if (!isset($part->body)) {
	$this->storage->set_folder($this->folder);
	$part->body = $this->storage->get_message_part($this->uid, $part->mime_id, $part);
	}

	$parts = array();
	// FIXME: line length is max.65?
	$uu_regexp = '/begin [0-7]{3,4} ([^\n]+)\n/s';

	if (preg_match_all($uu_regexp, $part->body, $matches, PREG_SET_ORDER)) {
	// update message content-type
	$part->ctype_primary = 'multipart';
	$part->ctype_secondary = 'mixed';
	$part->mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
	$uu_endstring = "`\nend\n";

	// add attachments to the structure
	foreach ($matches as $pid => $att) {
	$startpos = strpos($part->body, $att[1]) + strlen($att[1]) + 1; // "\n"
	$endpos = strpos($part->body, $uu_endstring);
	$filebody = substr($part->body, $startpos, $endpos-$startpos);

	// remove attachments bodies from the message body
	$part->body = substr_replace($part->body, "", $startpos, $endpos+strlen($uu_endstring)-$startpos);

	$uupart = new rcube_message_part;

	$uupart->filename = trim($att[1]);
	$uupart->encoding = 'stream';
	$uupart->body = convert_uudecode($filebody);
	$uupart->size = strlen($uupart->body);
	$uupart->mime_id = 'uu.' . $part->mime_id . '.' . $pid;

	$ctype = rcube_mime::content_type($uupart->body, $uupart->filename, 'application/octet-stream', true);
	$uupart->mimetype = $ctype;
	list($uupart->ctype_primary, $uupart->ctype_secondary) = explode('/', $ctype);

	$parts[] = $uupart;
	unset($matches[$pid]);
	}

	// remove attachments bodies from the message body
	$part->body = preg_replace($uu_regexp, '', $part->body);
	}

	return $parts;
	}


	/**
	* Deprecated methods (to be removed)
	*/

	public static function unfold_flowed($text)
	{
	return rcube_mime::unfold_flowed($text);
	}

	public static function format_flowed($text, $length = 72)
	{
	return rcube_mime::format_flowed($text, $length);
	}

	}
	diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
	index 2e3cd506d..d42171869 100644
	--- a/program/include/rcube_output_html.php
	+++ b/program/include/rcube_output_html.php
	@@ -1,1733 +1,1742 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/include/rcubeoutput_html.php \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2006-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Class to handle HTML page output using a skin template. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Class to create HTML page output using a skin template
	*
	* @package View
	*/
	class rcube_output_html extends rcube_output
	{
	public $type = 'html';

	protected $message = null;
	protected $js_env = array();
	protected $js_labels = array();
	protected $js_commands = array();
	protected $skin_paths = array();
	protected $template_name;
	protected $scripts_path = '';
	protected $script_files = array();
	protected $css_files = array();
	protected $scripts = array();
	protected $default_template = "<html>\n<head><title></title></head>\n<body></body>\n</html>";
	protected $header = '';
	protected $footer = '';
	protected $body = '';
	protected $base_path = '';

	// deprecated names of templates used before 0.5
	protected $deprecated_templates = array(
	'contact' => 'showcontact',
	'contactadd' => 'addcontact',
	'contactedit' => 'editcontact',
	'identityedit' => 'editidentity',
	'messageprint' => 'printmessage',
	);

	/**
	* Constructor
	*
	* @todo Replace $this->config with the real rcube_config object
	*/
	public function __construct($task = null, $framed = false)
	{
	parent::__construct();

	//$this->framed = $framed;
	$this->set_env('task', $task);
	$this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));

	// add cookie info
	$this->set_env('cookie_domain', ini_get('session.cookie_domain'));
	$this->set_env('cookie_path', ini_get('session.cookie_path'));
	$this->set_env('cookie_secure', ini_get('session.cookie_secure'));

	// load the correct skin (in case user-defined)
	$skin = $this->config->get('skin');
	$this->set_skin($skin);
	$this->set_env('skin', $skin);

	+ if (!empty($_REQUEST['_extwin']))
	+ $this->set_env('extwin', 1);
	+
	// add common javascripts
	$this->add_script('var '.rcmail::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');

	// don't wait for page onload. Call init at the bottom of the page (delayed)
	$this->add_script(rcmail::JS_OBJECT_NAME.'.init();', 'docready');

	$this->scripts_path = 'program/js/';
	$this->include_script('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'),
	'preloader' => array($this, 'preloader'),
	'username' => array($this, 'current_username'),
	'message' => array($this, 'message_container'),
	'charsetselector' => array($this, 'charset_selector'),
	'aboutcontent' => array($this, 'about_content'),
	));
	}


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


	/**
	* Getter for the current page title
	*
	* @return string The page title
	*/
	protected function get_pagetitle()
	{
	if (!empty($this->pagetitle)) {
	$title = $this->pagetitle;
	}
	else if ($this->env['task'] == 'login') {
	$title = $this->app->gettext(array(
	'name' => 'welcome',
	'vars' => array('product' => $this->config->get('product_name')
	)));
	}
	else {
	$title = ucfirst($this->env['task']);
	}

	return $title;
	}


	/**
	* Set skin
	*/
	public function set_skin($skin)
	{
	$valid = false;

	if (!empty($skin) && is_dir('skins/'.$skin) && is_readable('skins/'.$skin)) {
	$skin_path = 'skins/'.$skin;
	$valid = true;
	}
	else {
	$skin_path = $this->config->get('skin_path');
	if (!$skin_path) {
	$skin_path = 'skins/' . rcube_config::DEFAULT_SKIN;
	}
	$valid = !$skin;
	}

	$this->config->set('skin_path', $skin_path);

	// register skin path(s)
	$this->skin_paths = array();
	$this->load_skin($skin_path);

	return $valid;
	}

	/**
	* Helper method to recursively read skin meta files and register search paths
	*/
	private function load_skin($skin_path)
	{
	$this->skin_paths[] = $skin_path;

	// read meta file and check for dependecies
	$meta = @json_decode(@file_get_contents($skin_path.'/meta.json'), true);
	if ($meta['extends'] && is_dir('skins/' . $meta['extends'])) {
	$this->load_skin('skins/' . $meta['extends']);
	}
	}


	/**
	* Check if a specific template exists
	*
	* @param string Template name
	* @return boolean True if template exists
	*/
	public function template_exists($name)
	{
	$found = false;
	foreach ($this->skin_paths as $skin_path) {
	$filename = $skin_path . '/templates/' . $name . '.html';
	$found = (is_file($filename) && is_readable($filename)) \|\| ($this->deprecated_templates[$name] && $this->template_exists($this->deprecated_templates[$name]));
	if ($found)
	break;
	}
	return $found;
	}


	/**
	* 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(rcmail::JS_OBJECT_NAME.".gui_object('$obj', '$id');");
	}


	/**
	* Call a client method
	*
	* @param string Method to call
	* @param ... Additional arguments
	*/
	public function command()
	{
	$cmd = func_get_args();
	if (strpos($cmd[0], 'plugin.') !== false)
	$this->js_commands[] = array('triggerEvent', $cmd[0], $cmd[1]);
	else
	$this->js_commands[] = $cmd;
	}


	/**
	* Add a localized label to the client environment
	*/
	public function add_label()
	{
	$args = func_get_args();
	if (count($args) == 1 && is_array($args[0]))
	$args = $args[0];

	foreach ($args as $name) {
	$this->js_labels[$name] = $this->app->gettext($name);
	}
	}


	/**
	* Invoke display_message command
	*
	* @param string $message Message to display
	* @param string $type Message type [notice\|confirm\|error]
	* @param array $vars Key-value pairs to be replaced in localized text
	* @param boolean $override Override last set message
	* @param int $timeout Message display time in seconds
	* @uses self::command()
	*/
	public function show_message($message, $type='notice', $vars=null, $override=true, $timeout=0)
	{
	if ($override \|\| !$this->message) {
	if ($this->app->text_exists($message)) {
	if (!empty($vars))
	$vars = array_map('Q', $vars);
	$msgtext = $this->app->gettext(array('name' => $message, 'vars' => $vars));
	}
	else
	$msgtext = $message;

	$this->message = $message;
	$this->command('display_message', $msgtext, $type, $timeout * 1000);
	}
	}


	/**
	* Delete all stored env variables and commands
	*/
	public function reset()
	{
	parent::reset();
	$this->js_env = array();
	$this->js_labels = array();
	$this->js_commands = array();
	$this->script_files = array();
	$this->scripts = array();
	$this->header = '';
	$this->footer = '';
	$this->body = '';
	}


	/**
	* Redirect to a certain url
	*
	* @param mixed $p Either a string with the action or url parameters as key-value pairs
	* @param int $delay Delay in seconds
	*/
	public function redirect($p = array(), $delay = 1)
	{
	+ if ($this->env['extwin'])
	+ $p['extwin'] = 1;
	$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') {
	// prevent from endless loops
	if ($exit != 'recur' && $this->app->plugins->is_processing('render_page')) {
	rcube::raise_error(array('code' => 505, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => 'Recursion alert: ignoring output->send()'), true, false);
	return;
	}
	$this->parse($templ, false);
	}
	else {
	$this->framed = $templ == 'iframe' ? true : $this->framed;
	$this->write();
	}

	// set output asap
	ob_flush();
	flush();

	if ($exit) {
	exit;
	}
	}


	/**
	* Process template and write to stdOut
	*
	* @param string $template HTML template content
	*/
	public function write($template = '')
	{
	// unlock interface after iframe load
	$unlock = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['_unlock']);
	if ($this->framed) {
	array_unshift($this->js_commands, array('set_busy', false, null, $unlock));
	}
	else if ($unlock) {
	array_unshift($this->js_commands, array('hide_message', $unlock));
	}

	if (!empty($this->script_files))
	$this->set_env('request_token', $this->app->get_request_token());

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

	// send clickjacking protection headers
	$iframe = $this->framed \|\| !empty($_REQUEST['_framed']);
	if (!headers_sent() && ($xframe = $this->app->config->get('x_frame_options', 'sameorigin')))
	header('X-Frame-Options: ' . ($iframe && $xframe == 'deny' ? 'sameorigin' : $xframe));

	// call super method
	$this->_write($template, $this->config->get('skin_path'));
	}


	/**
	* Parse a specific skin template and deliver to stdout (or return)
	*
	* @param string Template name
	* @param boolean Exit script
	* @param boolean Don't write to stdout, return parsed content instead
	*
	* @link http://php.net/manual/en/function.exit.php
	*/
	function parse($name = 'main', $exit = true, $write = true)
	{
	$plugin = false;
	$realname = $name;
	$this->template_name = $realname;

	$temp = explode('.', $name, 2);
	if (count($temp) > 1) {
	$plugin = $temp[0];
	$name = $temp[1];
	$skin_dir = $plugin . '/skins/' . $this->config->get('skin');

	// apply skin search escalation list to plugin directory
	$plugin_skin_paths = array();
	foreach ($this->skin_paths as $skin_path) {
	$plugin_skin_paths[] = $this->app->plugins->dir . $plugin . '/' . $skin_path;
	}

	// add fallback to default skin
	if (is_dir($this->app->plugins->dir . $plugin . '/skins/default')) {
	$skin_dir = $plugin . '/skins/default';
	$plugin_skin_paths[] = $this->app->plugins->dir . $skin_dir;
	}

	// add plugin skin paths to search list
	$this->skin_paths = array_merge($plugin_skin_paths, $this->skin_paths);
	}

	// find skin template
	$path = false;
	foreach ($this->skin_paths as $skin_path) {
	$path = "$skin_path/templates/$name.html";

	// fallback to deprecated template names
	if (!is_readable($path) && $this->deprecated_templates[$realname]) {
	$path = "$skin_path/templates/" . $this->deprecated_templates[$realname] . ".html";
	rcube::raise_error(array(
	'code' => 502, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Using deprecated template '" . $this->deprecated_templates[$realname]
	. "' in $skin_path/templates. Please rename to '$realname'"),
	true, false);
	}

	if (is_readable($path)) {
	$this->config->set('skin_path', $skin_path);
	$this->base_path = $skin_path;
	break;
	}
	else {
	$path = false;
	}
	}

	// read template file
	if (!$path \|\| ($templ = @file_get_contents($path)) === false) {
	rcube::raise_error(array(
	'code' => 501,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => 'Error loading template for '.$realname
	), true, $write);
	return false;
	}

	// replace all path references to plugins/... with the configured plugins dir
	// and /this/ to the current plugin skin directory
	if ($plugin) {
	$templ = preg_replace(array('/\bplugins\//', '/(["\']?)\/this\//'), array($this->app->plugins->url, '\\1'.$this->app->plugins->url.$skin_dir.'/'), $templ);
	}

	// parse for specialtags
	$output = $this->parse_conditions($templ);
	$output = $this->parse_xml($output);

	// trigger generic hook where plugins can put additional content to the page
	$hook = $this->app->plugins->exec_hook("render_page", array('template' => $realname, 'content' => $output));

	// save some memory
	$output = $hook['content'];
	unset($hook['content']);

	$output = $this->parse_with_globals($this->fix_paths($output));

	// make sure all <form> tags have a valid request token
	$output = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $output);
	$this->footer = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $this->footer);

	if ($write) {
	// add debug console
	if ($realname != 'error' && ($this->config->get('debug_level') & 8)) {
	$this->add_footer('<div id="console" style="position:absolute;top:5px;left:5px;width:405px;padding:2px;background:white;z-index:9000;display:none">
	<a href="#toggle" onclick="con=$(\'#dbgconsole\');con[con.is(\':visible\')?\'hide\':\'show\']();return false">console</a>
	<textarea name="console" id="dbgconsole" rows="20" cols="40" style="display:none;width:400px;border:none;font-size:10px" spellcheck="false"></textarea></div>'
	);
	$this->add_script(
	"if (!window.console \|\| !window.console.log) {\n".
	" window.console = new rcube_console();\n".
	" $('#console').show();\n".
	"}", 'foot');
	}
	$this->write(trim($output));
	}
	else {
	return $output;
	}

	if ($exit) {
	exit;
	}
	}


	/**
	* Return executable javascript code for all registered commands
	*
	* @return string $out
	*/
	protected function get_js_commands()
	{
	$out = '';
	if (!$this->framed && !empty($this->js_env)) {
	$out .= rcmail::JS_OBJECT_NAME . '.set_env('.self::json_serialize($this->js_env).");\n";
	}
	if (!empty($this->js_labels)) {
	$this->command('add_label', $this->js_labels);
	}
	foreach ($this->js_commands as $i => $args) {
	$method = array_shift($args);
	foreach ($args as $i => $arg) {
	$args[$i] = self::json_serialize($arg);
	}
	$parent = $this->framed \|\| preg_match('/^parent\./', $method);
	$out .= sprintf(
	"%s.%s(%s);\n",
	($parent ? 'if(window.parent && parent.'.rcmail::JS_OBJECT_NAME.') parent.' : '') . rcmail::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)
	{
	if ($str[0] == '/')
	return $this->base_path . $str;
	else
	return $str;
	}


	/**
	* Show error page and terminate script execution
	*
	* @param int $code Error code
	* @param string $message Error message
	*/
	public function raise_error($code, $message)
	{
	global $__page_content, $ERROR_CODE, $ERROR_MESSAGE;

	$ERROR_CODE = $code;
	$ERROR_MESSAGE = $message;

	include INSTALL_PATH . 'program/steps/utils/error.inc';
	exit;
	}


	/*** Template parsing methods ***/

	/**
	* Replace all strings ($varname)
	* with the content of the according global variable.
	*/
	protected function parse_with_globals($input)
	{
	$GLOBALS['__version'] = html::quote(RCMAIL_VERSION);
	$GLOBALS['__comm_path'] = html::quote($this->app->comm_path);
	$GLOBALS['__skin_path'] = html::quote($this->base_path);

	return preg_replace_callback('/\$(__[a-z0-9_\-]+)/',
	array($this, 'globals_callback'), $input);
	}


	/**
	* Callback funtion for preg_replace_callback() in parse_with_globals()
	*/
	protected function globals_callback($matches)
	{
	return $GLOBALS[$matches[1]];
	}


	/**
	* Correct absolute paths in images and other tags
	* add timestamp to .js and .css filename
	*/
	protected function fix_paths($output)
	{
	return preg_replace_callback(
	'!(src\|href\|background)=(["\']?)([a-z0-9/_.-]+)(["\'\s>])!i',
	array($this, 'file_callback'), $output);
	}


	/**
	* Callback function for preg_replace_callback in write()
	*
	* @return string Parsed string
	*/
	protected function file_callback($matches)
	{
	$file = $matches[3];

	// correct absolute paths
	if ($file[0] == '/') {
	$file = $this->base_path . $file;
	}

	// add file modification timestamp
	if (preg_match('/\.(js\|css)$/', $file)) {
	if ($fs = @filemtime($file)) {
	$file .= '?s=' . $fs;
	}
	}

	return $matches[1] . '=' . $matches[2] . $file . $matches[4];
	}


	/**
	* Public wrapper to dipp into template parsing.
	*
	* @param string $input
	* @return string
	* @uses rcube_output_html::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
	*/
	protected function parse_conditions($input)
	{
	$matches = preg_split('/<roundcube:(if\|elseif\|else\|endif)\s+([^>]+)>\n?/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 = html::parse_attrib_string($matches[2]);
	if (isset($attrib['condition'])) {
	$condmet = $this->check_condition($attrib['condition']);
	$submatches = preg_split('/<roundcube:(elseif\|else\|endif)\s+([^>]+)>\n?/is', $matches[3], 2, PREG_SPLIT_DELIM_CAPTURE);
	if ($condmet) {
	$result = $submatches[0];
	$result.= ($submatches[1] != 'endif' ? preg_replace('/.*<roundcube:endif\s+[^>]+>\n?/Uis', '', $submatches[3], 1) : $submatches[3]);
	}
	else {
	$result = "<roundcube:$submatches[1] $submatches[2]>" . $submatches[3];
	}
	return $matches[0] . $this->parse_conditions($result);
	}
	rcube::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
	*/
	protected function check_condition($condition)
	{
	return eval("return (".$this->parse_expression($condition).");");
	}


	/**
	* Inserts hidden field with CSRF-prevention-token into POST forms
	*/
	protected function alter_form_tag($matches)
	{
	$out = $matches[0];
	$attrib = html::parse_attrib_string($matches[1]);

	if (strtolower($attrib['method']) == 'post') {
	$hidden = new html_hiddenfield(array('name' => '_token', 'value' => $this->app->get_request_token()));
	$out .= "\n" . $hidden->show();
	}

	return $out;
	}


	/**
	* Parses expression and replaces variables
	*
	* @param string Expression statement
	* @return string Expression value
	*/
	protected 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',
	'/browser:([a-z0-9_]+)/i',
	'/template:name/i',
	),
	array(
	"\$_SESSION['\\1']",
	"\$this->app->config->get('\\1',get_boolean('\\3'))",
	"\$this->env['\\1']",
	"rcube_utils::get_input_value('\\1', rcube_utils::INPUT_GPC)",
	"\$_COOKIE['\\1']",
	"\$this->browser->{'\\1'}",
	$this->template_name,
	),
	$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.
	*/
	protected function parse_xml($input)
	{
	return preg_replace_callback('/<roundcube:([-_a-z]+)\s+((?:[^>]\|\\\\>)+)(?<!\\\\)>/Ui', array($this, 'xml_command'), $input);
	}


	/**
	* Callback function for parsing an xml command tag
	* and turn it into real html content
	*
	* @param array Matches array of preg_replace_callback
	* @return string Tag/Object content
	*/
	protected function xml_command($matches)
	{
	$command = strtolower($matches[1]);
	$attrib = html::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;

	// frame
	case 'frame':
	return $this->frame($attrib);
	break;

	// show a label
	case 'label':
	if ($attrib['expression'])
	$attrib['name'] = eval("return " . $this->parse_expression($attrib['expression']) .";");

	if ($attrib['name'] \|\| $attrib['command']) {
	// @FIXME: 'noshow' is useless, remove?
	if ($attrib['noshow']) {
	return '';
	}

	$vars = $attrib + array('product' => $this->config->get('product_name'));
	unset($vars['name'], $vars['command']);

	$label = $this->app->gettext($attrib + array('vars' => $vars));
	$quoting = !empty($attrib['quoting']) ? strtolower($attrib['quoting']) : (get_boolean((string)$attrib['html']) ? 'no' : '');

	switch ($quoting) {
	case 'no':
	case 'raw':
	break;
	case 'javascript':
	case 'js':
	$label = rcmail::JQ($label);
	break;
	default:
	$label = html::quote($label);
	break;
	}

	return $label;
	}
	break;

	// include a file
	case 'include':
	$old_base_path = $this->base_path;
	$skin_paths = $this->skin_paths;
	if ($attrib['skin_path'])
	array_unshift($skin_paths, $attrib['skin_path']);
	foreach ($skin_paths as $skin_path) {
	$path = realpath($skin_path . $attrib['file']);
	if (is_file($path)) {
	$this->base_path = $skin_path;
	break;
	}
	}

	if (is_readable($path)) {
	if ($this->config->get('skin_include_php')) {
	$incl = $this->include_php($path);
	}
	else {
	$incl = file_get_contents($path);
	}
	$incl = $this->parse_conditions($incl);
	$incl = $this->parse_xml($incl);
	$incl = $this->fix_paths($incl);
	$this->base_path = $old_base_path;
	return $incl;
	}
	break;

	case 'plugin.include':
	$hook = $this->app->plugins->exec_hook("template_plugin_include", $attrib);
	return $hook['content'];

	// 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])))
	$content = call_user_func($handler, $attrib);
	}
	// execute object handler function
	else if (function_exists($handler)) {
	$content = call_user_func($handler, $attrib);
	}
	else if ($object == 'doctype') {
	$content = html::doctype($attrib['value']);
	}
	else if ($object == 'logo') {
	$attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));
	if ($logo = $this->config->get('skin_logo'))
	$attrib['src'] = $logo;
	$content = html::img($attrib);
	}
	else if ($object == 'productname') {
	$name = $this->config->get('product_name', 'Roundcube Webmail');
	$content = html::quote($name);
	}
	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].']';
	}
	else if (is_file(INSTALL_PATH . '.git/index')) {
	if (preg_match('/Date:\s+([^\n]+)/', @shell_exec('git log -1'), $regs)) {
	if ($date = date('Ymd.Hi', strtotime($regs[1]))) {
	$ver .= ' [GIT '.$date.']';
	}
	}
	}
	$content = html::quote($ver);
	}
	else if ($object == 'steptitle') {
	$content = html::quote($this->get_pagetitle());
	}
	else if ($object == 'pagetitle') {
	if ($this->config->get('devel_mode') && !empty($_SESSION['username']))
	$title = $_SESSION['username'].' :: ';
	else if ($prod_name = $this->config->get('product_name'))
	$title = $prod_name . ' :: ';
	else
	$title = '';
	$title .= $this->get_pagetitle();
	$content = html::quote($title);
	}

	// 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']);
	return eval("return html::quote($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->get($name);
	if (is_array($value) && $value[$_SESSION['storage_host']]) {
	$value = $value[$_SESSION['storage_host']];
	}
	break;
	case 'request':
	$value = rcube_utils::get_input_value($name, rcube_utils::INPUT_GPC);
	break;
	case 'session':
	$value = $_SESSION[$name];
	break;
	case 'cookie':
	$value = htmlspecialchars($_COOKIE[$name]);
	break;
	case 'browser':
	$value = $this->browser->{$name};
	break;
	}

	if (is_array($value)) {
	$value = implode(', ', $value);
	}

	return html::quote($value);
	break;
	}
	return '';
	}


	/**
	* Include a specific file and return it's contents
	*
	* @param string File path
	* @return string Contents of the processed file
	*/
	protected 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 $s_button_count = 100;

	// these commands can be called directly via url
	$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'];

	if ($attrib['task'])
	$command = $attrib['task'] . '.' . $command;

	if (!$attrib['image']) {
	$attrib['image'] = $attrib['imagepas'] ? $attrib['imagepas'] : $attrib['imageact'];
	}

	if (!$attrib['id']) {
	$attrib['id'] = sprintf('rcmbtn%d', $s_button_count++);
	}
	// get localized text for labels and titles
	if ($attrib['title']) {
	$attrib['title'] = html::quote($this->app->gettext($attrib['title'], $attrib['domain']));
	}
	if ($attrib['label']) {
	$attrib['label'] = html::quote($this->app->gettext($attrib['label'], $attrib['domain']));
	}
	if ($attrib['alt']) {
	$attrib['alt'] = html::quote($this->app->gettext($attrib['alt'], $attrib['domain']));
	}

	// set title to alt attribute for IE browsers
	if ($this->browser->ie && !$attrib['title'] && $attrib['alt']) {
	$attrib['title'] = $attrib['alt'];
	}

	// 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');",
	rcmail::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'] = $this->app->url(array('task' => $attrib['command']));
	$attrib['onclick'] = sprintf("%s.command('switch-task','%s',null,event); return false", rcmail::JS_OBJECT_NAME, $attrib['command']);
	}
	else if ($attrib['task'] && in_array($attrib['task'], rcmail::$main_tasks)) {
	$attrib['href'] = $this->app->url(array('action' => $attrib['command'], 'task' => $attrib['task']));
	}
	else if (in_array($attrib['command'], $a_static_commands)) {
	$attrib['href'] = $this->app->url(array('action' => $attrib['command']));
	}
	- else if ($attrib['command'] == 'permaurl' && !empty($this->env['permaurl'])) {
	+ else if (($attrib['command'] == 'permaurl' \|\| $attrib['command'] == 'extwin') && !empty($this->env['permaurl'])) {
	$attrib['href'] = $this->env['permaurl'];
	}
	}

	// overwrite attributes
	if (!$attrib['href']) {
	$attrib['href'] = '#';
	}
	if ($attrib['task']) {
	if ($attrib['classact'])
	$attrib['class'] = $attrib['classact'];
	}
	else if ($command && !$attrib['onclick']) {
	$attrib['onclick'] = sprintf(
	"return %s.command('%s','%s',this,event)",
	rcmail::JS_OBJECT_NAME,
	$command,
	$attrib['prop']
	);
	}

	$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', 'title'
	)
	);
	$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', 'target');
	}
	else if ($attrib['type'] == 'link') {
	$btn_content = isset($attrib['content']) ? $attrib['content'] : ($attrib['label'] ? $attrib['label'] : $attrib['command']);
	$link_attrib = array('href', 'onclick', 'title', 'id', 'class', 'style', 'tabindex', 'target');
	if ($attrib['innerclass'])
	$btn_content = html::span($attrib['innerclass'], $btn_content);
	}
	else if ($attrib['type'] == 'input') {
	$attrib['type'] = 'button';

	if ($attrib['label']) {
	$attrib['value'] = $attrib['label'];
	}
	if ($attrib['command']) {
	$attrib['disabled'] = 'disabled';
	}

	$out = html::tag('input', $attrib, null, array('type', 'value', 'onclick', 'id', 'class', 'style', 'tabindex', 'disabled'));
	}

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


	/**
	* 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 (!preg_match('\|^https?://\|i', $file) && $file[0] != '/') {
	$file = $this->scripts_path . $file;
	if ($fs = @filemtime($file)) {
	$file .= '?s=' . $fs;
	}
	}

	if (in_array($file, $sa_files)) {
	return;
	}

	$sa_files[] = $file;

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


	/**
	* Link an external css file
	*
	* @param string File URL
	*/
	public function include_css($file)
	{
	$this->css_files[] = $file;
	}


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


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


	/**
	* 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->pagetitle)) {
	$this->pagetitle = 'Roundcube Mail';
	}

	// replace specialchars in content
	$page_title = html::quote($this->pagetitle);
	$page_header = '';
	$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 .= html::script($file);
	}
	}

	$head_script = $this->scripts['head_top'] . $this->scripts['head'];
	if (!empty($head_script)) {
	$page_header .= html::script(array(), $head_script);
	}

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

	// put docready commands into page footer
	if (!empty($this->scripts['docready'])) {
	$this->add_script('$(document).ready(function(){ ' . $this->scripts['docready'] . "\n});", 'foot');
	}

	if (is_array($this->script_files['foot'])) {
	foreach ($this->script_files['foot'] as $file) {
	$page_footer .= html::script($file);
	}
	}

	if (!empty($this->footer)) {
	$page_footer .= $this->footer . "\n";
	}

	if (!empty($this->scripts['foot'])) {
	$page_footer .= html::script(array(), $this->scripts['foot']);
	}

	// find page header
	if ($hpos = stripos($output, '</head>')) {
	$page_header .= "\n";
	}
	else {
	if (!is_numeric($hpos)) {
	$hpos = stripos($output, '<body');
	}
	if (!is_numeric($hpos) && ($hpos = stripos($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_replace($output, $page_header, $hpos, 0);
	}
	else {
	$output = $page_header . $output;
	}

	// add page footer
	if (($fpos = strripos($output, '</body>')) \|\| ($fpos = strripos($output, '</html>'))) {
	$output = substr_replace($output, $page_footer."\n", $fpos, 0);
	}
	else {
	$output .= "\n".$page_footer;
	}

	// add css files in head, before scripts, for speed up with parallel downloads
	if (!empty($this->css_files) &&
	(($pos = stripos($output, '<script ')) \|\| ($pos = stripos($output, '</head>')))
	) {
	$css = '';
	foreach ($this->css_files as $file) {
	$css .= html::tag('link', array('rel' => 'stylesheet',
	'type' => 'text/css', 'href' => $file, 'nl' => true));
	}
	$output = substr_replace($output, $css, $pos, 0);
	}

	// trigger hook with final HTML content to be sent
	$hook = $this->app->plugins->exec_hook("send_page", array('content' => $output));
	if (!$hook['abort']) {
	if ($this->charset != RCMAIL_CHARSET) {
	echo rcube_charset::convert($hook['content'], RCMAIL_CHARSET, $this->charset);
	}
	else {
	echo $hook['content'];
	}
	}
	}


	/**
	* Returns iframe object, registers some related env variables
	*
	* @param array $attrib HTML attributes
	*
	* @return string IFRAME element
	*/
	public function frame($attrib)
	{
	if (!$attrib['id']) {
	$attrib['id'] = 'rcmframe';
	}

	if (!$attrib['name']) {
	$attrib['name'] = $attrib['id'];
	}

	$this->set_env('contentframe', $attrib['id']);
	$this->set_env('blankpage', $attrib['src'] ? $this->abs_url($attrib['src']) : 'program/resources/blank.gif');

	return html::iframe($attrib);
	}


	/* *********** 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 \|\| !empty($_REQUEST['_framed'])) {
	$hiddenfield = new html_hiddenfield(array('name' => '_framed', 'value' => '1'));
	$hidden = $hiddenfield->show();
	}
	+ if ($this->env['extwin']) {
	+ $hiddenfield = new html_hiddenfield(array('name' => '_extwin', 'value' => '1'));
	+ $hidden = $hiddenfield->show();
	+ }

	if (!$content)
	$attrib['noclose'] = true;

	return html::tag('form',
	$attrib + array('action' => "./", 'method' => "get"),
	$hidden . $content,
	array('id','class','style','name','method','action','enctype','onsubmit'));
	}


	/**
	* Build a form tag with a unique request token
	*
	* @param array Named tag parameters including 'action' and 'task' values which will be put into hidden fields
	* @param string Form content
	* @return string HTML code for the form
	*/
	public function request_form($attrib, $content = '')
	{
	$hidden = new html_hiddenfield();
	if ($attrib['task']) {
	$hidden->add(array('name' => '_task', 'value' => $attrib['task']));
	}
	if ($attrib['action']) {
	$hidden->add(array('name' => '_action', 'value' => $attrib['action']));
	}

	unset($attrib['task'], $attrib['request']);
	$attrib['action'] = './';

	// we already have a <form> tag
	if ($attrib['form']) {
	if ($this->framed \|\| !empty($_REQUEST['_framed']))
	$hidden->add(array('name' => '_framed', 'value' => '1'));
	return $hidden->show() . $content;
	}
	else
	return $this->form_tag($attrib, $hidden->show() . $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;
	}

	// Current username is an e-mail address
	if (strpos($_SESSION['username'], '@')) {
	$username = $_SESSION['username'];
	}
	// get e-mail address from default identity
	else if ($sql_arr = $this->app->user->get_identity()) {
	$username = $sql_arr['email'];
	}
	else {
	$username = $this->app->user->get_username();
	}

	return rcube_utils::idn_to_utf8($username);
	}


	/**
	* GUI object 'loginform'
	* Returns code for the webmail login form
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	protected function login_form($attrib)
	{
	$default_host = $this->config->get('default_host');
	$autocomplete = (int) $this->config->get('login_autocomplete');

	$_SESSION['temp'] = true;

	// save original url
	$url = rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST);
	if (empty($url) && !preg_match('/_(task\|action)=logout/', $_SERVER['QUERY_STRING']))
	$url = $_SERVER['QUERY_STRING'];

	// Disable autocapitalization on iPad/iPhone (#1488609)
	$attrib['autocapitalize'] = 'off';

	// set atocomplete attribute
	$user_attrib = $autocomplete > 0 ? array() : array('autocomplete' => 'off');
	$host_attrib = $autocomplete > 0 ? array() : array('autocomplete' => 'off');
	$pass_attrib = $autocomplete > 1 ? array() : array('autocomplete' => 'off');

	$input_task = new html_hiddenfield(array('name' => '_task', 'value' => 'login'));
	$input_action = new html_hiddenfield(array('name' => '_action', 'value' => 'login'));
	$input_tzone = new html_hiddenfield(array('name' => '_timezone', 'id' => 'rcmlogintz', 'value' => '_default_'));
	$input_dst = new html_hiddenfield(array('name' => '_dstactive', 'id' => 'rcmlogindst', 'value' => '_default_'));
	$input_url = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => $url));
	$input_user = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser')
	+ $attrib + $user_attrib);
	$input_pass = new html_passwordfield(array('name' => '_pass', 'id' => 'rcmloginpwd')
	+ $attrib + $pass_attrib);
	$input_host = null;

	if (is_array($default_host) && count($default_host) > 1) {
	$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 (is_array($default_host) && ($host = array_pop($default_host))) {
	$hide_host = true;
	$input_host = new html_hiddenfield(array(
	'name' => '_host', 'id' => 'rcmloginhost', 'value' => $host) + $attrib);
	}
	else if (empty($default_host)) {
	$input_host = new html_inputfield(array('name' => '_host', 'id' => 'rcmloginhost')
	+ $attrib + $host_attrib);
	}

	$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', html::quote($this->app->gettext('username'))));
	$table->add('input', $input_user->show(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC)));

	$table->add('title', html::label('rcmloginpwd', html::quote($this->app->gettext('password'))));
	$table->add('input', $input_pass->show());

	// add host selection row
	if (is_object($input_host) && !$hide_host) {
	$table->add('title', html::label('rcmloginhost', html::quote($this->app->gettext('server'))));
	$table->add('input', $input_host->show(rcube_utils::get_input_value('_host', rcube_utils::INPUT_GPC)));
	}

	$out = $input_task->show();
	$out .= $input_action->show();
	$out .= $input_tzone->show();
	$out .= $input_dst->show();
	$out .= $input_url->show();
	$out .= $table->show();

	if ($hide_host) {
	$out .= $input_host->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 'preloader'
	* Loads javascript code for images preloading
	*
	* @param array Named parameters
	* @return void
	*/
	protected function preloader($attrib)
	{
	$images = preg_split('/[\s\t\n,]+/', $attrib['images'], -1, PREG_SPLIT_NO_EMPTY);
	$images = array_map(array($this, 'abs_url'), $images);

	if (empty($images) \|\| $this->app->task == 'logout')
	return;

	$this->add_script('var images = ' . self::json_serialize($images) .';
	for (var i=0; i<images.length; i++) {
	img = new Image();
	img.src = images[i];
	}', 'docready');
	}


	/**
	* GUI object 'searchform'
	* Returns code for search function
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	protected 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' => rcmail::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
	*/
	protected 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
	*/
	public 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', 'name', 'class', 'style', 'size', 'tabindex'))) {
	$field_attrib[$attr] = $value;
	}
	}

	$charsets = array(
	'UTF-8' => 'UTF-8 ('.$this->app->gettext('unicode').')',
	'US-ASCII' => 'ASCII ('.$this->app->gettext('english').')',
	'ISO-8859-1' => 'ISO-8859-1 ('.$this->app->gettext('westerneuropean').')',
	'ISO-8859-2' => 'ISO-8859-2 ('.$this->app->gettext('easterneuropean').')',
	'ISO-8859-4' => 'ISO-8859-4 ('.$this->app->gettext('baltic').')',
	'ISO-8859-5' => 'ISO-8859-5 ('.$this->app->gettext('cyrillic').')',
	'ISO-8859-6' => 'ISO-8859-6 ('.$this->app->gettext('arabic').')',
	'ISO-8859-7' => 'ISO-8859-7 ('.$this->app->gettext('greek').')',
	'ISO-8859-8' => 'ISO-8859-8 ('.$this->app->gettext('hebrew').')',
	'ISO-8859-9' => 'ISO-8859-9 ('.$this->app->gettext('turkish').')',
	'ISO-8859-10' => 'ISO-8859-10 ('.$this->app->gettext('nordic').')',
	'ISO-8859-11' => 'ISO-8859-11 ('.$this->app->gettext('thai').')',
	'ISO-8859-13' => 'ISO-8859-13 ('.$this->app->gettext('baltic').')',
	'ISO-8859-14' => 'ISO-8859-14 ('.$this->app->gettext('celtic').')',
	'ISO-8859-15' => 'ISO-8859-15 ('.$this->app->gettext('westerneuropean').')',
	'ISO-8859-16' => 'ISO-8859-16 ('.$this->app->gettext('southeasterneuropean').')',
	'WINDOWS-1250' => 'Windows-1250 ('.$this->app->gettext('easterneuropean').')',
	'WINDOWS-1251' => 'Windows-1251 ('.$this->app->gettext('cyrillic').')',
	'WINDOWS-1252' => 'Windows-1252 ('.$this->app->gettext('westerneuropean').')',
	'WINDOWS-1253' => 'Windows-1253 ('.$this->app->gettext('greek').')',
	'WINDOWS-1254' => 'Windows-1254 ('.$this->app->gettext('turkish').')',
	'WINDOWS-1255' => 'Windows-1255 ('.$this->app->gettext('hebrew').')',
	'WINDOWS-1256' => 'Windows-1256 ('.$this->app->gettext('arabic').')',
	'WINDOWS-1257' => 'Windows-1257 ('.$this->app->gettext('baltic').')',
	'WINDOWS-1258' => 'Windows-1258 ('.$this->app->gettext('vietnamese').')',
	'ISO-2022-JP' => 'ISO-2022-JP ('.$this->app->gettext('japanese').')',
	'ISO-2022-KR' => 'ISO-2022-KR ('.$this->app->gettext('korean').')',
	'ISO-2022-CN' => 'ISO-2022-CN ('.$this->app->gettext('chinese').')',
	'EUC-JP' => 'EUC-JP ('.$this->app->gettext('japanese').')',
	'EUC-KR' => 'EUC-KR ('.$this->app->gettext('korean').')',
	'EUC-CN' => 'EUC-CN ('.$this->app->gettext('chinese').')',
	'BIG5' => 'BIG5 ('.$this->app->gettext('chinese').')',
	'GB2312' => 'GB2312 ('.$this->app->gettext('chinese').')',
	);

	if (!empty($_POST['_charset'])) {
	$set = $_POST['_charset'];
	}
	else if (!empty($attrib['selected'])) {
	$set = $attrib['selected'];
	}
	else {
	$set = $this->get_charset();
	}

	$set = strtoupper($set);
	if (!isset($charsets[$set])) {
	$charsets[$set] = $set;
	}

	$select = new html_select($field_attrib);
	$select->add(array_values($charsets), array_keys($charsets));

	return $select->show($set);
	}

	/**
	* Include content from config/about.<LANG>.html if available
	*/
	protected function about_content($attrib)
	{
	$content = '';
	$filenames = array(
	'about.' . $_SESSION['language'] . '.html',
	'about.' . substr($_SESSION['language'], 0, 2) . '.html',
	'about.html',
	);
	foreach ($filenames as $file) {
	$fn = RCMAIL_CONFIG_DIR . '/' . $file;
	if (is_readable($fn)) {
	$content = file_get_contents($fn);
	$content = $this->parse_conditions($content);
	$content = $this->parse_xml($content);
	break;
	}
	}

	return $content;
	}

	}
	diff --git a/program/js/app.js b/program/js/app.js
	index 8296400ba..783936c56 100644
	--- a/program/js/app.js
	+++ b/program/js/app.js
	@@ -1,6666 +1,6739 @@
	/*
	+-----------------------------------------------------------------------+
	\| Roundcube Webmail Client Script \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| Copyright (C) 2011, Kolab Systems AG \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Authors: Thomas Bruederli <roundcube@gmail.com> \|
	\| Aleksander 'A.L.E.C' Machniak <alec@alec.pl> \|
	\| Charles McNulty <charles@charlesmcnulty.com> \|
	+-----------------------------------------------------------------------+
	\| Requires: jquery.js, common.js, list.js \|
	+-----------------------------------------------------------------------+
	*/

	function rcube_webmail()
	{
	this.env = { recipients_separator:',', recipients_delimiter:', ' };
	this.labels = {};
	this.buttons = {};
	this.buttons_sel = {};
	this.gui_objects = {};
	this.gui_containers = {};
	this.commands = {};
	this.command_handlers = {};
	this.onloads = [];
	this.messages = {};
	this.group2expand = {};

	// create protected reference to myself
	this.ref = 'rcmail';
	var ref = this;

	// webmail client settings
	this.dblclick_time = 500;
	this.message_time = 4000;

	this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');

	// 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.blankpage = 'program/resources/blank.gif';

	// set jQuery ajax options
	$.ajaxSetup({
	cache: false,
	timeout: this.env.request_timeout * 1000,
	error: function(request, status, err){ ref.http_error(request, status, err); },
	beforeSend: function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
	});

	$(window).bind('beforeunload', function() { rcmail.unload = true; });

	// 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(p, value)
	{
	if (typeof p == 'string')
	this.labels[p] = value;
	else if (typeof p == 'object')
	$.extend(this.labels, p);
	};

	// add a button to the button list
	this.register_button = function(command, id, type, act, sel, over)
	{
	if (!this.buttons[command])
	this.buttons[command] = [];

	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].push(button_prop);

	if (this.loaded)
	init_button(command, button_prop);
	};

	// register a specific gui object
	this.gui_object = function(name, id)
	{
	this.gui_objects[name] = this.loaded ? rcube_find_object(id) : 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.push(f);
	};

	// initialize webmail client
	this.init = function()
	{
	var n, p = this;
	this.task = this.env.task;

	// check browser
	if (!bw.dom \|\| !bw.xmlhttp_test() \|\| (bw.mz && bw.vendver < 1.9)) {
	this.goto_url('error', '_code=0x199');
	return;
	}

	// find all registered gui containers
	for (n in this.gui_containers)
	this.gui_containers[n] = $('#'+this.gui_containers[n]);

	// find all registered gui objects
	for (n in this.gui_objects)
	this.gui_objects[n] = rcube_find_object(this.gui_objects[n]);

	// clickjacking protection
	if (this.env.x_frame_options) {
	try {
	// bust frame if not allowed
	if (this.env.x_frame_options == 'deny' && top.location.href != self.location.href)
	top.location.href = self.location.href;
	else if (top.location.hostname != self.location.hostname)
	throw 1;
	} catch (e) {
	// possible clickjacking attack: disable all form elements
	$('form').each(function(){ ref.lock_form(this, true); });
	this.display_message("Blocked: possible clickjacking attack!", 'error');
	return;
	}
	}

	// init registered buttons
	this.init_buttons();

	// tell parent window that this frame is loaded
	if (this.is_framed()) {
	parent.rcmail.set_busy(false, null, parent.rcmail.env.frame_lock);
	parent.rcmail.env.frame_lock = null;
	}

	// enable general commands
	- this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', 'switch-task', true);
	+ this.enable_command('close', 'logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', 'switch-task', true);

	if (this.env.permaurl)
	- this.enable_command('permaurl', true);
	+ this.enable_command('permaurl', 'extwin', true);

	switch (this.task) {

	case 'mail':
	// enable mail commands
	this.enable_command('list', 'checkmail', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);

	if (this.gui_objects.messagelist) {

	this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {
	multiselect:true, multiexpand:true, draggable:true, keyboard:true,
	column_movable:this.env.col_movable, 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('click', function(o){ p.msglist_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(e){ p.drag_move(e); });
	this.message_list.addEventListener('dragend', function(e){ p.drag_end(e); });
	this.message_list.addEventListener('expandcollapse', function(e){ p.msglist_expand(e); });
	this.message_list.addEventListener('column_replace', function(e){ p.msglist_set_coltypes(e); });

	document.onmouseup = function(e){ return p.doc_mouse_up(e); };
	this.gui_objects.messagelist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };

	this.message_list.init();
	this.enable_command('toggle_status', 'toggle_flag', 'menu-open', 'menu-save', 'sort', true);

	// load messages
	this.command('list');
	}

	if (this.gui_objects.qsearchbox) {
	if (this.env.search_text != null) {
	this.gui_objects.qsearchbox.value = this.env.search_text;
	}
	$(this.gui_objects.qsearchbox).focusin(function() { rcmail.message_list.blur(); });
	}

	this.set_button_titles();

	this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward',
	'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download',
	'print', 'load-attachment', 'show-headers', 'hide-headers', 'forward-attachment'];

	if (this.env.action == 'show' \|\| this.env.action == 'preview') {
	this.enable_command(this.env.message_commands, this.env.uid);
	this.enable_command('reply-list', this.env.list_post);

	if (this.env.action == 'show') {
	this.http_request('pagenav', {_uid: this.env.uid, _mbox: this.env.mailbox, _search: this.env.search_request},
	this.display_message('', 'loading'));
	}

	if (this.env.blockedobjects) {
	if (this.gui_objects.remoteobjectsmsg)
	this.gui_objects.remoteobjectsmsg.style.display = 'block';
	this.enable_command('load-images', 'always-load', true);
	}

	// make preview/message frame visible
	if (this.env.action == 'preview' && this.is_framed()) {
	this.enable_command('compose', 'add-contact', false);
	parent.rcmail.show_contentframe(true);
	}
	}
	else if (this.env.action == 'compose') {
	- this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor', 'list-adresses'];
	+ this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor', 'list-adresses', 'extwin'];

	if (this.env.drafts_mailbox)
	this.env.compose_commands.push('savedraft')

	this.enable_command(this.env.compose_commands, 'identities', true);

	// add more commands (not enabled)
	$.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']);

	if (this.env.spellcheck) {
	this.env.spellcheck.spelling_state_observer = function(s) { ref.spellcheck_state(); };
	this.env.compose_commands.push('spellcheck')
	this.enable_command('spellcheck', true);
	}

	document.onmouseup = function(e){ return p.doc_mouse_up(e); };

	// init message compose form
	this.init_messageform();
	}
	// show printing dialog
	else if (this.env.action == 'print' && this.env.uid)
	if (bw.safari)
	setTimeout('window.print()', 10);
	else
	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');
	}

	// init address book widget
	if (this.gui_objects.contactslist) {
	this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
	{ multiselect:true, draggable:false, keyboard:false });
	this.contact_list.addEventListener('select', function(o){ ref.compose_recipient_select(o); });
	this.contact_list.addEventListener('dblclick', function(o){ ref.compose_add_recipient('to'); });
	this.contact_list.init();
	}

	if (this.gui_objects.addressbookslist) {
	this.gui_objects.folderlist = this.gui_objects.addressbookslist;
	this.enable_command('list-adresses', true);
	}

	// ask user to send MDN
	if (this.env.mdn_request && this.env.uid) {
	var postact = 'sendmdn',
	postdata = {_uid: this.env.uid, _mbox: this.env.mailbox};
	if (!confirm(this.get_label('mdnrequest'))) {
	postdata._flag = 'mdnsent';
	postact = 'mark';
	}
	this.http_post(postact, postdata);
	}

	// detect browser capabilities
	if (!this.is_framed())
	this.browser_capabilities_check();

	break;

	case 'addressbook':
	if (this.gui_objects.folderlist)
	this.env.contactfolders = $.extend($.extend({}, this.env.address_sources), this.env.contactgroups);

	this.enable_command('add', 'import', this.env.writable_source);
	this.enable_command('list', 'listgroup', 'listsearch', 'advanced-search', true);

	if (this.gui_objects.contactslist) {

	this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
	{multiselect:true, draggable:this.gui_objects.folderlist?true:false, keyboard:true});
	this.contact_list.row_init = function(row){ p.triggerEvent('insertrow', { cid:row.uid, row:row }); };
	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(e){ p.drag_move(e); });
	this.contact_list.addEventListener('dragend', function(e){ p.drag_end(e); });
	this.contact_list.init();

	if (this.env.cid)
	this.contact_list.highlight_row(this.env.cid);

	this.gui_objects.contactslist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };
	document.onmouseup = function(e){ return p.doc_mouse_up(e); };
	if (this.gui_objects.qsearchbox) {
	$(this.gui_objects.qsearchbox).focusin(function() { rcmail.contact_list.blur(); });
	}

	this.update_group_commands();
	this.command('list');
	}

	this.set_page_buttons();

	if (this.env.cid) {
	this.enable_command('show', 'edit', true);
	// register handlers for group assignment via checkboxes
	if (this.gui_objects.editform) {
	$('input.groupmember').change(function() {
	ref.group_member_change(this.checked ? 'add' : 'del', ref.env.cid, ref.env.source, this.value);
	});
	}
	}

	if (this.gui_objects.editform) {
	this.enable_command('save', true);
	if (this.env.action == 'add' \|\| this.env.action == 'edit')
	this.init_contact_form();
	}

	if (this.gui_objects.qsearchbox) {
	this.enable_command('search', 'reset-search', 'moveto', true);
	}

	break;

	case 'settings':
	this.enable_command('preferences', 'identities', 'save', 'folders', true);

	if (this.env.action == 'identities') {
	this.enable_command('add', this.env.identities_level < 2);
	}
	else if (this.env.action == 'edit-identity' \|\| this.env.action == 'add-identity') {
	this.enable_command('save', 'edit', 'toggle-editor', true);
	this.enable_command('delete', this.env.identities_level < 2);

	if (this.env.action == 'add-identity')
	$("input[type='text']").first().select();
	}
	else if (this.env.action == 'folders') {
	this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', true);
	}
	else if (this.env.action == 'edit-folder' && this.gui_objects.editform) {
	this.enable_command('save', 'folder-size', true);
	parent.rcmail.env.messagecount = this.env.messagecount;
	parent.rcmail.enable_command('purge', this.env.messagecount);
	$("input[type='text']").first().select();
	}

	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);
	}
	else if (this.gui_objects.sectionslist) {
	this.sections_list = new rcube_list_widget(this.gui_objects.sectionslist, {multiselect:false, draggable:false, keyboard:false});
	this.sections_list.addEventListener('select', function(o){ p.section_select(o); });
	this.sections_list.init();
	this.sections_list.focus();
	}
	else if (this.gui_objects.subscriptionlist)
	this.init_subscription_list();

	break;

	case 'login':
	var input_user = $('#rcmloginuser');
	input_user.bind('keyup', function(e){ return rcmail.login_user_keyup(e); });

	if (input_user.val() == '')
	input_user.focus();
	else
	$('#rcmloginpwd').focus();

	// detect client timezone
	var dt = new Date(),
	tz = dt.getTimezoneOffset() / -60,
	stdtz = dt.getStdTimezoneOffset() / -60;

	$('#rcmlogintz').val(stdtz);
	$('#rcmlogindst').val(tz > stdtz ? 1 : 0);

	// display 'loading' message on form submit, lock submit button
	$('form').submit(function () {
	$('input[type=submit]', this).prop('disabled', true);
	rcmail.clear_messages();
	rcmail.display_message('', 'loading');
	});

	this.enable_command('login', true);
	break;

	default:
	break;
	}

	// prevent from form submit with Enter key in file input fields
	if (bw.ie)
	$('input[type=file]').keydown(function(e) { if (e.keyCode == '13') e.preventDefault(); });

	// flag object as complete
	this.loaded = true;

	// show message
	if (this.pending_message)
	this.display_message(this.pending_message[0], this.pending_message[1], this.pending_message[2]);

	// map implicit containers
	if (this.gui_objects.folderlist)
	this.gui_containers.foldertray = $(this.gui_objects.folderlist);

	// activate html5 file drop feature (if browser supports it and if configured)
	if (this.gui_objects.filedrop && this.env.filedrop && ((window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary) \|\| window.FormData)) {
	$(document.body).bind('dragover dragleave drop', function(e){ return ref.document_drag_hover(e, e.type == 'dragover'); });
	$(this.gui_objects.filedrop).addClass('droptarget')
	.bind('dragover dragleave', function(e){ return ref.file_drag_hover(e, e.type == 'dragover'); })
	.get(0).addEventListener('drop', function(e){ return ref.file_dropped(e); }, false);
	}

	// trigger init event hook
	this.triggerEvent('init', { task:this.task, action:this.env.action });

	// execute all foreign onload scripts
	// @deprecated
	for (var i in this.onloads) {
	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();
	};

	this.log = function(msg)
	{
	if (window.console && console.log)
	console.log(msg);
	};

	/*********************************************************/
	/******* client command interface *******/
	/*********************************************************/

	// execute a specific command on the web client
	this.command = function(command, props, obj, event)
	{
	var ret, uid, cid, url, flag;

	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.is_framed())
	parent.rcmail.command(command, props);

	return false;
	}

	// check input before leaving compose step
	if (this.task == 'mail' && this.env.action == 'compose' && $.inArray(command, this.env.compose_commands)<0) {
	if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
	return false;
	}

	// process external commands
	if (typeof this.command_handlers[command] === 'function') {
	ret = this.command_handlers[command](props, obj);
	return ret !== undefined ? ret : (obj ? false : true);
	}
	else if (typeof this.command_handlers[command] === 'string') {
	ret = window[this.command_handlers[command]](props, obj);
	return ret !== undefined ? ret : (obj ? false : true);
	}

	// trigger plugin hooks
	this.triggerEvent('actionbefore', {props:props, action:command});
	ret = this.triggerEvent('before'+command, props);
	if (ret !== undefined) {
	// abort if one of the handlers returned false
	if (ret === false)
	return false;
	else
	props = ret;
	}

	ret = undefined;

	// process internal command
	switch (command) {

	case 'login':
	if (this.gui_objects.loginform)
	this.gui_objects.loginform.submit();
	break;

	// commands to switch task
	case 'mail':
	case 'addressbook':
	case 'settings':
	case 'logout':
	this.switch_task(command);
	break;

	case 'about':
	location.href = '?_task=settings&_action=about';
	break;

	case 'permaurl':
	if (obj && obj.href && obj.target)
	return true;
	else if (this.env.permaurl)
	parent.location.href = this.env.permaurl;
	break;

	+ case 'extwin':
	+ if (this.env.action == 'compose') {
	+ var prevstate = this.env.compose_extwin;
	+ $("input[name='_action']", this.gui_objects.messageform).val('compose');
	+ this.gui_objects.messageform.action = this.url('mail/compose', { _id: this.env.compose_id, _extwin: 1 });
	+ this.gui_objects.messageform.target = this.open_window('', 1150, 900);
	+ this.gui_objects.messageform.submit();
	+ }
	+ else {
	+ this.open_window(this.env.permaurl, 1000, 1200);
	+ }
	+ break;
	+
	case 'menu-open':
	case 'menu-save':
	this.triggerEvent(command, {props:props});
	return false;

	case 'open':
	if (uid = this.get_single_uid()) {
	obj.href = '?_task='+this.env.task+'&_action=show&_mbox='+urlencode(this.env.mailbox)+'&_uid='+uid;
	return true;
	}
	break;

	+ case 'close':
	+ if (this.env.extwin)
	+ window.close();
	+ break;
	+
	case 'list':
	if (props && props != '')
	this.reset_qsearch();
	- if (this.task == 'mail') {
	+ if (this.env.action == 'compose' && this.env.extwin) {
	+ window.close();
	+ }
	+ else if (this.task == 'mail') {
	this.list_mailbox(props);
	this.set_button_titles();
	}
	else if (this.task == 'addressbook')
	this.list_contacts(props);
	break;

	case 'sort':
	var sort_order = this.env.sort_order,
	sort_col = !this.env.disabled_sort_col ? props : this.env.sort_col;

	if (!this.env.disabled_sort_order)
	sort_order = this.env.sort_col == sort_col && sort_order == 'ASC' ? 'DESC' : 'ASC';

	// set table header and update env
	this.set_list_sorting(sort_col, 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') {
	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: this.env.mailbox }, true);
	+ this.open_compose_step({ _draft_uid: uid, _mbox: this.env.mailbox });
	else
	this.show_message(uid);
	}
	}
	else if (this.task == 'addressbook') {
	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':
	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');
	else if (this.task == 'mail' && (cid = this.get_single_uid())) {
	url = { _mbox: this.env.mailbox };
	url[this.env.mailbox == this.env.drafts_mailbox && props != 'new' ? '_draft_uid' : '_uid'] = cid;
	- this.goto_url('compose', url, true);
	+ this.open_compose_step(url);
	}
	break;

	case 'save':
	var input, form = this.gui_objects.editform;
	if (form) {
	// adv. search
	if (this.env.action == 'search') {
	}
	// user prefs
	else if ((input = $("input[name='_pagesize']", form)) && input.length && isNaN(parseInt(input.val()))) {
	alert(this.get_label('nopagesizewarning'));
	input.focus();
	break;
	}
	// contacts/identities
	else {
	// reload form
	if (props == 'reload') {
	form.action += '?_reload=1';
	}
	else if (this.task == 'settings' && (this.env.identities_level % 2) == 0 &&
	(input = $("input[name='_email']", form)) && input.length && !rcube_check_email(input.val())
	) {
	alert(this.get_label('noemailwarning'));
	input.focus();
	break;
	}

	// clear empty input fields
	$('input.placeholder').each(function(){ if (this.value == this._placeholder) this.value = ''; });
	}

	// add selected source (on the list)
	if (parent.rcmail && parent.rcmail.env.source)
	form.action = this.add_url(form.action, '_orig_source', parent.rcmail.env.source);

	form.submit();
	}
	break;

	case 'delete':
	// mail task
	if (this.task == 'mail')
	this.delete_messages(event);
	// 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 'copy':
	if (this.task == 'mail')
	this.copy_messages(props);
	break;

	case 'mark':
	if (props)
	this.mark_message(props);
	break;

	case 'toggle_status':
	if (props && !props._row)
	break;

	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;

	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(this.env.sender);
	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 && this.env.mimetypes && $.inArray(props.mimetype, this.env.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) {
	setTimeout(function(){ ref.attachment_win.focus(); }, 10);
	break;
	}
	}

	this.goto_url('get', qstring+'&_download=1', false);
	break;

	case 'select-all':
	this.select_all_mode = props ? false : true;
	this.dummy_select = true; // prevent msg opening if there's only one msg on the list
	if (props == 'invert')
	this.message_list.invert_selection();
	else
	this.message_list.select_all(props == 'page' ? '' : props);
	this.dummy_select = null;
	break;

	case 'select-none':
	this.select_all_mode = false;
	this.message_list.clear_selection();
	break;

	case 'expand-all':
	this.env.autoexpand_threads = 1;
	this.message_list.expand_all();
	break;

	case 'expand-unread':
	this.env.autoexpand_threads = 2;
	this.message_list.collapse_all();
	this.expand_unread();
	break;

	case 'collapse-all':
	this.env.autoexpand_threads = 0;
	this.message_list.collapse_all();
	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':
	- url = this.url('mail/compose');
	+ url = {};

	if (this.task == 'mail') {
	- url += '&_mbox='+urlencode(this.env.mailbox);
	+ url._mbox = this.env.mailbox;
	if (props)
	- url += '&_to='+urlencode(props);
	+ url._to = props;
	// also send search request so we can go back to search result after message is sent
	if (this.env.search_request)
	- url += '&_search='+this.env.search_request;
	+ url._search = this.env.search_request;
	}
	// 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 n, len, a_cids = [];
	- if (props)
	- a_cids.push(props);
	- // get selected contacts
	- else if (this.contact_list) {
	- var selection = this.contact_list.get_selection();
	- for (n=0, len=selection.length; n<len; n++)
	- a_cids.push(selection[n]);
	+ url._to = props;
	}
	+ else {
	+ // use contact_id passed as command parameter
	+ var n, len, a_cids = [];
	+ if (props)
	+ a_cids.push(props);
	+ // get selected contacts
	+ else if (this.contact_list) {
	+ var selection = this.contact_list.get_selection();
	+ for (n=0, len=selection.length; n<len; n++)
	+ a_cids.push(selection[n]);
	+ }

	- if (a_cids.length)
	- this.http_post('mailto', { _cid: a_cids.join(','), _source: this.env.source}, true);
	- else if (this.env.group)
	- this.http_post('mailto', { _gid: this.env.group, _source: this.env.source}, true);
	+ if (a_cids.length)
	+ this.http_post('mailto', { _cid: a_cids.join(','), _source: this.env.source, }, true);
	+ else if (this.env.group)
	+ this.http_post('mailto', { _gid: this.env.group, _source: this.env.source }, true);

	- break;
	+ break;
	+ }
	}
	else if (props)
	- url += '&_to='+urlencode(props);
	+ url._to = props;

	- this.redirect(url);
	+ this.open_compose_step(url);
	break;

	case 'spellcheck':
	if (this.spellcheck_state()) {
	this.stop_spellchecking();
	}
	else {
	if (window.tinyMCE && tinyMCE.get(this.env.composebody)) {
	tinyMCE.execCommand('mceSpellCheck', true);
	}
	else if (this.env.spellcheck && this.env.spellcheck.spellCheck) {
	this.env.spellcheck.spellCheck();
	}
	}
	this.spellcheck_state();
	break;

	case 'savedraft':
	// Reset the auto-save timer
	clearTimeout(this.save_timer);

	// compose form did not change
	if (this.cmp_hash == this.compose_field_hash()) {
	this.auto_save_start();
	break;
	}

	// re-set keep-alive timeout
	this.start_keepalive();

	this.submit_messageform(true);
	break;

	case 'send':
	if (!props.nocheck && !this.check_compose_input(command))
	break;

	// Reset the auto-save timer
	clearTimeout(this.save_timer);

	this.submit_messageform();
	break;

	case 'send-attachment':
	// Reset the auto-save timer
	clearTimeout(this.save_timer);

	this.upload_file(props \|\| this.gui_objects.uploadform);
	break;

	case 'insert-sig':
	this.change_identity($("[name='_from']")[0], true);
	break;

	case 'list-adresses':
	this.list_contacts(props);
	this.enable_command('add-recipient', false);
	break;

	case 'add-recipient':
	this.compose_add_recipient(props);
	break;

	case 'reply-all':
	case 'reply-list':
	case 'reply':
	if (uid = this.get_single_uid()) {
	url = {_reply_uid: uid, _mbox: this.env.mailbox};
	if (command == 'reply-all')
	// do reply-list, when list is detected and popup menu wasn't used
	url._all = (!props && this.commands['reply-list'] ? 'list' : 'all');
	else if (command == 'reply-list')
	url._all = 'list';

	- this.goto_url('compose', url, true);
	+ this.open_compose_step(url);
	}
	break;

	case 'forward-attachment':
	case 'forward':
	if (uid = this.get_single_uid()) {
	url = { _forward_uid: uid, _mbox: this.env.mailbox };
	if (command == 'forward-attachment' \|\| (!props && this.env.forward_attachment))
	url._attachment = 1;
	- this.goto_url('compose', url, true);
	+ this.open_compose_step(url);
	}
	break;

	case 'print':
	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) {
	setTimeout(function(){ ref.printwin.focus(); }, 20);
	if (this.env.action != 'show')
	this.mark_message('read', uid);
	}
	}
	break;

	case 'viewsource':
	if (uid = this.get_single_uid()) {
	ref.sourcewin = window.open(this.env.comm_path+'&_action=viewsource&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox));
	if (this.sourcewin)
	setTimeout(function(){ ref.sourcewin.focus(); }, 20);
	}
	break;

	case 'download':
	if (uid = this.get_single_uid())
	this.goto_url('viewsource', { _uid: uid, _mbox: this.env.mailbox, _save: 1 });
	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 n, s = this.env.search_request \|\| this.env.qsearch;

	this.reset_qsearch();
	this.select_all_mode = false;

	if (s && this.env.mailbox)
	this.list_mailbox(this.env.mailbox, 1);
	else if (s && this.task == 'addressbook') {
	if (this.env.source == '') {
	for (n in this.env.address_sources) break;
	this.env.source = n;
	this.env.group = '';
	}
	this.list_contacts(this.env.source, this.env.group, 1);
	}
	break;

	case 'listgroup':
	this.reset_qsearch();
	this.list_contacts(props.source, props.id);
	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', (this.env.source ? '_target='+urlencode(this.env.source)+'&' : ''));
	break;

	case 'export':
	if (this.contact_list.rowcount > 0) {
	this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _search: this.env.search_request });
	}
	break;

	case 'upload-photo':
	this.upload_contact_photo(props \|\| this.gui_objects.uploadform);
	break;

	case 'delete-photo':
	this.replace_contact_photo('-del-');
	break;

	// user settings commands
	case 'preferences':
	case 'identities':
	case 'folders':
	this.goto_url('settings/' + command);
	break;

	case 'undo':
	this.http_request('undo', '', this.display_message('', 'loading'));
	break;

	// unified command call (command name == function name)
	default:
	var func = command.replace(/-/g, '_');
	if (this[func] && typeof this[func] === 'function') {
	ret = this[func](props, obj);
	}
	break;
	}

	if (this.triggerEvent('after'+command, props) === false)
	ret = false;
	this.triggerEvent('actionafter', {props:props, action:command});

	return ret === false ? false : obj ? false : true;
	};

	// set command(s) enabled or disabled
	this.enable_command = function()
	{
	var i, n, args = Array.prototype.slice.call(arguments),
	enable = args.pop(), cmd;

	for (n=0; n<args.length; n++) {
	cmd = args[n];
	// argument of type array
	if (typeof cmd === 'string') {
	this.commands[cmd] = enable;
	this.set_button(cmd, (enable ? 'act' : 'pas'));
	}
	// push array elements into commands array
	else {
	for (i in cmd)
	args.push(cmd[i]);
	}
	}
	};

	// lock/unlock interface
	this.set_busy = function(a, message, id)
	{
	if (a && message) {
	var msg = this.get_label(message);
	if (msg == message)
	msg = 'Loading...';

	id = this.display_message(msg, 'loading');
	}
	else if (!a && id) {
	this.hide_message(id);
	}

	this.busy = a;
	//document.body.style.cursor = a ? 'wait' : 'default';

	if (this.gui_objects.editform)
	this.lock_form(this.gui_objects.editform, a);

	return id;
	};

	// return a localized string
	this.get_label = function(name, domain)
	{
	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);
	};

	this.reload = function(delay)
	{
	if (this.is_framed())
	parent.rcmail.reload(delay);
	else if (delay)
	setTimeout(function(){ rcmail.reload(); }, delay);
	else if (window.location)
	location.href = this.env.comm_path + (this.env.action ? '&_action='+this.env.action : '');
	};

	// Add variable to GET string, replace old value if exists
	this.add_url = function(url, name, value)
	{
	value = urlencode(value);

	if (/(\?.*)$/.test(url)) {
	var urldata = RegExp.$1,
	datax = RegExp('((\\?\|&)'+RegExp.escape(name)+'=[^&]*)');

	if (datax.test(urldata)) {
	urldata = urldata.replace(datax, RegExp.$2 + name + '=' + value);
	}
	else
	urldata += '&' + name + '=' + value

	return url.replace(/(\?.*)$/, urldata);
	}

	return url + '?' + name + '=' + value;
	};

	this.is_framed = function()
	{
	return (this.env.framed && parent.rcmail && parent.rcmail != this && parent.rcmail.command);
	};

	this.save_pref = function(prop)
	{
	var request = {'_name': prop.name, '_value': prop.value};

	if (prop.session)
	request['_session'] = prop.session;
	if (prop.env)
	this.env[prop.env] = prop.value;

	this.http_post('save-pref', request);
	};

	this.html_identifier = function(str, encode)
	{
	str = String(str);
	if (encode)
	return Base64.encode(str).replace(/=+$/, '').replace(/\+/g, '-').replace(/\//g, '_');
	else
	return str.replace(this.identifier_expr, '_');
	};

	this.html_identifier_decode = function(str)
	{
	str = String(str).replace(/-/g, '+').replace(/_/g, '/');

	while (str.length % 4) str += '=';

	return Base64.decode(str);
	};


	/*********************************************************/
	/******* event handling methods *******/
	/*********************************************************/

	this.drag_menu = function(e, target)
	{
	var modkey = rcube_event.get_modifier(e),
	menu = this.gui_objects.message_dragmenu;

	if (menu && modkey == SHIFT_KEY && this.commands['copy']) {
	var pos = rcube_event.get_mouse_pos(e);
	this.env.drag_target = target;
	$(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'}).show();
	return true;
	}

	return false;
	};

	this.drag_menu_action = function(action)
	{
	var menu = this.gui_objects.message_dragmenu;
	if (menu) {
	$(menu).hide();
	}
	this.command(action, this.env.drag_target);
	this.env.drag_target = null;
	};

	this.drag_start = function(list)
	{
	var model = this.task == 'mail' ? this.env.mailboxes : this.env.contactfolders;

	this.drag_active = true;

	if (this.preview_timer)
	clearTimeout(this.preview_timer);
	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);

	// save folderlist and folders location/sizes for droptarget calculation in drag_move()
	if (this.gui_objects.folderlist && model) {
	this.initialBodyScrollTop = bw.ie ? 0 : window.pageYOffset;
	this.initialListScrollTop = this.gui_objects.folderlist.parentNode.scrollTop;

	var k, li, height,
	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 = [];
	for (k in model) {
	if (li = this.get_folder_li(k)) {
	// only visible folders
	if (height = li.firstChild.offsetHeight) {
	pos = $(li.firstChild).offset();
	this.env.folder_coords[k] = { x1:pos.left, y1:pos.top,
	x2:pos.left + li.firstChild.offsetWidth, y2:pos.top + height, on:0 };
	}
	}
	}
	}
	};

	this.drag_end = function(e)
	{
	this.drag_active = false;
	this.env.last_folder_target = null;

	if (this.folder_auto_timer) {
	clearTimeout(this.folder_auto_timer);
	this.folder_auto_timer = null;
	this.folder_auto_expand = null;
	}

	// over the folders
	if (this.gui_objects.folderlist && this.env.folder_coords) {
	for (var k in this.env.folder_coords) {
	if (this.env.folder_coords[k].on)
	$(this.get_folder_li(k)).removeClass('droptarget');
	}
	}
	};

	this.drag_move = function(e)
	{
	if (this.gui_objects.folderlist && this.env.folder_coords) {
	var k, li, div, check, oldclass,
	layerclass = 'draglayernormal',
	mouse = rcube_event.get_mouse_pos(e),
	pos = this.env.folderlist_coords,
	// offsets to compensate for scrolling while dragging a message
	boffset = bw.ie ? -document.documentElement.scrollTop : this.initialBodyScrollTop,
	moffset = this.initialListScrollTop-this.gui_objects.folderlist.parentNode.scrollTop;

	if (this.contact_list && this.contact_list.draglayer)
	oldclass = this.contact_list.draglayer.attr('class');

	mouse.y += -moffset-boffset;

	// 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.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
	this.env.folder_coords[this.env.last_folder_target].on = 0;
	this.env.last_folder_target = null;
	}
	if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
	this.contact_list.draglayer.attr('class', layerclass);
	return;
	}

	// over the folders
	for (k in this.env.folder_coords) {
	pos = this.env.folder_coords[k];
	if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2){
	if ((check = this.check_droptarget(k))) {
	li = this.get_folder_li(k);
	div = $(li.getElementsByTagName('div')[0]);

	// if the folder is collapsed, expand it after 1sec and restart the drag & drop process.
	if (div.hasClass('collapsed')) {
	if (this.folder_auto_timer)
	clearTimeout(this.folder_auto_timer);

	this.folder_auto_expand = this.env.mailboxes[k].id;
	this.folder_auto_timer = setTimeout(function() {
	rcmail.command('collapse-folder', rcmail.folder_auto_expand);
	rcmail.drag_start(null);
	}, 1000);
	} else if (this.folder_auto_timer) {
	clearTimeout(this.folder_auto_timer);
	this.folder_auto_timer = null;
	this.folder_auto_expand = null;
	}

	$(li).addClass('droptarget');
	this.env.folder_coords[k].on = 1;
	this.env.last_folder_target = k;
	layerclass = 'draglayer' + (check > 1 ? 'copy' : 'normal');
	} else { // Clear target, otherwise drag end will trigger move into last valid droptarget
	this.env.last_folder_target = null;
	}
	}
	else if (pos.on) {
	$(this.get_folder_li(k)).removeClass('droptarget');
	this.env.folder_coords[k].on = 0;
	}
	}

	if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
	this.contact_list.draglayer.attr('class', layerclass);
	}
	};

	this.collapse_folder = function(name)
	{
	var li = this.get_folder_li(name, '', true),
	div = $('div:first', li),
	ul = $('ul:first', li);

	if (div.hasClass('collapsed')) {
	ul.show();
	div.removeClass('collapsed').addClass('expanded');
	var reg = new RegExp('&'+urlencode(name)+'&');
	this.env.collapsed_folders = this.env.collapsed_folders.replace(reg, '');
	}
	else if (div.hasClass('expanded')) {
	ul.hide();
	div.removeClass('expanded').addClass('collapsed');
	this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(name)+'&';

	// select the folder if one of its childs is currently selected
	// don't select if it's virtual (#1488346)
	if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0 && !$(li).hasClass('virtual'))
	this.command('list', name);
	}
	else
	return;

	// Work around a bug in IE6 and IE7, see #1485309
	if (bw.ie6 \|\| bw.ie7) {
	var siblings = li.nextSibling ? li.nextSibling.getElementsByTagName('ul') : null;
	if (siblings && siblings.length && (li = siblings[0]) && li.style && li.style.display != 'none') {
	li.style.display = 'none';
	li.style.display = '';
	}
	}

	this.command('save-pref', { name: 'collapsed_folders', value: this.env.collapsed_folders });
	this.set_unread_count_display(name, false);
	};

	this.doc_mouse_up = function(e)
	{
	var model, list, id;

	// ignore event if jquery UI dialog is open
	if ($(rcube_event.get_target(e)).closest('.ui-dialog, .ui-widget-overlay').length)
	return;

	if (list = this.message_list)
	model = this.env.mailboxes;
	else if (list = this.contact_list)
	model = this.env.contactfolders;
	else if (this.ksearch_value)
	this.ksearch_blur();

	if (list && !rcube_mouse_is_over(e, list.list.parentNode))
	list.blur();

	// handle mouse release when dragging
	if (this.drag_active && model && this.env.last_folder_target) {
	var target = model[this.env.last_folder_target];

	$(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
	this.env.last_folder_target = null;
	list.draglayer.hide();

	if (!this.drag_menu(e, target))
	this.command('moveto', target);
	}

	// reset 'pressed' buttons
	if (this.buttons_sel) {
	for (id in this.buttons_sel)
	if (typeof id !== 'function')
	this.button_out(this.buttons_sel[id], id);
	this.buttons_sel = {};
	}
	};

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

	return true;
	};

	this.msglist_select = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);
	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);

	var selected = list.get_single_selection() != null;

	this.enable_command(this.env.message_commands, selected);
	if (selected) {
	// Hide certain command buttons when Drafts folder is selected
	if (this.env.mailbox == this.env.drafts_mailbox)
	this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-attachment', false);
	// Disable reply-list when List-Post header is not set
	else {
	var msg = this.env.messages[list.get_single_selection()];
	if (!msg.ml)
	this.enable_command('reply-list', false);
	}
	}
	// Multi-message commands
	this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));

	// reset all-pages-selection
	if (selected \|\| (list.selection.length && list.selection.length != list.rowcount))
	this.select_all_mode = false;

	// start timer for message preview (wait for double click)
	if (selected && this.env.contentframe && !list.multi_selecting && !this.dummy_select)
	this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, 200);
	else if (this.env.contentframe)
	this.show_contentframe(false);
	};

	// This allow as to re-select selected message and display it in preview frame
	this.msglist_click = function(list)
	{
	if (list.multi_selecting \|\| !this.env.contentframe)
	return;

	if (list.get_single_selection())
	return;

	var win = this.get_frame_window(this.env.contentframe);

	if (win && win.location.href.indexOf(this.env.blankpage)>=0) {
	if (this.preview_timer)
	clearTimeout(this.preview_timer);
	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);
	this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, 200);
	}
	};

	this.msglist_dbl_click = function(list)
	{
	if (this.preview_timer)
	clearTimeout(this.preview_timer);

	if (this.preview_read_timer)
	clearTimeout(this.preview_read_timer);

	var uid = list.get_single_selection();
	if (uid && this.env.mailbox == this.env.drafts_mailbox)
	- this.goto_url('compose', { _draft_uid: uid, _mbox: this.env.mailbox }, true);
	+ this.open_compose_step({ _draft_uid: uid, _mbox: this.env.mailbox });
	else if (uid)
	this.show_message(uid, false, false);
	};

	this.msglist_keypress = function(list)
	{
	if (list.modkey == CONTROL_KEY)
	return;

	if (list.key_pressed == list.ENTER_KEY)
	this.command('show');
	else if (list.key_pressed == list.DELETE_KEY \|\| list.key_pressed == list.BACKSPACE_KEY)
	this.command('delete');
	else if (list.key_pressed == 33)
	this.command('previouspage');
	else if (list.key_pressed == 34)
	this.command('nextpage');
	};

	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.msglist_expand = function(row)
	{
	if (this.env.messages[row.uid])
	this.env.messages[row.uid].expanded = row.expanded;
	$(row.obj)[row.expanded?'addClass':'removeClass']('expanded');
	};

	this.msglist_set_coltypes = function(list)
	{
	var i, found, name, cols = list.list.tHead.rows[0].cells;

	this.env.coltypes = [];

	for (i=0; i<cols.length; i++)
	if (cols[i].id && cols[i].id.match(/^rcm/)) {
	name = cols[i].id.replace(/^rcm/, '');
	this.env.coltypes.push(name);
	}

	if ((found = $.inArray('flag', this.env.coltypes)) >= 0)
	this.env.flagged_col = found;

	if ((found = $.inArray('subject', this.env.coltypes)) >= 0)
	this.env.subject_col = found;

	this.command('save-pref', { name: 'list_cols', value: this.env.coltypes, session: 'list_attrib/columns' });
	};

	this.check_droptarget = function(id)
	{
	var allow = false, copy = false;

	if (this.task == 'mail')
	allow = (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
	else if (this.task == 'settings')
	allow = (id != this.env.mailbox);
	else if (this.task == 'addressbook') {
	if (id != this.env.source && this.env.contactfolders[id]) {
	if (this.env.contactfolders[id].type == 'group') {
	var target_abook = this.env.contactfolders[id].source;
	allow = this.env.contactfolders[id].id != this.env.group && !this.env.contactfolders[target_abook].readonly;
	copy = target_abook != this.env.source;
	}
	else {
	allow = !this.env.contactfolders[id].readonly;
	copy = true;
	}
	}
	}

	return allow ? (copy ? 2 : 1) : 0;
	};

	+ this.open_window = function(url, width, height)
	+ {
	+ var w = Math.min(width, screen.width - 10),
	+ h = Math.min(height, screen.height - 100),
	+ l = (screen.width - w) / 2 + (screen.left \|\| 0),
	+ t = Math.max(0, (screen.height - h) / 2 + (screen.top \|\| 0) - 20);
	+
	+ var wname = 'rcmextwin' + new Date().getTime(),
	+ extwin = window.open(url + '&_extwin=1', wname, 'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,toolbar=no,status=no');
	+ extwin.moveTo(l,t);
	+
	+ // write loading... message to empty windows
	+ if (!url && extwin.document) {
	+ extwin.document.write('<html><body>' + this.get_label('loading') + '</body></html>');
	+ }
	+
	+ // focus window, delayed to bring to front
	+ window.setTimeout(function(){ extwin.focus(); }, 10);
	+
	+ return wname;
	+ };
	+

	/*********************************************************/
	/******* (message) list functionality *******/
	/*********************************************************/

	this.init_message_row = function(row)
	{
	var expando, self = this, uid = row.uid,
	status_icon = (this.env.status_col != null ? 'status' : 'msg') + 'icn' + row.uid;

	if (uid && this.env.messages[uid])
	$.extend(row, this.env.messages[uid]);

	// set eventhandler to status icon
	if (row.icon = document.getElementById(status_icon)) {
	row.icon._row = row.obj;
	row.icon.onmousedown = function(e) { self.command('toggle_status', this); rcube_event.cancel(e); };
	}

	// save message icon position too
	if (this.env.status_col != null)
	row.msgicon = document.getElementById('msgicn'+row.uid);
	else
	row.msgicon = row.icon;

	// set eventhandler to flag icon, if icon found
	if (this.env.flagged_col != null && (row.flagicon = document.getElementById('flagicn'+row.uid))) {
	row.flagicon._row = row.obj;
	row.flagicon.onmousedown = function(e) { self.command('toggle_flag', this); rcube_event.cancel(e); };
	}

	if (!row.depth && row.has_children && (expando = document.getElementById('rcmexpando'+row.uid))) {
	row.expando = expando;
	expando.onmousedown = function(e) { return self.expand_message_row(e, uid); };
	}

	this.triggerEvent('insertrow', { uid:uid, row:row });
	};

	// create a table row in the message list
	this.add_message_row = function(uid, cols, flags, attop)
	{
	if (!this.gui_objects.messagelist \|\| !this.message_list)
	return false;

	// Prevent from adding messages from different folder (#1487752)
	if (flags.mbox != this.env.mailbox && !flags.skip_mbox_check)
	return false;

	if (!this.env.messages[uid])
	this.env.messages[uid] = {};

	// merge flags over local message object
	$.extend(this.env.messages[uid], {
	deleted: flags.deleted?1:0,
	replied: flags.answered?1:0,
	unread: !flags.seen?1:0,
	forwarded: flags.forwarded?1:0,
	flagged: flags.flagged?1:0,
	has_children: flags.has_children?1:0,
	depth: flags.depth?flags.depth:0,
	unread_children: flags.unread_children?flags.unread_children:0,
	parent_uid: flags.parent_uid?flags.parent_uid:0,
	selected: this.select_all_mode \|\| this.message_list.in_selection(uid),
	ml: flags.ml?1:0,
	ctype: flags.ctype,
	// flags from plugins
	flags: flags.extra_flags
	});

	var c, n, col, html, css_class,
	tree = '', expando = '',
	list = this.message_list,
	rows = list.rows,
	message = this.env.messages[uid],
	row_class = 'message'
	+ (!flags.seen ? ' unread' : '')
	+ (flags.deleted ? ' deleted' : '')
	+ (flags.flagged ? ' flagged' : '')
	+ (flags.unread_children && flags.seen && !this.env.autoexpand_threads ? ' unroot' : '')
	+ (message.selected ? ' selected' : ''),
	// for performance use DOM instead of jQuery here
	row = document.createElement('tr');

	row.id = 'rcmrow'+uid;

	// message status icons
	css_class = 'msgicon';
	if (this.env.status_col === null) {
	css_class += ' status';
	if (flags.deleted)
	css_class += ' deleted';
	else if (!flags.seen)
	css_class += ' unread';
	else if (flags.unread_children > 0)
	css_class += ' unreadchildren';
	}
	if (flags.answered)
	css_class += ' replied';
	if (flags.forwarded)
	css_class += ' forwarded';

	// update selection
	if (message.selected && !list.in_selection(uid))
	list.selection.push(uid);

	// threads
	if (this.env.threading) {
	if (message.depth) {
	// This assumes that div width is hardcoded to 15px,
	tree += '<span id="rcmtab' + uid + '" class="branch" style="width:' + (message.depth * 15) + 'px;">  </span>';

	if ((rows[message.parent_uid] && rows[message.parent_uid].expanded === false)
	\|\| ((this.env.autoexpand_threads == 0 \|\| this.env.autoexpand_threads == 2) &&
	(!rows[message.parent_uid] \|\| !rows[message.parent_uid].expanded))
	) {
	row.style.display = 'none';
	message.expanded = false;
	}
	else
	message.expanded = true;

	row_class += ' thread expanded';
	}
	else if (message.has_children) {
	if (message.expanded === undefined && (this.env.autoexpand_threads == 1 \|\| (this.env.autoexpand_threads == 2 && message.unread_children))) {
	message.expanded = true;
	}

	expando = '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '">  </div>';
	row_class += ' thread' + (message.expanded? ' expanded' : '');
	}
	}

	tree += '<span id="msgicn'+uid+'" class="'+css_class+'"> </span>';
	row.className = row_class;

	// build subject link
	if (!bw.ie && cols.subject) {
	var action = flags.mbox == this.env.drafts_mailbox ? 'compose' : 'show';
	var uid_param = flags.mbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid';
	cols.subject = '<a href="./?_task=mail&_action='+action+'&_mbox='+urlencode(flags.mbox)+'&'+uid_param+'='+uid+'"'+
	' onclick="return rcube_event.cancel(event)" onmouseover="rcube_webmail.long_subject_title(this,'+(message.depth+1)+')">'+cols.subject+'</a>';
	}

	// add each submitted col
	for (n in this.env.coltypes) {
	c = this.env.coltypes[n];
	col = document.createElement('td');
	col.className = String(c).toLowerCase();

	if (c == 'flag') {
	css_class = (flags.flagged ? 'flagged' : 'unflagged');
	html = '<span id="flagicn'+uid+'" class="'+css_class+'"> </span>';
	}
	else if (c == 'attachment') {
	if (/application\/\|multipart\/(m\|signed)/.test(flags.ctype))
	html = '<span class="attachment"> </span>';
	else if (/multipart\/report/.test(flags.ctype))
	html = '<span class="report"> </span>';
	else
	html = ' ';
	}
	else if (c == 'status') {
	if (flags.deleted)
	css_class = 'deleted';
	else if (!flags.seen)
	css_class = 'unread';
	else if (flags.unread_children > 0)
	css_class = 'unreadchildren';
	else
	css_class = 'msgicon';
	html = '<span id="statusicn'+uid+'" class="'+css_class+'"> </span>';
	}
	else if (c == 'threads')
	html = expando;
	else if (c == 'subject') {
	if (bw.ie) {
	col.onmouseover = function() { rcube_webmail.long_subject_title_ie(this, message.depth+1); };
	if (bw.ie8)
	tree = '<span></span>' + tree; // #1487821
	}
	html = tree + cols[c];
	}
	else if (c == 'priority') {
	if (flags.prio > 0 && flags.prio < 6)
	html = '<span class="prio'+flags.prio+'"> </span>';
	else
	html = ' ';
	}
	else
	html = cols[c];

	col.innerHTML = html;

	row.appendChild(col);
	}

	list.insert_row(row, attop);

	// remove 'old' row
	if (attop && this.env.pagesize && list.rowcount > this.env.pagesize) {
	var uid = list.get_last_row();
	list.remove_row(uid);
	list.clear_selection(uid);
	}
	};

	this.set_list_sorting = function(sort_col, sort_order)
	{
	// set table header class
	$('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));
	if (sort_col)
	$('#rcm'+sort_col).addClass('sorted'+sort_order);

	this.env.sort_col = sort_col;
	this.env.sort_order = sort_order;
	};

	this.set_list_options = function(cols, sort_col, sort_order, threads)
	{
	var update, post_data = {};

	if (sort_col === undefined)
	sort_col = this.env.sort_col;
	if (!sort_order)
	sort_order = this.env.sort_order;

	if (this.env.sort_col != sort_col \|\| this.env.sort_order != sort_order) {
	update = 1;
	this.set_list_sorting(sort_col, sort_order);
	}

	if (this.env.threading != threads) {
	update = 1;
	post_data._threads = threads;
	}

	if (cols && cols.length) {
	// make sure new columns are added at the end of the list
	var i, idx, name, newcols = [], oldcols = this.env.coltypes;
	for (i=0; i<oldcols.length; i++) {
	name = oldcols[i];
	idx = $.inArray(name, cols);
	if (idx != -1) {
	newcols.push(name);
	delete cols[idx];
	}
	}
	for (i=0; i<cols.length; i++)
	if (cols[i])
	newcols.push(cols[i]);

	if (newcols.join() != oldcols.join()) {
	update = 1;
	post_data._cols = newcols.join(',');
	}
	}

	if (update)
	this.list_mailbox('', '', sort_col+'_'+sort_order, post_data);
	};

	- // when user doble-clicks on a row
	+ // when user double-clicks on a row
	this.show_message = function(id, safe, preview)
	{
	if (!id)
	return;

	var win, target = window,
	action = preview ? 'preview': 'show',
	url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox);

	if (preview && (win = this.get_frame_window(this.env.contentframe))) {
	target = win;
	url += '&_framed=1';
	}

	if (safe)
	url += '&_safe=1';

	// also send search request to get the right messages
	if (this.env.search_request)
	url += '&_search='+this.env.search_request;

	// add browser capabilities, so we can properly handle attachments
	url += '&_caps='+urlencode(this.browser_capabilities());

	- if (preview && String(target.location.href).indexOf(url) >= 0)
	+ if (this.env.extwin)
	+ url += '&_extwin=1';
	+
	+ if (preview && String(target.location.href).indexOf(url) >= 0) {
	this.show_contentframe(true);
	+ }
	else {
	- this.location_href(this.env.comm_path+url, target, true);
	+ if (!preview && this.env.message_extwin && !this.env.extwin)
	+ this.open_window(this.env.comm_path+url, 1000, 1200);
	+ else
	+ this.location_href(this.env.comm_path+url, target, true);

	// mark as read and change mbox unread counter
	if (preview && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read >= 0) {
	this.preview_read_timer = setTimeout(function() {
	ref.set_message(id, 'unread', false);
	ref.update_thread_root(id, 'read');
	if (ref.env.unread_counts[ref.env.mailbox]) {
	ref.env.unread_counts[ref.env.mailbox] -= 1;
	ref.set_unread_count(ref.env.mailbox, ref.env.unread_counts[ref.env.mailbox], ref.env.mailbox == 'INBOX');
	}
	if (ref.env.preview_pane_mark_read > 0)
	ref.http_post('mark', {_uid: id, _flag: 'read', _quiet: 1});
	}, this.env.preview_pane_mark_read * 1000);
	}
	}
	};

	this.show_contentframe = function(show)
	{
	var frame, win, name = this.env.contentframe;

	if (name && (frame = this.get_frame_element(name))) {
	if (!show && (win = this.get_frame_window(name))) {
	if (win.location && win.location.href.indexOf(this.env.blankpage)<0)
	win.location.href = this.env.blankpage;
	}
	else if (!bw.safari && !bw.konq)
	$(frame)[show ? 'show' : 'hide']();
	}

	if (!show && this.busy)
	this.set_busy(false, null, this.env.frame_lock);
	};

	this.get_frame_element = function(id)
	{
	var frame;

	if (id && (frame = document.getElementById(id)))
	return frame;
	};

	this.get_frame_window = function(id)
	{
	var frame = this.get_frame_element(id);

	if (frame && frame.name && window.frames)
	return window.frames[frame.name];
	};

	this.lock_frame = function()
	{
	if (!this.env.frame_lock)
	(this.is_framed() ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
	};

	// list a specific page
	this.list_page = function(page)
	{
	if (page == 'next')
	page = this.env.current_page+1;
	else if (page == 'last')
	page = this.env.pagecount;
	else if (page == 'prev' && this.env.current_page > 1)
	page = this.env.current_page-1;
	else 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 == 'addressbook' \|\| this.contact_list)
	this.list_contacts(this.env.source, this.env.group, page);
	else if (this.task == 'mail')
	this.list_mailbox(this.env.mailbox, page);
	}
	};

	// list messages of a specific mailbox using filter
	this.filter_mailbox = function(filter)
	{
	var lock = this.set_busy(true, 'searching');

	this.clear_message_list();

	// reset vars
	this.env.current_page = 1;
	this.http_request('search', this.search_params(false, filter), lock);
	};

	// list messages of a specific mailbox
	this.list_mailbox = function(mbox, page, sort, url)
	{
	var win, target = window;

	if (typeof url != 'object')
	url = {};

	if (!mbox)
	mbox = this.env.mailbox ? this.env.mailbox : 'INBOX';

	// add sort to url if set
	if (sort)
	url._sort = sort;

	// also send search request to get the right messages
	if (this.env.search_request)
	url._search = this.env.search_request;

	// set page=1 if changeing to another mailbox
	if (this.env.mailbox != mbox) {
	page = 1;
	this.env.current_page = page;
	this.select_all_mode = false;
	}

	// unselect selected messages and clear the list and message data
	this.clear_message_list();

	if (mbox != this.env.mailbox \|\| (mbox == this.env.mailbox && !page && !sort))
	url._refresh = 1;

	this.select_folder(mbox, '', true);
	this.unmark_folder(mbox, 'recent', '', true);
	this.env.mailbox = mbox;

	// load message list remotely
	if (this.gui_objects.messagelist) {
	this.list_mailbox_remote(mbox, page, url);
	return;
	}

	if (win = this.get_frame_window(this.env.contentframe)) {
	target = win;
	url._framed = 1;
	}

	// load message list to target frame/window
	if (mbox) {
	this.set_busy(true, 'loading');
	url._mbox = mbox;
	if (page)
	url._page = page;
	this.location_href(url, target);
	}
	};

	this.clear_message_list = function()
	{
	this.env.messages = {};
	this.last_selected = 0;

	this.show_contentframe(false);
	if (this.message_list)
	this.message_list.clear(true);
	};

	// send remote request to load message list
	this.list_mailbox_remote = function(mbox, page, post_data)
	{
	// clear message list first
	this.message_list.clear();

	var lock = this.set_busy(true, 'loading');

	if (typeof post_data != 'object')
	post_data = {};
	post_data._mbox = mbox;
	if (page)
	post_data._page = page;

	this.http_request('list', post_data, lock);
	};

	// removes messages that doesn't exists from list selection array
	this.update_selection = function()
	{
	var selected = this.message_list.selection,
	rows = this.message_list.rows,
	i, selection = [];

	for (i in selected)
	if (rows[selected[i]])
	selection.push(selected[i]);

	this.message_list.selection = selection;
	}

	// expand all threads with unread children
	this.expand_unread = function()
	{
	var r, tbody = this.gui_objects.messagelist.tBodies[0],
	new_row = tbody.firstChild;

	while (new_row) {
	if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) {
	this.message_list.expand_all(r);
	this.set_unread_children(r.uid);
	}
	new_row = new_row.nextSibling;
	}
	return false;
	};

	// thread expanding/collapsing handler
	this.expand_message_row = function(e, uid)
	{
	var row = this.message_list.rows[uid];

	// handle unread_children mark
	row.expanded = !row.expanded;
	this.set_unread_children(uid);
	row.expanded = !row.expanded;

	this.message_list.expand_row(e, uid);
	};

	// message list expanding
	this.expand_threads = function()
	{
	if (!this.env.threading \|\| !this.env.autoexpand_threads \|\| !this.message_list)
	return;

	switch (this.env.autoexpand_threads) {
	case 2: this.expand_unread(); break;
	case 1: this.message_list.expand_all(); break;
	}
	};

	// Initializes threads indicators/expanders after list update
	this.init_threads = function(roots, mbox)
	{
	// #1487752
	if (mbox && mbox != this.env.mailbox)
	return false;

	for (var n=0, len=roots.length; n<len; n++)
	this.add_tree_icons(roots[n]);
	this.expand_threads();
	};

	// adds threads tree icons to the list (or specified thread)
	this.add_tree_icons = function(root)
	{
	var i, l, r, n, len, pos, tmp = [], uid = [],
	row, rows = this.message_list.rows;

	if (root)
	row = rows[root] ? rows[root].obj : null;
	else
	row = this.message_list.list.tBodies[0].firstChild;

	while (row) {
	if (row.nodeType == 1 && (r = rows[row.uid])) {
	if (r.depth) {
	for (i=tmp.length-1; i>=0; i--) {
	len = tmp[i].length;
	if (len > r.depth) {
	pos = len - r.depth;
	if (!(tmp[i][pos] & 2))
	tmp[i][pos] = tmp[i][pos] ? tmp[i][pos]+2 : 2;
	}
	else if (len == r.depth) {
	if (!(tmp[i][0] & 2))
	tmp[i][0] += 2;
	}
	if (r.depth > len)
	break;
	}

	tmp.push(new Array(r.depth));
	tmp[tmp.length-1][0] = 1;
	uid.push(r.uid);
	}
	else {
	if (tmp.length) {
	for (i in tmp) {
	this.set_tree_icons(uid[i], tmp[i]);
	}
	tmp = [];
	uid = [];
	}
	if (root && row != rows[root].obj)
	break;
	}
	}
	row = row.nextSibling;
	}

	if (tmp.length) {
	for (i in tmp) {
	this.set_tree_icons(uid[i], tmp[i]);
	}
	}
	};

	// adds tree icons to specified message row
	this.set_tree_icons = function(uid, tree)
	{
	var i, divs = [], html = '', len = tree.length;

	for (i=0; i<len; i++) {
	if (tree[i] > 2)
	divs.push({'class': 'l3', width: 15});
	else if (tree[i] > 1)
	divs.push({'class': 'l2', width: 15});
	else if (tree[i] > 0)
	divs.push({'class': 'l1', width: 15});
	// separator div
	else if (divs.length && !divs[divs.length-1]['class'])
	divs[divs.length-1].width += 15;
	else
	divs.push({'class': null, width: 15});
	}

	for (i=divs.length-1; i>=0; i--) {
	if (divs[i]['class'])
	html += '<div class="tree '+divs[i]['class']+'" />';
	else
	html += '<div style="width:'+divs[i].width+'px" />';
	}

	if (html)
	$('#rcmtab'+uid).html(html);
	};

	// update parent in a thread
	this.update_thread_root = function(uid, flag)
	{
	if (!this.env.threading)
	return;

	var root = this.message_list.find_root(uid);

	if (uid == root)
	return;

	var p = this.message_list.rows[root];

	if (flag == 'read' && p.unread_children) {
	p.unread_children--;
	}
	else if (flag == 'unread' && p.has_children) {
	// unread_children may be undefined
	p.unread_children = p.unread_children ? p.unread_children + 1 : 1;
	}
	else {
	return;
	}

	this.set_message_icon(root);
	this.set_unread_children(root);
	};

	// update thread indicators for all messages in a thread below the specified message
	// return number of removed/added root level messages
	this.update_thread = function (uid)
	{
	if (!this.env.threading)
	return 0;

	var r, parent, count = 0,
	rows = this.message_list.rows,
	row = rows[uid],
	depth = rows[uid].depth,
	roots = [];

	if (!row.depth) // root message: decrease roots count
	count--;
	else if (row.unread) {
	// update unread_children for thread root
	parent = this.message_list.find_root(uid);
	rows[parent].unread_children--;
	this.set_unread_children(parent);
	}

	parent = row.parent_uid;

	// childrens
	row = row.obj.nextSibling;
	while (row) {
	if (row.nodeType == 1 && (r = rows[row.uid])) {
	if (!r.depth \|\| r.depth <= depth)
	break;

	r.depth--; // move left
	// reset width and clear the content of a tab, icons will be added later
	$('#rcmtab'+r.uid).width(r.depth * 15).html('');
	if (!r.depth) { // a new root
	count++; // increase roots count
	r.parent_uid = 0;
	if (r.has_children) {
	// replace 'leaf' with 'collapsed'
	$('#rcmrow'+r.uid+' '+'.leaf:first')
	.attr('id', 'rcmexpando' + r.uid)
	.attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed'))
	.bind('mousedown', {uid:r.uid, p:this},
	function(e) { return e.data.p.expand_message_row(e, e.data.uid); });

	r.unread_children = 0;
	roots.push(r);
	}
	// show if it was hidden
	if (r.obj.style.display == 'none')
	$(r.obj).show();
	}
	else {
	if (r.depth == depth)
	r.parent_uid = parent;
	if (r.unread && roots.length)
	roots[roots.length-1].unread_children++;
	}
	}
	row = row.nextSibling;
	}

	// update unread_children for roots
	for (var i=0; i<roots.length; i++)
	this.set_unread_children(roots[i].uid);

	return count;
	};

	this.delete_excessive_thread_rows = function()
	{
	var rows = this.message_list.rows,
	tbody = this.message_list.list.tBodies[0],
	row = tbody.firstChild,
	cnt = this.env.pagesize + 1;

	while (row) {
	if (row.nodeType == 1 && (r = rows[row.uid])) {
	if (!r.depth && cnt)
	cnt--;

	if (!cnt)
	this.message_list.remove_row(row.uid);
	}
	row = row.nextSibling;
	}
	};

	// set message icon
	this.set_message_icon = function(uid)
	{
	var css_class,
	row = this.message_list.rows[uid];

	if (!row)
	return false;

	if (row.icon) {
	css_class = 'msgicon';
	if (row.deleted)
	css_class += ' deleted';
	else if (row.unread)
	css_class += ' unread';
	else if (row.unread_children)
	css_class += ' unreadchildren';
	if (row.msgicon == row.icon) {
	if (row.replied)
	css_class += ' replied';
	if (row.forwarded)
	css_class += ' forwarded';
	css_class += ' status';
	}

	row.icon.className = css_class;
	}

	if (row.msgicon && row.msgicon != row.icon) {
	css_class = 'msgicon';
	if (!row.unread && row.unread_children)
	css_class += ' unreadchildren';
	if (row.replied)
	css_class += ' replied';
	if (row.forwarded)
	css_class += ' forwarded';

	row.msgicon.className = css_class;
	}

	if (row.flagicon) {
	css_class = (row.flagged ? 'flagged' : 'unflagged');
	row.flagicon.className = css_class;
	}
	};

	// set message status
	this.set_message_status = function(uid, flag, status)
	{
	var row = this.message_list.rows[uid];

	if (!row)
	return false;

	if (flag == 'unread')
	row.unread = status;
	else if(flag == 'deleted')
	row.deleted = status;
	else if (flag == 'replied')
	row.replied = status;
	else if (flag == 'forwarded')
	row.forwarded = status;
	else if (flag == 'flagged')
	row.flagged = status;
	};

	// set message row status, class and icon
	this.set_message = function(uid, flag, status)
	{
	var row = this.message_list && this.message_list.rows[uid];

	if (!row)
	return false;

	if (flag)
	this.set_message_status(uid, flag, status);

	var rowobj = $(row.obj);

	if (row.unread && !rowobj.hasClass('unread'))
	rowobj.addClass('unread');
	else if (!row.unread && rowobj.hasClass('unread'))
	rowobj.removeClass('unread');

	if (row.deleted && !rowobj.hasClass('deleted'))
	rowobj.addClass('deleted');
	else if (!row.deleted && rowobj.hasClass('deleted'))
	rowobj.removeClass('deleted');

	if (row.flagged && !rowobj.hasClass('flagged'))
	rowobj.addClass('flagged');
	else if (!row.flagged && rowobj.hasClass('flagged'))
	rowobj.removeClass('flagged');

	this.set_unread_children(uid);
	this.set_message_icon(uid);
	};

	// sets unroot (unread_children) class of parent row
	this.set_unread_children = function(uid)
	{
	var row = this.message_list.rows[uid];

	if (row.parent_uid)
	return;

	if (!row.unread && row.unread_children && !row.expanded)
	$(row.obj).addClass('unroot');
	else
	$(row.obj).removeClass('unroot');
	};

	// copy selected messages to the specified mailbox
	this.copy_messages = function(mbox)
	{
	if (mbox && typeof mbox === 'object')
	mbox = mbox.id;

	// 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 a_uids = [], n, selection,
	lock = this.display_message(this.get_label('copyingmessage'), 'loading'),
	post_data = {_mbox: this.env.mailbox, _target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};

	if (this.env.uid)
	a_uids[0] = this.env.uid;
	else {
	selection = this.message_list.get_selection();
	for (n in selection) {
	a_uids.push(selection[n]);
	}
	}

	post_data._uid = this.uids_to_list(a_uids);

	// send request to server
	this.http_post('copy', post_data, lock);
	};

	// move selected messages to the specified mailbox
	this.move_messages = function(mbox)
	{
	if (mbox && typeof mbox === 'object')
	mbox = mbox.id;

	// 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,
	add_post = {_target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};

	// show wait message
	if (this.env.action == 'show')
	lock = this.set_busy(true, 'movingmessage');
	else
	this.show_contentframe(false);

	// Hide message command buttons until a message is selected
	this.enable_command(this.env.message_commands, false);

	this._with_selected_messages('moveto', lock, add_post);
	};

	// delete selected messages from the current mailbox
	this.delete_messages = function(event)
	{
	var uid, i, len, trash = this.env.trash_mailbox,
	list = this.message_list,
	selection = list ? $.merge([], list.get_selection()) : [];

	// exit if no mailbox specified or if selection is empty
	if (!this.env.uid && !selection.length)
	return;

	// also select childs of collapsed rows
	for (i=0, len=selection.length; i<len; i++) {
	uid = selection[i];
	if (list.rows[uid].has_children && !list.rows[uid].expanded)
	list.select_childs(uid);
	}

	// if config is set to flag for deletion
	if (this.env.flag_for_deletion) {
	this.mark_message('delete');
	return false;
	}
	// if there isn't a defined trash mailbox or we are in it
	// @TODO: we should check if defined trash mailbox exists
	else if (!trash \|\| this.env.mailbox == trash)
	this.permanently_remove_messages();
	// we're in Junk folder and delete_junk is enabled
	else if (this.env.delete_junk && this.env.junk_mailbox && this.env.mailbox == this.env.junk_mailbox)
	this.permanently_remove_messages();
	// if there is a trash mailbox defined and we're not currently in it
	else {
	// if shift was pressed delete it immediately
	if ((list && list.modkey == SHIFT_KEY) \|\| (event && rcube_event.get_modifier(event) == SHIFT_KEY)) {
	if (confirm(this.get_label('deletemessagesconfirm')))
	this.permanently_remove_messages();
	}
	else
	this.move_messages(trash);
	}

	return true;
	};

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

	// Send a specifc moveto/delete request with UIDs of all selected messages
	// @private
	this._with_selected_messages = function(action, lock, post_data)
	{
	var a_uids = [], count = 0, msg, lock;

	if (typeof(post_data) != 'object')
	post_data = {};

	if (this.env.uid)
	a_uids[0] = this.env.uid;
	else {
	var n, id, root, roots = [],
	selection = this.message_list.get_selection();

	for (n=0, len=selection.length; n<len; n++) {
	id = selection[n];
	a_uids.push(id);

	if (this.env.threading) {
	count += this.update_thread(id);
	root = this.message_list.find_root(id);
	if (root != id && $.inArray(root, roots) < 0) {
	roots.push(root);
	}
	}
	this.message_list.remove_row(id, (this.env.display_next && n == selection.length-1));
	}
	// make sure there are no selected rows
	if (!this.env.display_next)
	this.message_list.clear_selection();
	// update thread tree icons
	for (n=0, len=roots.length; n<len; n++) {
	this.add_tree_icons(roots[n]);
	}
	}

	// also send search request to get the right messages
	if (this.env.search_request)
	post_data._search = this.env.search_request;

	if (this.env.display_next && this.env.next_uid)
	post_data._next_uid = this.env.next_uid;

	if (count < 0)
	post_data._count = (count*-1);
	// remove threads from the end of the list
	else if (count > 0)
	this.delete_excessive_thread_rows();

	post_data._uid = this.uids_to_list(a_uids);
	post_data._mbox = this.env.mailbox;

	if (!lock) {
	msg = action == 'moveto' ? 'movingmessage' : 'deletingmessage';
	lock = this.display_message(this.get_label(msg), 'loading');
	}

	// send request to server
	this.http_post(action, post_data, lock);
	};

	// set a specific flag to one or more messages
	this.mark_message = function(flag, uid)
	{
	var a_uids = [], r_uids = [], len, n, id, selection,
	list = this.message_list;

	if (uid)
	a_uids[0] = uid;
	else if (this.env.uid)
	a_uids[0] = this.env.uid;
	else if (list) {
	selection = list.get_selection();
	for (n=0, len=selection.length; n<len; n++) {
	a_uids.push(selection[n]);
	}
	}

	if (!list)
	r_uids = a_uids;
	else {
	list.focus();
	for (n=0, len=a_uids.length; n<len; n++) {
	id = a_uids[n];
	if ((flag=='read' && list.rows[id].unread)
	\|\| (flag=='unread' && !list.rows[id].unread)
	\|\| (flag=='delete' && !list.rows[id].deleted)
	\|\| (flag=='undelete' && list.rows[id].deleted)
	\|\| (flag=='flagged' && !list.rows[id].flagged)
	\|\| (flag=='unflagged' && list.rows[id].flagged))
	{
	r_uids.push(id);
	}
	}
	}

	// nothing to do
	if (!r_uids.length && !this.select_all_mode)
	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)
	{
	var i, len = a_uids.length,
	post_data = {_uid: this.uids_to_list(a_uids), _flag: flag},
	lock = this.display_message(this.get_label('markingmessage'), 'loading');

	// mark all message rows as read/unread
	for (i=0; i<len; i++)
	this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));

	// also send search request to get the right messages
	if (this.env.search_request)
	post_data._search = this.env.search_request;

	this.http_post('mark', post_data, lock);

	for (i=0; i<len; i++)
	this.update_thread_root(a_uids[i], flag);
	};

	// set image to flagged or unflagged
	this.toggle_flagged_status = function(flag, a_uids)
	{
	var i, len = a_uids.length,
	post_data = {_uid: this.uids_to_list(a_uids), _flag: flag},
	lock = this.display_message(this.get_label('markingmessage'), 'loading');

	// mark all message rows as flagged/unflagged
	for (i=0; i<len; i++)
	this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));

	// also send search request to get the right messages
	if (this.env.search_request)
	post_data._search = this.env.search_request;

	this.http_post('mark', post_data, lock);
	};

	// mark all message rows as deleted/undeleted
	this.toggle_delete_status = function(a_uids)
	{
	var len = a_uids.length,
	i, uid, all_deleted = true,
	rows = this.message_list ? this.message_list.rows : [];

	if (len == 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;
	}

	for (i=0; i<len; i++) {
	uid = a_uids[i];
	if (rows[uid] && !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)
	{
	var i, len=a_uids.length,
	post_data = {_uid: this.uids_to_list(a_uids), _flag: 'undelete'},
	lock = this.display_message(this.get_label('markingmessage'), 'loading');

	for (i=0; i<len; i++)
	this.set_message(a_uids[i], 'deleted', false);

	// also send search request to get the right messages
	if (this.env.search_request)
	post_data._search = this.env.search_request;

	this.http_post('mark', post_data, lock);
	return true;
	};

	this.flag_as_deleted = function(a_uids)
	{
	var r_uids = [],
	post_data = {_uid: this.uids_to_list(a_uids), _flag: 'delete'},
	lock = this.display_message(this.get_label('markingmessage'), 'loading'),
	rows = this.message_list ? this.message_list.rows : [],
	count = 0;

	for (var i=0, len=a_uids.length; i<len; i++) {
	uid = a_uids[i];
	if (rows[uid]) {
	if (rows[uid].unread)
	r_uids[r_uids.length] = uid;

	if (this.env.skip_deleted) {
	count += this.update_thread(uid);
	this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1));
	}
	else
	this.set_message(uid, 'deleted', true);
	}
	}

	// make sure there are no selected rows
	if (this.env.skip_deleted && this.message_list) {
	if(!this.env.display_next)
	this.message_list.clear_selection();
	if (count < 0)
	post_data._count = (count*-1);
	else if (count > 0)
	// remove threads from the end of the list
	this.delete_excessive_thread_rows();
	}

	if (this.env.action)
	post_data._from = this.env.action;

	// ??
	if (r_uids.length)
	post_data._ruid = this.uids_to_list(r_uids);

	if (this.env.skip_deleted && this.env.display_next && this.env.next_uid)
	post_data._next_uid = this.env.next_uid;

	// also send search request to get the right messages
	if (this.env.search_request)
	post_data._search = this.env.search_request;

	this.http_post('mark', post_data, lock);
	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, uid, i, len,
	rows = this.message_list ? this.message_list.rows : [];

	uids = String(uids).split(',');

	for (i=0, len=uids.length; i<len; i++) {
	uid = uids[i];
	if (rows[uid])
	this.set_message(uid, 'unread', false);
	}
	};

	// Converts array of message UIDs to comma-separated list for use in URL
	// with select_all mode checking
	this.uids_to_list = function(uids)
	{
	return this.select_all_mode ? '*' : uids.join(',');
	};

	// Sets title of the delete button
	this.set_button_titles = function()
	{
	var label = 'deletemessage';

	if (!this.env.flag_for_deletion
	&& this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox
	&& (!this.env.delete_junk \|\| !this.env.junk_mailbox \|\| this.env.mailbox != this.env.junk_mailbox)
	)
	label = 'movemessagetotrash';

	this.set_alttext('delete', label);
	};

	/*********************************************************/
	/******* mailbox folders methods *******/
	/*********************************************************/

	this.expunge_mailbox = function(mbox)
	{
	var lock, post_data = {_mbox: mbox};

	// lock interface if it's the active mailbox
	if (mbox == this.env.mailbox) {
	lock = this.set_busy(true, 'loading');
	post_data._reload = 1;
	if (this.env.search_request)
	post_data._search = this.env.search_request;
	}

	// send request to server
	this.http_post('expunge', post_data, lock);
	};

	this.purge_mailbox = function(mbox)
	{
	var lock, post_data = {_mbox: mbox};

	if (!confirm(this.get_label('purgefolderconfirm')))
	return false;

	// lock interface if it's the active mailbox
	if (mbox == this.env.mailbox) {
	lock = this.set_busy(true, 'loading');
	post_data._reload = 1;
	}

	// send request to server
	this.http_post('purge', post_data, lock);
	};

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


	/*********************************************************/
	/******* 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 passwd = $('#rcmloginpwd');

	// enter
	if (key == 13 && passwd.length && !passwd.val()) {
	passwd.focus();
	return rcube_event.cancel(e);
	}

	return true;
	};


	/*********************************************************/
	/******* message compose methods *******/
	/*********************************************************/

	+ this.open_compose_step = function(p)
	+ {
	+ var url = this.url('mail/compose', p);
	+
	+ // open new compose window
	+ if (this.env.compose_extwin)
	+ this.open_window(url, 1150, 900);
	+ else
	+ this.redirect(url);
	+ };
	+
	// init message compose form: set focus and eventhandlers
	this.init_messageform = function()
	{
	if (!this.gui_objects.messageform)
	return false;

	var input_from = $("[name='_from']"),
	input_to = $("[name='_to']"),
	input_subject = $("input[name='_subject']"),
	input_message = $("[name='_message']").get(0),
	html_mode = $("input[name='_is_html']").val() == '1',
	ac_fields = ['cc', 'bcc', 'replyto', 'followupto'],
	ac_props;

	+ // close compose step in opener
	+ if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose') {
	+ setTimeout(function(){ opener.history.back(); }, 100);
	+ }
	+
	// configure parallel autocompletion
	if (this.env.autocomplete_threads > 0) {
	ac_props = {
	threads: this.env.autocomplete_threads,
	sources: this.env.autocomplete_sources
	};
	}

	// init live search events
	this.init_address_input_events(input_to, ac_props);
	for (var i in ac_fields) {
	this.init_address_input_events($("[name='_"+ac_fields[i]+"']"), ac_props);
	}

	if (!html_mode) {
	this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
	// add signature according to selected identity
	// if we have HTML editor, signature is added in callback
	if (input_from.prop('type') == 'select-one') {
	this.change_identity(input_from[0]);
	}
	}

	if (input_to.val() == '')
	input_to.focus();
	else if (input_subject.val() == '')
	input_subject.focus();
	else if (input_message)
	input_message.focus();

	this.env.compose_focus_elem = document.activeElement;

	// 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, props)
	{
	this.env.recipients_delimiter = this.env.recipients_separator + ' ';

	obj[bw.ie \|\| bw.safari \|\| bw.chrome ? 'keydown' : 'keypress'](function(e) { return ref.ksearch_keydown(e, this, props); })
	.attr('autocomplete', 'off');
	};

	this.submit_messageform = function(draft)
	{
	var form = this.gui_objects.messageform;

	if (!form)
	return;

	// all checks passed, send message
	var msgid = this.set_busy(true, draft ? 'savingmessage' : 'sendingmessage'),
	lang = this.spellcheck_lang(),
	files = [];

	// send files list
	$('li', this.gui_objects.attachmentlist).each(function() { files.push(this.id.replace(/^rcmfile/, '')); });
	$('input[name="_attachments"]', form).val(files.join());

	form.target = 'savetarget';
	form._draft.value = draft ? '1' : '';
	form.action = this.add_url(form.action, '_unlock', msgid);
	form.action = this.add_url(form.action, '_lang', lang);
	form.submit();
	};

	this.compose_recipient_select = function(list)
	{
	this.enable_command('add-recipient', list.selection.length > 0);
	};

	this.compose_add_recipient = function(field)
	{
	var recipients = [], input = $('#_'+field);

	if (this.contact_list && this.contact_list.selection.length) {
	for (var id, n=0; n < this.contact_list.selection.length; n++) {
	id = this.contact_list.selection[n];
	if (id && this.env.contactdata[id]) {
	recipients.push(this.env.contactdata[id]);

	// group is added, expand it
	if (id.charAt(0) == 'E' && this.env.contactdata[id].indexOf('@') < 0 && input.length) {
	var gid = id.substr(1);
	this.group2expand[gid] = { name:this.env.contactdata[id], input:input.get(0) };
	this.http_request('group-expand', {_source: this.env.source, _gid: gid}, false);
	}
	}
	}
	}

	if (recipients.length && input.length) {
	var oldval = input.val();
	input.val((oldval ? oldval + this.env.recipients_delimiter : '') + recipients.join(this.env.recipients_delimiter));
	this.triggerEvent('add-recipient', { field:field, recipients:recipients });
	}
	};

	// checks the input fields before sending a message
	this.check_compose_input = function(cmd)
	{
	// check input fields
	var ed, input_to = $("[name='_to']"),
	input_cc = $("[name='_cc']"),
	input_bcc = $("[name='_bcc']"),
	input_from = $("[name='_from']"),
	input_subject = $("[name='_subject']"),
	input_message = $("[name='_message']");

	// check sender (if have no identities)
	if (input_from.prop('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.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;
	}

	// check if all files has been uploaded
	for (var key in this.env.attachments) {
	if (typeof this.env.attachments[key] === 'object' && !this.env.attachments[key].complete) {
	alert(this.get_label('notuploadedwarning'));
	return false;
	}
	}

	// display localized warning for missing subject
	if (input_subject.val() == '') {
	var myprompt = $('<div class="prompt">').html('<div class="message">' + this.get_label('nosubjectwarning') + '</div>').appendTo(document.body);
	var prompt_value = $('<input>').attr('type', 'text').attr('size', 30).appendTo(myprompt).val(this.get_label('nosubject'));

	var buttons = {};
	buttons[this.get_label('cancel')] = function(){
	input_subject.focus();
	$(this).dialog('close');
	};
	buttons[this.get_label('sendmessage')] = function(){
	input_subject.val(prompt_value.val());
	$(this).dialog('close');
	ref.command(cmd, { nocheck:true }); // repeat command which triggered this
	};

	myprompt.dialog({
	modal: true,
	resizable: false,
	buttons: buttons,
	close: function(event, ui) { $(this).remove() }
	});
	prompt_value.select();
	return false;
	}

	// Apply spellcheck changes if spell checker is active
	this.stop_spellchecking();

	if (window.tinyMCE)
	ed = tinyMCE.get(this.env.composebody);

	// check for empty body
	if (!ed && input_message.val() == '' && !confirm(this.get_label('nobodywarning'))) {
	input_message.focus();
	return false;
	}
	else if (ed) {
	if (!ed.getContent() && !confirm(this.get_label('nobodywarning'))) {
	ed.focus();
	return false;
	}
	// move body from html editor to textarea (just to be sure, #1485860)
	tinyMCE.triggerSave();
	}

	return true;
	};

	this.toggle_editor = function(props)
	{
	this.stop_spellchecking();

	if (props.mode == 'html') {
	this.plain2html($('#'+props.id).val(), props.id);
	tinyMCE.execCommand('mceAddControl', false, props.id);

	if (this.env.default_font)
	setTimeout(function() {
	$(tinyMCE.get(props.id).getBody()).css('font-family', rcmail.env.default_font);
	}, 500);
	}
	else {
	var thisMCE = tinyMCE.get(props.id), existingHtml;

	if (existingHtml = thisMCE.getContent()) {
	if (!confirm(this.get_label('editorwarning'))) {
	return false;
	}
	this.html2plain(existingHtml, props.id);
	}
	tinyMCE.execCommand('mceRemoveControl', false, props.id);
	}

	return true;
	};

	this.stop_spellchecking = function()
	{
	var ed;

	if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody))) {
	if (ed.plugins && ed.plugins.spellchecker && ed.plugins.spellchecker.active)
	ed.execCommand('mceSpellCheck');
	}
	else if (ed = this.env.spellcheck) {
	if (ed.state && ed.state != 'ready' && ed.state != 'no_error_found')
	$(ed.spell_span).trigger('click');
	}

	this.spellcheck_state();
	};

	this.spellcheck_state = function()
	{
	var ed, active;

	if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins && ed.plugins.spellchecker)
	active = ed.plugins.spellchecker.active;
	else if ((ed = this.env.spellcheck) && ed.state)
	active = ed.state != 'ready' && ed.state != 'no_error_found';

	if (rcmail.buttons.spellcheck)
	$('#'+rcmail.buttons.spellcheck[0].id)[active ? 'addClass' : 'removeClass']('selected');

	return active;
	};

	// get selected language
	this.spellcheck_lang = function()
	{
	var ed;

	if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins && ed.plugins.spellchecker)
	return ed.plugins.spellchecker.selectedLang;
	else if (this.env.spellcheck)
	return GOOGIE_CUR_LANG;
	};

	this.spellcheck_lang_set = function(lang)
	{
	var ed;

	if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins)
	ed.plugins.spellchecker.selectedLang = lang;
	else if (this.env.spellcheck)
	this.env.spellcheck.setCurrentLanguage(lang);
	};

	// resume spellchecking, highlight provided mispellings without new ajax request
	this.spellcheck_resume = function(ishtml, data)
	{
	if (ishtml) {
	var ed = tinyMCE.get(this.env.composebody);
	sp = ed.plugins.spellchecker;

	sp.active = 1;
	sp._markWords(data);
	ed.nodeChanged();
	}
	else {
	var sp = this.env.spellcheck;
	sp.prepare(false, true);
	sp.processData(data);
	}

	this.spellcheck_state();
	}

	this.set_draft_id = function(id)
	{
	$("input[name='_draft_saveid']").val(id);
	};

	this.auto_save_start = function()
	{
	if (this.env.draft_autosave)
	this.save_timer = 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 ed, i, val, str = '', hash_fields = ['to', 'cc', 'bcc', 'subject'];

	for (i=0; i<hash_fields.length; i++)
	if (val = $('[name="_' + hash_fields[i] + '"]').val())
	str += val + ':';

	if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)))
	str += ed.getContent();
	else
	str += $("[name='_message']").val();

	if (this.env.attachments)
	for (var upload_id in this.env.attachments)
	str += upload_id;

	if (save)
	this.cmp_hash = str;

	return str;
	};

	this.change_identity = function(obj, show_sig)
	{
	if (!obj \|\| !obj.options)
	return false;

	if (!show_sig)
	show_sig = this.env.show_sig;

	var cursor_pos, p = -1,
	id = obj.options[obj.selectedIndex].value,
	input_message = $("[name='_message']"),
	message = input_message.val(),
	is_html = ($("input[name='_is_html']").val() == '1'),
	sig = this.env.identity;

	// enable manual signature insert
	if (this.env.signatures && this.env.signatures[id]) {
	this.enable_command('insert-sig', true);
	this.env.compose_commands.push('insert-sig');
	}
	else
	this.enable_command('insert-sig', false);

	if (!is_html) {
	// remove the 'old' signature
	if (show_sig && sig && this.env.signatures && this.env.signatures[sig]) {
	sig = this.env.signatures[sig].text;
	sig = sig.replace(/\r\n/g, '\n');

	p = this.env.sig_above ? message.indexOf(sig) : message.lastIndexOf(sig);
	if (p >= 0)
	message = message.substring(0, p) + message.substring(p+sig.length, message.length);
	}
	// add the new signature string
	if (show_sig && this.env.signatures && this.env.signatures[id]) {
	sig = this.env.signatures[id].text;
	sig = sig.replace(/\r\n/g, '\n');

	if (this.env.sig_above) {
	if (p >= 0) { // in place of removed signature
	message = message.substring(0, p) + sig + message.substring(p, message.length);
	cursor_pos = p - 1;
	}
	else if (pos = this.get_caret_pos(input_message.get(0))) { // at cursor position
	message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
	cursor_pos = pos;
	}
	else { // on top
	cursor_pos = 0;
	message = '\n\n' + sig + '\n\n' + message.replace(/^[\r\n]+/, '');
	}
	}
	else {
	message = message.replace(/[\r\n]+$/, '');
	cursor_pos = !this.env.top_posting && message.length ? message.length+1 : 0;
	message += '\n\n' + sig;
	}
	}
	else
	cursor_pos = this.env.top_posting ? 0 : message.length;

	input_message.val(message);

	// move cursor before the signature
	this.set_caret_pos(input_message.get(0), cursor_pos);
	}
	else if (show_sig && this.env.signatures) { // html
	var editor = tinyMCE.get(this.env.composebody),
	sigElem = editor.dom.get('_rc_sig');

	// Append the signature as a div within the body
	if (!sigElem) {
	var body = editor.getBody(),
	doc = editor.getDoc();

	sigElem = doc.createElement('div');
	sigElem.setAttribute('id', '_rc_sig');

	if (this.env.sig_above) {
	// if no existing sig and top posting then insert at caret pos
	editor.getWin().focus(); // correct focus in IE & Chrome

	var node = editor.selection.getNode();
	if (node.nodeName == 'BODY') {
	// no real focus, insert at start
	body.insertBefore(sigElem, body.firstChild);
	body.insertBefore(doc.createElement('br'), body.firstChild);
	}
	else {
	body.insertBefore(sigElem, node.nextSibling);
	body.insertBefore(doc.createElement('br'), node.nextSibling);
	}
	}
	else {
	if (bw.ie) // add empty line before signature on IE
	body.appendChild(doc.createElement('br'));

	body.appendChild(sigElem);
	}
	}

	if (this.env.signatures[id])
	sigElem.innerHTML = this.env.signatures[id].html;
	}

	this.env.identity = id;
	return true;
	};

	// upload attachment file
	this.upload_file = function(form)
	{
	if (!form)
	return false;

	// get file input field, count files on capable browser
	var i, size = 0, field = $('input[type=file]', form).get(0),
	files = field.files ? field.files.length : field.value ? 1 : 0;

	// create hidden iframe and post upload form
	if (files) {
	// check file size
	if (field.files && this.env.max_filesize && this.env.filesizeerror) {
	for (i=0; i<files; i++)
	size += field.files[i].size;
	if (size && size > this.env.max_filesize) {
	this.display_message(this.env.filesizeerror, 'error');
	return;
	}
	}

	var frame_name = this.async_upload_form(form, 'upload', function(e) {
	var d, content = '';
	try {
	if (this.contentDocument) {
	d = this.contentDocument;
	} else if (this.contentWindow) {
	d = this.contentWindow.document;
	}
	content = d.childNodes[0].innerHTML;
	} catch (err) {}

	if (!content.match(/add2attachment/) && (!bw.opera \|\| (rcmail.env.uploadframe && rcmail.env.uploadframe == e.data.ts))) {
	if (!content.match(/display_message/))
	rcmail.display_message(rcmail.get_label('fileuploaderror'), 'error');
	rcmail.remove_from_attachment_list(e.data.ts);
	}
	// Opera hack: handle double onload
	if (bw.opera)
	rcmail.env.uploadframe = e.data.ts;
	});

	// display upload indicator and cancel button
	var content = '<span>' + this.get_label('uploading' + (files > 1 ? 'many' : '')) + '</span>',
	ts = frame_name.replace(/^rcmupload/, '');

	this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', frame:frame_name, complete:false });

	// upload progress support
	if (this.env.upload_progress_time) {
	this.upload_progress_start('upload', ts);
	}
	}

	// 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, att, upload_id)
	{
	if (!this.gui_objects.attachmentlist)
	return false;

	if (!att.complete && ref.env.loadingicon)
	att.html = '<img src="'+ref.env.loadingicon+'" alt="" class="uploading" />' + att.html;

	if (!att.complete && att.frame)
	att.html = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+name+'\', \''+att.frame+'\');" href="#cancelupload" class="cancelupload">'
	+ (this.env.cancelicon ? '<img src="'+this.env.cancelicon+'" alt="" />' : this.get_label('cancel')) + '</a>' + att.html;

	var indicator, li = $('<li>').attr('id', name).addClass(att.classname).html(att.html);

	// replace indicator's li
	if (upload_id && (indicator = document.getElementById(upload_id))) {
	li.replaceAll(indicator);
	}
	else { // add new li
	li.appendTo(this.gui_objects.attachmentlist);
	}

	if (upload_id && this.env.attachments[upload_id])
	delete this.env.attachments[upload_id];

	this.env.attachments[name] = att;

	return true;
	};

	this.remove_from_attachment_list = function(name)
	{
	delete this.env.attachments[name];
	$('#'+name).remove();
	};

	this.remove_attachment = function(name)
	{
	if (name && this.env.attachments[name])
	this.http_post('remove-attachment', { _id:this.env.compose_id, _file:name });

	return true;
	};

	this.cancel_attachment_upload = function(name, frame_name)
	{
	if (!name \|\| !frame_name)
	return false;

	this.remove_from_attachment_list(name);
	$("iframe[name='"+frame_name+"']").remove();
	return false;
	};

	this.upload_progress_start = function(action, name)
	{
	setTimeout(function() { rcmail.http_request(action, {_progress: name}); },
	this.env.upload_progress_time * 1000);
	};

	this.upload_progress_update = function(param)
	{
	var elem = $('#'+param.name + '> span');

	if (!elem.length \|\| !param.text)
	return;

	elem.text(param.text);

	if (!param.done)
	this.upload_progress_start(param.action, param.name);
	};

	// 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)
	{
	if (value != '') {
	var r, lock = this.set_busy(true, 'searching'),
	url = this.search_params(value);

	if (this.message_list)
	this.clear_message_list();
	else if (this.contact_list)
	this.list_contacts_clear();

	if (this.env.source)
	url._source = this.env.source;
	if (this.env.group)
	url._gid = this.env.group;

	// reset vars
	this.env.current_page = 1;

	r = this.http_request('search', url, lock);

	this.env.qsearch = {lock: lock, request: r};
	}
	};

	// build URL params for search
	this.search_params = function(search, filter)
	{
	var n, url = {}, mods_arr = [],
	mods = this.env.search_mods,
	mbox = this.env.mailbox;

	if (!filter && this.gui_objects.search_filter)
	filter = this.gui_objects.search_filter.value;

	if (!search && this.gui_objects.qsearchbox)
	search = this.gui_objects.qsearchbox.value;

	if (filter)
	url._filter = filter;

	if (search) {
	url._q = search;

	if (mods && this.message_list)
	mods = mods[mbox] ? mods[mbox] : mods['*'];

	if (mods) {
	for (n in mods)
	mods_arr.push(n);
	url._headers = mods_arr.join(',');
	}
	}

	if (mbox)
	url._mbox = mbox;

	return url;
	};

	// reset quick-search form
	this.reset_qsearch = function()
	{
	if (this.gui_objects.qsearchbox)
	this.gui_objects.qsearchbox.value = '';

	if (this.env.qsearch)
	this.abort_request(this.env.qsearch);

	this.env.qsearch = null;
	this.env.search_request = null;
	this.env.search_id = null;
	};

	this.sent_successfully = function(type, msg)
	{
	this.display_message(msg, type);
	- // before redirect we need to wait some time for Chrome (#1486177)
	- setTimeout(function(){ ref.list_mailbox(); }, 500);
	+
	+ if (this.env.extwin && window.opener && opener.rcmail) {
	+ this.lock_form(this.gui_objects.messageform);
	+ opener.rcmail.display_message(msg, type);
	+ setTimeout(function(){ window.close() }, 1000);
	+ }
	+ else {
	+ // before redirect we need to wait some time for Chrome (#1486177)
	+ setTimeout(function(){ ref.list_mailbox(); }, 500);
	+ }
	};


	/*********************************************************/
	/******* keyboard live-search methods *******/
	/*********************************************************/

	// handler for keyboard events on address-fields
	this.ksearch_keydown = function(e, obj, props)
	{
	if (this.ksearch_timer)
	clearTimeout(this.ksearch_timer);

	var highlight,
	key = rcube_event.get_keycode(e),
	mod = rcube_event.get_modifier(e);

	switch (key) {
	case 38: // arrow up
	case 40: // arrow down
	if (!this.ksearch_visible())
	break;

	var dir = key==38 ? 1 : 0;

	highlight = document.getElementById('rcmksearchSelected');
	if (!highlight)
	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 \|\| !this.ksearch_visible()) {
	this.ksearch_hide();
	return;
	}

	case 13: // enter
	if (!this.ksearch_visible())
	return false;

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

	case 37: // left
	case 39: // right
	if (mod != SHIFT_KEY)
	return;
	}

	// start timer
	this.ksearch_timer = setTimeout(function(){ ref.ksearch_get_results(props); }, 200);
	this.ksearch_input = obj;

	return true;
	};

	this.ksearch_visible = function()
	{
	return (this.ksearch_selected !== null && this.ksearch_selected !== undefined && this.ksearch_value);
	};

	this.ksearch_select = function(node)
	{
	var current = $('#rcmksearchSelected');
	if (current[0] && node) {
	current.removeAttr('id').removeClass('selected');
	}

	if (node) {
	$(node).attr('id', 'rcmksearchSelected').addClass('selected');
	this.ksearch_selected = node._rcm_id;
	}
	};

	this.insert_recipient = function(id)
	{
	if (id === null \|\| !this.env.contacts[id] \|\| !this.ksearch_input)
	return;

	// get cursor pos
	var inp_value = this.ksearch_input.value,
	cpos = this.get_caret_pos(this.ksearch_input),
	p = inp_value.lastIndexOf(this.ksearch_value, cpos),
	trigger = false,
	insert = '',
	// replace search string with full address
	pre = inp_value.substring(0, p),
	end = inp_value.substring(p+this.ksearch_value.length, inp_value.length);

	this.ksearch_destroy();

	// insert all members of a group
	if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].id) {
	insert += this.env.contacts[id].name + this.env.recipients_delimiter;
	this.group2expand[this.env.contacts[id].id] = $.extend({ input: this.ksearch_input }, this.env.contacts[id]);
	this.http_request('mail/group-expand', {_source: this.env.contacts[id].source, _gid: this.env.contacts[id].id}, false);
	}
	else if (typeof this.env.contacts[id] === 'string') {
	insert = this.env.contacts[id] + this.env.recipients_delimiter;
	trigger = true;
	}

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

	if (trigger)
	this.triggerEvent('autocomplete_insert', { field:this.ksearch_input, insert:insert });
	};

	this.replace_group_recipients = function(id, recipients)
	{
	if (this.group2expand[id]) {
	this.group2expand[id].input.value = this.group2expand[id].input.value.replace(this.group2expand[id].name, recipients);
	this.triggerEvent('autocomplete_insert', { field:this.group2expand[id].input, insert:recipients });
	this.group2expand[id] = null;
	}
	};

	// address search processor
	this.ksearch_get_results = function(props)
	{
	var inp_value = this.ksearch_input ? this.ksearch_input.value : null;

	if (inp_value === null)
	return;

	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),
	p = inp_value.lastIndexOf(this.env.recipients_separator, cpos-1),
	q = inp_value.substring(p+1, cpos),
	min = this.env.autocomplete_min_length,
	ac = this.ksearch_data;

	// trim query string
	q = $.trim(q);

	// Don't (re-)search if the last results are still active
	if (q == this.ksearch_value)
	return;

	this.ksearch_destroy();

	if (q.length && q.length < min) {
	if (!this.ksearch_info) {
	this.ksearch_info = this.display_message(
	this.get_label('autocompletechars').replace('$min', min));
	}
	return;
	}

	var old_value = this.ksearch_value;
	this.ksearch_value = q;

	// ...string is empty
	if (!q.length)
	return;

	// ...new search value contains old one and previous search was not finished or its result was empty
	if (old_value && old_value.length && q.indexOf(old_value) == 0 && (!ac \|\| ac.num <= 0) && this.env.contacts && !this.env.contacts.length)
	return;

	var i, lock, source, xhr, reqid = new Date().getTime(),
	post_data = {_search: q, _id: reqid},
	threads = props && props.threads ? props.threads : 1,
	sources = props && props.sources ? props.sources : [],
	action = props && props.action ? props.action : 'mail/autocomplete';

	this.ksearch_data = {id: reqid, sources: sources.slice(), action: action,
	locks: [], requests: [], num: sources.length};

	for (i=0; i<threads; i++) {
	source = this.ksearch_data.sources.shift();
	if (threads > 1 && source === undefined)
	break;

	post_data._source = source ? source : '';
	lock = this.display_message(this.get_label('searching'), 'loading');
	xhr = this.http_post(action, post_data, lock);

	this.ksearch_data.locks.push(lock);
	this.ksearch_data.requests.push(xhr);
	}
	};

	this.ksearch_query_results = function(results, search, reqid)
	{
	// search stopped in meantime?
	if (!this.ksearch_value)
	return;

	// ignore this outdated search response
	if (this.ksearch_input && search != this.ksearch_value)
	return;

	// display search results
	var i, len, ul, li, text, init,
	value = this.ksearch_value,
	data = this.ksearch_data,
	maxlen = this.env.autocomplete_max ? this.env.autocomplete_max : 15;

	// create results pane if not present
	if (!this.ksearch_pane) {
	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];
	}

	ul = this.ksearch_pane.__ul;

	// remove all search results or add to existing list if parallel search
	if (reqid && this.ksearch_pane.data('reqid') == reqid) {
	maxlen -= ul.childNodes.length;
	}
	else {
	this.ksearch_pane.data('reqid', reqid);
	init = 1;
	// reset content
	ul.innerHTML = '';
	this.env.contacts = [];
	// move the results pane right under the input box
	var pos = $(this.ksearch_input).offset();
	this.ksearch_pane.css({ left:pos.left+'px', top:(pos.top + this.ksearch_input.offsetHeight)+'px', display: 'none'});
	}

	// add each result line to list
	if (results && (len = results.length)) {
	for (i=0; i < len && maxlen > 0; i++) {
	text = typeof results[i] === 'object' ? results[i].name : results[i];
	li = document.createElement('LI');
	li.innerHTML = text.replace(new RegExp('('+RegExp.escape(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 = this.env.contacts.length + i;
	ul.appendChild(li);
	maxlen -= 1;
	}
	}

	if (ul.childNodes.length) {
	this.ksearch_pane.show();
	// select the first
	if (!this.env.contacts.length) {
	$('li:first', ul).attr('id', 'rcmksearchSelected').addClass('selected');
	this.ksearch_selected = 0;
	}
	}

	if (len)
	this.env.contacts = this.env.contacts.concat(results);

	// run next parallel search
	if (data.id == reqid) {
	data.num--;
	if (maxlen > 0 && data.sources.length) {
	var lock, xhr, source = data.sources.shift(), post_data;
	if (source) {
	post_data = {_search: value, _id: reqid, _source: source};
	lock = this.display_message(this.get_label('searching'), 'loading');
	xhr = this.http_post(data.action, post_data, lock);

	this.ksearch_data.locks.push(lock);
	this.ksearch_data.requests.push(xhr);
	}
	}
	else if (!maxlen) {
	if (!this.ksearch_msg)
	this.ksearch_msg = this.display_message(this.get_label('autocompletemore'));
	// abort pending searches
	this.ksearch_abort();
	}
	}
	};

	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_input = null;
	this.ksearch_hide();
	};

	this.ksearch_hide = function()
	{
	this.ksearch_selected = null;
	this.ksearch_value = '';

	if (this.ksearch_pane)
	this.ksearch_pane.hide();

	this.ksearch_destroy();
	};

	// Clears autocomplete data/requests
	this.ksearch_destroy = function()
	{
	this.ksearch_abort();

	if (this.ksearch_info)
	this.hide_message(this.ksearch_info);

	if (this.ksearch_msg)
	this.hide_message(this.ksearch_msg);

	this.ksearch_data = null;
	this.ksearch_info = null;
	this.ksearch_msg = null;
	}

	// Aborts pending autocomplete requests
	this.ksearch_abort = function()
	{
	var i, len, ac = this.ksearch_data;

	if (!ac)
	return;

	for (i=0, len=ac.locks.length; i<len; i++)
	this.abort_request({request: ac.requests[i], lock: ac.locks[i]});
	};


	/*********************************************************/
	/******* 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 n, id, sid, ref = this, writable = false,
	source = this.env.source ? this.env.address_sources[this.env.source] : null;

	if (id = list.get_single_selection())
	this.preview_timer = setTimeout(function(){ ref.load_contact(id, 'show'); }, 200);
	else if (this.env.contentframe)
	this.show_contentframe(false);

	// no source = search result, we'll need to detect if any of
	// selected contacts are in writable addressbook to enable edit/delete
	if (list.selection.length) {
	if (!source) {
	for (n in list.selection) {
	sid = String(list.selection[n]).replace(/^[^-]+-/, '');
	if (sid && this.env.address_sources[sid] && !this.env.address_sources[sid].readonly) {
	writable = true;
	break;
	}
	}
	}
	else {
	writable = !source.readonly;
	}
	}

	// if a group is currently selected, and there is at least one contact selected
	// thend we can enable the group-remove-selected command
	this.enable_command('group-remove-selected', this.env.group && list.selection.length > 0);
	this.enable_command('compose', this.env.group \|\| list.selection.length > 0);
	this.enable_command('edit', id && writable);
	this.enable_command('delete', list.selection.length && writable);

	return false;
	};

	this.list_contacts = function(src, group, page)
	{
	var win, folder, url = {},
	target = window;

	if (!src)
	src = this.env.source;

	if (page && this.current_page == page && src == this.env.source && group == this.env.group)
	return false;

	if (src != this.env.source) {
	page = this.env.current_page = 1;
	this.reset_qsearch();
	}
	else if (group != this.env.group)
	page = this.env.current_page = 1;

	if (this.env.search_id)
	folder = 'S'+this.env.search_id;
	else
	folder = group ? 'G'+src+group : src;

	this.select_folder(folder);

	this.env.source = src;
	this.env.group = group;

	// load contacts remotely
	if (this.gui_objects.contactslist) {
	this.list_contacts_remote(src, group, page);
	return;
	}

	if (win = this.get_frame_window(this.env.contentframe)) {
	target = win;
	url._framed = 1;
	}

	if (group)
	url._gid = group;
	if (page)
	url._page = page;
	if (src)
	url._source = src;

	// also send search request to get the correct listing
	if (this.env.search_request)
	url._search = this.env.search_request;

	this.set_busy(true, 'loading');
	this.location_href(url, target);
	};

	// send remote request to load contacts list
	this.list_contacts_remote = function(src, group, page)
	{
	// clear message list first
	this.list_contacts_clear();

	// send request to server
	var url = {}, lock = this.set_busy(true, 'loading');

	if (src)
	url._source = src;
	if (page)
	url._page = page;
	if (group)
	url._gid = group;

	this.env.source = src;
	this.env.group = group;

	// also send search request to get the right messages
	if (this.env.search_request)
	url._search = this.env.search_request;

	this.http_request(this.env.task == 'mail' ? 'list-contacts' : 'list', url, lock);
	};

	this.list_contacts_clear = function()
	{
	this.contact_list.clear(true);
	this.show_contentframe(false);
	this.enable_command('delete', false);
	this.enable_command('compose', this.env.group ? true : false);
	};

	// load contact record
	this.load_contact = function(cid, action, framed)
	{
	var win, url = {}, target = window;

	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	this.show_contentframe(true);

	// load dummy content
	if (!cid) {
	// unselect selected row(s)
	this.contact_list.clear_selection();
	this.enable_command('delete', 'compose', false);
	}
	}
	else if (framed)
	return false;

	if (action && (cid \|\| action=='add') && !this.drag_active) {
	if (this.env.group)
	url._gid = this.env.group;

	url._action = action;
	url._source = this.env.source;
	url._cid = cid;

	this.location_href(url, target, true);
	}

	return true;
	};

	// add/delete member to/from the group
	this.group_member_change = function(what, cid, source, gid)
	{
	what = what == 'add' ? 'add' : 'del';
	var label = this.get_label(what == 'add' ? 'addingmember' : 'removingmember'),
	lock = this.display_message(label, 'loading'),
	post_data = {_cid: cid, _source: source, _gid: gid};

	this.http_post('group-'+what+'members', post_data, lock);
	};

	// 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.type == 'group' && to.source == this.env.source)
	this.group_member_change('add', cid, to.source, to.id);
	else if (to.type == 'group' && !this.env.address_sources[to.source].readonly) {
	var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
	post_data = {_cid: cid, _source: this.env.source, _to: to.source, _togid: to.id,
	_gid: (this.env.group ? this.env.group : '')};

	this.http_post('copy', post_data, lock);
	}
	else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly) {
	var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
	post_data = {_cid: cid, _source: this.env.source, _to: to.id,
	_gid: (this.env.group ? this.env.group : '')};

	this.http_post('copy', post_data, lock);
	}
	};

	this.delete_contacts = function()
	{
	var selection = this.contact_list.get_selection(),
	undelete = this.env.source && this.env.address_sources[this.env.source].undelete;

	// exit if no mailbox specified or if selection is empty
	if (!(selection.length \|\| this.env.cid) \|\| (!undelete && !confirm(this.get_label('deletecontactconfirm'))))
	return;

	var id, n, a_cids = [],
	post_data = {_source: this.env.source, _from: (this.env.action ? this.env.action : '')},
	lock = this.display_message(this.get_label('contactdeleting'), 'loading');

	if (this.env.cid)
	a_cids.push(this.env.cid);
	else {
	for (n=0; n<selection.length; n++) {
	id = selection[n];
	a_cids.push(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);
	}

	post_data._cid = a_cids.join(',');

	if (this.env.group)
	post_data._gid = this.env.group;

	// also send search request to get the right records from the next page
	if (this.env.search_request)
	post_data._search = this.env.search_request;

	// send request to server
	this.http_post('delete', post_data, lock)

	return true;
	};

	// update a contact record in the list
	this.update_contact_row = function(cid, cols_arr, newcid, source)
	{
	var c, row, list = this.contact_list;

	cid = this.html_identifier(cid);

	// when in searching mode, concat cid with the source name
	if (!list.rows[cid]) {
	cid = cid+'-'+source;
	if (newcid)
	newcid = newcid+'-'+source;
	}

	if (list.rows[cid] && (row = list.rows[cid].obj)) {
	for (c=0; c<cols_arr.length; c++)
	if (row.cells[c])
	$(row.cells[c]).html(cols_arr[c]);

	// cid change
	if (newcid) {
	newcid = this.html_identifier(newcid);
	row.id = 'rcmrow' + newcid;
	list.remove_row(cid);
	list.init_row(row);
	list.selection[0] = newcid;
	row.style.display = '';
	}
	}
	};

	// add row to contacts list
	this.add_contact_row = function(cid, cols, classes)
	{
	if (!this.gui_objects.contactslist)
	return false;

	var c, col, list = this.contact_list,
	row = document.createElement('tr');

	row.id = 'rcmrow'+this.html_identifier(cid);
	row.className = 'contact ' + (classes \|\| '');

	if (list.in_selection(cid))
	row.className += ' selected';

	// add each submitted col
	for (c in cols) {
	col = document.createElement('td');
	col.className = String(c).toLowerCase();
	col.innerHTML = cols[c];
	row.appendChild(col);
	}

	list.insert_row(row);

	this.enable_command('export', list.rowcount > 0);
	};

	this.init_contact_form = function()
	{
	var ref = this, col;

	this.set_photo_actions($('#ff_photo').val());

	for (col in this.env.coltypes)
	this.init_edit_field(col, null);

	$('.contactfieldgroup .row a.deletebutton').click(function() {
	ref.delete_edit_field(this);
	return false;
	});

	$('select.addfieldmenu').change(function(e) {
	ref.insert_edit_field($(this).val(), $(this).attr('rel'), this);
	this.selectedIndex = 0;
	});

	// enable date pickers on date fields
	if ($.datepicker && this.env.date_format) {
	$.datepicker.setDefaults({
	dateFormat: this.env.date_format,
	changeMonth: true,
	changeYear: true,
	yearRange: '-100:+10',
	showOtherMonths: true,
	selectOtherMonths: true,
	onSelect: function(dateText) { $(this).focus().val(dateText) }
	});
	$('input.datepicker').datepicker();
	}

	$("input[type='text']:visible").first().focus();
	};

	this.group_create = function()
	{
	this.add_input_row('contactgroup');
	};

	this.group_rename = function()
	{
	if (!this.env.group \|\| !this.gui_objects.folderlist)
	return;

	if (!this.name_input) {
	this.enable_command('list', 'listgroup', false);
	this.name_input = $('<input>').attr('type', 'text').val(this.env.contactgroups['G'+this.env.source+this.env.group].name);
	this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
	this.env.group_renaming = true;

	var link, li = this.get_folder_li(this.env.source+this.env.group, 'rcmliG');
	if (li && (link = li.firstChild)) {
	$(link).hide().before(this.name_input);
	}
	}

	this.name_input.select().focus();
	};

	this.group_delete = function()
	{
	if (this.env.group && confirm(this.get_label('deletegroupconfirm'))) {
	var lock = this.set_busy(true, 'groupdeleting');
	this.http_post('group-delete', {_source: this.env.source, _gid: this.env.group}, lock);
	}
	};

	// callback from server upon group-delete command
	this.remove_group_item = function(prop)
	{
	var li, key = 'G'+prop.source+prop.id;
	if ((li = this.get_folder_li(key))) {
	this.triggerEvent('group_delete', { source:prop.source, id:prop.id, li:li });

	li.parentNode.removeChild(li);
	delete this.env.contactfolders[key];
	delete this.env.contactgroups[key];
	}

	this.list_contacts(prop.source, 0);
	};

	// @TODO: maybe it would be better to use popup instead of inserting input to the list?
	this.add_input_row = function(type)
	{
	if (!this.gui_objects.folderlist)
	return;

	if (!this.name_input) {
	this.name_input = $('<input>').attr('type', 'text').data('tt', type);
	this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
	this.name_input_li = $('<li>').addClass(type).append(this.name_input);

	var li = type == 'contactsearch' ? $('li:last', this.gui_objects.folderlist) : this.get_folder_li(this.env.source);
	this.name_input_li.insertAfter(li);
	}

	this.name_input.select().focus();
	};

	//remove selected contacts from current active group
	this.group_remove_selected = function()
	{
	ref.http_post('group-delmembers', {_cid: this.contact_list.selection,
	_source: this.env.source, _gid: this.env.group});
	};

	//callback after deleting contact(s) from current group
	this.remove_group_contacts = function(props)
	{
	if('undefined' != typeof this.env.group && (this.env.group === props.gid)){
	var n, selection = this.contact_list.get_selection();
	for (n=0; n<selection.length; n++) {
	id = selection[n];
	this.contact_list.remove_row(id, (n == selection.length-1));
	}
	}
	}

	// handler for keyboard events on the input field
	this.add_input_keydown = function(e)
	{
	var key = rcube_event.get_keycode(e),
	input = $(e.target), itype = input.data('tt');

	// enter
	if (key == 13) {
	var newname = input.val();

	if (newname) {
	var lock = this.set_busy(true, 'loading');

	if (itype == 'contactsearch')
	this.http_post('search-create', {_search: this.env.search_request, _name: newname}, lock);
	else if (this.env.group_renaming)
	this.http_post('group-rename', {_source: this.env.source, _gid: this.env.group, _name: newname}, lock);
	else
	this.http_post('group-create', {_source: this.env.source, _name: newname}, lock);
	}
	return false;
	}
	// escape
	else if (key == 27)
	this.reset_add_input();

	return true;
	};

	this.reset_add_input = function()
	{
	if (this.name_input) {
	if (this.env.group_renaming) {
	var li = this.name_input.parent();
	li.children().last().show();
	this.env.group_renaming = false;
	}

	this.name_input.remove();

	if (this.name_input_li)
	this.name_input_li.remove();

	this.name_input = this.name_input_li = null;
	}

	this.enable_command('list', 'listgroup', true);
	};

	// callback for creating a new contact group
	this.insert_contact_group = function(prop)
	{
	this.reset_add_input();

	prop.type = 'group';
	var key = 'G'+prop.source+prop.id,
	link = $('<a>').attr('href', '#')
	.attr('rel', prop.source+':'+prop.id)
	.click(function() { return rcmail.command('listgroup', prop, this); })
	.html(prop.name),
	li = $('<li>').attr({id: 'rcmli'+this.html_identifier(key), 'class': 'contactgroup'})
	.append(link);

	this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
	this.add_contact_group_row(prop, li);

	this.triggerEvent('group_insert', { id:prop.id, source:prop.source, name:prop.name, li:li[0] });
	};

	// callback for renaming a contact group
	this.update_contact_group = function(prop)
	{
	this.reset_add_input();

	var key = 'G'+prop.source+prop.id,
	li = this.get_folder_li(key),
	link;

	// group ID has changed, replace link node and identifiers
	if (li && prop.newid) {
	var newkey = 'G'+prop.source+prop.newid,
	newprop = $.extend({}, prop);;

	li.id = 'rcmli' + this.html_identifier(newkey);
	this.env.contactfolders[newkey] = this.env.contactfolders[key];
	this.env.contactfolders[newkey].id = prop.newid;
	this.env.group = prop.newid;

	delete this.env.contactfolders[key];
	delete this.env.contactgroups[key];

	newprop.id = prop.newid;
	newprop.type = 'group';

	link = $('<a>').attr('href', '#')
	.attr('rel', prop.source+':'+prop.newid)
	.click(function() { return rcmail.command('listgroup', newprop, this); })
	.html(prop.name);
	$(li).children().replaceWith(link);
	}
	// update displayed group name
	else if (li && (link = li.firstChild) && link.tagName.toLowerCase() == 'a')
	link.innerHTML = prop.name;

	this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
	this.add_contact_group_row(prop, $(li), true);

	this.triggerEvent('group_update', { id:prop.id, source:prop.source, name:prop.name, li:li[0], newid:prop.newid });
	};

	// add contact group row to the list, with sorting
	this.add_contact_group_row = function(prop, li, reloc)
	{
	var row, name = prop.name.toUpperCase(),
	sibling = this.get_folder_li(prop.source),
	prefix = 'rcmliG' + this.html_identifier(prop.source);

	// When renaming groups, we need to remove it from DOM and insert it in the proper place
	if (reloc) {
	row = li.clone(true);
	li.remove();
	}
	else
	row = li;

	$('li[id^="'+prefix+'"]', this.gui_objects.folderlist).each(function(i, elem) {
	if (name >= $(this).text().toUpperCase())
	sibling = elem;
	else
	return false;
	});

	row.insertAfter(sibling);
	};

	this.update_group_commands = function()
	{
	var source = this.env.source != '' ? this.env.address_sources[this.env.source] : null;
	this.enable_command('group-create', (source && source.groups && !source.readonly));
	this.enable_command('group-rename', 'group-delete', (source && source.groups && this.env.group && !source.readonly));
	};

	this.init_edit_field = function(col, elem)
	{
	var label = this.env.coltypes[col].label;

	if (!elem)
	elem = $('.ff_' + col);

	if (label)
	elem.placeholder(label);
	};

	this.insert_edit_field = function(col, section, menu)
	{
	// just make pre-defined input field visible
	var elem = $('#ff_'+col);
	if (elem.length) {
	elem.show().focus();
	$(menu).children('option[value="'+col+'"]').prop('disabled', true);
	}
	else {
	var lastelem = $('.ff_'+col),
	appendcontainer = $('#contactsection'+section+' .contactcontroller'+col);

	if (!appendcontainer.length) {
	var sect = $('#contactsection'+section),
	lastgroup = $('.contactfieldgroup', sect).last();
	appendcontainer = $('<fieldset>').addClass('contactfieldgroup contactcontroller'+col);
	if (lastgroup.length)
	appendcontainer.insertAfter(lastgroup);
	else
	sect.prepend(appendcontainer);
	}

	if (appendcontainer.length && appendcontainer.get(0).nodeName == 'FIELDSET') {
	var input, colprop = this.env.coltypes[col],
	row = $('<div>').addClass('row'),
	cell = $('<div>').addClass('contactfieldcontent data'),
	label = $('<div>').addClass('contactfieldlabel label');

	if (colprop.subtypes_select)
	label.html(colprop.subtypes_select);
	else
	label.html(colprop.label);

	var name_suffix = colprop.limit != 1 ? '[]' : '';
	if (colprop.type == 'text' \|\| colprop.type == 'date') {
	input = $('<input>')
	.addClass('ff_'+col)
	.attr({type: 'text', name: '_'+col+name_suffix, size: colprop.size})
	.appendTo(cell);

	this.init_edit_field(col, input);

	if (colprop.type == 'date' && $.datepicker)
	input.datepicker();
	}
	else if (colprop.type == 'textarea') {
	input = $('<textarea>')
	.addClass('ff_'+col)
	.attr({ name: '_'+col+name_suffix, cols:colprop.size, rows:colprop.rows })
	.appendTo(cell);

	this.init_edit_field(col, input);
	}
	else if (colprop.type == 'composite') {
	var childcol, cp, first, templ, cols = [], suffices = [];
	// read template for composite field order
	if ((templ = this.env[col+'_template'])) {
	for (var j=0; j < templ.length; j++) {
	cols.push(templ[j][1]);
	suffices.push(templ[j][2]);
	}
	}
	else { // list fields according to appearance in colprop
	for (childcol in colprop.childs)
	cols.push(childcol);
	}

	for (var i=0; i < cols.length; i++) {
	childcol = cols[i];
	cp = colprop.childs[childcol];
	input = $('<input>')
	.addClass('ff_'+childcol)
	.attr({ type: 'text', name: '_'+childcol+name_suffix, size: cp.size })
	.appendTo(cell);
	cell.append(suffices[i] \|\| " ");
	this.init_edit_field(childcol, input);
	if (!first) first = input;
	}
	input = first; // set focus to the first of this composite fields
	}
	else if (colprop.type == 'select') {
	input = $('<select>')
	.addClass('ff_'+col)
	.attr('name', '_'+col+name_suffix)
	.appendTo(cell);

	var options = input.attr('options');
	options[options.length] = new Option('---', '');
	if (colprop.options)
	$.each(colprop.options, function(i, val){ options[options.length] = new Option(val, i); });
	}

	if (input) {
	var delbutton = $('<a href="#del"></a>')
	.addClass('contactfieldbutton deletebutton')
	.attr({title: this.get_label('delete'), rel: col})
	.html(this.env.delbutton)
	.click(function(){ ref.delete_edit_field(this); return false })
	.appendTo(cell);

	row.append(label).append(cell).appendTo(appendcontainer.show());
	input.first().focus();

	// disable option if limit reached
	if (!colprop.count) colprop.count = 0;
	if (++colprop.count == colprop.limit && colprop.limit)
	$(menu).children('option[value="'+col+'"]').prop('disabled', true);
	}
	}
	}
	};

	this.delete_edit_field = function(elem)
	{
	var col = $(elem).attr('rel'),
	colprop = this.env.coltypes[col],
	fieldset = $(elem).parents('fieldset.contactfieldgroup'),
	addmenu = fieldset.parent().find('select.addfieldmenu');

	// just clear input but don't hide the last field
	if (--colprop.count <= 0 && colprop.visible)
	$(elem).parent().children('input').val('').blur();
	else {
	$(elem).parents('div.row').remove();
	// hide entire fieldset if no more rows
	if (!fieldset.children('div.row').length)
	fieldset.hide();
	}

	// enable option in add-field selector or insert it if necessary
	if (addmenu.length) {
	var option = addmenu.children('option[value="'+col+'"]');
	if (option.length)
	option.prop('disabled', false);
	else
	option = $('<option>').attr('value', col).html(colprop.label).appendTo(addmenu);
	addmenu.show();
	}
	};

	this.upload_contact_photo = function(form)
	{
	if (form && form.elements._photo.value) {
	this.async_upload_form(form, 'upload-photo', function(e) {
	rcmail.set_busy(false, null, rcmail.file_upload_id);
	});

	// display upload indicator
	this.file_upload_id = this.set_busy(true, 'uploading');
	}
	};

	this.replace_contact_photo = function(id)
	{
	var img_src = id == '-del-' ? this.env.photo_placeholder :
	this.env.comm_path + '&_action=photo&_source=' + this.env.source + '&_cid=' + this.env.cid + '&_photo=' + id;

	this.set_photo_actions(id);
	$(this.gui_objects.contactphoto).children('img').attr('src', img_src);
	};

	this.photo_upload_end = function()
	{
	this.set_busy(false, null, this.file_upload_id);
	delete this.file_upload_id;
	};

	this.set_photo_actions = function(id)
	{
	var n, buttons = this.buttons['upload-photo'];
	for (n=0; buttons && n < buttons.length; n++)
	$('a#'+buttons[n].id).html(this.get_label(id == '-del-' ? 'addphoto' : 'replacephoto'));

	$('#ff_photo').val(id);
	this.enable_command('upload-photo', this.env.coltypes.photo ? true : false);
	this.enable_command('delete-photo', this.env.coltypes.photo && id != '-del-');
	};

	// load advanced search page
	this.advanced_search = function()
	{
	var win, url = {_form: 1, _action: 'search'}, target = window;

	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	this.contact_list.clear_selection();
	}

	this.location_href(url, target, true);

	return true;
	};

	// unselect directory/group
	this.unselect_directory = function()
	{
	this.select_folder('');
	this.enable_command('search-delete', false);
	};

	// callback for creating a new saved search record
	this.insert_saved_search = function(name, id)
	{
	this.reset_add_input();

	var key = 'S'+id,
	link = $('<a>').attr('href', '#')
	.attr('rel', id)
	.click(function() { return rcmail.command('listsearch', id, this); })
	.html(name),
	li = $('<li>').attr({id: 'rcmli' + this.html_identifier(key), 'class': 'contactsearch'})
	.append(link),
	prop = {name:name, id:id, li:li[0]};

	this.add_saved_search_row(prop, li);
	this.select_folder('S'+id);
	this.enable_command('search-delete', true);
	this.env.search_id = id;

	this.triggerEvent('abook_search_insert', prop);
	};

	// add saved search row to the list, with sorting
	this.add_saved_search_row = function(prop, li, reloc)
	{
	var row, sibling, name = prop.name.toUpperCase();

	// When renaming groups, we need to remove it from DOM and insert it in the proper place
	if (reloc) {
	row = li.clone(true);
	li.remove();
	}
	else
	row = li;

	$('li[class~="contactsearch"]', this.gui_objects.folderlist).each(function(i, elem) {
	if (!sibling)
	sibling = this.previousSibling;

	if (name >= $(this).text().toUpperCase())
	sibling = elem;
	else
	return false;
	});

	if (sibling)
	row.insertAfter(sibling);
	else
	row.appendTo(this.gui_objects.folderlist);
	};

	// creates an input for saved search name
	this.search_create = function()
	{
	this.add_input_row('contactsearch');
	};

	this.search_delete = function()
	{
	if (this.env.search_request) {
	var lock = this.set_busy(true, 'savedsearchdeleting');
	this.http_post('search-delete', {_sid: this.env.search_id}, lock);
	}
	};

	// callback from server upon search-delete command
	this.remove_search_item = function(id)
	{
	var li, key = 'S'+id;
	if ((li = this.get_folder_li(key))) {
	this.triggerEvent('search_delete', { id:id, li:li });

	li.parentNode.removeChild(li);
	}

	this.env.search_id = null;
	this.env.search_request = null;
	this.list_contacts_clear();
	this.reset_qsearch();
	this.enable_command('search-delete', 'search-create', false);
	};

	this.listsearch = function(id)
	{
	var folder, lock = this.set_busy(true, 'searching');

	if (this.contact_list) {
	this.list_contacts_clear();
	}

	this.reset_qsearch();
	this.select_folder('S'+id);

	// reset vars
	this.env.current_page = 1;
	this.http_request('search', {_sid: id}, lock);
	};


	/*********************************************************/
	/******* user settings methods *******/
	/*********************************************************/

	// preferences section select and load options frame
	this.section_select = function(list)
	{
	var win, id = list.get_single_selection(), target = window,
	url = {_action: 'edit-prefs', _section: id};

	if (id) {
	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	}
	this.location_href(url, target, true);
	}

	return true;
	};

	this.identity_select = function(list)
	{
	var id;
	if (id = list.get_single_selection()) {
	this.enable_command('delete', list.rowcount > 1 && this.env.identities_level < 2);
	this.load_identity(id, 'edit-identity');
	}
	};

	// load identity record
	this.load_identity = function(id, action)
	{
	if (action == 'edit-identity' && (!id \|\| id == this.env.iid))
	return false;

	var win, target = window,
	url = {_action: action, _iid: id};

	if (win = this.get_frame_window(this.env.contentframe)) {
	url._framed = 1;
	target = win;
	}

	if (action && (id \|\| action == 'add-identity')) {
	this.set_busy(true);
	this.location_href(url, target);
	}

	return true;
	};

	this.delete_identity = function(id)
	{
	// exit if no identity is 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];

	// submit request with appended token
	if (confirm(this.get_label('deleteidentityconfirm')))
	this.goto_url('delete-identity', { _iid: id, _token: this.env.request_token }, true);

	return true;
	};

	this.update_identity_row = function(id, name, add)
	{
	var row, col, list = this.identity_list,
	rid = this.html_identifier(id);

	if (list.rows[rid] && (row = list.rows[rid].obj)) {
	$(row.cells[0]).html(name);
	}
	else if (add) {
	row = $('<tr>').attr('id', 'rcmrow'+rid).get(0);
	col = $('<td>').addClass('mail').html(name).appendTo(row);
	list.insert_row(row);
	list.select(rid);
	}
	};


	/*********************************************************/
	/******* folder manager 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) {
	row.obj.onmouseover = function() { p.focus_subscription(row.id); };
	row.obj.onmouseout = function() { p.unfocus_subscription(row.id); };
	};
	this.subscription_list.init();
	$('#mailboxroot')
	.mouseover(function(){ p.focus_subscription(this.id); })
	.mouseout(function(){ p.unfocus_subscription(this.id); })
	};

	this.focus_subscription = function(id)
	{
	var row, folder,
	delim = RegExp.escape(this.env.delimiter),
	reg = RegExp('['+delim+']?[^'+delim+']+$');

	if (this.drag_active && this.env.mailbox && (row = document.getElementById(id)))
	if (this.env.subscriptionrows[id] &&
	(folder = this.env.subscriptionrows[id][0]) !== null
	) {
	if (this.check_droptarget(folder) &&
	!this.env.subscriptionrows[this.get_folder_row_id(this.env.mailbox)][2] &&
	(folder != this.env.mailbox.replace(reg, '')) &&
	(!folder.match(new RegExp('^'+RegExp.escape(this.env.mailbox+this.env.delimiter))))
	) {
	this.env.dstfolder = folder;
	$(row).addClass('droptarget');
	}
	}
	};

	this.unfocus_subscription = function(id)
	{
	var row = $('#'+id);

	this.env.dstfolder = null;
	if (this.env.subscriptionrows[id] && row[0])
	row.removeClass('droptarget');
	else
	$(this.subscription_list.frame).removeClass('droptarget');
	};

	this.subscription_select = function(list)
	{
	var id, folder;

	if (list && (id = list.get_single_selection()) &&
	(folder = this.env.subscriptionrows['rcmrow'+id])
	) {
	this.env.mailbox = folder[0];
	this.show_folder(folder[0]);
	this.enable_command('delete-folder', !folder[2]);
	}
	else {
	this.env.mailbox = null;
	this.show_contentframe(false);
	this.enable_command('delete-folder', 'purge', false);
	}
	};

	this.subscription_move_folder = function(list)
	{
	var delim = RegExp.escape(this.env.delimiter),
	reg = RegExp('['+delim+']?[^'+delim+']+$');

	if (this.env.mailbox && this.env.dstfolder !== null && (this.env.dstfolder != this.env.mailbox) &&
	(this.env.dstfolder != this.env.mailbox.replace(reg, ''))
	) {
	reg = new RegExp('[^'+delim+']*['+delim+']', 'g');
	var basename = this.env.mailbox.replace(reg, ''),
	newname = this.env.dstfolder === '' ? basename : this.env.dstfolder+this.env.delimiter+basename;

	if (newname != this.env.mailbox) {
	this.http_post('rename-folder', {_folder_oldname: this.env.mailbox, _folder_newname: newname}, this.set_busy(true, 'foldermoving'));
	this.subscription_list.draglayer.hide();
	}
	}
	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()
	{
	this.show_folder('', this.env.mailbox);
	};

	// delete a specific mailbox with all its messages
	this.delete_folder = function(name)
	{
	var id = this.get_folder_row_id(name ? name : this.env.mailbox),
	folder = this.env.subscriptionrows[id][0];

	if (folder && confirm(this.get_label('deletefolderconfirm'))) {
	var lock = this.set_busy(true, 'folderdeleting');
	this.http_post('delete-folder', {_mbox: folder}, lock);
	}
	};

	// Add folder row to the table and initialize it
	this.add_folder_row = function (name, display_name, is_protected, subscribed, skip_init, class_name)
	{
	if (!this.gui_objects.subscriptionlist)
	return false;

	var row, n, i, tmp, tmp_name, folders, rowid, list = [], slist = [],
	tbody = this.gui_objects.subscriptionlist.tBodies[0],
	refrow = $('tr', tbody).get(1),
	id = 'rcmrow'+((new Date).getTime());

	if (!refrow) {
	// Refresh page if we don't have a table row to clone
	this.goto_url('folders');
	return false;
	}

	// clone a table row if there are existing rows
	row = $(refrow).clone(true);

	// set ID, reset css class
	row.attr('id', id);
	row.attr('class', class_name);

	// set folder name
	row.find('td:first').html(display_name);

	// update subscription checkbox
	$('input[name="_subscribed[]"]', row).val(name)
	.prop({checked: subscribed ? true : false, disabled: is_protected ? true : false});

	// add to folder/row-ID map
	this.env.subscriptionrows[id] = [name, display_name, 0];

	// sort folders, to find a place where to insert the row
	folders = [];
	$.each(this.env.subscriptionrows, function(k,v){ folders.push(v) });
	folders.sort(function(a,b){ return a[0] < b[0] ? -1 : (a[0] > b[0] ? 1 : 0) });

	for (n in folders) {
	// protected folder
	if (folders[n][2]) {
	tmp_name = folders[n][0] + this.env.delimiter;
	// prefix namespace cannot have subfolders (#1488349)
	if (tmp_name == this.env.prefix_ns)
	continue;
	slist.push(folders[n][0]);
	tmp = tmp_name;
	}
	// protected folder's child
	else if (tmp && folders[n][0].indexOf(tmp) == 0)
	slist.push(folders[n][0]);
	// other
	else {
	list.push(folders[n][0]);
	tmp = null;
	}
	}

	// check if subfolder of a protected folder
	for (n=0; n<slist.length; n++) {
	if (name.indexOf(slist[n]+this.env.delimiter) == 0)
	rowid = this.get_folder_row_id(slist[n]);
	}

	// find folder position after sorting
	for (n=0; !rowid && n<list.length; n++) {
	if (n && list[n] == name)
	rowid = this.get_folder_row_id(list[n-1]);
	}

	// add row to the table
	if (rowid)
	$('#'+rowid).after(row);
	else
	row.appendTo(tbody);

	// update list widget
	this.subscription_list.clear_selection();
	if (!skip_init)
	this.init_subscription_list();

	row = row.get(0);
	if (row.scrollIntoView)
	row.scrollIntoView();

	return row;
	};

	// replace an existing table row with a new folder line (with subfolders)
	this.replace_folder_row = function(oldfolder, newfolder, display_name, is_protected, class_name)
	{
	if (!this.gui_objects.subscriptionlist)
	return false;

	var i, n, len, name, dispname, oldrow, tmprow, row, level,
	tbody = this.gui_objects.subscriptionlist.tBodies[0],
	folders = this.env.subscriptionrows,
	id = this.get_folder_row_id(oldfolder),
	regex = new RegExp('^'+RegExp.escape(oldfolder)),
	subscribed = $('input[name="_subscribed[]"]', $('#'+id)).prop('checked'),
	// find subfolders of renamed folder
	list = this.get_subfolders(oldfolder);

	// replace an existing table row
	this._remove_folder_row(id);
	row = $(this.add_folder_row(newfolder, display_name, is_protected, subscribed, true, class_name));

	// detect tree depth change
	if (len = list.length) {
	level = (oldfolder.split(this.env.delimiter)).length - (newfolder.split(this.env.delimiter)).length;
	}

	// move subfolders to the new branch
	for (n=0; n<len; n++) {
	id = list[n];
	name = this.env.subscriptionrows[id][0];
	dispname = this.env.subscriptionrows[id][1];
	oldrow = $('#'+id);
	tmprow = oldrow.clone(true);
	oldrow.remove();
	row.after(tmprow);
	row = tmprow;
	// update folder index
	name = name.replace(regex, newfolder);
	$('input[name="_subscribed[]"]', row).val(name);
	this.env.subscriptionrows[id][0] = name;
	// update the name if level is changed
	if (level != 0) {
	if (level > 0) {
	for (i=level; i>0; i--)
	dispname = dispname.replace(/^    /, '');
	}
	else {
	for (i=level; i<0; i++)
	dispname = '    ' + dispname;
	}
	row.find('td:first').html(dispname);
	this.env.subscriptionrows[id][1] = dispname;
	}
	}

	// update list widget
	this.init_subscription_list();
	};

	// remove the table row of a specific mailbox from the table
	this.remove_folder_row = function(folder, subs)
	{
	var n, len, list = [], id = this.get_folder_row_id(folder);

	// get subfolders if any
	if (subs)
	list = this.get_subfolders(folder);

	// remove old row
	this._remove_folder_row(id);

	// remove subfolders
	for (n=0, len=list.length; n<len; n++)
	this._remove_folder_row(list[n]);
	};

	this._remove_folder_row = function(id)
	{
	this.subscription_list.remove_row(id.replace(/^rcmrow/, ''));
	$('#'+id).remove();
	delete this.env.subscriptionrows[id];
	}

	this.get_subfolders = function(folder)
	{
	var name, list = [],
	regex = new RegExp('^'+RegExp.escape(folder)+RegExp.escape(this.env.delimiter)),
	row = $('#'+this.get_folder_row_id(folder)).get(0);

	while (row = row.nextSibling) {
	if (row.id) {
	name = this.env.subscriptionrows[row.id][0];
	if (regex.test(name)) {
	list.push(row.id);
	}
	else
	break;
	}
	}

	return list;
	}

	this.subscribe = function(folder)
	{
	if (folder) {
	var lock = this.display_message(this.get_label('foldersubscribing'), 'loading');
	this.http_post('subscribe', {_mbox: folder}, lock);
	}
	};

	this.unsubscribe = function(folder)
	{
	if (folder) {
	var lock = this.display_message(this.get_label('folderunsubscribing'), 'loading');
	this.http_post('unsubscribe', {_mbox: folder}, lock);
	}
	};

	// helper method to find a specific mailbox row ID
	this.get_folder_row_id = function(folder)
	{
	var id, folders = this.env.subscriptionrows;
	for (id in folders)
	if (folders[id] && folders[id][0] == folder)
	break;

	return id;
	};

	// when user select a folder in manager
	this.show_folder = function(folder, path, force)
	{
	var win, target = window,
	url = '&_action=edit-folder&_mbox='+urlencode(folder);

	if (path)
	url += '&_path='+urlencode(path);

	if (win = this.get_frame_window(this.env.contentframe)) {
	target = win;
	url += '&_framed=1';
	}

	if (String(target.location.href).indexOf(url) >= 0 && !force)
	this.show_contentframe(true);
	else
	this.location_href(this.env.comm_path+url, target, true);
	};

	// disables subscription checkbox (for protected folder)
	this.disable_subscription = function(folder)
	{
	var id = this.get_folder_row_id(folder);
	if (id)
	$('input[name="_subscribed[]"]', $('#'+id)).prop('disabled', true);
	};

	this.folder_size = function(folder)
	{
	var lock = this.set_busy(true, 'loading');
	this.http_post('folder-size', {_mbox: folder}, lock);
	};

	this.folder_size_update = function(size)
	{
	$('#folder-size').replaceWith(size);
	};


	/*********************************************************/
	/******* GUI functionality *******/
	/*********************************************************/

	var init_button = function(cmd, prop)
	{
	var elm = document.getElementById(prop.id);
	if (!elm)
	return;

	var preload = false;
	if (prop.type == 'image') {
	elm = elm.parentNode;
	preload = true;
	}

	elm._command = cmd;
	elm._id = prop.id;
	if (prop.sel) {
	elm.onmousedown = function(e){ return rcmail.button_sel(this._command, this._id); };
	elm.onmouseup = function(e){ return rcmail.button_out(this._command, this._id); };
	if (preload)
	new Image().src = prop.sel;
	}
	if (prop.over) {
	elm.onmouseover = function(e){ return rcmail.button_over(this._command, this._id); };
	elm.onmouseout = function(e){ return rcmail.button_out(this._command, this._id); };
	if (preload)
	new Image().src = prop.over;
	}
	};

	// set event handlers on registered buttons
	this.init_buttons = function()
	{
	for (var cmd in this.buttons) {
	if (typeof cmd !== 'string')
	continue;

	for (var i=0; i<this.buttons[cmd].length; i++) {
	init_button(cmd, this.buttons[cmd][i]);
	}
	}

	// set active task button
	this.set_button(this.task, 'sel');
	};

	// set button to a specific state
	this.set_button = function(command, state)
	{
	var n, button, obj, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	obj = document.getElementById(button.id);

	if (!obj)
	continue;

	// get default/passive setting of the button
	if (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 (!button.status)
	button.pas = String(obj.className);

	// set image according to button state
	if (button.type == 'image' && button[state]) {
	button.status = state;
	obj.src = button[state];
	}
	// set class name according to button state
	else if (button[state] !== undefined) {
	button.status = state;
	obj.className = button[state];
	}
	// disable/enable input buttons
	if (button.type == 'input') {
	button.status = state;
	obj.disabled = !state;
	}
	}
	};

	// display a specific alttext
	this.set_alttext = function(command, label)
	{
	var n, button, obj, link, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	obj = document.getElementById(button.id);

	if (button.type == 'image' && obj) {
	obj.setAttribute('alt', this.get_label(label));
	if ((link = obj.parentNode) && link.tagName.toLowerCase() == '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 n, button, obj, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	if (button.id == id && button.status == 'act') {
	obj = document.getElementById(button.id);
	if (obj && button.over) {
	if (button.type == 'image')
	obj.src = button.over;
	else
	obj.className = button.over;
	}
	}
	}
	};

	// mouse down on button
	this.button_sel = function(command, id)
	{
	var n, button, obj, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	if (button.id == id && button.status == 'act') {
	obj = document.getElementById(button.id);
	if (obj && button.sel) {
	if (button.type == 'image')
	obj.src = button.sel;
	else
	obj.className = button.sel;
	}
	this.buttons_sel[id] = command;
	}
	}
	};

	// mouse out of button
	this.button_out = function(command, id)
	{
	var n, button, obj, a_buttons = this.buttons[command],
	len = a_buttons ? a_buttons.length : 0;

	for (n=0; n<len; n++) {
	button = a_buttons[n];
	if (button.id == id && button.status == 'act') {
	obj = document.getElementById(button.id);
	if (obj && button.act) {
	if (button.type == 'image')
	obj.src = button.act;
	else
	obj.className = button.act;
	}
	}
	}
	};

	// write to the document/window title
	this.set_pagetitle = function(title)
	{
	if (title && document.title)
	document.title = title;
	};

	// display a system message, list of types in common.css (below #message definition)
	this.display_message = function(msg, type, timeout)
	{
	// pass command to parent window
	if (this.is_framed())
	return parent.rcmail.display_message(msg, type, timeout);

	if (!this.gui_objects.message) {
	// save message in order to display after page loaded
	if (type != 'loading')
	this.pending_message = [msg, type, timeout];
	return false;
	}

	type = type ? type : 'notice';

	var ref = this,
	key = this.html_identifier(msg),
	date = new Date(),
	id = type + date.getTime();

	if (!timeout)
	timeout = this.message_time * (type == 'error' \|\| type == 'warning' ? 2 : 1);

	if (type == 'loading') {
	key = 'loading';
	timeout = this.env.request_timeout * 1000;
	if (!msg)
	msg = this.get_label('loading');
	}

	// The same message is already displayed
	if (this.messages[key]) {
	// replace label
	if (this.messages[key].obj)
	this.messages[key].obj.html(msg);
	// store label in stack
	if (type == 'loading') {
	this.messages[key].labels.push({'id': id, 'msg': msg});
	}
	// add element and set timeout
	this.messages[key].elements.push(id);
	setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
	return id;
	}

	// create DOM object and display it
	var obj = $('<div>').addClass(type).html(msg).data('key', key),
	cont = $(this.gui_objects.message).append(obj).show();

	this.messages[key] = {'obj': obj, 'elements': [id]};

	if (type == 'loading') {
	this.messages[key].labels = [{'id': id, 'msg': msg}];
	}
	else {
	obj.click(function() { return ref.hide_message(obj); });
	}

	this.triggerEvent('message', { message:msg, type:type, timeout:timeout, object:obj });

	if (timeout > 0)
	setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
	return id;
	};

	// make a message to disapear
	this.hide_message = function(obj, fade)
	{
	// pass command to parent window
	if (this.is_framed())
	return parent.rcmail.hide_message(obj, fade);

	var k, n, i, msg, m = this.messages;

	// Hide message by object, don't use for 'loading'!
	if (typeof obj === 'object') {
	$(obj)[fade?'fadeOut':'hide']();
	msg = $(obj).data('key');
	if (this.messages[msg])
	delete this.messages[msg];
	}
	// Hide message by id
	else {
	for (k in m) {
	for (n in m[k].elements) {
	if (m[k] && m[k].elements[n] == obj) {
	m[k].elements.splice(n, 1);
	// hide DOM element if last instance is removed
	if (!m[k].elements.length) {
	m[k].obj[fade?'fadeOut':'hide']();
	delete m[k];
	}
	// set pending action label for 'loading' message
	else if (k == 'loading') {
	for (i in m[k].labels) {
	if (m[k].labels[i].id == obj) {
	delete m[k].labels[i];
	}
	else {
	msg = m[k].labels[i].msg;
	}
	m[k].obj.html(msg);
	}
	}
	}
	}
	}
	}
	};

	// remove all messages immediately
	this.clear_messages = function()
	{
	// pass command to parent window
	if (this.is_framed())
	return parent.rcmail.clear_messages();

	var k, n, m = this.messages;

	for (k in m)
	for (n in m[k].elements)
	if (m[k].obj)
	m[k].obj.hide();

	this.messages = {};
	};

	// open a jquery UI dialog with the given content
	this.show_popup_dialog = function(html, title)
	{
	// forward call to parent window
	if (this.is_framed()) {
	parent.rcmail.show_popup_dialog(html, title);
	return;
	}

	var popup = $('<div class="popup">')
	.html(html)
	.dialog({
	title: title,
	modal: true,
	resizable: true,
	width: 580,
	close: function(event, ui) { $(this).remove() }
	});

	// resize and center popup
	var win = $(window), w = win.width(), h = win.height(),
	width = popup.width(), height = popup.height();
	popup.dialog('option', { height: Math.min(h-40, height+50), width: Math.min(w-20, width+50) })
	.dialog('option', 'position', ['center', 'center']); // only works in a separate call (!?)
	};

	// enable/disable buttons for page shifting
	this.set_page_buttons = function()
	{
	this.enable_command('nextpage', 'lastpage', (this.env.pagecount > this.env.current_page));
	this.enable_command('previouspage', 'firstpage', (this.env.current_page > 1));
	};

	// mark a mailbox as selected and set environment variable
	this.select_folder = function(name, prefix, encode)
	{
	if (this.gui_objects.folderlist) {
	var current_li, target_li;

	if ((current_li = $('li.selected', this.gui_objects.folderlist))) {
	current_li.removeClass('selected').addClass('unfocused');
	}
	if ((target_li = this.get_folder_li(name, prefix, encode))) {
	$(target_li).removeClass('unfocused').addClass('selected');
	}

	// trigger event hook
	this.triggerEvent('selectfolder', { folder:name, prefix:prefix });
	}
	};

	// adds a class to selected folder
	this.mark_folder = function(name, class_name, prefix, encode)
	{
	$(this.get_folder_li(name, prefix, encode)).addClass(class_name);
	};

	// adds a class to selected folder
	this.unmark_folder = function(name, class_name, prefix, encode)
	{
	$(this.get_folder_li(name, prefix, encode)).removeClass(class_name);
	};

	// helper method to find a folder list item
	this.get_folder_li = function(name, prefix, encode)
	{
	if (!prefix)
	prefix = 'rcmli';

	if (this.gui_objects.folderlist) {
	name = this.html_identifier(name, encode);
	return document.getElementById(prefix+name);
	}

	return null;
	};

	// for reordering column array (Konqueror workaround)
	// and for setting some message list global variables
	this.set_message_coltypes = function(coltypes, repl, smart_col)
	{
	var list = this.message_list,
	thead = list ? list.list.tHead : null,
	cell, col, n, len, th, tr;

	this.env.coltypes = coltypes;

	// replace old column headers
	if (thead) {
	if (repl) {
	th = document.createElement('thead');
	tr = document.createElement('tr');

	for (c=0, len=repl.length; c < len; c++) {
	cell = document.createElement('td');
	cell.innerHTML = repl[c].html;
	if (repl[c].id) cell.id = repl[c].id;
	if (repl[c].className) cell.className = repl[c].className;
	tr.appendChild(cell);
	}
	th.appendChild(tr);
	thead.parentNode.replaceChild(th, thead);
	thead = th;
	}

	for (n=0, len=this.env.coltypes.length; n<len; n++) {
	col = this.env.coltypes[n];
	if ((cell = thead.rows[0].cells[n]) && (col == 'from' \|\| col == 'to' \|\| col == 'fromto')) {
	cell.id = 'rcm'+col;
	$('span,a', cell).text(this.get_label(col == 'fromto' ? smart_col : col));
	// if we have links for sorting, it's a bit more complicated...
	$('a', cell).click(function(){
	return rcmail.command('sort', this.id.replace(/^rcm/, ''), this);
	});
	}
	}
	}

	this.env.subject_col = null;
	this.env.flagged_col = null;
	this.env.status_col = null;

	if ((n = $.inArray('subject', this.env.coltypes)) >= 0) {
	this.env.subject_col = n;
	if (list)
	list.subject_col = n;
	}
	if ((n = $.inArray('flag', this.env.coltypes)) >= 0)
	this.env.flagged_col = n;
	if ((n = $.inArray('status', this.env.coltypes)) >= 0)
	this.env.status_col = n;

	if (list)
	list.init_header();
	};

	// replace content of row count display
	this.set_rowcount = function(text, mbox)
	{
	// #1487752
	if (mbox && mbox != this.env.mailbox)
	return false;

	$(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 && content.type == 'text')
	$(this.gui_objects.quotadisplay).html(content.percent+'%').attr('title', content.title);

	this.triggerEvent('setquota', content);
	this.env.quota_content = content;
	};

	// update the mailboxlist
	this.set_unread_count = function(mbox, count, set_title, mark)
	{
	if (!this.gui_objects.mailboxlist)
	return false;

	this.env.unread_counts[mbox] = count;
	this.set_unread_count_display(mbox, set_title);

	if (mark)
	this.mark_folder(mbox, mark, '', true);
	else if (!count)
	this.unmark_folder(mbox, 'recent', '', true);
	};

	// update the mailbox count display
	this.set_unread_count_display = function(mbox, set_title)
	{
	var reg, link, text_obj, item, mycount, childcount, div;

	if (item = this.get_folder_li(mbox, '', true)) {
	mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
	link = $(item).children('a').eq(0);
	text_obj = link.children('span.unreadcount');
	if (!text_obj.length && mycount)
	text_obj = $('<span>').addClass('unreadcount').appendTo(link);
	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)
	childcount += this.env.unread_counts[k];
	}

	if (mycount && text_obj.length)
	text_obj.html(this.env.unreadwrap.replace(/%[sd]/, mycount));
	else if (text_obj.length)
	text_obj.remove();

	// 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
	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 new_title = '',
	doc_title = String(document.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);
	}
	};

	// display fetched raw headers
	this.set_headers = function(content)
	{
	if (this.gui_objects.all_headers_row && this.gui_objects.all_headers_box && content)
	$(this.gui_objects.all_headers_box).html(content).show();
	};

	// display all-headers row and fetch raw message headers
	this.show_headers = function(props, elem)
	{
	if (!this.gui_objects.all_headers_row \|\| !this.gui_objects.all_headers_box \|\| !this.env.uid)
	return;

	$(elem).removeClass('show-headers').addClass('hide-headers');
	$(this.gui_objects.all_headers_row).show();
	elem.onclick = function() { rcmail.command('hide-headers', '', elem); };

	// fetch headers only once
	if (!this.gui_objects.all_headers_box.innerHTML) {
	var lock = this.display_message(this.get_label('loading'), 'loading');
	this.http_post('headers', {_uid: this.env.uid}, lock);
	}
	};

	// hide all-headers row
	this.hide_headers = function(props, elem)
	{
	if (!this.gui_objects.all_headers_row \|\| !this.gui_objects.all_headers_box)
	return;

	$(elem).removeClass('hide-headers').addClass('show-headers');
	$(this.gui_objects.all_headers_row).hide();
	elem.onclick = function() { rcmail.command('show-headers', '', elem); };
	};


	/********************************************************/
	/******* html to text conversion functions *******/
	/********************************************************/

	this.html2plain = function(htmlText, id)
	{
	var rcmail = this,
	url = '?_task=utils&_action=html2text',
	lock = this.set_busy(true, 'converting');

	this.log('HTTP POST: ' + url);

	$.ajax({ type: 'POST', url: url, data: htmlText, contentType: 'application/octet-stream',
	error: function(o, status, err) { rcmail.http_error(o, status, err, lock); },
	success: function(data) { rcmail.set_busy(false, null, lock); $('#'+id).val(data); rcmail.log(data); }
	});
	};

	this.plain2html = function(plain, id)
	{
	var lock = this.set_busy(true, 'converting');

	plain = plain.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
	$('#'+id).val(plain ? '<pre>'+plain+'</pre>' : '');

	this.set_busy(false, null, lock);
	};


	/********************************************************/
	/******* remote request methods *******/
	/********************************************************/

	// compose a valid url with the given parameters
	this.url = function(action, query)
	{
	var querystring = typeof query === 'string' ? '&' + query : '';

	if (typeof action !== 'string')
	query = action;
	else if (!query \|\| typeof query !== 'object')
	query = {};

	if (action)
	query._action = action;
	else
	query._action = this.env.action;

	var base = this.env.comm_path, k, param = {};

	// overwrite task name
	if (query._action.match(/([a-z]+)\/([a-z0-9-_.]+)/)) {
	query._action = RegExp.$2;
	base = base.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
	}

	// remove undefined values
	for (k in query) {
	if (query[k] !== undefined && query[k] !== null)
	param[k] = query[k];
	}

	return base + '&' + $.param(param) + querystring;
	};

	this.redirect = function(url, lock)
	{
	if (lock \|\| lock === null)
	this.set_busy(true);

	if (this.is_framed())
	parent.rcmail.redirect(url, lock);
	else
	this.location_href(url, window);
	};

	this.goto_url = function(action, query, lock)
	{
	this.redirect(this.url(action, query));
	};

	this.location_href = function(url, target, frame)
	{
	if (frame)
	this.lock_frame();

	if (typeof url == 'object')
	url = this.env.comm_path + '&' + $.param(url);

	// simulate real link click to force IE to send referer header
	if (bw.ie && target == window)
	$('<a>').attr('href', url).appendTo(document.body).get(0).click();
	else
	target.location.href = url;
	};

	// send a http request to the server
	this.http_request = function(action, query, lock)
	{
	var url = this.url(action, query);

	// trigger plugin hook
	var result = this.triggerEvent('request'+action, query);

	if (result !== undefined) {
	// abort if one the handlers returned false
	if (result === false)
	return false;
	else
	query = result;
	}

	url += '&_remote=1';

	// send request
	this.log('HTTP GET: ' + url);

	return $.ajax({
	type: 'GET', url: url, data: { _unlock:(lock?lock:0) }, dataType: 'json',
	success: function(data){ ref.http_response(data); },
	error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
	});
	};

	// send a http POST request to the server
	this.http_post = function(action, postdata, lock)
	{
	var url = this.url(action);

	if (postdata && typeof postdata === 'object') {
	postdata._remote = 1;
	postdata._unlock = (lock ? lock : 0);
	}
	else
	postdata += (postdata ? '&' : '') + '_remote=1' + (lock ? '&_unlock='+lock : '');

	// trigger plugin hook
	var result = this.triggerEvent('request'+action, postdata);
	if (result !== undefined) {
	// abort if one the handlers returned false
	if (result === false)
	return false;
	else
	postdata = result;
	}

	// send request
	this.log('HTTP POST: ' + url);

	return $.ajax({
	type: 'POST', url: url, data: postdata, dataType: 'json',
	success: function(data){ ref.http_response(data); },
	error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
	});
	};

	// aborts ajax request
	this.abort_request = function(r)
	{
	if (r.request)
	r.request.abort();
	if (r.lock)
	this.set_busy(false, null, r.lock);
	};

	// handle HTTP response
	this.http_response = function(response)
	{
	if (!response)
	return;

	if (response.unlock)
	this.set_busy(false);

	this.triggerEvent('responsebefore', {response: response});
	this.triggerEvent('responsebefore'+response.action, {response: response});

	// set env vars
	if (response.env)
	this.set_env(response.env);

	// 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) {
	this.log(response.exec);
	eval(response.exec);
	}

	// execute callback functions of plugins
	if (response.callbacks && response.callbacks.length) {
	for (var i=0; i < response.callbacks.length; i++)
	this.triggerEvent(response.callbacks[i][0], response.callbacks[i][1]);
	}

	// process the response data according to the sent action
	switch (response.action) {
	case 'delete':
	if (this.task == 'addressbook') {
	var sid, uid = this.contact_list.get_selection(), writable = false;

	if (uid && this.contact_list.rows[uid]) {
	// search results, get source ID from record ID
	if (this.env.source == '') {
	sid = String(uid).replace(/^[^-]+-/, '');
	writable = sid && this.env.address_sources[sid] && !this.env.address_sources[sid].readonly;
	}
	else {
	writable = !this.env.address_sources[this.env.source].readonly;
	}
	}
	this.enable_command('compose', (uid && this.contact_list.rows[uid]));
	this.enable_command('delete', 'edit', writable);
	this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
	}

	case 'moveto':
	if (this.env.action == 'show') {
	// re-enable commands on move/delete error
	this.enable_command(this.env.message_commands, true);
	if (!this.env.list_post)
	this.enable_command('reply-list', false);
	}
	else if (this.task == 'addressbook') {
	this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
	}

	case 'purge':
	case 'expunge':
	if (this.task == 'mail') {
	if (!this.env.messagecount) {
	// clear preview pane content
	if (this.env.contentframe)
	this.show_contentframe(false);
	// disable commands useless when mailbox is empty
	this.enable_command(this.env.message_commands, 'purge', 'expunge',
	'select-all', 'select-none', 'expand-all', 'expand-unread', 'collapse-all', false);
	}
	if (this.message_list)
	this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
	}
	break;

	case 'check-recent':
	case 'getunread':
	case 'search':
	this.env.qsearch = null;
	case 'list':
	if (this.task == 'mail') {
	this.enable_command('show', 'expunge', 'select-all', 'select-none', (this.env.messagecount > 0));
	this.enable_command('purge', this.purge_mailbox_test());
	this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount);

	if ((response.action == 'list' \|\| response.action == 'search') && this.message_list) {
	this.msglist_select(this.message_list);
	this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
	}
	}
	else if (this.task == 'addressbook') {
	this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));

	if (response.action == 'list' \|\| response.action == 'search') {
	this.enable_command('search-create', this.env.source == '');
	this.enable_command('search-delete', this.env.search_id);
	this.update_group_commands();
	this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
	}
	}
	break;
	}

	if (response.unlock)
	this.hide_message(response.unlock);

	this.triggerEvent('responseafter', {response: response});
	this.triggerEvent('responseafter'+response.action, {response: response});
	};

	// handle HTTP request errors
	this.http_error = function(request, status, err, lock, action)
	{
	var errmsg = request.statusText;

	this.set_busy(false, null, lock);
	request.abort();

	// don't display error message on page unload (#1488547)
	if (this.unload)
	return;

	if (request.status && errmsg)
	this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
	else if (status == 'timeout')
	this.display_message(this.get_label('requesttimedout'), 'error');
	else if (request.status == 0 && status != 'abort')
	this.display_message(this.get_label('servererror') + ' (No connection)', 'error');

	// re-send keep-alive requests after 30 seconds
	if (action == 'keep-alive')
	setTimeout(function(){ ref.keep_alive(); }, 30000);
	else if (action == 'check-recent')
	setTimeout(function(){ ref.check_for_recent(false); }, 30000);
	};

	// post the given form to a hidden iframe
	this.async_upload_form = function(form, action, onload)
	{
	var ts = new Date().getTime(),
	frame_name = 'rcmupload'+ts;

	// upload progress support
	if (this.env.upload_progress_name) {
	var fname = this.env.upload_progress_name,
	field = $('input[name='+fname+']', form);

	if (!field.length) {
	field = $('<input>').attr({type: 'hidden', name: fname});
	field.prependTo(form);
	}

	field.val(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/resources/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);
	}

	// handle upload errors, parsing iframe content in onload
	$(frame_name).bind('load', {ts:ts}, onload);

	$(form).attr({
	target: frame_name,
	action: this.url(action, { _id:this.env.compose_id\|\|'', _uploadid:ts }),
	method: 'POST'})
	.attr(form.encoding ? 'encoding' : 'enctype', 'multipart/form-data')
	.submit();

	return frame_name;
	};

	// html5 file-drop API
	this.document_drag_hover = function(e, over)
	{
	e.preventDefault();
	$(ref.gui_objects.filedrop)[(over?'addClass':'removeClass')]('active');
	};

	this.file_drag_hover = function(e, over)
	{
	e.preventDefault();
	e.stopPropagation();
	$(ref.gui_objects.filedrop)[(over?'addClass':'removeClass')]('hover');
	};

	// handler when files are dropped to a designated area.
	// compose a multipart form data and submit it to the server
	this.file_dropped = function(e)
	{
	// abort event and reset UI
	this.file_drag_hover(e, false);

	// prepare multipart form data composition
	var files = e.target.files \|\| e.dataTransfer.files,
	formdata = window.FormData ? new FormData() : null,
	fieldname = (this.env.filedrop.fieldname \|\| '_file') + (this.env.filedrop.single ? '' : '[]'),
	boundary = '------multipartformboundary' + (new Date).getTime(),
	dashdash = '--', crlf = '\r\n',
	multipart = dashdash + boundary + crlf;

	if (!files \|\| !files.length)
	return;

	// inline function to submit the files to the server
	var submit_data = function() {
	var multiple = files.length > 1,
	ts = new Date().getTime(),
	content = '<span>' + (multiple ? ref.get_label('uploadingmany') : files[0].name) + '</span>';

	// add to attachments list
	if (!ref.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false }))
	ref.file_upload_id = ref.set_busy(true, 'uploading');

	// complete multipart content and post request
	multipart += dashdash + boundary + dashdash + crlf;

	$.ajax({
	type: 'POST',
	dataType: 'json',
	url: ref.url(ref.env.filedrop.action\|\|'upload', { _id:ref.env.compose_id\|\|ref.env.cid\|\|'', _uploadid:ts, _remote:1 }),
	contentType: formdata ? false : 'multipart/form-data; boundary=' + boundary,
	processData: false,
	data: formdata \|\| multipart,
	headers: {'X-Roundcube-Request': ref.env.request_token},
	beforeSend: function(xhr, s) { if (!formdata && xhr.sendAsBinary) xhr.send = xhr.sendAsBinary; },
	success: function(data){ ref.http_response(data); },
	error: function(o, status, err) { ref.http_error(o, status, err, null, 'attachment'); }
	});
	};

	// get contents of all dropped files
	var last = this.env.filedrop.single ? 0 : files.length - 1;
	for (var j=0, i=0, f; j <= last && (f = files[i]); i++) {
	if (!f.name) f.name = f.fileName;
	if (!f.size) f.size = f.fileSize;
	if (!f.type) f.type = 'application/octet-stream';

	// file name contains non-ASCII characters, do UTF8-binary string conversion.
	if (!formdata && /[^\x20-\x7E]/.test(f.name))
	f.name_bin = unescape(encodeURIComponent(f.name));

	// filter by file type if requested
	if (this.env.filedrop.filter && !f.type.match(new RegExp(this.env.filedrop.filter))) {
	// TODO: show message to user
	continue;
	}

	// do it the easy way with FormData (FF 4+, Chrome 5+, Safari 5+)
	if (formdata) {
	formdata.append(fieldname, f);
	if (j == last)
	return submit_data();
	}
	// use FileReader supporetd by Firefox 3.6
	else if (window.FileReader) {
	var reader = new FileReader();

	// closure to pass file properties to async callback function
	reader.onload = (function(file, j) {
	return function(e) {
	multipart += 'Content-Disposition: form-data; name="' + fieldname + '"';
	multipart += '; filename="' + (f.name_bin \|\| file.name) + '"' + crlf;
	multipart += 'Content-Length: ' + file.size + crlf;
	multipart += 'Content-Type: ' + file.type + crlf + crlf;
	multipart += e.target.result + crlf;
	multipart += dashdash + boundary + crlf;

	if (j == last) // we're done, submit the data
	return submit_data();
	}
	})(f,j);
	reader.readAsBinaryString(f);
	}
	// Firefox 3
	else if (f.getAsBinary) {
	multipart += 'Content-Disposition: form-data; name="' + fieldname + '"';
	multipart += '; filename="' + (f.name_bin \|\| f.name) + '"' + crlf;
	multipart += 'Content-Length: ' + f.size + crlf;
	multipart += 'Content-Type: ' + f.type + crlf + crlf;
	multipart += f.getAsBinary() + crlf;
	multipart += dashdash + boundary +crlf;

	if (j == last)
	return submit_data();
	}

	j++;
	}
	};


	// starts interval for keep-alive/check-recent signal
	this.start_keepalive = function()
	{
	if (!this.env.keep_alive \|\| this.env.framed)
	return;

	if (this._int)
	clearInterval(this._int);

	if (this.task == 'mail' && this.gui_objects.mailboxlist)
	this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
	else if (this.task != 'login' && this.env.action != 'print')
	this._int = setInterval(function(){ ref.keep_alive(); }, this.env.keep_alive * 1000);
	};

	// sends keep-alive signal
	this.keep_alive = function()
	{
	if (!this.busy)
	this.http_request('keep-alive');
	};

	// sends request to check for recent messages
	this.check_for_recent = function(refresh)
	{
	if (this.busy)
	return;

	var lock, url = {_mbox: this.env.mailbox};

	if (refresh) {
	lock = this.set_busy(true, 'checkingmail');
	url._refresh = 1;
	// reset check-recent interval
	this.start_keepalive();
	}

	if (this.gui_objects.messagelist)
	url._list = 1;
	if (this.gui_objects.quotadisplay)
	url._quota = 1;
	if (this.env.search_request)
	url._search = this.env.search_request;

	this.http_request('check-recent', url, lock);
	};


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

	// gets cursor position
	this.get_caret_pos = function(obj)
	{
	if (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;
	};

	// moves cursor to specified position
	this.set_caret_pos = function(obj, pos)
	{
	if (obj.setSelectionRange)
	obj.setSelectionRange(pos, pos);
	else if (obj.createTextRange) {
	var range = obj.createTextRange();
	range.collapse(true);
	range.moveEnd('character', pos);
	range.moveStart('character', pos);
	range.select();
	}
	};

	// disable/enable all fields of a form
	this.lock_form = function(form, lock)
	{
	if (!form \|\| !form.elements)
	return;

	var n, len, elm;

	if (lock)
	this.disabled_form_elements = [];

	for (n=0, len=form.elements.length; n<len; n++) {
	elm = form.elements[n];

	if (elm.type == 'hidden')
	continue;
	// remember which elem was disabled before lock
	if (lock && elm.disabled)
	this.disabled_form_elements.push(elm);
	// check this.disabled_form_elements before inArray() as a workaround for FF5 bug
	// http://bugs.jquery.com/ticket/9873
	else if (lock \|\| (this.disabled_form_elements && $.inArray(elm, this.disabled_form_elements)<0))
	elm.disabled = lock;
	}
	};

	this.mailto_handler_uri = function()
	{
	return location.href.split('?')[0] + '?_task=mail&_action=compose&_to=%s';
	};

	this.register_protocol_handler = function(name)
	{
	try {
	window.navigator.registerProtocolHandler('mailto', this.mailto_handler_uri(), name);
	}
	catch(e) {};
	};

	this.check_protocol_handler = function(name, elem)
	{
	var nav = window.navigator;
	if (!nav
	\|\| (typeof nav.registerProtocolHandler != 'function')
	\|\| ((typeof nav.isProtocolHandlerRegistered == 'function')
	&& nav.isProtocolHandlerRegistered('mailto', this.mailto_handler_uri()) == 'registered')
	)
	$(elem).addClass('disabled');
	else
	$(elem).click(function() { rcmail.register_protocol_handler(name); return false; });
	};

	// Checks browser capabilities eg. PDF support, TIF support
	this.browser_capabilities_check = function()
	{
	if (!this.env.browser_capabilities)
	this.env.browser_capabilities = {};

	if (this.env.browser_capabilities.pdf === undefined)
	this.env.browser_capabilities.pdf = this.pdf_support_check();

	if (this.env.browser_capabilities.flash === undefined)
	this.env.browser_capabilities.flash = this.flash_support_check();

	if (this.env.browser_capabilities.tif === undefined)
	this.tif_support_check();
	};

	// Returns browser capabilities string
	this.browser_capabilities = function()
	{
	if (!this.env.browser_capabilities)
	return '';

	var n, ret = [];

	for (n in this.env.browser_capabilities)
	ret.push(n + '=' + this.env.browser_capabilities[n]);

	return ret.join();
	};

	this.tif_support_check = function()
	{
	var img = new Image();

	img.onload = function() { rcmail.env.browser_capabilities.tif = 1; };
	img.onerror = function() { rcmail.env.browser_capabilities.tif = 0; };
	img.src = 'program/resources/blank.tif';
	};

	this.pdf_support_check = function()
	{
	var plugin = navigator.mimeTypes ? navigator.mimeTypes["application/pdf"] : {},
	plugins = navigator.plugins,
	len = plugins.length,
	regex = /Adobe Reader\|PDF\|Acrobat/i;

	if (plugin && plugin.enabledPlugin)
	return 1;

	if (window.ActiveXObject) {
	try {
	if (axObj = new ActiveXObject("AcroPDF.PDF"))
	return 1;
	}
	catch (e) {}
	try {
	if (axObj = new ActiveXObject("PDF.PdfCtrl"))
	return 1;
	}
	catch (e) {}
	}

	for (i=0; i<len; i++) {
	plugin = plugins[i];
	if (typeof plugin === 'String') {
	if (regex.test(plugin))
	return 1;
	}
	else if (plugin.name && regex.test(plugin.name))
	return 1;
	}

	return 0;
	};

	this.flash_support_check = function()
	{
	var plugin = navigator.mimeTypes ? navigator.mimeTypes["application/x-shockwave-flash"] : {};

	if (plugin && plugin.enabledPlugin)
	return 1;

	if (window.ActiveXObject) {
	try {
	if (axObj = new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))
	return 1;
	}
	catch (e) {}
	}

	return 0;
	};

	// Cookie setter
	this.set_cookie = function(name, value, expires)
	{
	setCookie(name, value, expires, this.env.cookie_path, this.env.cookie_domain, this.env.cookie_secure);
	}

	} // end object rcube_webmail


	// some static methods
	rcube_webmail.long_subject_title = function(elem, indent)
	{
	if (!elem.title) {
	var $elem = $(elem);
	if ($elem.width() + indent * 15 > $elem.parent().width())
	elem.title = $elem.html();
	}
	};

	rcube_webmail.long_subject_title_ie = function(elem, indent)
	{
	if (!elem.title) {
	var $elem = $(elem),
	txt = $.trim($elem.text()),
	tmp = $('<span>').text(txt)
	.css({'position': 'absolute', 'float': 'left', 'visibility': 'hidden',
	'font-size': $elem.css('font-size'), 'font-weight': $elem.css('font-weight')})
	.appendTo($('body')),
	w = tmp.width();

	tmp.remove();
	if (w + indent * 15 > $elem.width())
	elem.title = txt;
	}
	};

	rcube_webmail.prototype.get_cookie = getCookie;

	// 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/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
	index 4164e0333..f9f9531e8 100644
	--- a/program/localization/de_CH/labels.inc
	+++ b/program/localization/de_CH/labels.inc
	@@ -1,450 +1,453 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| localization/de_CH/labels.inc \|
	\| \|
	\| Language file of the Roundcube Webmail client \|
	\| Copyright (C) 2012, The Roundcube Dev Team \|
	\| Licensed under the GNU General Public License \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas \|
	+-----------------------------------------------------------------------+
	*/

	$labels = array();
	$labels['welcome'] = 'Willkommen bei $product';
	$labels['username'] = 'Benutzername';
	$labels['password'] = 'Passwort';
	$labels['server'] = 'Server';
	$labels['login'] = 'Login';
	$labels['logout'] = 'Logout';
	$labels['mail'] = 'E-Mail';
	$labels['settings'] = 'Einstellungen';
	$labels['addressbook'] = 'Adressbuch';
	$labels['inbox'] = 'Posteingang';
	$labels['drafts'] = 'EntwÃ¼rfe';
	$labels['sent'] = 'Gesendet';
	$labels['trash'] = 'GelÃ¶scht';
	$labels['junk'] = 'Spam';
	$labels['subject'] = 'Betreff';
	$labels['from'] = 'Absender';
	$labels['to'] = 'EmpfÃ¤nger';
	$labels['cc'] = 'Kopie (CC)';
	$labels['bcc'] = 'Blind-Kopie';
	$labels['replyto'] = 'Antwort an';
	$labels['followupto'] = 'Followup-To';
	$labels['date'] = 'Datum';
	$labels['size'] = 'GrÃ¶sse';
	$labels['priority'] = 'PrioritÃ¤t';
	$labels['organization'] = 'Organisation';
	$labels['readstatus'] = 'Gelesen/Ungelesen';
	$labels['listoptions'] = 'Listenoptionen...';
	$labels['mailboxlist'] = 'Ordner';
	$labels['folders'] = 'Ordner';
	$labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
	$labels['threadsfromto'] = 'Konversationen $from bis $to von $count';
	$labels['messagenrof'] = 'Nachricht $nr von $count';
	$labels['fromtoshort'] = '$from â $to von $count';
	$labels['copy'] = 'Kopieren';
	$labels['move'] = 'Verschieben';
	$labels['moveto'] = 'Verschieben nach...';
	$labels['download'] = 'Download';
	$labels['filename'] = 'Dateiname';
	$labels['filesize'] = 'DateigrÃ¶sse';
	$labels['addtoaddressbook'] = 'Ins Adressbuch Ã¼bernehmen';
	$labels['sun'] = 'So';
	$labels['mon'] = 'Mo';
	$labels['tue'] = 'Di';
	$labels['wed'] = 'Mi';
	$labels['thu'] = 'Do';
	$labels['fri'] = 'Fr';
	$labels['sat'] = 'Sa';
	$labels['sunday'] = 'Sonntag';
	$labels['monday'] = 'Montag';
	$labels['tuesday'] = 'Dienstag';
	$labels['wednesday'] = 'Mittwoch';
	$labels['thursday'] = 'Donnerstag';
	$labels['friday'] = 'Freitag';
	$labels['saturday'] = 'Samstag';
	$labels['jan'] = 'Jan';
	$labels['feb'] = 'Feb';
	$labels['mar'] = 'MÃ¤r';
	$labels['apr'] = 'Apr';
	$labels['may'] = 'Mai';
	$labels['longmay'] = 'Mai';
	$labels['jun'] = 'Jun';
	$labels['jul'] = 'Jul';
	$labels['aug'] = 'Aug';
	$labels['sep'] = 'Sep';
	$labels['oct'] = 'Okt';
	$labels['nov'] = 'Nov';
	$labels['dec'] = 'Dez';
	$labels['longjan'] = 'Januar';
	$labels['longfeb'] = 'Februar';
	$labels['longmar'] = 'MÃ¤rz';
	$labels['longapr'] = 'April';
	$labels['longjun'] = 'Juni';
	$labels['longjul'] = 'Juli';
	$labels['longaug'] = 'August';
	$labels['longsep'] = 'September';
	$labels['longoct'] = 'Oktober';
	$labels['longnov'] = 'November';
	$labels['longdec'] = 'Dezember';
	$labels['today'] = 'Heute';
	$labels['refresh'] = 'Aktualisieren';
	$labels['checkmail'] = 'Auf neue Nachrichten prÃ¼fen';
	$labels['compose'] = 'Schreiben';
	$labels['writenewmessage'] = 'Neue Nachricht schreiben';
	$labels['reply'] = 'Antworten';
	$labels['replytomessage'] = 'Antwort verfassen';
	$labels['replytoallmessage'] = 'Antwort an Absender und alle EmpfÃ¤nger verfassen';
	$labels['replyall'] = 'Allen antworten';
	$labels['replylist'] = 'Liste antworten';
	$labels['forward'] = 'Weiterleiten';
	$labels['forwardinline'] = 'Eingebunden weiterleiten';
	$labels['forwardattachment'] = 'Als Anhang weiterleiten';
	$labels['forwardmessage'] = 'Nachricht weiterleiten';
	$labels['deletemessage'] = 'Nachricht lÃ¶schen';
	$labels['movemessagetotrash'] = 'Nachricht in den Papierkorb verschieben';
	$labels['printmessage'] = 'Nachricht drucken';
	$labels['previousmessage'] = 'Vorherige Nachricht anzeigen';
	$labels['firstmessage'] = 'Die erste Nachricht anzeigen';
	$labels['nextmessage'] = 'NÃ¤chste Nachricht anzeigen';
	$labels['lastmessage'] = 'Die letzte Nachricht anzeigen';
	$labels['backtolist'] = 'ZurÃ¼ck zur Liste';
	$labels['viewsource'] = 'Quelltext anzeigen';
	$labels['mark'] = 'Markieren';
	$labels['markmessages'] = 'Nachrichten markieren';
	$labels['markread'] = 'Als gelesen';
	$labels['markunread'] = 'Als ungelesen';
	$labels['markflagged'] = 'Markierung hinzufÃ¼gen';
	$labels['markunflagged'] = 'Markierung entfernen';
	$labels['moreactions'] = 'Mehr ...';
	$labels['more'] = 'Mehr';
	$labels['back'] = 'ZurÃ¼ck';
	$labels['options'] = 'Optionen';
	$labels['select'] = 'AuswÃ¤hlen';
	$labels['all'] = 'Alle';
	$labels['none'] = 'Keine';
	$labels['nonesort'] = 'Keine';
	$labels['currpage'] = 'Aktuelle Seite';
	$labels['unread'] = 'Ungelesene';
	$labels['flagged'] = 'Markierte';
	$labels['unanswered'] = 'Unbeantwortete';
	$labels['deleted'] = 'GelÃ¶schte';
	$labels['invert'] = 'Umkehren';
	$labels['filter'] = 'Filter';
	$labels['list'] = 'Liste';
	$labels['threads'] = 'Konversationen';
	$labels['expand-all'] = 'Alle aufklappen';
	$labels['expand-unread'] = 'Ungelesene aufklappen';
	$labels['collapse-all'] = 'Alle zuklappen';
	$labels['threaded'] = 'Gruppiert';
	$labels['autoexpand_threads'] = 'Konversationen aufklappen';
	$labels['do_expand'] = 'alle';
	$labels['expand_only_unread'] = 'nur ungelesene';
	$labels['fromto'] = 'Sender/EmpfÃ¤nger';
	$labels['flag'] = 'Markierung';
	$labels['attachment'] = 'Anhang';
	$labels['sentdate'] = 'Sendedatum';
	$labels['arrival'] = 'Empfangsdatum';
	$labels['asc'] = 'aufsteigend';
	$labels['desc'] = 'absteigend';
	$labels['listcolumns'] = 'Spalten';
	$labels['listsorting'] = 'Sortierung';
	$labels['listorder'] = 'Ordnung';
	$labels['listmode'] = 'Anzeigemodus';
	$labels['folderactions'] = 'Ordneraktionen...';
	$labels['compact'] = 'Packen';
	$labels['empty'] = 'Leeren';
	$labels['quota'] = 'Verwendeter Speicherplatz';
	$labels['unknown'] = 'unbekannt';
	$labels['unlimited'] = 'unlimitiert';
	$labels['quicksearch'] = 'Schnellsuche';
	$labels['resetsearch'] = 'LÃ¶schen';
	$labels['searchmod'] = 'Suchkriterien Ã¤ndern';
	$labels['msgtext'] = 'Ganze Nachricht';
	$labels['openinextwin'] = 'In neuem Fenster Ã¶ffnen';
	$labels['emlsave'] = 'Herunterladen (.eml)';
	$labels['editasnew'] = 'Als neue Nachricht Ã¶ffnen';
	-$labels['savemessage'] = 'Nachricht speichern';
	+$labels['send'] = 'Senden';
	$labels['sendmessage'] = 'Nachricht jetzt senden';
	+$labels['savemessage'] = 'Nachricht speichern';
	$labels['addattachment'] = 'Datei anfÃ¼gen';
	$labels['charset'] = 'Zeichensatz';
	$labels['editortype'] = 'Editor-Typ';
	$labels['returnreceipt'] = 'EmpfangsbestÃ¤tigung (MDN)';
	$labels['dsn'] = 'ÃbermittlungsbestÃ¤tigung (DSN)';
	$labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
	$labels['originalmessage'] = 'Originalnachricht';
	$labels['editidents'] = 'Absender bearbeiten';
	$labels['spellcheck'] = 'Rechtschreibung';
	$labels['checkspelling'] = 'Rechtschreibung prÃ¼fen';
	$labels['resumeediting'] = 'Bearbeitung fortsetzen';
	$labels['revertto'] = 'ZurÃ¼ck zu';
	$labels['attach'] = 'AnhÃ¤ngen';
	$labels['attachments'] = 'AnhÃ¤nge';
	$labels['upload'] = 'Hochladen';
	$labels['uploadprogress'] = '$percent ($current von $total)';
	$labels['close'] = 'Schliessen';
	$labels['messageoptions'] = 'Optionen...';
	$labels['low'] = 'Niedrig';
	$labels['lowest'] = 'Niedrigste';
	$labels['normal'] = 'Normal';
	$labels['high'] = 'Hoch';
	$labels['highest'] = 'HÃ¶chste';
	$labels['nosubject'] = '(kein Betreff)';
	$labels['showimages'] = 'Bilder anzeigen';
	$labels['alwaysshow'] = 'Bilder von $sender immer zeigen';
	$labels['isdraft'] = 'Dies ist ein Entwurf';
	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'Klartext';
	$labels['savesentmessagein'] = 'Nachricht speichern in';
	$labels['dontsave'] = 'nicht speichern';
	$labels['maxuploadsize'] = 'Maximal erlaubte DateigrÃ¶sse ist $size';
	$labels['addcc'] = 'Cc hinzufÃ¼gen';
	$labels['addbcc'] = 'Bcc hinzufÃ¼gen';
	$labels['addreplyto'] = 'Antwortadresse hinzufÃ¼gen';
	$labels['addfollowupto'] = 'Followup-To hinzufÃ¼gen';
	$labels['mdnrequest'] = 'Der Sender dieser Nachricht hat eine EmpfangsbestÃ¤tigung angefordert. MÃ¶chten Sie diese jetzt senden?';
	$labels['receiptread'] = 'EmpfangsbestÃ¤tigung (gelesen)';
	$labels['yourmessage'] = 'Dieses ist eine EmpfangsbestÃ¤tigung fÃ¼r Ihre Nachricht';
	$labels['receiptnote'] = 'Hinweis: Der EmpfÃ¤nger hat den Empfang der Nachricht bestÃ¤tigt. Dieses ist keine Garantie, dass die Nachricht gelesen und verstanden wurde.';
	$labels['name'] = 'Anzeigename';
	$labels['firstname'] = 'Vorname';
	$labels['surname'] = 'Nachname';
	$labels['middlename'] = '2. Vorname';
	$labels['nameprefix'] = 'PrÃ¤fix';
	$labels['namesuffix'] = 'Suffix';
	$labels['nickname'] = 'Spitzname';
	$labels['jobtitle'] = 'Titel';
	$labels['department'] = 'Abteilung';
	$labels['gender'] = 'Geschlecht';
	$labels['maidenname'] = 'MÃ¤dchenname';
	$labels['email'] = 'E-Mail';
	$labels['phone'] = 'Telefon';
	$labels['address'] = 'Adresse';
	$labels['street'] = 'Strasse';
	$labels['locality'] = 'Ort';
	$labels['zipcode'] = 'PLZ';
	$labels['region'] = 'Region';
	$labels['country'] = 'Land';
	$labels['birthday'] = 'Geburtstag';
	$labels['anniversary'] = 'Jahrestag';
	$labels['website'] = 'Website';
	$labels['instantmessenger'] = 'IM';
	$labels['notes'] = 'Notizen';
	$labels['male'] = 'mÃ¤nnlich';
	$labels['female'] = 'weiblich';
	$labels['manager'] = 'Vorgesetzte/r';
	$labels['assistant'] = 'Assistent';
	$labels['typeassistant'] = 'Assistent';
	$labels['spouse'] = 'Partner/in';
	$labels['allfields'] = 'Alle Felder';
	$labels['search'] = 'Suche';
	$labels['advsearch'] = 'Erweiterte Suche';
	$labels['advanced'] = 'Erweitert';
	$labels['other'] = 'Andere';
	$labels['typeother'] = 'Andere';
	$labels['typehome'] = 'Zuhause';
	$labels['typework'] = 'Arbeit';
	$labels['typemobile'] = 'Mobiltelefon';
	$labels['typemain'] = 'Hauptnummer';
	$labels['typehomefax'] = 'Fax Zuhause';
	$labels['typeworkfax'] = 'Fax Arbeit';
	$labels['typecar'] = 'Auto';
	$labels['typepager'] = 'Pager';
	$labels['typevideo'] = 'Video';
	$labels['typehomepage'] = 'Homepage';
	$labels['typeblog'] = 'Blog';
	$labels['typeprofile'] = 'Profil';
	$labels['addfield'] = 'Feld hinzufÃ¼gen...';
	$labels['addcontact'] = 'Kontakt hinzufÃ¼gen';
	$labels['editcontact'] = 'Kontakt bearbeiten';
	$labels['contacts'] = 'Kontakte';
	$labels['contactproperties'] = 'Kontaktdaten';
	$labels['personalinfo'] = 'PersÃ¶nliche Informationen';
	$labels['edit'] = 'Bearbeiten';
	$labels['cancel'] = 'Abbrechen';
	$labels['save'] = 'Speichern';
	$labels['delete'] = 'LÃ¶schen';
	$labels['rename'] = 'Umbenennen';
	$labels['addphoto'] = 'HinzufÃ¼gen';
	$labels['replacephoto'] = 'Ersetzen';
	$labels['uploadphoto'] = 'Bild hochladen';
	$labels['newcontact'] = 'Neuen Kontakt erfassen';
	$labels['deletecontact'] = 'GewÃ¤hlte Kontakte lÃ¶schen';
	$labels['composeto'] = 'Nachricht verfassen';
	$labels['contactsfromto'] = 'Kontakte $from bis $to von $count';
	$labels['print'] = 'Drucken';
	$labels['export'] = 'Exportieren';
	$labels['exportvcards'] = 'Kontakte im vCard-Format exportieren';
	$labels['newcontactgroup'] = 'Neue Adressgruppe erstellen';
	$labels['grouprename'] = 'Gruppe umbenennen';
	$labels['groupdelete'] = 'Gruppe lÃ¶schen';
	$labels['groupremoveselected'] = 'GewÃ¤hlte Kontakte aus Gruppe entfernen';
	$labels['previouspage'] = 'Eine Seite zurÃ¼ck';
	$labels['firstpage'] = 'Erste Seite';
	$labels['nextpage'] = 'NÃ¤chste Seite';
	$labels['lastpage'] = 'Letzte Seite';
	$labels['group'] = 'Gruppe';
	$labels['groups'] = 'Gruppen';
	$labels['personaladrbook'] = 'PersÃ¶nliches Adressbuch';
	$labels['searchsave'] = 'Suche speichern';
	$labels['searchdelete'] = 'Suche lÃ¶schen';
	$labels['import'] = 'Importieren';
	$labels['importcontacts'] = 'Adressen importieren';
	$labels['importfromfile'] = 'Import aus Datei:';
	$labels['importtarget'] = 'Neue Kontakte speichern in:';
	$labels['importreplace'] = 'Bestehendes Adressbuch komplett ersetzen';
	$labels['importtext'] = 'Sie kÃ¶nnen Kontakte aus einem bestehenden Adressbuch hochladen.<br/>Es kÃ¶nnen AdressbÃ¼cher im <a href="http://de.wikipedia.org/wiki/VCard">vCard-Format</a> importiert werden.';
	$labels['done'] = 'Fertig';
	$labels['settingsfor'] = 'Einstellungen fÃ¼r';
	$labels['about'] = 'Ãber';
	$labels['preferences'] = 'Einstellungen';
	$labels['userpreferences'] = 'Benutzereinstellungen';
	$labels['editpreferences'] = 'Einstellungen bearbeiten';
	$labels['identities'] = 'Absender';
	$labels['manageidentities'] = 'Absender fÃ¼r dieses Konto verwalten';
	$labels['newidentity'] = 'Neuer Absender';
	$labels['newitem'] = 'Neuer Eintrag';
	$labels['edititem'] = 'Eintrag bearbeiten';
	$labels['preferhtml'] = 'HTML bevorzugen';
	$labels['defaultcharset'] = 'Standard-Zeichensatz';
	$labels['htmlmessage'] = 'HTML Nachricht';
	$labels['dateformat'] = 'Datumsformat';
	$labels['timeformat'] = 'Zeitformat';
	$labels['prettydate'] = 'Kurze Datumsanzeige';
	$labels['setdefault'] = 'Als Standard';
	$labels['autodetect'] = 'Automatisch';
	$labels['language'] = 'Sprache';
	$labels['timezone'] = 'Zeitzone';
	$labels['pagesize'] = 'EintrÃ¤ge pro Seite';
	$labels['signature'] = 'Signatur';
	$labels['dstactive'] = 'Sommerzeit';
	+$labels['showinextwin'] = 'Nachrichten in neuem Fenster Ã¶ffnen';
	+$labels['composeextwin'] = 'Nachrichten in neuem Fenster verfassen';
	$labels['htmleditor'] = 'HTML-Nachrichten verfassen';
	$labels['htmlonreply'] = 'nur Antworten auf HTML-Nachrichten';
	$labels['htmlsignature'] = 'HTML-Signatur';
	$labels['previewpane'] = 'Nachrichtenvorschau anzeigen';
	$labels['skin'] = 'OberflÃ¤chendesign';
	$labels['logoutclear'] = 'Papierkorb beim Abmelden leeren';
	$labels['logoutcompact'] = 'Posteingang beim Abmelden packen';
	$labels['uisettings'] = 'BenutzeroberflÃ¤che';
	$labels['serversettings'] = 'Server-Einstellungen';
	$labels['mailboxview'] = 'Mailbox-Ansicht';
	$labels['mdnrequests'] = 'EmpfangsbestÃ¤tigung senden';
	$labels['askuser'] = 'immer fragen';
	$labels['autosend'] = 'automatisch senden';
	$labels['autosendknown'] = 'fÃ¼r bekannte Absender, sonst fragen';
	$labels['autosendknownignore'] = 'fÃ¼r bekannte Absender, sonst ignorieren';
	$labels['ignore'] = 'ignorieren';
	$labels['readwhendeleted'] = 'Beim LÃ¶schen als gelesen markieren';
	$labels['flagfordeletion'] = 'Als gelÃ¶scht markieren anstatt in den Papierkorb verschieben';
	$labels['skipdeleted'] = 'Zeige keine gelÃ¶schten Nachrichten an';
	$labels['deletealways'] = 'LÃ¶schen wenn Verschieben in den Papierkorb nicht mÃ¶glich';
	$labels['deletejunk'] = 'Nachrichten in Spam direkt lÃ¶schen';
	$labels['showremoteimages'] = 'Eingebettete Bilder vom Internet laden';
	$labels['fromknownsenders'] = 'bei bekannten Absendern';
	$labels['always'] = 'immer';
	$labels['showinlineimages'] = 'AngehÃ¤ngte Bilder unter der Nachricht anzeigen';
	$labels['autosavedraft'] = 'Entwurf autom. speichern';
	$labels['everynminutes'] = '$n Minute(n)';
	$labels['keepalive'] = 'Auf neue Nachrichten prÃ¼fen nach';
	$labels['never'] = 'nie';
	$labels['immediately'] = 'sofort';
	$labels['messagesdisplaying'] = 'Nachrichtendarstellung';
	$labels['messagescomposition'] = 'Nachrichtenerstellung';
	$labels['mimeparamfolding'] = 'Namen der DateianhÃ¤nge';
	$labels['2231folding'] = 'VollstÃ¤ndig RFC 2231 kompatibel (Thunderbird)';
	$labels['miscfolding'] = 'RFC 2047/2231 kompatibel (Microsoft Outlook)';
	$labels['2047folding'] = 'VollstÃ¤ndig RFC 2047 kompatibel (andere)';
	$labels['force7bit'] = 'MIME-Kodierung fÃ¼r 8-bit Zeichen';
	$labels['advancedoptions'] = 'Erweiterte Einstellungen';
	$labels['focusonnewmessage'] = 'Fokussiere Browserfenster bei neuen Nachrichten';
	$labels['checkallfolders'] = 'Alle Ordner auf neue Nachrichten prÃ¼fen';
	$labels['displaynext'] = 'Zeige nÃ¤chste Nachricht nach verschieben/lÃ¶schen';
	$labels['defaultfont'] = 'Standardschrift in HTML-Nachrichten';
	$labels['mainoptions'] = 'Allgemein';
	$labels['browseroptions'] = 'Browsereinstellungen';
	$labels['section'] = 'Bereich';
	$labels['maintenance'] = 'Wartung';
	$labels['newmessage'] = 'Neue Nachrichten';
	$labels['signatureoptions'] = 'Signatur';
	$labels['whenreplying'] = 'Beantworten einer Nachricht';
	$labels['replytopposting'] = 'Antwort Ã¼ber der Originalnachricht';
	$labels['replybottomposting'] = 'Antwort unter der Originalnachricht';
	$labels['replyremovesignature'] = 'Beim Antworten die Signatur der Originalnachricht entfernen';
	$labels['autoaddsignature'] = 'Signatur automatisch einfÃ¼gen';
	$labels['newmessageonly'] = 'nur bei neuen Nachrichten';
	$labels['replyandforwardonly'] = 'nur bei Antworten und Weiterleitungen';
	$labels['replysignaturepos'] = 'Beim Antworten oder Weiterleiten die Signatur';
	$labels['belowquote'] = 'unter der Originalnachricht einfÃ¼gen';
	$labels['abovequote'] = 'Ã¼ber der Originalnachricht einfÃ¼gen';
	$labels['insertsignature'] = 'Signatur einfÃ¼gen';
	$labels['previewpanemarkread'] = 'Nachricht in Vorschau als gelesen markieren';
	$labels['afternseconds'] = 'nach $n Sekunden';
	$labels['reqmdn'] = 'EmpfangsbestÃ¤tigung (MSN) immer anfordern';
	$labels['reqdsn'] = 'ÃbermittlungsbestÃ¤tigung (DSN) immer anfordern';
	$labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern';
	$labels['defaultaddressbook'] = 'Neue Kontakte speichern in';
	$labels['autocompletesingle'] = 'Keine alternativen E-Mail-Adressen in AutovervollstÃ¤ndigung';
	$labels['listnamedisplay'] = 'Kontakte auflisten als';
	$labels['spellcheckbeforesend'] = 'Rechtscheibung vor dem Senden prÃ¼fen';
	$labels['spellcheckoptions'] = 'RechtschreibprÃ¼fungsoptionen';
	$labels['spellcheckignoresyms'] = 'WÃ¶rter mit Symbolen Ã¼berspringen';
	$labels['spellcheckignorenums'] = 'WÃ¶rter mit Ziffern Ã¼berspringen';
	$labels['spellcheckignorecaps'] = 'WÃ¶rter Ã¼berspringen, die nur aus Grossbuchstaben bestehen';
	$labels['addtodict'] = 'Zum WÃ¶rterbuch hinzufÃ¼gen';
	$labels['mailtoprotohandler'] = 'Als EmpfÃ¤nger fÃ¼r mailto: Links einrichten';
	$labels['folder'] = 'Ordner';
	$labels['foldername'] = 'Ordnername';
	$labels['subscribed'] = 'Abonniert';
	$labels['messagecount'] = 'Nachrichten';
	$labels['create'] = 'Erstellen';
	$labels['createfolder'] = 'Neuen Ordner erstellen';
	$labels['managefolders'] = 'Ordner verwalten';
	$labels['specialfolders'] = 'Spezialordner';
	$labels['properties'] = 'Eigenschaften';
	$labels['folderproperties'] = 'Ordnereigenschaften';
	$labels['parentfolder'] = 'Eltern';
	$labels['location'] = 'Speicherort';
	$labels['info'] = 'Informationen';
	$labels['getfoldersize'] = 'OrdnergrÃ¶sse anzeigen';
	$labels['changesubscription'] = 'Abonnieren';
	$labels['foldertype'] = 'Ordnertyp';
	$labels['personalfolder'] = 'Privater Ordner';
	$labels['otherfolder'] = 'Order eines anderen Benutzers';
	$labels['sharedfolder'] = 'Ãffentlicher Ordner';
	$labels['sortby'] = 'Sortieren nach';
	$labels['sortasc'] = 'aufsteigend sortieren';
	$labels['sortdesc'] = 'absteigend sortieren';
	$labels['undo'] = 'RÃ¼ckgÃ¤ngig';
	$labels['plugin'] = 'Plugin';
	$labels['version'] = 'Version';
	$labels['source'] = 'Quellcode';
	$labels['license'] = 'Lizenz';
	$labels['support'] = 'Support';
	$labels['B'] = 'B';
	$labels['KB'] = 'KB';
	$labels['MB'] = 'MB';
	$labels['GB'] = 'GB';
	$labels['unicode'] = 'Unicode';
	$labels['english'] = 'Englisch';
	$labels['westerneuropean'] = 'WesteuropÃ¤isch';
	$labels['easterneuropean'] = 'OsteuropÃ¤isch';
	$labels['southeasterneuropean'] = 'SÃ¼dosteuropÃ¤isch';
	$labels['baltic'] = 'Baltisch';
	$labels['cyrillic'] = 'Kyrillisch';
	$labels['arabic'] = 'Arabisch';
	$labels['greek'] = 'Griechisch';
	$labels['hebrew'] = 'HebrÃ¤isch';
	$labels['turkish'] = 'TÃ¼rkisch';
	$labels['nordic'] = 'Skandinavisch';
	$labels['thai'] = 'ThailÃ¤ndisch';
	$labels['celtic'] = 'Keltisch';
	$labels['vietnamese'] = 'Vietnamesisch';
	$labels['japanese'] = 'Japanisch';
	$labels['korean'] = 'Koreanisch';
	$labels['chinese'] = 'Chinesisch';

	diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
	index 71d5b80f2..5c6303479 100644
	--- a/program/localization/de_DE/labels.inc
	+++ b/program/localization/de_DE/labels.inc
	@@ -1,450 +1,453 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| localization/de_DE/labels.inc \|
	\| \|
	\| Language file of the Roundcube Webmail client \|
	\| Copyright (C) 2012, The Roundcube Dev Team \|
	\| Licensed under the GNU General Public License \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas \|
	+-----------------------------------------------------------------------+
	*/

	$labels = array();
	$labels['welcome'] = 'Willkommen bei $product';
	$labels['username'] = 'Benutzername';
	$labels['password'] = 'Passwort';
	$labels['server'] = 'Server';
	$labels['login'] = 'Anmelden';
	$labels['logout'] = 'Abmelden';
	$labels['mail'] = 'E-Mail';
	$labels['settings'] = 'Einstellungen';
	$labels['addressbook'] = 'Adressbuch';
	$labels['inbox'] = 'Posteingang';
	$labels['drafts'] = 'EntwÃ¼rfe';
	$labels['sent'] = 'Gesendet';
	$labels['trash'] = 'GelÃ¶scht';
	$labels['junk'] = 'Spam';
	$labels['subject'] = 'Betreff';
	$labels['from'] = 'Absender';
	$labels['to'] = 'EmpfÃ¤nger';
	$labels['cc'] = 'Kopie';
	$labels['bcc'] = 'Blindkopie';
	$labels['replyto'] = 'Antwort an';
	$labels['followupto'] = 'Followup-To';
	$labels['date'] = 'Datum';
	$labels['size'] = 'GrÃ¶Ãe';
	$labels['priority'] = 'PrioritÃ¤t';
	$labels['organization'] = 'Organisation';
	$labels['readstatus'] = 'Gelesen/Ungelesen';
	$labels['listoptions'] = 'Listenoptionen...';
	$labels['mailboxlist'] = 'Ordner';
	$labels['folders'] = 'Ordner';
	$labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
	$labels['threadsfromto'] = 'Konversationen $from bis $to von $count';
	$labels['messagenrof'] = 'Nachricht $nr von $count';
	$labels['fromtoshort'] = '$from â $to von $count';
	$labels['copy'] = 'Kopieren';
	$labels['move'] = 'Verschieben';
	$labels['moveto'] = 'Verschieben nach...';
	$labels['download'] = 'Herunterladen';
	$labels['filename'] = 'Dateiname';
	$labels['filesize'] = 'DateigrÃ¶Ãe';
	$labels['addtoaddressbook'] = 'Ins Adressbuch Ã¼bernehmen';
	$labels['sun'] = 'So';
	$labels['mon'] = 'Mo';
	$labels['tue'] = 'Di';
	$labels['wed'] = 'Mi';
	$labels['thu'] = 'Do';
	$labels['fri'] = 'Fr';
	$labels['sat'] = 'Sa';
	$labels['sunday'] = 'Sonntag';
	$labels['monday'] = 'Montag';
	$labels['tuesday'] = 'Dienstag';
	$labels['wednesday'] = 'Mittwoch';
	$labels['thursday'] = 'Donnerstag';
	$labels['friday'] = 'Freitag';
	$labels['saturday'] = 'Samstag';
	$labels['jan'] = 'Jan';
	$labels['feb'] = 'Feb';
	$labels['mar'] = 'MÃ¤r';
	$labels['apr'] = 'Apr';
	$labels['may'] = 'Mai';
	$labels['longmay'] = 'Mai';
	$labels['jun'] = 'Jun';
	$labels['jul'] = 'Jul';
	$labels['aug'] = 'Aug';
	$labels['sep'] = 'Sep';
	$labels['oct'] = 'Okt';
	$labels['nov'] = 'Nov';
	$labels['dec'] = 'Dez';
	$labels['longjan'] = 'Januar';
	$labels['longfeb'] = 'Februar';
	$labels['longmar'] = 'MÃ¤rz';
	$labels['longapr'] = 'April';
	$labels['longjun'] = 'Juni';
	$labels['longjul'] = 'Juli';
	$labels['longaug'] = 'August';
	$labels['longsep'] = 'September';
	$labels['longoct'] = 'Oktober';
	$labels['longnov'] = 'November';
	$labels['longdec'] = 'Dezember';
	$labels['today'] = 'Heute';
	$labels['refresh'] = 'Aktualisieren';
	$labels['checkmail'] = 'Auf neue Nachrichten Ã¼berprÃ¼fen';
	$labels['compose'] = 'Schreiben';
	$labels['writenewmessage'] = 'Neue Nachricht schreiben';
	$labels['reply'] = 'Antworten';
	$labels['replytomessage'] = 'Antwort verfassen';
	$labels['replytoallmessage'] = 'Antwort an Mailingliste oder an Absender und alle EmpfÃ¤nger verfassen';
	$labels['replyall'] = 'Allen antworten';
	$labels['replylist'] = 'Liste antworten';
	$labels['forward'] = 'Weiterleiten';
	$labels['forwardinline'] = 'innerhalb der Nachricht';
	$labels['forwardattachment'] = 'als Dateianhang';
	$labels['forwardmessage'] = 'Nachricht weiterleiten';
	$labels['deletemessage'] = 'Nachricht lÃ¶schen';
	$labels['movemessagetotrash'] = 'Nachricht in den Papierkorb verschieben';
	$labels['printmessage'] = 'Nachricht drucken';
	$labels['previousmessage'] = 'Vorherige Nachricht anzeigen';
	$labels['firstmessage'] = 'Die erste Nachricht anzeigen';
	$labels['nextmessage'] = 'NÃ¤chste Nachricht anzeigen';
	$labels['lastmessage'] = 'Die letzte Nachricht anzeigen';
	$labels['backtolist'] = 'ZurÃ¼ck zur Liste';
	$labels['viewsource'] = 'Quelltext anzeigen';
	$labels['mark'] = 'Markieren';
	$labels['markmessages'] = 'Nachrichten markieren';
	$labels['markread'] = 'Als gelesen';
	$labels['markunread'] = 'Als ungelesen';
	$labels['markflagged'] = 'Markierung hinzufÃ¼gen';
	$labels['markunflagged'] = 'Markierung entfernen';
	$labels['moreactions'] = 'Mehr...';
	$labels['more'] = 'Mehr';
	$labels['back'] = 'ZurÃ¼ck';
	$labels['options'] = 'Optionen';
	$labels['select'] = 'Auswahl';
	$labels['all'] = 'Alle';
	$labels['none'] = 'Keine';
	$labels['nonesort'] = 'Keine';
	$labels['currpage'] = 'Aktuelle Seite';
	$labels['unread'] = 'Ungelesene';
	$labels['flagged'] = 'Markierte';
	$labels['unanswered'] = 'Unbeantwortete';
	$labels['deleted'] = 'GelÃ¶schte';
	$labels['invert'] = 'Invertieren';
	$labels['filter'] = 'Filter';
	$labels['list'] = 'Liste';
	$labels['threads'] = 'Konversationen';
	$labels['expand-all'] = 'Alle aufklappen';
	$labels['expand-unread'] = 'Ungelesene aufklappen';
	$labels['collapse-all'] = 'Alle zuklappen';
	$labels['threaded'] = 'Gruppiert';
	$labels['autoexpand_threads'] = 'Konversationen aufklappen';
	$labels['do_expand'] = 'alle';
	$labels['expand_only_unread'] = 'nur ungelesene';
	$labels['fromto'] = 'Sender/EmpfÃ¤nger';
	$labels['flag'] = 'Markierung';
	$labels['attachment'] = 'Anhang';
	$labels['sentdate'] = 'Sendedatum';
	$labels['arrival'] = 'Empfangsdatum';
	$labels['asc'] = 'aufsteigend';
	$labels['desc'] = 'absteigend';
	$labels['listcolumns'] = 'Spalten';
	$labels['listsorting'] = 'Sortierung';
	$labels['listorder'] = 'Ordnung';
	$labels['listmode'] = 'Anzeigemodus';
	$labels['folderactions'] = 'Ordneraktionen...';
	$labels['compact'] = 'Packen';
	$labels['empty'] = 'Leeren';
	$labels['quota'] = 'Speicherplatz';
	$labels['unknown'] = 'unbekannt';
	$labels['unlimited'] = 'unbegrenzt';
	$labels['quicksearch'] = 'Schnellsuche';
	$labels['resetsearch'] = 'Suche zurÃ¼cksetzen';
	$labels['searchmod'] = 'Suchkriterien Ã¤ndern';
	$labels['msgtext'] = 'Nachricht';
	$labels['openinextwin'] = 'In neuem Fenster Ã¶ffnen';
	$labels['emlsave'] = 'Lokal speichern (.eml)';
	$labels['editasnew'] = 'Als neue Nachricht Ã¶ffnen';
	-$labels['savemessage'] = 'Nachricht speichern';
	+$labels['send'] = 'Senden';
	$labels['sendmessage'] = 'Nachricht jetzt senden';
	+$labels['savemessage'] = 'Nachricht speichern';
	$labels['addattachment'] = 'Datei anfÃ¼gen';
	$labels['charset'] = 'Zeichensatz';
	$labels['editortype'] = 'Editor Typ';
	$labels['returnreceipt'] = 'EmpfangsbestÃ¤tigung (MSN)';
	$labels['dsn'] = 'ÃbermittlungsbestÃ¤tigung (DSN)';
	$labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
	$labels['originalmessage'] = 'Originalnachricht';
	$labels['editidents'] = 'Absender Ã¤ndern';
	$labels['spellcheck'] = 'Rechtschreibung';
	$labels['checkspelling'] = 'Rechtschreibung prÃ¼fen';
	$labels['resumeediting'] = 'Bearbeitung fortsetzen';
	$labels['revertto'] = 'ZurÃ¼ck zu';
	$labels['attach'] = 'AnhÃ¤ngen';
	$labels['attachments'] = 'AnhÃ¤nge';
	$labels['upload'] = 'Hochladen';
	$labels['uploadprogress'] = '$percent ($current von $total)';
	$labels['close'] = 'SchlieÃen';
	$labels['messageoptions'] = 'Optionen...';
	$labels['low'] = 'Niedrig';
	$labels['lowest'] = 'Niedrigste';
	$labels['normal'] = 'Normal';
	$labels['high'] = 'Hoch';
	$labels['highest'] = 'HÃ¶chste';
	$labels['nosubject'] = '(kein Betreff)';
	$labels['showimages'] = 'Bilder anzeigen';
	$labels['alwaysshow'] = 'Bilder von $sender immer zeigen';
	$labels['isdraft'] = 'Dies ist ein Entwurf';
	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'Nur-Text';
	$labels['savesentmessagein'] = 'Nachricht speichern in';
	$labels['dontsave'] = 'nicht speichern';
	$labels['maxuploadsize'] = 'Maximal erlaubte DateigrÃ¶Ãe ist $size';
	$labels['addcc'] = 'Cc hinzufÃ¼gen';
	$labels['addbcc'] = 'Bcc hinzufÃ¼gen';
	$labels['addreplyto'] = 'Antwortadresse hinzufÃ¼gen';
	$labels['addfollowupto'] = 'Followup-To hinzufÃ¼gen';
	$labels['mdnrequest'] = 'Der Sender dieser Nachricht mÃ¶chte gerne eine LesebestÃ¤tigung. Wollen Sie dieses bestÃ¤tigen?';
	$labels['receiptread'] = 'EmpfangsbestÃ¤tigung (gelesen)';
	$labels['yourmessage'] = 'Dies ist eine EmpfangsbestÃ¤tigung fÃ¼r Ihre Nachricht';
	$labels['receiptnote'] = 'Hinweis: Der EmpfÃ¤nger hat den Empfang der Nachricht bestÃ¤tigt. Dies ist keine Garantie, dass die Nachricht gelesen und verstanden wurde.';
	$labels['name'] = 'Angezeigter Name';
	$labels['firstname'] = 'Vorname';
	$labels['surname'] = 'Nachname';
	$labels['middlename'] = 'zweiter Vorname';
	$labels['nameprefix'] = 'Anrede';
	$labels['namesuffix'] = 'Namenszusatz';
	$labels['nickname'] = 'Spitzname';
	$labels['jobtitle'] = 'Berufsbezeichnung';
	$labels['department'] = 'Firma';
	$labels['gender'] = 'Geschlecht';
	$labels['maidenname'] = 'MÃ¤dchenname';
	$labels['email'] = 'E-Mail';
	$labels['phone'] = 'Telefon';
	$labels['address'] = 'Adresse';
	$labels['street'] = 'StraÃe';
	$labels['locality'] = 'Ort';
	$labels['zipcode'] = 'PLZ';
	$labels['region'] = 'Region';
	$labels['country'] = 'Land';
	$labels['birthday'] = 'Geburtstag';
	$labels['anniversary'] = 'Jahrestag';
	$labels['website'] = 'Webseite';
	$labels['instantmessenger'] = 'IM-Adresse';
	$labels['notes'] = 'Notizen';
	$labels['male'] = 'mÃ¤nnlich';
	$labels['female'] = 'weiblich';
	$labels['manager'] = 'Vorgesetze(r)';
	$labels['assistant'] = 'Assistenz';
	$labels['typeassistant'] = 'Assistenz';
	$labels['spouse'] = 'Partner/in';
	$labels['allfields'] = 'Alle Felder';
	$labels['search'] = 'Suche';
	$labels['advsearch'] = 'Detaillierte Suche';
	$labels['advanced'] = 'Erweitert';
	$labels['other'] = 'Andere';
	$labels['typeother'] = 'Andere';
	$labels['typehome'] = 'Privat';
	$labels['typework'] = 'Dienstlich';
	$labels['typemobile'] = 'Mobil';
	$labels['typemain'] = 'Hauptnummer';
	$labels['typehomefax'] = 'Fax Privat';
	$labels['typeworkfax'] = 'Fax Dienst';
	$labels['typecar'] = 'Auto';
	$labels['typepager'] = 'Pager';
	$labels['typevideo'] = 'Video';
	$labels['typehomepage'] = 'Internet';
	$labels['typeblog'] = 'Blog';
	$labels['typeprofile'] = 'Profil';
	$labels['addfield'] = 'Feld hinzufÃ¼gen...';
	$labels['addcontact'] = 'Kontakt hinzufÃ¼gen';
	$labels['editcontact'] = 'Kontakt bearbeiten';
	$labels['contacts'] = 'Kontakte';
	$labels['contactproperties'] = 'Kontaktdaten';
	$labels['personalinfo'] = 'PersÃ¶nliche Informationen';
	$labels['edit'] = 'Bearbeiten';
	$labels['cancel'] = 'Abbrechen';
	$labels['save'] = 'Speichern';
	$labels['delete'] = 'LÃ¶schen';
	$labels['rename'] = 'Umbenennen';
	$labels['addphoto'] = 'Kontaktbild hinzufÃ¼gen';
	$labels['replacephoto'] = 'Bild Ã¤ndern';
	$labels['uploadphoto'] = 'Bild hochladen';
	$labels['newcontact'] = 'Neuen Kontakt erstellen';
	$labels['deletecontact'] = 'GewÃ¤hlte Kontakte lÃ¶schen';
	$labels['composeto'] = 'Nachricht verfassen';
	$labels['contactsfromto'] = 'Kontakte $from bis $to von $count';
	$labels['print'] = 'Drucken';
	$labels['export'] = 'Exportieren';
	$labels['exportvcards'] = 'Kontakte im vCard-Format exportieren';
	$labels['newcontactgroup'] = 'Neue Kontaktgruppe erstellen';
	$labels['grouprename'] = 'Gruppe umbenennen';
	$labels['groupdelete'] = 'Gruppe lÃ¶schen';
	$labels['groupremoveselected'] = 'GewÃ¤hlte Kontakte aus Gruppe entfernen';
	$labels['previouspage'] = 'Seite zurÃ¼ck';
	$labels['firstpage'] = 'Erste Seite';
	$labels['nextpage'] = 'NÃ¤chste Seite';
	$labels['lastpage'] = 'Letzte Seite';
	$labels['group'] = 'Gruppe';
	$labels['groups'] = 'Gruppen';
	$labels['personaladrbook'] = 'PersÃ¶nliches Adressbuch';
	$labels['searchsave'] = 'Suchergebnisse speichern';
	$labels['searchdelete'] = 'Suchergebnisse lÃ¶schen';
	$labels['import'] = 'Importieren';
	$labels['importcontacts'] = 'Kontakte importieren';
	$labels['importfromfile'] = 'Import aus Datei:';
	$labels['importtarget'] = 'Einen neuen Kontakt hinzufÃ¼gen:';
	$labels['importreplace'] = 'Bestehendes Adressbuch komplett ersetzen';
	$labels['importtext'] = 'Sie kÃ¶nnen Kontakte aus einem bestehenden Adressbuch hochladen. Zur Zeit kÃ¶nnen AdressbÃ¼cher im vCard-Format importiert werden.';
	$labels['done'] = 'Fertig';
	$labels['settingsfor'] = 'Einstellungen fÃ¼r';
	$labels['about'] = 'Ãber';
	$labels['preferences'] = 'Einstellungen';
	$labels['userpreferences'] = 'Benutzereinstellungen';
	$labels['editpreferences'] = 'Benutzereinstellungen bearbeiten';
	$labels['identities'] = 'IdentitÃ¤ten';
	$labels['manageidentities'] = 'Absender fÃ¼r dieses Konto verwalten';
	$labels['newidentity'] = 'Neuer Absender';
	$labels['newitem'] = 'Neuer Eintrag';
	$labels['edititem'] = 'Eintrag bearbeiten';
	$labels['preferhtml'] = 'HTML anzeigen';
	$labels['defaultcharset'] = 'Standard Zeichensatz';
	$labels['htmlmessage'] = 'HTML-Nachricht';
	$labels['dateformat'] = 'Datumsformatierung';
	$labels['timeformat'] = 'Zeitformatierung';
	$labels['prettydate'] = 'Kurze Datumsanzeige';
	$labels['setdefault'] = 'Als Standard';
	$labels['autodetect'] = 'Automatisch';
	$labels['language'] = 'Sprache';
	$labels['timezone'] = 'Zeitzone';
	$labels['pagesize'] = 'EintrÃ¤ge pro Seite';
	$labels['signature'] = 'Signatur';
	$labels['dstactive'] = 'Sommerzeit';
	+$labels['showinextwin'] = 'Nachrichten in neuem Fenster Ã¶ffnen';
	+$labels['composeextwin'] = 'Nachrichten in neuem Fenster verfassen';
	$labels['htmleditor'] = 'HTML-Nachrichten verfassen';
	$labels['htmlonreply'] = 'nur Antworten auf HTML-Nachrichten';
	$labels['htmlsignature'] = 'HTML-Signatur';
	$labels['previewpane'] = 'Nachrichtenvorschau anzeigen';
	$labels['skin'] = 'OberflÃ¤chendesign';
	$labels['logoutclear'] = 'Papierkorb beim Abmelden leeren';
	$labels['logoutcompact'] = 'Posteingang beim Abmelden packen';
	$labels['uisettings'] = 'BenutzeroberflÃ¤che';
	$labels['serversettings'] = 'Server-Einstellungen';
	$labels['mailboxview'] = 'Mailbox-Ansicht';
	$labels['mdnrequests'] = 'EmpfangsbestÃ¤tigung senden';
	$labels['askuser'] = 'immer fragen';
	$labels['autosend'] = 'LesebestÃ¤tigung automatisch senden';
	$labels['autosendknown'] = 'LesebestÃ¤tigung nur an meine Kontakte senden';
	$labels['autosendknownignore'] = 'fÃ¼r bekannte Absender, sonst ignorieren';
	$labels['ignore'] = 'ignorieren';
	$labels['readwhendeleted'] = 'Beim LÃ¶schen als gelesen markieren';
	$labels['flagfordeletion'] = 'Als gelÃ¶scht markieren anstatt in den Papierkorb verschieben';
	$labels['skipdeleted'] = 'Zeige keine gelÃ¶schten Nachrichten an';
	$labels['deletealways'] = 'Wenn verschieben in den Papierkorb fehlschlÃ¤gt, Nachricht lÃ¶schen';
	$labels['deletejunk'] = 'Nachrichten in Spam direkt lÃ¶schen';
	$labels['showremoteimages'] = 'Eingebettete Bilder vom Internet laden';
	$labels['fromknownsenders'] = 'bei bekannten Absendern';
	$labels['always'] = 'immer';
	$labels['showinlineimages'] = 'AngehÃ¤ngte Bilder unter der Nachricht anzeigen';
	$labels['autosavedraft'] = 'Entwurf automatisch speichern';
	$labels['everynminutes'] = '$n Minute(n)';
	$labels['keepalive'] = 'Auf neue Nachrichten prÃ¼fen nach';
	$labels['never'] = 'nie';
	$labels['immediately'] = 'sofort';
	$labels['messagesdisplaying'] = 'Nachrichtendarstellung';
	$labels['messagescomposition'] = 'Nachrichtenerstellung';
	$labels['mimeparamfolding'] = 'Namen der DateianhÃ¤nge';
	$labels['2231folding'] = 'vollstÃ¤ndig RFC 2231 kompatibel (Thunderbird)';
	$labels['miscfolding'] = 'RFC 2047/2231 kompatibel (Microsoft Outlook)';
	$labels['2047folding'] = 'vollstÃ¤ndig RFC 2047 kompatibel (andere)';
	$labels['force7bit'] = 'MIME-Kodierung fÃ¼r 8-bit Zeichen';
	$labels['advancedoptions'] = 'Erweiterte Einstellungen';
	$labels['focusonnewmessage'] = 'Fokussiere Browserfenster bei neuen Nachrichten';
	$labels['checkallfolders'] = 'Alle Ordner auf neue Nachrichten prÃ¼fen';
	$labels['displaynext'] = 'Zeige nÃ¤chste Nachricht nach verschieben/lÃ¶schen';
	$labels['defaultfont'] = 'Standard Schrift von HTML Nachrichten';
	$labels['mainoptions'] = 'Allgemein';
	$labels['browseroptions'] = 'Browsereinstellungen';
	$labels['section'] = 'Bereich';
	$labels['maintenance'] = 'Wartung';
	$labels['newmessage'] = 'Neue Nachricht';
	$labels['signatureoptions'] = 'Signatur';
	$labels['whenreplying'] = 'Beantworten einer Nachricht';
	$labels['replytopposting'] = 'Antwort Ã¼ber der Originalnachricht';
	$labels['replybottomposting'] = 'Antwort unter der Originalnachricht';
	$labels['replyremovesignature'] = 'Beim Antworten Signatur der Originalnachricht entfernen';
	$labels['autoaddsignature'] = 'Signatur automatisch einfÃ¼gen';
	$labels['newmessageonly'] = 'nur bei neuen Nachrichten';
	$labels['replyandforwardonly'] = 'nur bei Antworten und Weiterleitungen';
	$labels['replysignaturepos'] = 'Beim Antworten die Signatur';
	$labels['belowquote'] = 'unter der Originalnachricht einfÃ¼gen';
	$labels['abovequote'] = 'Ã¼ber der Originalnachricht einfÃ¼gen';
	$labels['insertsignature'] = 'Signatur einfÃ¼gen';
	$labels['previewpanemarkread'] = 'Nachricht in Vorschau als gelesen markieren';
	$labels['afternseconds'] = 'nach $n Sekunden';
	$labels['reqmdn'] = 'EmpfangsbestÃ¤tigung (MSN) immer anfordern';
	$labels['reqdsn'] = 'ÃbermittlungsbestÃ¤tigung (DSN) immer anfordern';
	$labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern';
	$labels['defaultaddressbook'] = 'Neue Kontakte zum ausgewÃ¤hlten Adressbuch hinzufÃ¼gen';
	$labels['autocompletesingle'] = 'Alternative E-Mailadressen bei der Auto-VervollstÃ¤ndigung nicht berÃ¼cksichtigen';
	$labels['listnamedisplay'] = 'Kontakte auflisten als';
	$labels['spellcheckbeforesend'] = 'RechtschreibprÃ¼fung vor dem Absenden der Nachricht';
	$labels['spellcheckoptions'] = 'RechtschreibprÃ¼fungsoptionen';
	$labels['spellcheckignoresyms'] = 'WÃ¶rter mit Symbolen Ã¼berspringen';
	$labels['spellcheckignorenums'] = 'WÃ¶rter mit Ziffern Ã¼berspringen';
	$labels['spellcheckignorecaps'] = 'WÃ¶rter Ã¼berspringen, die nur aus GroÃbuchstaben bestehen';
	$labels['addtodict'] = 'Zum WÃ¶rterbuch hinzufÃ¼gen';
	$labels['mailtoprotohandler'] = 'Als EmpfÃ¤nger fÃ¼r mailto: Links einrichten';
	$labels['folder'] = 'Ordner';
	$labels['foldername'] = 'Ordnername';
	$labels['subscribed'] = 'Abonniert';
	$labels['messagecount'] = 'Nachrichten';
	$labels['create'] = 'Erstellen';
	$labels['createfolder'] = 'Neuen Ordner erstellen';
	$labels['managefolders'] = 'Ordner verwalten';
	$labels['specialfolders'] = 'Spezialordner';
	$labels['properties'] = 'Eigenschaften';
	$labels['folderproperties'] = 'Ordnereigenschaften';
	$labels['parentfolder'] = 'Eltern';
	$labels['location'] = 'Speicherort';
	$labels['info'] = 'Informationen';
	$labels['getfoldersize'] = 'OrdnergrÃ¶Ãe anzeigen';
	$labels['changesubscription'] = 'Abonnieren';
	$labels['foldertype'] = 'Ordnertyp';
	$labels['personalfolder'] = 'Privater Ordner';
	$labels['otherfolder'] = 'Ordner eines anderen Benutzers';
	$labels['sharedfolder'] = 'Ãffentlicher Ordner';
	$labels['sortby'] = 'Sortieren nach';
	$labels['sortasc'] = 'Aufsteigend sortieren';
	$labels['sortdesc'] = 'Absteigend sortieren';
	$labels['undo'] = 'RÃ¼ckgÃ¤ngig machen';
	$labels['plugin'] = 'Erweiterung';
	$labels['version'] = 'Version';
	$labels['source'] = 'Quellcode';
	$labels['license'] = 'Lizenz';
	$labels['support'] = 'Support';
	$labels['B'] = 'B';
	$labels['KB'] = 'KB';
	$labels['MB'] = 'MB';
	$labels['GB'] = 'GB';
	$labels['unicode'] = 'Unicode';
	$labels['english'] = 'Englisch';
	$labels['westerneuropean'] = 'West EuropÃ¤isch';
	$labels['easterneuropean'] = 'Ost EuropÃ¤isch';
	$labels['southeasterneuropean'] = 'SÃ¼d-Ost EuropÃ¤isch';
	$labels['baltic'] = 'Baltisch';
	$labels['cyrillic'] = 'Kyrillisch';
	$labels['arabic'] = 'Arabisch';
	$labels['greek'] = 'Griechisch';
	$labels['hebrew'] = 'HebrÃ¤isch';
	$labels['turkish'] = 'TÃ¼rkisch';
	$labels['nordic'] = 'Nordisch';
	$labels['thai'] = 'ThailÃ¤ndisch';
	$labels['celtic'] = 'Keltisch';
	$labels['vietnamese'] = 'Vietnamesisch';
	$labels['japanese'] = 'Japanisch';
	$labels['korean'] = 'Koreanisch';
	$labels['chinese'] = 'Chinesisch';

	diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
	index fbc154b88..2b1397f02 100644
	--- a/program/localization/en_US/labels.inc
	+++ b/program/localization/en_US/labels.inc
	@@ -1,524 +1,527 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| language/en_US/labels.inc \|
	\| \|
	\| Language file of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2011, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$labels = array();

	// login page
	$labels['welcome'] = 'Welcome to $product';
	$labels['username'] = 'Username';
	$labels['password'] = 'Password';
	$labels['server'] = 'Server';
	$labels['login'] = 'Login';

	// taskbar
	$labels['logout'] = 'Logout';
	$labels['mail'] = 'Mail';
	$labels['settings'] = 'Settings';
	$labels['addressbook'] = 'Address Book';

	// mailbox names
	$labels['inbox'] = 'Inbox';
	$labels['drafts'] = 'Drafts';
	$labels['sent'] = 'Sent';
	$labels['trash'] = 'Trash';
	$labels['junk'] = 'Junk';

	// message listing
	$labels['subject'] = 'Subject';
	$labels['from'] = 'From';
	$labels['to'] = 'To';
	$labels['cc'] = 'Cc';
	$labels['bcc'] = 'Bcc';
	$labels['replyto'] = 'Reply-To';
	$labels['followupto'] = 'Followup-To';
	$labels['date'] = 'Date';
	$labels['size'] = 'Size';
	$labels['priority'] = 'Priority';
	$labels['organization'] = 'Organization';
	$labels['readstatus'] = 'Read status';
	$labels['listoptions'] = 'List options...';

	$labels['mailboxlist'] = 'Folders';
	$labels['messagesfromto'] = 'Messages $from to $to of $count';
	$labels['threadsfromto'] = 'Threads $from to $to of $count';
	$labels['messagenrof'] = 'Message $nr of $count';
	$labels['fromtoshort'] = '$from â $to of $count';

	$labels['copy'] = 'Copy';
	$labels['move'] = 'Move';
	$labels['moveto'] = 'Move to...';
	$labels['download'] = 'Download';

	$labels['filename'] = 'File name';
	$labels['filesize'] = 'File size';

	$labels['addtoaddressbook'] = 'Add to address book';

	// weekdays short
	$labels['sun'] = 'Sun';
	$labels['mon'] = 'Mon';
	$labels['tue'] = 'Tue';
	$labels['wed'] = 'Wed';
	$labels['thu'] = 'Thu';
	$labels['fri'] = 'Fri';
	$labels['sat'] = 'Sat';

	// weekdays long
	$labels['sunday'] = 'Sunday';
	$labels['monday'] = 'Monday';
	$labels['tuesday'] = 'Tuesday';
	$labels['wednesday'] = 'Wednesday';
	$labels['thursday'] = 'Thursday';
	$labels['friday'] = 'Friday';
	$labels['saturday'] = 'Saturday';

	// months short
	$labels['jan'] = 'Jan';
	$labels['feb'] = 'Feb';
	$labels['mar'] = 'Mar';
	$labels['apr'] = 'Apr';
	$labels['may'] = 'May';
	$labels['jun'] = 'Jun';
	$labels['jul'] = 'Jul';
	$labels['aug'] = 'Aug';
	$labels['sep'] = 'Sep';
	$labels['oct'] = 'Oct';
	$labels['nov'] = 'Nov';
	$labels['dec'] = 'Dec';

	// months long
	$labels['longjan'] = 'January';
	$labels['longfeb'] = 'February';
	$labels['longmar'] = 'March';
	$labels['longapr'] = 'April';
	$labels['longmay'] = 'May';
	$labels['longjun'] = 'June';
	$labels['longjul'] = 'July';
	$labels['longaug'] = 'August';
	$labels['longsep'] = 'September';
	$labels['longoct'] = 'October';
	$labels['longnov'] = 'November';
	$labels['longdec'] = 'December';

	$labels['today'] = 'Today';

	// toolbar buttons
	$labels['refresh'] = 'Refresh';
	$labels['checkmail'] = 'Check for new messages';
	$labels['compose'] = 'Compose';
	$labels['writenewmessage'] = 'Create a new message';
	$labels['reply'] = 'Reply';
	$labels['replytomessage'] = 'Reply to sender';
	$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
	$labels['replyall'] = 'Reply all';
	$labels['replylist'] = 'Reply list';
	$labels['forward'] = 'Forward';
	$labels['forwardinline'] = 'Forward inline';
	$labels['forwardattachment'] = 'Forward as attachment';
	$labels['forwardmessage'] = 'Forward the message';
	$labels['deletemessage'] = 'Delete message';
	$labels['movemessagetotrash'] = 'Move message to trash';
	$labels['printmessage'] = 'Print this message';
	$labels['previousmessage'] = 'Show previous message';
	$labels['firstmessage'] = 'Show first message';
	$labels['nextmessage'] = 'Show next message';
	$labels['lastmessage'] = 'Show last message';
	$labels['backtolist'] = 'Back to message list';
	$labels['viewsource'] = 'Show source';
	$labels['mark'] = 'Mark';
	$labels['markmessages'] = 'Mark messages';
	$labels['markread'] = 'As read';
	$labels['markunread'] = 'As unread';
	$labels['markflagged'] = 'As flagged';
	$labels['markunflagged'] = 'As unflagged';
	$labels['moreactions'] = 'More actions...';
	$labels['more'] = 'More';
	$labels['back'] = 'Back';
	$labels['options'] = 'Options';

	$labels['select'] = 'Select';
	$labels['all'] = 'All';
	$labels['none'] = 'None';
	$labels['currpage'] = 'Current page';
	$labels['unread'] = 'Unread';
	$labels['flagged'] = 'Flagged';
	$labels['unanswered'] = 'Unanswered';
	$labels['deleted'] = 'Deleted';
	$labels['undeleted'] = 'Not deleted';
	$labels['invert'] = 'Invert';
	$labels['filter'] = 'Filter';
	$labels['list'] = 'List';
	$labels['threads'] = 'Threads';
	$labels['expand-all'] = 'Expand All';
	$labels['expand-unread'] = 'Expand Unread';
	$labels['collapse-all'] = 'Collapse All';
	$labels['threaded'] = 'Threaded';

	$labels['autoexpand_threads'] = 'Expand message threads';
	$labels['do_expand'] = 'all threads';
	$labels['expand_only_unread'] = 'only with unread messages';
	$labels['fromto'] = 'From/To';
	$labels['flag'] = 'Flag';
	$labels['attachment'] = 'Attachment';
	$labels['nonesort'] = 'None';
	$labels['sentdate'] = 'Sent date';
	$labels['arrival'] = 'Arrival date';
	$labels['asc'] = 'ascending';
	$labels['desc'] = 'descending';
	$labels['listcolumns'] = 'List columns';
	$labels['listsorting'] = 'Sorting column';
	$labels['listorder'] = 'Sorting order';
	$labels['listmode'] = 'List view mode';

	$labels['folderactions'] = 'Folder actions...';
	$labels['compact'] = 'Compact';
	$labels['empty'] = 'Empty';

	$labels['quota'] = 'Disk usage';
	$labels['unknown'] = 'unknown';
	$labels['unlimited'] = 'unlimited';

	$labels['quicksearch'] = 'Quick search';
	$labels['resetsearch'] = 'Reset search';
	$labels['searchmod'] = 'Search modifiers';
	$labels['msgtext'] = 'Entire message';

	$labels['openinextwin'] = 'Open in new window';
	$labels['emlsave'] = 'Download (.eml)';

	// message compose
	$labels['editasnew'] = 'Edit as new';
	-$labels['savemessage'] = 'Save as draft';
	+$labels['send'] = 'Send';
	$labels['sendmessage'] = 'Send message';
	+$labels['savemessage'] = 'Save as draft';
	$labels['addattachment'] = 'Attach a file';
	$labels['charset'] = 'Charset';
	$labels['editortype'] = 'Editor type';
	$labels['returnreceipt'] = 'Return receipt';
	$labels['dsn'] = 'Delivery status notification';
	$labels['mailreplyintro'] = 'On $date, $sender wrote:';
	$labels['originalmessage'] = 'Original Message';

	$labels['editidents'] = 'Edit identities';
	$labels['spellcheck'] = 'Spell';
	$labels['checkspelling'] = 'Check spelling';
	$labels['resumeediting'] = 'Resume editing';
	$labels['revertto'] = 'Revert to';

	$labels['attach'] = 'Attach';
	$labels['attachments'] = 'Attachments';
	$labels['upload'] = 'Upload';
	$labels['uploadprogress'] = '$percent ($current from $total)';
	$labels['close'] = 'Close';
	$labels['messageoptions'] = 'Message options...';

	$labels['low'] = 'Low';
	$labels['lowest'] = 'Lowest';
	$labels['normal'] = 'Normal';
	$labels['high'] = 'High';
	$labels['highest'] = 'Highest';

	$labels['nosubject'] = '(no subject)';
	$labels['showimages'] = 'Display images';
	$labels['alwaysshow'] = 'Always show images from $sender';
	$labels['isdraft'] = 'This is a draft message.';
	$labels['andnmore'] = '$nr more...';
	$labels['togglemoreheaders'] = 'Show more message headers';
	$labels['togglefullheaders'] = 'Toggle raw message headers';

	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'Plain text';
	$labels['savesentmessagein'] = 'Save sent message in';
	$labels['dontsave'] = 'don\'t save';
	$labels['maxuploadsize'] = 'Maximum allowed file size is $size';

	$labels['addcc'] = 'Add Cc';
	$labels['addbcc'] = 'Add Bcc';
	$labels['addreplyto'] = 'Add Reply-To';
	$labels['addfollowupto'] = 'Add Followup-To';

	// mdn
	$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
	$labels['receiptread'] = 'Return Receipt (read)';
	$labels['yourmessage'] = 'This is a Return Receipt for your message';
	$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';

	// address boook
	$labels['name'] = 'Display Name';
	$labels['firstname'] = 'First Name';
	$labels['surname'] = 'Last Name';
	$labels['middlename'] = 'Middle Name';
	$labels['nameprefix'] = 'Prefix';
	$labels['namesuffix'] = 'Suffix';
	$labels['nickname'] = 'Nickname';
	$labels['jobtitle'] = 'Job Title';
	$labels['department'] = 'Department';
	$labels['gender'] = 'Gender';
	$labels['maidenname'] = 'Maiden Name';
	$labels['email'] = 'Email';
	$labels['phone'] = 'Phone';
	$labels['address'] = 'Address';
	$labels['street'] = 'Street';
	$labels['locality'] = 'City';
	$labels['zipcode'] = 'ZIP Code';
	$labels['region'] = 'State/Province';
	$labels['country'] = 'Country';
	$labels['birthday'] = 'Birthday';
	$labels['anniversary'] = 'Anniversary';
	$labels['website'] = 'Website';
	$labels['instantmessenger'] = 'IM';
	$labels['notes'] = 'Notes';
	$labels['male'] = 'male';
	$labels['female'] = 'female';
	$labels['manager'] = 'Manager';
	$labels['assistant'] = 'Assistant';
	$labels['spouse'] = 'Spouse';
	$labels['allfields'] = 'All fields';
	$labels['search'] = 'Search';
	$labels['advsearch'] = 'Advanced Search';
	$labels['advanced'] = 'Advanced';
	$labels['other'] = 'Other';

	$labels['typehome'] = 'Home';
	$labels['typework'] = 'Work';
	$labels['typeother'] = 'Other';
	$labels['typemobile'] = 'Mobile';
	$labels['typemain'] = 'Main';
	$labels['typehomefax'] = 'Home Fax';
	$labels['typeworkfax'] = 'Work Fax';
	$labels['typecar'] = 'Car';
	$labels['typepager'] = 'Pager';
	$labels['typevideo'] = 'Video';
	$labels['typeassistant'] = 'Assistant';
	$labels['typehomepage'] = 'Home Page';
	$labels['typeblog'] = 'Blog';
	$labels['typeprofile'] = 'Profile';

	$labels['addfield'] = 'Add field...';
	$labels['addcontact'] = 'Add new contact';
	$labels['editcontact'] = 'Edit contact';
	$labels['contacts'] = 'Contacts';
	$labels['contactproperties'] = 'Contact properties';
	$labels['personalinfo'] = 'Personal information';

	$labels['edit'] = 'Edit';
	$labels['cancel'] = 'Cancel';
	$labels['save'] = 'Save';
	$labels['delete'] = 'Delete';
	$labels['rename'] = 'Rename';
	$labels['addphoto'] = 'Add';
	$labels['replacephoto'] = 'Replace';
	$labels['uploadphoto'] = 'Upload photo';

	$labels['newcontact'] = 'Create new contact card';
	$labels['deletecontact'] = 'Delete selected contacts';
	$labels['composeto'] = 'Compose mail to';
	$labels['contactsfromto'] = 'Contacts $from to $to of $count';
	$labels['print'] = 'Print';
	$labels['export'] = 'Export';
	$labels['exportvcards'] = 'Export contacts in vCard format';
	$labels['newcontactgroup'] = 'Create new contact group';
	$labels['grouprename'] = 'Rename group';
	$labels['groupdelete'] = 'Delete group';
	$labels['groupremoveselected'] = 'Remove selected contacts from group';

	$labels['previouspage'] = 'Show previous page';
	$labels['firstpage'] = 'Show first page';
	$labels['nextpage'] = 'Show next page';
	$labels['lastpage'] = 'Show last page';

	$labels['group'] = 'Group';
	$labels['groups'] = 'Groups';
	$labels['personaladrbook'] = 'Personal Addresses';

	$labels['searchsave'] = 'Save search';
	$labels['searchdelete'] = 'Delete search';

	$labels['import'] = 'Import';
	$labels['importcontacts'] = 'Import contacts';
	$labels['importfromfile'] = 'Import from file:';
	$labels['importtarget'] = 'Add new contacts to address book:';
	$labels['importreplace'] = 'Replace the entire address book';
	$labels['importtext'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.';
	$labels['done'] = 'Done';

	// settings
	$labels['settingsfor'] = 'Settings for';
	$labels['about'] = 'About';
	$labels['preferences'] = 'Preferences';
	$labels['userpreferences'] = 'User preferences';
	$labels['editpreferences'] = 'Edit user preferences';

	$labels['identities'] = 'Identities';
	$labels['manageidentities'] = 'Manage identities for this account';
	$labels['newidentity'] = 'New identity';

	$labels['newitem'] = 'New item';
	$labels['edititem'] = 'Edit item';

	$labels['preferhtml'] = 'Display HTML';
	$labels['defaultcharset'] = 'Default Character Set';
	$labels['htmlmessage'] = 'HTML Message';
	$labels['dateformat'] = 'Date format';
	$labels['timeformat'] = 'Time format';
	$labels['prettydate'] = 'Pretty dates';
	$labels['setdefault'] = 'Set default';
	$labels['autodetect'] = 'Auto';
	$labels['language'] = 'Language';
	$labels['timezone'] = 'Time zone';
	$labels['pagesize'] = 'Rows per page';
	$labels['signature'] = 'Signature';
	$labels['dstactive'] = 'Daylight saving time';
	+$labels['showinextwin'] = 'Open message in a new window';
	+$labels['composeextwin'] = 'Compose in a new window';
	$labels['htmleditor'] = 'Compose HTML messages';
	$labels['htmlonreply'] = 'on reply to HTML message';
	$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
	$labels['htmlsignature'] = 'HTML signature';
	$labels['previewpane'] = 'Show preview pane';
	$labels['skin'] = 'Interface skin';
	$labels['logoutclear'] = 'Clear Trash on logout';
	$labels['logoutcompact'] = 'Compact Inbox on logout';
	$labels['uisettings'] = 'User Interface';
	$labels['serversettings'] = 'Server Settings';
	$labels['mailboxview'] = 'Mailbox View';
	$labels['mdnrequests'] = 'On request for return receipt';
	$labels['askuser'] = 'ask me';
	$labels['autosend'] = 'send receipt';
	$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
	$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
	$labels['ignore'] = 'ignore';
	$labels['readwhendeleted'] = 'Mark the message as read on delete';
	$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
	$labels['skipdeleted'] = 'Do not show deleted messages';
	$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
	$labels['deletejunk'] = 'Directly delete messages in Junk';
	$labels['showremoteimages'] = 'Display remote inline images';
	$labels['fromknownsenders'] = 'from known senders';
	$labels['always'] = 'always';
	$labels['showinlineimages'] = 'Display attached images below the message';
	$labels['autosavedraft'] = 'Automatically save draft';
	$labels['everynminutes'] = 'every $n minute(s)';
	$labels['keepalive'] = 'Check for new messages on';
	$labels['never'] = 'never';
	$labels['immediately'] = 'immediately';
	$labels['messagesdisplaying'] = 'Displaying Messages';
	$labels['messagescomposition'] = 'Composing Messages';
	$labels['mimeparamfolding'] = 'Attachment names';
	$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
	$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
	$labels['2047folding'] = 'Full RFC 2047 (other)';
	$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
	$labels['advancedoptions'] = 'Advanced options';
	$labels['focusonnewmessage'] = 'Focus browser window on new message';
	$labels['checkallfolders'] = 'Check all folders for new messages';
	$labels['displaynext'] = 'After message delete/move display the next message';
	$labels['defaultfont'] = 'Default font of HTML message';
	$labels['mainoptions'] = 'Main Options';
	$labels['browseroptions'] = 'Browser Options';
	$labels['section'] = 'Section';
	$labels['maintenance'] = 'Maintenance';
	$labels['newmessage'] = 'New Message';
	$labels['signatureoptions'] = 'Signature Options';
	$labels['whenreplying'] = 'When replying';
	$labels['replyempty'] = 'do not quote the original message';
	$labels['replytopposting'] = 'start new message above the quote';
	$labels['replybottomposting'] = 'start new message below the quote';
	$labels['replyremovesignature'] = 'When replying remove original signature from message';
	$labels['autoaddsignature'] = 'Automatically add signature';
	$labels['newmessageonly'] = 'new message only';
	$labels['replyandforwardonly'] = 'replies and forwards only';
	$labels['replysignaturepos'] = 'When replying or forwarding place signature';
	$labels['belowquote'] = 'below the quote';
	$labels['abovequote'] = 'above the quote';
	$labels['insertsignature'] = 'Insert signature';
	$labels['previewpanemarkread'] = 'Mark previewed messages as read';
	$labels['afternseconds'] = 'after $n seconds';
	$labels['reqmdn'] = 'Always request a return receipt';
	$labels['reqdsn'] = 'Always request a delivery status notification';
	$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
	$labels['defaultaddressbook'] = 'Add new contacts to the selected addressbook';
	$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
	$labels['listnamedisplay'] = 'List contacts as';
	$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
	$labels['spellcheckoptions'] = 'Spellcheck Options';
	$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
	$labels['spellcheckignorenums'] = 'Ignore words with numbers';
	$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
	$labels['addtodict'] = 'Add to dictionary';
	$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
	$labels['forwardmode'] = 'Messages forwarding';
	$labels['inline'] = 'inline';
	$labels['asattachment'] = 'as attachment';

	$labels['folder'] = 'Folder';
	$labels['folders'] = 'Folders';
	$labels['foldername'] = 'Folder name';
	$labels['subscribed'] = 'Subscribed';
	$labels['messagecount'] = 'Messages';
	$labels['create'] = 'Create';
	$labels['createfolder'] = 'Create new folder';
	$labels['managefolders'] = 'Manage folders';
	$labels['specialfolders'] = 'Special Folders';
	$labels['properties'] = 'Properties';
	$labels['folderproperties'] = 'Folder properties';
	$labels['parentfolder'] = 'Parent folder';
	$labels['location'] = 'Location';
	$labels['info'] = 'Information';
	$labels['getfoldersize'] = 'Click to get folder size';
	$labels['changesubscription'] = 'Click to change subscription';
	$labels['foldertype'] = 'Folder Type';
	$labels['personalfolder'] = 'Private Folder';
	$labels['otherfolder'] = 'Other User\'s Folder';
	$labels['sharedfolder'] = 'Public Folder';

	$labels['sortby'] = 'Sort by';
	$labels['sortasc'] = 'Sort ascending';
	$labels['sortdesc'] = 'Sort descending';
	$labels['undo'] = 'Undo';

	$labels['plugin'] = 'Plugin';
	$labels['version'] = 'Version';
	$labels['source'] = 'Source';
	$labels['license'] = 'License';
	$labels['support'] = 'Get support';

	// units
	$labels['B'] = 'B';
	$labels['KB'] = 'KB';
	$labels['MB'] = 'MB';
	$labels['GB'] = 'GB';

	// character sets
	$labels['unicode'] = 'Unicode';
	$labels['english'] = 'English';
	$labels['westerneuropean'] = 'Western European';
	$labels['easterneuropean'] = 'Eastern European';
	$labels['southeasterneuropean'] = 'South-Eastern European';
	$labels['baltic'] = 'Baltic';
	$labels['cyrillic'] = 'Cyrillic';
	$labels['arabic'] = 'Arabic';
	$labels['greek'] = 'Greek';
	$labels['hebrew'] = 'Hebrew';
	$labels['turkish'] = 'Turkish';
	$labels['nordic'] = 'Nordic';
	$labels['thai'] = 'Thai';
	$labels['celtic'] = 'Celtic';
	$labels['vietnamese'] = 'Vietnamese';
	$labels['japanese'] = 'Japanese';
	$labels['korean'] = 'Korean';
	$labels['chinese'] = 'Chinese';

	?>
	diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
	index 7425dd7b8..d47bd0f4b 100644
	--- a/program/localization/es_ES/labels.inc
	+++ b/program/localization/es_ES/labels.inc
	@@ -1,450 +1,451 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| localization/es_ES/labels.inc \|
	\| \|
	\| Language file of the Roundcube Webmail client \|
	\| Copyright (C) 2012, The Roundcube Dev Team \|
	\| Licensed under the GNU General Public License \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Jorge LÃ³pez <jorge@adobo.org> \|
	+-----------------------------------------------------------------------+
	*/

	$labels = array();
	$labels['welcome'] = 'Bienvenido a $product';
	$labels['username'] = 'Nombre de usuario';
	$labels['password'] = 'ContraseÃ±a';
	$labels['server'] = 'Servidor';
	$labels['login'] = 'Iniciar sesiÃ³n';
	$labels['logout'] = 'Cerrar sesiÃ³n';
	$labels['mail'] = 'Correo';
	$labels['settings'] = 'ConfiguraciÃ³n';
	$labels['addressbook'] = 'Contactos';
	$labels['inbox'] = 'Entrada';
	$labels['drafts'] = 'Borradores';
	$labels['sent'] = 'Enviados';
	$labels['trash'] = 'Papelera';
	$labels['junk'] = 'Basura';
	$labels['subject'] = 'Asunto';
	$labels['from'] = 'Remitente';
	$labels['to'] = 'Destinatario';
	$labels['cc'] = 'Cc';
	$labels['bcc'] = 'Cco';
	$labels['replyto'] = 'Responder a';
	$labels['followupto'] = 'Responder-a';
	$labels['date'] = 'Fecha';
	$labels['size'] = 'TamaÃ±o';
	$labels['priority'] = 'Prioridad';
	$labels['organization'] = 'OrganizaciÃ³n';
	$labels['readstatus'] = 'Leer estado';
	$labels['listoptions'] = 'Lista de opciones...';
	$labels['mailboxlist'] = 'Carpetas';
	$labels['folders'] = 'Carpetas';
	$labels['messagesfromto'] = 'Mensajes $from a $to de $count';
	$labels['threadsfromto'] = 'Hilos $from a $to de $count';
	$labels['messagenrof'] = 'Mensaje $nr de $count';
	$labels['fromtoshort'] = '$from â $to de $count';
	$labels['copy'] = 'Copiar';
	$labels['move'] = 'Mover';
	$labels['moveto'] = 'Mover aâ¦';
	$labels['download'] = 'Descargar';
	$labels['filename'] = 'Nombre del archivo';
	$labels['filesize'] = 'TamaÃ±o del archivo';
	$labels['addtoaddressbook'] = 'AÃ±adir a contactos';
	$labels['sun'] = 'Dom';
	$labels['mon'] = 'Lun';
	$labels['tue'] = 'Mar';
	$labels['wed'] = 'MiÃ©';
	$labels['thu'] = 'Jue';
	$labels['fri'] = 'Vie';
	$labels['sat'] = 'SÃ¡b';
	$labels['sunday'] = 'Domingo';
	$labels['monday'] = 'Lunes';
	$labels['tuesday'] = 'Martes';
	$labels['wednesday'] = 'MiÃ©rcoles';
	$labels['thursday'] = 'Jueves';
	$labels['friday'] = 'Viernes';
	$labels['saturday'] = 'SÃ¡bado';
	$labels['jan'] = 'Ene';
	$labels['feb'] = 'Feb';
	$labels['mar'] = 'Mar';
	$labels['apr'] = 'Abr';
	$labels['may'] = 'May';
	$labels['longmay'] = 'May';
	$labels['jun'] = 'Jun';
	$labels['jul'] = 'Jul';
	$labels['aug'] = 'Ago';
	$labels['sep'] = 'Sep';
	$labels['oct'] = 'Oct';
	$labels['nov'] = 'Nov';
	$labels['dec'] = 'Dic';
	$labels['longjan'] = 'Enero';
	$labels['longfeb'] = 'Febrero';
	$labels['longmar'] = 'Marzo';
	$labels['longapr'] = 'Abril';
	$labels['longjun'] = 'Junio';
	$labels['longjul'] = 'Julio';
	$labels['longaug'] = 'Agosto';
	$labels['longsep'] = 'Septiembre';
	$labels['longoct'] = 'Octubre';
	$labels['longnov'] = 'Noviembre';
	$labels['longdec'] = 'Diciembre';
	$labels['today'] = 'Hoy';
	$labels['refresh'] = 'Actualizar';
	$labels['checkmail'] = 'Revisar si hay mensajes nuevos';
	$labels['compose'] = 'Redactar';
	$labels['writenewmessage'] = 'Crear un mensaje nuevo';
	$labels['reply'] = 'Responder';
	$labels['replytomessage'] = 'Responder mensaje';
	$labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
	$labels['replyall'] = 'Responder a todos';
	$labels['replylist'] = 'Responder a la lista';
	$labels['forward'] = 'Reenviar';
	$labels['forwardinline'] = 'Reenviar directamente';
	$labels['forwardattachment'] = 'Reenviar como adjunto';
	$labels['forwardmessage'] = 'Reenviar mensaje';
	$labels['deletemessage'] = 'Eliminar mensaje';
	$labels['movemessagetotrash'] = 'Mover mensaje a la papelera';
	$labels['printmessage'] = 'Imprimir este mensaje';
	$labels['previousmessage'] = 'Mostrar mensaje anterior';
	$labels['firstmessage'] = 'Mostrar primer mensaje';
	$labels['nextmessage'] = 'Mostrar el siguiente mensaje';
	$labels['lastmessage'] = 'Mostrar el Ãºltimo mensaje';
	$labels['backtolist'] = 'Volver a la lista de mensajes';
	$labels['viewsource'] = 'Mostrar cÃ³digo';
	$labels['mark'] = 'Marcar';
	$labels['markmessages'] = 'Marcar mensajes';
	$labels['markread'] = 'Como leÃdo';
	$labels['markunread'] = 'Como no leÃdo';
	$labels['markflagged'] = 'Como marcado';
	$labels['markunflagged'] = 'Como no marcado';
	$labels['moreactions'] = 'MÃ¡s accionesâ¦';
	$labels['more'] = 'MÃ¡s';
	$labels['back'] = 'Volver';
	$labels['options'] = 'Opciones';
	$labels['select'] = 'Elija';
	$labels['all'] = 'Todos';
	$labels['none'] = 'Ninguno';
	$labels['nonesort'] = 'Ninguno';
	$labels['currpage'] = 'PÃ¡gina actual';
	$labels['unread'] = 'Sin leer';
	$labels['flagged'] = 'SeÃ±alado';
	$labels['unanswered'] = 'Sin respuesta';
	$labels['deleted'] = 'Eliminado';
	$labels['invert'] = 'Invertir';
	$labels['filter'] = 'Filtrar';
	$labels['list'] = 'Lista';
	$labels['threads'] = 'Hilos';
	$labels['expand-all'] = 'Expandir todos';
	$labels['expand-unread'] = 'Expandir no leÃdos';
	$labels['collapse-all'] = 'Colapsar todos';
	$labels['threaded'] = 'Encadenados';
	$labels['autoexpand_threads'] = 'Expandir hilos de mensajes';
	$labels['do_expand'] = 'todos los hilos';
	$labels['expand_only_unread'] = 'solo con mensajes no leÃdos';
	$labels['fromto'] = 'Remitente/Destinatario';
	$labels['flag'] = 'Marca';
	$labels['attachment'] = 'Adjunto';
	$labels['sentdate'] = 'Fecha de envÃo';
	$labels['arrival'] = 'Fecha de llegada';
	$labels['asc'] = 'ascendente';
	$labels['desc'] = 'descendente';
	$labels['listcolumns'] = 'Listar columnas';
	$labels['listsorting'] = 'Columna de listado';
	$labels['listorder'] = 'Orden de listado';
	$labels['listmode'] = 'Modo de vista de lista';
	$labels['folderactions'] = 'Acciones de bandeja...';
	$labels['compact'] = 'Compactar';
	$labels['empty'] = 'Vaciar';
	$labels['quota'] = 'Uso de disco';
	$labels['unknown'] = 'desconocido';
	$labels['unlimited'] = 'sin lÃmite';
	$labels['quicksearch'] = 'BÃºsqueda rÃ¡pida';
	$labels['resetsearch'] = 'Reiniciar la bÃºsqueda';
	$labels['searchmod'] = 'Opciones de bÃºsqueda';
	$labels['msgtext'] = 'Mensaje completo';
	$labels['openinextwin'] = 'Abrir en nueva ventana';
	$labels['emlsave'] = 'Descargar (.eml)';
	$labels['editasnew'] = 'Editar como nuevo';
	$labels['savemessage'] = 'Guardar como borrador';
	$labels['sendmessage'] = 'Enviar ahora el mensaje';
	$labels['addattachment'] = 'Adjuntar un archivo';
	$labels['charset'] = 'CodificaciÃ³n';
	$labels['editortype'] = 'Tipo de editor';
	$labels['returnreceipt'] = 'Acuse de recibo';
	$labels['dsn'] = 'Entrega de notificaciones de estado';
	$labels['mailreplyintro'] = 'El $date, $sender escribiÃ³:';
	$labels['originalmessage'] = 'Mensaje original';
	$labels['editidents'] = 'Editar identidades';
	$labels['spellcheck'] = 'Corrector ortogrÃ¡fico';
	$labels['checkspelling'] = 'Revisar ortografÃa';
	$labels['resumeediting'] = 'Continuar ediciÃ³n';
	$labels['revertto'] = 'Revertir a';
	$labels['attach'] = 'Adjuntar';
	$labels['attachments'] = 'Adjuntos';
	$labels['upload'] = 'Subir';
	$labels['uploadprogress'] = '$percent ($current de $total)';
	$labels['close'] = 'Cerrar';
	$labels['messageoptions'] = 'Opciones de mensaje...';
	$labels['low'] = 'Bajo';
	$labels['lowest'] = 'BajÃsimo';
	$labels['normal'] = 'Normal';
	$labels['high'] = 'Alto';
	$labels['highest'] = 'AltÃsimo';
	$labels['nosubject'] = '(sin asunto)';
	$labels['showimages'] = 'Mostrar imÃ¡genes';
	$labels['alwaysshow'] = 'Mostrar siempre imÃ¡genes de $sender';
	$labels['isdraft'] = 'Este mensaje es un borrador';
	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'SÃ³lo texto';
	$labels['savesentmessagein'] = 'Guardar mensaje enviado en';
	$labels['dontsave'] = 'No guardar';
	$labels['maxuploadsize'] = 'TamaÃ±o de archivo mÃ¡ximo permitido: $size';
	$labels['addcc'] = 'AÃ±adir Cc';
	$labels['addbcc'] = 'AÃ±adir Cco';
	$labels['addreplyto'] = 'AÃ±adir Responder a';
	$labels['addfollowupto'] = 'AÃ±adir Seguir a';
	$labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando usted lo lea. Â¿Quiere enviar esta notificaciÃ³n?';
	$labels['receiptread'] = 'NotificaciÃ³n de lectura';
	$labels['yourmessage'] = 'Esto es un acuse de recibo de su mensaje';
	$labels['receiptnote'] = 'Nota: Esta notificaciÃ³n sÃ³lo significa que su mensaje fue abierto en el ordenador del destinatario. Eso no garantiza que el destinatario haya leÃdo o entendido el contenido del mensaje.';
	$labels['name'] = 'Nombre para mostrar';
	$labels['firstname'] = 'Nombre';
	$labels['surname'] = 'Apellido';
	$labels['middlename'] = 'Segundo nombre';
	$labels['nameprefix'] = 'Prefijo';
	$labels['namesuffix'] = 'Sufijo';
	$labels['nickname'] = 'Alias';
	$labels['jobtitle'] = 'Tratamiento';
	$labels['department'] = 'Departamento';
	$labels['gender'] = 'Sexo';
	$labels['maidenname'] = 'Apellido de soltera';
	$labels['email'] = 'Correo';
	$labels['phone'] = 'TelÃ©fono';
	$labels['address'] = 'DirecciÃ³n';
	$labels['street'] = 'Calle';
	$labels['locality'] = 'Ciudad';
	$labels['zipcode'] = 'CÃ³digo postal';
	$labels['region'] = 'Provincia';
	$labels['country'] = 'PaÃs';
	$labels['birthday'] = 'CumpleaÃ±os';
	$labels['anniversary'] = 'Santo';
	$labels['website'] = 'PÃ¡gina web';
	$labels['instantmessenger'] = 'MensajerÃa instantÃ¡nea';
	$labels['notes'] = 'Notas';
	$labels['male'] = 'Hombre';
	$labels['female'] = 'Mujer';
	$labels['manager'] = 'Director';
	$labels['assistant'] = 'Auxiliar';
	$labels['typeassistant'] = 'Auxiliar';
	$labels['spouse'] = 'CÃ³nyuge';
	$labels['allfields'] = 'Todos los campos';
	$labels['search'] = 'Buscar';
	$labels['advsearch'] = 'BÃºsqueda avanzada';
	$labels['advanced'] = 'Avanzadas';
	$labels['other'] = 'Otro';
	$labels['typeother'] = 'Otro';
	$labels['typehome'] = 'Casa';
	$labels['typework'] = 'Trabajo';
	$labels['typemobile'] = 'MÃ³vil';
	$labels['typemain'] = 'Principal';
	$labels['typehomefax'] = 'Fax de casa';
	$labels['typeworkfax'] = 'Fax del trabajo';
	$labels['typecar'] = 'Coche';
	$labels['typepager'] = 'Busca';
	$labels['typevideo'] = 'VÃdeo';
	$labels['typehomepage'] = 'Inicio';
	$labels['typeblog'] = 'Blog';
	$labels['typeprofile'] = 'Perfil';
	$labels['addfield'] = 'AÃ±adir campo...';
	$labels['addcontact'] = 'AÃ±adir nuevo contacto';
	$labels['editcontact'] = 'Editar contacto';
	$labels['contacts'] = 'Contactos';
	$labels['contactproperties'] = 'Propiedades del contacto';
	$labels['personalinfo'] = 'InformaciÃ³n personal';
	$labels['edit'] = 'Editar';
	$labels['cancel'] = 'Cancelar';
	$labels['save'] = 'Guardar';
	$labels['delete'] = 'Eliminar';
	$labels['rename'] = 'Renombrar';
	$labels['addphoto'] = 'AÃ±adir';
	$labels['replacephoto'] = 'Reemplazar';
	$labels['uploadphoto'] = 'Subir foto';
	$labels['newcontact'] = 'Crear nueva tarjeta de contacto';
	$labels['deletecontact'] = 'Eliminar contactos seleccionados';
	$labels['composeto'] = 'Escribir mensaje a';
	$labels['contactsfromto'] = 'Contactos $from a $to de $count';
	$labels['print'] = 'Imprimir';
	$labels['export'] = 'Exportar';
	$labels['exportvcards'] = 'Exportar contactos en formato vCard';
	$labels['newcontactgroup'] = 'Crear un nuevo grupo de contactos';
	$labels['grouprename'] = 'Renombrar grupo';
	$labels['groupdelete'] = 'Borrar grupo';
	$labels['groupremoveselected'] = 'Eliminar los contactos seleccionados del grupo';
	$labels['previouspage'] = 'Mostrar grupo anterior';
	$labels['firstpage'] = 'Mostrar primer grupo';
	$labels['nextpage'] = 'Mostrar grupo siguiente';
	$labels['lastpage'] = 'Mostrar Ãºltimo grupo';
	$labels['group'] = 'Grupo';
	$labels['groups'] = 'Grupos';
	$labels['personaladrbook'] = 'Direcciones personales';
	$labels['searchsave'] = 'Guardar bÃºsqueda';
	$labels['searchdelete'] = 'Borrar bÃºsqueda';
	$labels['import'] = 'Importar';
	$labels['importcontacts'] = 'Importar contactos';
	$labels['importfromfile'] = 'Importar desde archivo:';
	$labels['importtarget'] = 'AÃ±adir un nuevo contacto a la los contactos:';
	$labels['importreplace'] = 'Reemplazar toda la lista de contactos';
	$labels['importtext'] = 'Puede importar contactos desde una lista existente.<br/>Actualmente sÃ³lo soportamos el formato <a href="http://es.wikipedia.org/wiki/VCard">vCard</a>.';
	$labels['done'] = 'Hecho';
	$labels['settingsfor'] = 'ConfiguraciÃ³n para';
	$labels['about'] = 'Acerca de';
	$labels['preferences'] = 'Preferencias';
	$labels['userpreferences'] = 'Preferencias de usuario';
	$labels['editpreferences'] = 'Editar preferencias de usuario';
	$labels['identities'] = 'Identidades';
	$labels['manageidentities'] = 'Gestionar identidades para esta cuenta';
	$labels['newidentity'] = 'Nueva identidad';
	$labels['newitem'] = 'Nuevo';
	$labels['edititem'] = 'Editar';
	$labels['preferhtml'] = 'Prefiero HTML';
	$labels['defaultcharset'] = 'Juego de caracteres por defecto';
	$labels['htmlmessage'] = 'Mensaje HTML';
	$labels['dateformat'] = 'Formato de fecha';
	$labels['timeformat'] = 'Formato de hora';
	$labels['prettydate'] = 'Fecha detallada';
	$labels['setdefault'] = 'Seleccionar opciÃ³n por defecto';
	$labels['autodetect'] = 'AutomÃ¡tico';
	$labels['language'] = 'Idioma';
	$labels['timezone'] = 'Zona horaria';
	$labels['pagesize'] = 'Filas por pÃ¡gina';
	$labels['signature'] = 'Firma';
	$labels['dstactive'] = 'Cambio de horario';
	+$labels['composeextwin'] = 'Redactar en una ventana nueva';
	$labels['htmleditor'] = 'Componer mensaje en HTML';
	$labels['htmlonreply'] = 'sÃ³lo en respuesta a un mensaje HTML';
	$labels['htmlsignature'] = 'Firma HTML';
	$labels['previewpane'] = 'Mostrar vista preliminar';
	$labels['skin'] = 'Apariencia de la interfaz';
	$labels['logoutclear'] = 'Vaciar papelera al cerrar sesiÃ³n';
	$labels['logoutcompact'] = 'Compactar la bandeja de entrada al cerrar sesiÃ³n';
	$labels['uisettings'] = 'Interfaz de usuario';
	$labels['serversettings'] = 'ConfiguraciÃ³n del servidor';
	$labels['mailboxview'] = 'Vista de buzÃ³n';
	$labels['mdnrequests'] = 'Cuando se pida acuse de recibo';
	$labels['askuser'] = 'preguntarme';
	$labels['autosend'] = 'enviar acuse de recibo';
	$labels['autosendknown'] = 'enviar acuse de recibo a mis contactos, con los demÃ¡s preguntarme';
	$labels['autosendknownignore'] = 'enviar acuse de recibo a mis contactos, no a los demÃ¡s';
	$labels['ignore'] = 'ignorar';
	$labels['readwhendeleted'] = 'Marcar el mensaje como leÃdo al borrarlo';
	$labels['flagfordeletion'] = 'Marcar el mensaje para borrarse en vez de borrarlo';
	$labels['skipdeleted'] = 'No mostrar mensajes borrados';
	$labels['deletealways'] = 'Cuando falle trasladar los mensajes a la papelera, borrarlos';
	$labels['deletejunk'] = 'Directamente eliminar mensajes de Correo no Deseado';
	$labels['showremoteimages'] = 'Mostrar las imÃ¡genes externas';
	$labels['fromknownsenders'] = 'de remitentes conocidos';
	$labels['always'] = 'siempre';
	$labels['showinlineimages'] = 'Mostrar imÃ¡genes adjuntas debajo del mensaje';
	$labels['autosavedraft'] = 'Guardar borrador automÃ¡ticamente';
	$labels['everynminutes'] = 'cada $n minuto(s)';
	$labels['keepalive'] = 'Comprobar si hay mensajes nuevos';
	$labels['never'] = 'nunca';
	$labels['immediately'] = 'inmediatamente';
	$labels['messagesdisplaying'] = 'Vista de mensajes';
	$labels['messagescomposition'] = 'ComposiciÃ³n de mensajes';
	$labels['mimeparamfolding'] = 'Nombres de archivos adjuntos';
	$labels['2231folding'] = 'RFC 2231 (Thunderbird)';
	$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
	$labels['2047folding'] = 'RFC 2047 (otro)';
	$labels['force7bit'] = 'Usar codificaciÃ³n MIME para caracteres de 8 bits';
	$labels['advancedoptions'] = 'Opciones avanzadas';
	$labels['focusonnewmessage'] = 'Activar la ventana del navegador si hay un mensaje nuevo';
	$labels['checkallfolders'] = 'Comprobar en todas las bandejas si hay mensajes nuevos';
	$labels['displaynext'] = 'DespuÃ©s de borrar/mover un mensaje, mostrar el siguiente';
	$labels['defaultfont'] = 'Tipo de letra predeterminada del mensaje HTML';
	$labels['mainoptions'] = 'Opciones principales';
	$labels['browseroptions'] = 'Opciones del Navegador';
	$labels['section'] = 'SecciÃ³n';
	$labels['maintenance'] = 'Mantenimiento';
	$labels['newmessage'] = 'Nuevo mensaje';
	$labels['signatureoptions'] = 'Opciones de firma';
	$labels['whenreplying'] = 'Al responder';
	$labels['replytopposting'] = 'empezar un mensaje nuevo encima del original';
	$labels['replybottomposting'] = 'empezar un mensaje nuevo debajo del original';
	$labels['replyremovesignature'] = 'Eliminar la firma original del mensaje al responder';
	$labels['autoaddsignature'] = 'AÃ±adir firma automÃ¡ticamente';
	$labels['newmessageonly'] = 'solamente mensaje nuevo';
	$labels['replyandforwardonly'] = 'respuestas y reenvÃos solamente';
	$labels['replysignaturepos'] = 'Colocar firma al responder o reenviar';
	$labels['belowquote'] = 'abajo del texto seleccionado';
	$labels['abovequote'] = 'arriba del texto seleccionado';
	$labels['insertsignature'] = 'Insertar firma';
	$labels['previewpanemarkread'] = 'Marcar mensaje previsualizado como leÃdo';
	$labels['afternseconds'] = 'despuÃ©s de $n segundos';
	$labels['reqmdn'] = 'Solicitar siempre un acuse de recibo';
	$labels['reqdsn'] = 'Solicitar siempre la entrega de notificaciones de estado';
	$labels['replysamefolder'] = 'Coloque las respuestas en la bandeja del mensaje que se responde';
	$labels['defaultaddressbook'] = 'AÃ±adir nuevos contactos a la lista de contactos seleccionada';
	$labels['autocompletesingle'] = 'Omitir direcciones de correo alternativas en autocompletado';
	$labels['listnamedisplay'] = 'Listar contactos como';
	$labels['spellcheckbeforesend'] = 'Comprobar ortografÃa antes de enviar un mensaje';
	$labels['spellcheckoptions'] = 'Opciones de ortografÃa';
	$labels['spellcheckignoresyms'] = 'Ignorar palabras con sÃmbolos';
	$labels['spellcheckignorenums'] = 'Ignorar palabras con nÃºmeros';
	$labels['spellcheckignorecaps'] = 'Ignorar palabras con todo mayÃºsculas';
	$labels['addtodict'] = 'AÃ±adir al diccionario';
	$labels['mailtoprotohandler'] = 'Registrar controlador de protocolo para enlaces mailto:';
	$labels['folder'] = 'Bandeja';
	$labels['foldername'] = 'Nombre de bandeja';
	$labels['subscribed'] = 'Suscrita';
	$labels['messagecount'] = 'Mensajes';
	$labels['create'] = 'Crear';
	$labels['createfolder'] = 'Crear nueva bandeja';
	$labels['managefolders'] = 'Administrar bandejas';
	$labels['specialfolders'] = 'Bandejas especiales';
	$labels['properties'] = 'Propiedades';
	$labels['folderproperties'] = 'Propiedades de bandeja';
	$labels['parentfolder'] = 'Bandeja contenedora';
	$labels['location'] = 'UbicaciÃ³n';
	$labels['info'] = 'InformaciÃ³n';
	$labels['getfoldersize'] = 'Clic para saber el tamaÃ±o de la bandeja';
	$labels['changesubscription'] = 'Clic para cambiar suscripciÃ³n';
	$labels['foldertype'] = 'Tipo de bandeja';
	$labels['personalfolder'] = 'Bandeja privada';
	$labels['otherfolder'] = 'Bandeja de otro usuario';
	$labels['sharedfolder'] = 'Bandeja pÃºblica';
	$labels['sortby'] = 'Ordenar por';
	$labels['sortasc'] = 'Orden ascendente';
	$labels['sortdesc'] = 'Orden descendente';
	$labels['undo'] = 'Deshacer';
	$labels['plugin'] = 'Plugin';
	$labels['version'] = 'VersiÃ³n';
	$labels['source'] = 'Origen';
	$labels['license'] = 'Licencia';
	$labels['support'] = 'Obtener soporte';
	$labels['B'] = 'B';
	$labels['KB'] = 'KB';
	$labels['MB'] = 'MB';
	$labels['GB'] = 'GB';
	$labels['unicode'] = 'Unicode';
	$labels['english'] = 'InglÃ©s';
	$labels['westerneuropean'] = 'Europeo occidental';
	$labels['easterneuropean'] = 'Europeo oriental';
	$labels['southeasterneuropean'] = 'Europeo sudoriental';
	$labels['baltic'] = 'BÃ¡ltico';
	$labels['cyrillic'] = 'CirÃlico';
	$labels['arabic'] = 'Ãrabe';
	$labels['greek'] = 'Griego';
	$labels['hebrew'] = 'Hebreo';
	$labels['turkish'] = 'Turco';
	$labels['nordic'] = 'NÃ³rdico';
	$labels['thai'] = 'TailandÃ©s';
	$labels['celtic'] = 'Celta';
	$labels['vietnamese'] = 'Vietnamita';
	$labels['japanese'] = 'JaponÃ©s';
	$labels['korean'] = 'Coreano';
	$labels['chinese'] = 'Chino';

	diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
	index 4d61ace8e..61b48b0cc 100644
	--- a/program/localization/it_IT/labels.inc
	+++ b/program/localization/it_IT/labels.inc
	@@ -1,450 +1,451 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| localization/it_IT/labels.inc \|
	\| \|
	\| Language file of the Roundcube Webmail client \|
	\| Copyright (C) 2012, The Roundcube Dev Team \|
	\| Licensed under the GNU General Public License \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Andrea Bernini <andrea.bernini@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$labels = array();
	$labels['welcome'] = 'Benvenuto in $product';
	$labels['username'] = 'Utente';
	$labels['password'] = 'Password';
	$labels['server'] = 'Server';
	$labels['login'] = 'Entra';
	$labels['logout'] = 'Esci';
	$labels['mail'] = 'E-Mail';
	$labels['settings'] = 'Impostazioni';
	$labels['addressbook'] = 'Rubrica';
	$labels['inbox'] = 'Posta in arrivo';
	$labels['drafts'] = 'Bozze';
	$labels['sent'] = 'Inviata';
	$labels['trash'] = 'Cestino';
	$labels['junk'] = 'Spam';
	$labels['subject'] = 'Oggetto';
	$labels['from'] = 'Mittente';
	$labels['to'] = 'Destinatario';
	$labels['cc'] = 'Cc';
	$labels['bcc'] = 'Bcc';
	$labels['replyto'] = 'Rispondi a';
	$labels['followupto'] = 'Followup-To';
	$labels['date'] = 'Data';
	$labels['size'] = 'Dimensione';
	$labels['priority'] = 'PrioritÃ ';
	$labels['organization'] = 'SocietÃ ';
	$labels['readstatus'] = 'Visualizza lo stato';
	$labels['listoptions'] = 'Elenco opzioni...';
	$labels['mailboxlist'] = 'Cartelle';
	$labels['folders'] = 'Cartelle';
	$labels['messagesfromto'] = 'Messaggi da $from a $to di $count';
	$labels['threadsfromto'] = 'Thread da $from a $to di $count';
	$labels['messagenrof'] = 'Messaggio $nr di $count';
	$labels['fromtoshort'] = '$from â $to di $count';
	$labels['copy'] = 'Copia';
	$labels['move'] = 'Sposta';
	$labels['moveto'] = 'Sposta in...';
	$labels['download'] = 'Download';
	$labels['filename'] = 'Nome file';
	$labels['filesize'] = 'Dimensione file';
	$labels['addtoaddressbook'] = 'Aggiungi alla rubrica';
	$labels['sun'] = 'Dom';
	$labels['mon'] = 'Lun';
	$labels['tue'] = 'Mar';
	$labels['wed'] = 'Mer';
	$labels['thu'] = 'Gio';
	$labels['fri'] = 'Ven';
	$labels['sat'] = 'Sab';
	$labels['sunday'] = 'Domenica';
	$labels['monday'] = 'LunedÃ¬';
	$labels['tuesday'] = 'MartedÃ¬';
	$labels['wednesday'] = 'MercoledÃ¬';
	$labels['thursday'] = 'GiovedÃ¬';
	$labels['friday'] = 'VenerdÃ¬';
	$labels['saturday'] = 'Sabato';
	$labels['jan'] = 'Gen';
	$labels['feb'] = 'Feb';
	$labels['mar'] = 'Mar';
	$labels['apr'] = 'Apr';
	$labels['may'] = 'Maggio';
	$labels['longmay'] = 'Maggio';
	$labels['jun'] = 'Giu';
	$labels['jul'] = 'Lug';
	$labels['aug'] = 'Ago';
	$labels['sep'] = 'Set';
	$labels['oct'] = 'Ott';
	$labels['nov'] = 'Nov';
	$labels['dec'] = 'Dic';
	$labels['longjan'] = 'Gennaio';
	$labels['longfeb'] = 'Febbraio';
	$labels['longmar'] = 'Marzo';
	$labels['longapr'] = 'Aprile';
	$labels['longjun'] = 'Giugno';
	$labels['longjul'] = 'Luglio';
	$labels['longaug'] = 'Agosto';
	$labels['longsep'] = 'Settembre';
	$labels['longoct'] = 'Ottobre';
	$labels['longnov'] = 'Novembre';
	$labels['longdec'] = 'Dicembre';
	$labels['today'] = 'Oggi';
	$labels['refresh'] = 'Aggiorna';
	$labels['checkmail'] = 'Controlla nuovi messaggi';
	$labels['compose'] = 'Scrivi un messaggio';
	$labels['writenewmessage'] = 'Scrivi un nuovo messaggio';
	$labels['reply'] = 'Rispondi';
	$labels['replytomessage'] = 'Rispondi al mittente';
	$labels['replytoallmessage'] = 'Rispondi al mittente e ai destinatari';
	$labels['replyall'] = 'Rispondi a tutti';
	$labels['replylist'] = 'Rispondi alla mailing list';
	$labels['forward'] = 'Inoltra';
	$labels['forwardinline'] = 'Inoltra come messaggio';
	$labels['forwardattachment'] = 'Inoltre come allegato';
	$labels['forwardmessage'] = 'Inoltra il messaggio';
	$labels['deletemessage'] = 'Elimina il messaggio';
	$labels['movemessagetotrash'] = 'Sposta il messaggio nel cestino';
	$labels['printmessage'] = 'Stampa il messaggio';
	$labels['previousmessage'] = 'Visualizza il messaggio precedente';
	$labels['firstmessage'] = 'Visualizza il primo messaggio';
	$labels['nextmessage'] = 'Visualizza il messaggio successivo';
	$labels['lastmessage'] = 'Visualizza l\'ultimo messaggio';
	$labels['backtolist'] = 'Torna alla lista messaggi';
	$labels['viewsource'] = 'Visualizza sorgente messaggio';
	$labels['mark'] = 'Contrassegna';
	$labels['markmessages'] = 'Marca i messaggi';
	$labels['markread'] = 'Letti';
	$labels['markunread'] = 'Non letti';
	$labels['markflagged'] = 'Contrassegnato';
	$labels['markunflagged'] = 'Non contrassegnato';
	$labels['moreactions'] = 'Altre operazioni...';
	$labels['more'] = 'Di piÃ¹';
	$labels['back'] = 'Indietro';
	$labels['options'] = 'Opzioni';
	$labels['select'] = 'Seleziona';
	$labels['all'] = 'Tutti';
	$labels['none'] = 'Nessuno';
	$labels['nonesort'] = 'Nessuno';
	$labels['currpage'] = 'Pagina corrente';
	$labels['unread'] = 'Non letti';
	$labels['flagged'] = 'Contrassegnato';
	$labels['unanswered'] = 'Senza risposta';
	$labels['deleted'] = 'Cancellato';
	$labels['invert'] = 'Inverti';
	$labels['filter'] = 'Filtra';
	$labels['list'] = 'Elenco';
	$labels['threads'] = 'Argomenti';
	$labels['expand-all'] = 'Espandi tutto';
	$labels['expand-unread'] = 'Espandi non letti';
	$labels['collapse-all'] = 'Richiudi tutti';
	$labels['threaded'] = 'Per argomenti';
	$labels['autoexpand_threads'] = 'Espandi';
	$labels['do_expand'] = 'tutti i thread';
	$labels['expand_only_unread'] = 'solo con messaggi non letti';
	$labels['fromto'] = 'Mittente/Destinatario';
	$labels['flag'] = 'Contrassegnato';
	$labels['attachment'] = 'Allegato';
	$labels['sentdate'] = 'Data d\'invio';
	$labels['arrival'] = 'Data di arrivo';
	$labels['asc'] = 'Ascendente';
	$labels['desc'] = 'Discendente';
	$labels['listcolumns'] = 'Elenco Colonne';
	$labels['listsorting'] = 'Ordina per';
	$labels['listorder'] = 'Ordinamento';
	$labels['listmode'] = 'ModalitÃ di visualizzazione';
	$labels['folderactions'] = 'Operazioni cartella';
	$labels['compact'] = 'Compatta';
	$labels['empty'] = 'Svuota';
	$labels['quota'] = 'Spazio utilizzato';
	$labels['unknown'] = 'sconosciuto';
	$labels['unlimited'] = 'illimitato';
	$labels['quicksearch'] = 'Ricerca veloce';
	$labels['resetsearch'] = 'Annulla ricerca';
	$labels['searchmod'] = 'Ambito di ricerca';
	$labels['msgtext'] = 'Intero messaggio';
	$labels['openinextwin'] = 'Apri in una nuova finestra';
	$labels['emlsave'] = 'Scarica (.eml)';
	$labels['editasnew'] = 'Modifica come nuovo';
	$labels['savemessage'] = 'Salva come bozza';
	$labels['sendmessage'] = 'Invia il messaggio adesso';
	$labels['addattachment'] = 'Allega un file';
	$labels['charset'] = 'Set di caratteri';
	$labels['editortype'] = 'Tipo editor';
	$labels['returnreceipt'] = 'Ricevuta di ritorno';
	$labels['dsn'] = 'Notifica di consegna';
	$labels['mailreplyintro'] = 'Il $date $sender ha scritto:';
	$labels['originalmessage'] = 'Messaggio originale';
	$labels['editidents'] = 'Modifica identitÃ ';
	$labels['spellcheck'] = 'Controllo ortografico';
	$labels['checkspelling'] = 'Controlla ortografia';
	$labels['resumeediting'] = 'Torna al messaggio';
	$labels['revertto'] = 'Ripristina';
	$labels['attach'] = 'Allega';
	$labels['attachments'] = 'Allegati';
	$labels['upload'] = 'Aggiungi';
	$labels['uploadprogress'] = '$percent ($current di $total)';
	$labels['close'] = 'Chiudi';
	$labels['messageoptions'] = 'Opzioni messaggi...';
	$labels['low'] = 'Bassa';
	$labels['lowest'] = 'Molto bassa';
	$labels['normal'] = 'Normale';
	$labels['high'] = 'Alta';
	$labels['highest'] = 'Molto alta';
	$labels['nosubject'] = '(nessun oggetto)';
	$labels['showimages'] = 'Visualizza immagini';
	$labels['alwaysshow'] = 'Mostra sempre immagini da $sender';
	$labels['isdraft'] = 'Questa Ã¨ una bozza.';
	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'Testo semplice';
	$labels['savesentmessagein'] = 'Salva i messaggi inviati in';
	$labels['dontsave'] = 'non salvare';
	$labels['maxuploadsize'] = 'La dimensione massima consentita Ã¨ $size';
	$labels['addcc'] = 'Aggiungi Cc';
	$labels['addbcc'] = 'Aggiungi Bcc';
	$labels['addreplyto'] = 'Aggiungi Rispondi a';
	$labels['addfollowupto'] = 'Aggiungi Followup-To';
	$labels['mdnrequest'] = 'Il mittente ha richiesto di ricevere una notifica dell\'avvenuta lettura del messaggio. Si desidera inviare tale notifica?';
	$labels['receiptread'] = 'Ricevuta di ritorno (letto)';
	$labels['yourmessage'] = 'Questa Ã¨ la ricevuta di ritorno del messaggio inviato';
	$labels['receiptnote'] = 'Nota: questa Ricevuta di ritorno attesta solamente che il messaggio Ã¨ stato visualizzato nel computer del destinatario. Non c\'Ã¨ pertanto alcuna garanzia che il destinatario abbia letto o compreso il suo contenuto.';
	$labels['name'] = 'Nome visualizzato';
	$labels['firstname'] = 'Nome';
	$labels['surname'] = 'Cognome';
	$labels['middlename'] = 'Secondo nome';
	$labels['nameprefix'] = 'Prefisso';
	$labels['namesuffix'] = 'Suffisso';
	$labels['nickname'] = 'Soprannome';
	$labels['jobtitle'] = 'Titolo';
	$labels['department'] = 'Dipartimento';
	$labels['gender'] = 'Sesso';
	$labels['maidenname'] = 'Cognome da nubile';
	$labels['email'] = 'E-Mail';
	$labels['phone'] = 'Telefono';
	$labels['address'] = 'Indirizzo';
	$labels['street'] = 'Via';
	$labels['locality'] = 'CittÃ ';
	$labels['zipcode'] = 'CAP';
	$labels['region'] = 'Regione';
	$labels['country'] = 'Stato';
	$labels['birthday'] = 'Compleanno';
	$labels['anniversary'] = 'Anniversario';
	$labels['website'] = 'Sito web';
	$labels['instantmessenger'] = 'IM';
	$labels['notes'] = 'Note';
	$labels['male'] = 'maschio';
	$labels['female'] = 'femmina';
	$labels['manager'] = 'Manager';
	$labels['assistant'] = 'Assistente';
	$labels['typeassistant'] = 'Assistente';
	$labels['spouse'] = 'Coniuge';
	$labels['allfields'] = 'Tutti i campi';
	$labels['search'] = 'Ricerca';
	$labels['advsearch'] = 'Ricerca avanzata';
	$labels['advanced'] = 'Opzioni avanzate';
	$labels['other'] = 'Altro';
	$labels['typeother'] = 'Altro';
	$labels['typehome'] = 'Casa';
	$labels['typework'] = 'Lavoro';
	$labels['typemobile'] = 'Cellulare';
	$labels['typemain'] = 'Principale';
	$labels['typehomefax'] = 'Fax casa';
	$labels['typeworkfax'] = 'Fax lavoro';
	$labels['typecar'] = 'Auto';
	$labels['typepager'] = 'Teledrin';
	$labels['typevideo'] = 'Video';
	$labels['typehomepage'] = 'Home page';
	$labels['typeblog'] = 'Blog';
	$labels['typeprofile'] = 'Profilo';
	$labels['addfield'] = 'Aggiungi campo...';
	$labels['addcontact'] = 'Aggiungi contatto alla rubrica';
	$labels['editcontact'] = 'Modifica contatto';
	$labels['contacts'] = 'Contatti';
	$labels['contactproperties'] = 'ProprietÃ contatto';
	$labels['personalinfo'] = 'Informazioni personali';
	$labels['edit'] = 'Modifica';
	$labels['cancel'] = 'Annulla';
	$labels['save'] = 'Salva';
	$labels['delete'] = 'Elimina';
	$labels['rename'] = 'Rinomina';
	$labels['addphoto'] = 'Aggiungi';
	$labels['replacephoto'] = 'Sostituisci';
	$labels['uploadphoto'] = 'Carica foto';
	$labels['newcontact'] = 'Crea un nuovo contatto';
	$labels['deletecontact'] = 'Elimina i contatti selezionati';
	$labels['composeto'] = 'Invia email a';
	$labels['contactsfromto'] = 'Contatti da $from a $to di $count';
	$labels['print'] = 'Stampa';
	$labels['export'] = 'Esporta';
	$labels['exportvcards'] = 'Esporta i contatti in formato vCard';
	$labels['newcontactgroup'] = 'Crea un nuovo gruppo';
	$labels['grouprename'] = 'Rinomina il gruppo';
	$labels['groupdelete'] = 'Cancella il gruppo';
	$labels['groupremoveselected'] = 'Rimuovi i contatti selezionati dal gruppo';
	$labels['previouspage'] = 'Pagina precedente';
	$labels['firstpage'] = 'Prima pagina';
	$labels['nextpage'] = 'Pagina successiva';
	$labels['lastpage'] = 'Ultima pagina';
	$labels['group'] = 'Gruppo';
	$labels['groups'] = 'Gruppi';
	$labels['personaladrbook'] = 'Rubrica Personale';
	$labels['searchsave'] = 'Salva ricerca';
	$labels['searchdelete'] = 'Elimina ricerca';
	$labels['import'] = 'Importa';
	$labels['importcontacts'] = 'Importa contatti';
	$labels['importfromfile'] = 'Importa da file:';
	$labels['importtarget'] = 'Aggiungi nuovi contattu alla rubrica:';
	$labels['importreplace'] = 'Sostituisci l\'intera rubrica';
	$labels['importtext'] = 'Puoi caricare i contatti da una rubrica esistente. Al momento Ã¨ supportata l\'importazione dei contatti dal formato vCard.';
	$labels['done'] = 'Fatto';
	$labels['settingsfor'] = 'Impostazioni per';
	$labels['about'] = 'Informazioni';
	$labels['preferences'] = 'Preferenze';
	$labels['userpreferences'] = 'Preferenze utente';
	$labels['editpreferences'] = 'Modifica le preferenze per l\'utente';
	$labels['identities'] = 'IdentitÃ ';
	$labels['manageidentities'] = 'Gestisci le identitÃ per questo account';
	$labels['newidentity'] = 'Nuova identitÃ ';
	$labels['newitem'] = 'Nuovo elemento';
	$labels['edititem'] = 'Modifica elemento';
	$labels['preferhtml'] = 'Mostra HTML';
	$labels['defaultcharset'] = 'Set di caratteri predefinito';
	$labels['htmlmessage'] = 'Messaggio HTML';
	$labels['dateformat'] = 'Formato data';
	$labels['timeformat'] = 'Formato orario';
	$labels['prettydate'] = 'Date piÃ¹ leggibili';
	$labels['setdefault'] = 'Imposta predefinita';
	$labels['autodetect'] = 'Auto';
	$labels['language'] = 'Lingua';
	$labels['timezone'] = 'Fuso orario';
	$labels['pagesize'] = 'Righe per pagina';
	$labels['signature'] = 'Firma';
	$labels['dstactive'] = 'Gestione ora legale';
	+$labels['composeextwin'] = 'Componi in nuova finestra';
	$labels['htmleditor'] = 'Scrivi i messaggi in HTML';
	$labels['htmlonreply'] = 'solo in risposta a messaggi HTML';
	$labels['htmlsignature'] = 'Firma in HTML';
	$labels['previewpane'] = 'Mostra l\'anteprima';
	$labels['skin'] = 'Tema interfaccia';
	$labels['logoutclear'] = 'Svuota il Cestino all\'uscita';
	$labels['logoutcompact'] = 'Compatta la Posta In Arrivo all\'uscita';
	$labels['uisettings'] = 'Interfaccia Utente';
	$labels['serversettings'] = 'Impostazioni Server';
	$labels['mailboxview'] = 'Vista Messaggi';
	$labels['mdnrequests'] = 'Su richiesta per la ricevuta di ritorno';
	$labels['askuser'] = 'chiedi conferma';
	$labels['autosend'] = 'invia';
	$labels['autosendknown'] = 'invia notifica ai miei contatti, altrimenti chiedi conferma';
	$labels['autosendknownignore'] = 'invia notifica ai miei contatti, altrimenti ignora';
	$labels['ignore'] = 'ignora';
	$labels['readwhendeleted'] = 'Marca il messaggio come letto prima di eliminarlo';
	$labels['flagfordeletion'] = 'Marca il messaggio come eliminato invece di eliminarlo';
	$labels['skipdeleted'] = 'Non mostrare i messaggi marcati come eliminati';
	$labels['deletealways'] = 'Quando non Ã¨ possinile spostare i messaggi nel Cestino eliminali';
	$labels['deletejunk'] = 'Elimina direttamente i messaggi in Spam';
	$labels['showremoteimages'] = 'Mostra immagini remote contenute nel messaggio';
	$labels['fromknownsenders'] = 'da mittenti conosciuti';
	$labels['always'] = 'sempre';
	$labels['showinlineimages'] = 'Mostra immagini allegate sotto il messaggio';
	$labels['autosavedraft'] = 'Salva le bozze automaticamente';
	$labels['everynminutes'] = 'ogni $n minuto(i)';
	$labels['keepalive'] = 'Controlla la presenza di nuovi messaggi';
	$labels['never'] = 'mai';
	$labels['immediately'] = 'immediatamente';
	$labels['messagesdisplaying'] = 'Visualizzazione Messaggi';
	$labels['messagescomposition'] = 'Composizione Messaggi';
	$labels['mimeparamfolding'] = 'Nomi allegati';
	$labels['2231folding'] = 'RFC 2231 completo (Thunderbird)';
	$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
	$labels['2047folding'] = 'RFC 2047 completo (altri)';
	$labels['force7bit'] = 'Usa la codifica MIME per i caratteri a 8-bit';
	$labels['advancedoptions'] = 'Opzioni avanzate';
	$labels['focusonnewmessage'] = 'Attiva la finestra del browser all\'arrivo di un nuovo messaggio';
	$labels['checkallfolders'] = 'Controlla tutte le cartelle per la presenza di nuovi messaggi';
	$labels['displaynext'] = 'Dopo aver cancellato/spostato il messaggio mostra quello successivo';
	$labels['defaultfont'] = 'font standard per messaggi in HTML';
	$labels['mainoptions'] = 'Opzioni principali';
	$labels['browseroptions'] = 'Opzioni del browser';
	$labels['section'] = 'Sezione';
	$labels['maintenance'] = 'Manutenzione';
	$labels['newmessage'] = 'Nuovo Messaggio';
	$labels['signatureoptions'] = 'Opzioni firma';
	$labels['whenreplying'] = 'Quando rispondi';
	$labels['replytopposting'] = 'inizia il nuovo messaggio sopra quello originale';
	$labels['replybottomposting'] = 'inizia il nuovo messaggio sotto quello originale';
	$labels['replyremovesignature'] = 'Quando rispondi, rimuovi la firma dal messaggio originale';
	$labels['autoaddsignature'] = 'Aggiungi automaticamente la firma';
	$labels['newmessageonly'] = 'solo ai nuovi messaggi';
	$labels['replyandforwardonly'] = 'solo alle risposte e inoltri';
	$labels['replysignaturepos'] = 'In risposta o inoltro, posiziona la firma';
	$labels['belowquote'] = 'sotto la citazione';
	$labels['abovequote'] = 'sopra la citazione';
	$labels['insertsignature'] = 'Inserisci firma';
	$labels['previewpanemarkread'] = 'Segna i messagi in anteprima come letti';
	$labels['afternseconds'] = 'dopo $n secondi';
	$labels['reqmdn'] = 'Richiedi sempre la ricevuta di ritorno';
	$labels['reqdsn'] = 'Richiedi sempre la notifica di consegna';
	$labels['replysamefolder'] = 'Salva risposta nella cartella del messaggio a cui si risponde';
	$labels['defaultaddressbook'] = 'Aggiungi nuovi contatti alla rubrica selezionata';
	$labels['autocompletesingle'] = 'Non considerare gli indirizzi secondari nell\'autocompletamento';
	$labels['listnamedisplay'] = 'Elenca contatti come';
	$labels['spellcheckbeforesend'] = 'Esegui il controllo ortografico prima di inviare un messaggio';
	$labels['spellcheckoptions'] = 'Opzioni controllo ortografico';
	$labels['spellcheckignoresyms'] = 'Ignora le parole contenenti simboli';
	$labels['spellcheckignorenums'] = 'Ignora le parole contenenti numeri';
	$labels['spellcheckignorecaps'] = 'Ignora le parole con tutte le lettere maiuscole';
	$labels['addtodict'] = 'Aggiungi al dizionario';
	$labels['mailtoprotohandler'] = 'Registra gestore per mailto:';
	$labels['folder'] = 'Cartella';
	$labels['foldername'] = 'Nome cartella';
	$labels['subscribed'] = 'Sottoscritta';
	$labels['messagecount'] = 'Messaggi';
	$labels['create'] = 'Crea';
	$labels['createfolder'] = 'Crea nuova cartella';
	$labels['managefolders'] = 'Gestione cartelle';
	$labels['specialfolders'] = 'Cartelle Speciali';
	$labels['properties'] = 'ProprietÃ ';
	$labels['folderproperties'] = 'ProprietÃ cartella';
	$labels['parentfolder'] = 'Cartella padre';
	$labels['location'] = 'Ubicazione';
	$labels['info'] = 'Informazioni';
	$labels['getfoldersize'] = 'Click per la dimensione della cartella';
	$labels['changesubscription'] = 'Click per cambiare sottoscrizione';
	$labels['foldertype'] = 'Tipo di cartella';
	$labels['personalfolder'] = 'Cartella privata';
	$labels['otherfolder'] = 'Cartella di un altro utente';
	$labels['sharedfolder'] = 'Cartella pubblica';
	$labels['sortby'] = 'Ordina per';
	$labels['sortasc'] = 'Ordinamento crescente';
	$labels['sortdesc'] = 'Ordinamento decrescente';
	$labels['undo'] = 'Annulla';
	$labels['plugin'] = 'Plugin';
	$labels['version'] = 'Versione';
	$labels['source'] = 'Sorgente';
	$labels['license'] = 'Licenza';
	$labels['support'] = 'Ottieni supporto';
	$labels['B'] = 'B';
	$labels['KB'] = 'KB';
	$labels['MB'] = 'MB';
	$labels['GB'] = 'GB';
	$labels['unicode'] = 'Unicode';
	$labels['english'] = 'Inglese';
	$labels['westerneuropean'] = 'Europa occidentale';
	$labels['easterneuropean'] = 'Europa orientale';
	$labels['southeasterneuropean'] = 'Europa sud-orientale';
	$labels['baltic'] = 'Baltiche';
	$labels['cyrillic'] = 'Cirillico';
	$labels['arabic'] = 'Arabo';
	$labels['greek'] = 'Greco';
	$labels['hebrew'] = 'Ebraico';
	$labels['turkish'] = 'Turco';
	$labels['nordic'] = 'Scandinavo';
	$labels['thai'] = 'Tailandese';
	$labels['celtic'] = 'Celtico';
	$labels['vietnamese'] = 'Vietnamita';
	$labels['japanese'] = 'Giapponese';
	$labels['korean'] = 'Coreano';
	$labels['chinese'] = 'Cinese';

	diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
	index 93537c58b..bb93004ff 100644
	--- a/program/localization/nl_NL/labels.inc
	+++ b/program/localization/nl_NL/labels.inc
	@@ -1,450 +1,451 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| localization/nl_NL/labels.inc \|
	\| \|
	\| Language file of the Roundcube Webmail client \|
	\| Copyright (C) 2012, The Roundcube Dev Team \|
	\| Licensed under the GNU General Public License \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Geert Wirken \|
	+-----------------------------------------------------------------------+
	*/

	$labels = array();
	$labels['welcome'] = 'Welkom bij $product';
	$labels['username'] = 'Gebruikersnaam';
	$labels['password'] = 'Wachtwoord';
	$labels['server'] = 'Server';
	$labels['login'] = 'Inloggen';
	$labels['logout'] = 'Uitloggen';
	$labels['mail'] = 'E-mail';
	$labels['settings'] = 'Instellingen';
	$labels['addressbook'] = 'Adresboek';
	$labels['inbox'] = 'Postvak IN';
	$labels['drafts'] = 'Concepten';
	$labels['sent'] = 'Verzonden';
	$labels['trash'] = 'Prullenbak';
	$labels['junk'] = 'Spam';
	$labels['subject'] = 'Onderwerp';
	$labels['from'] = 'Afzender';
	$labels['to'] = 'Ontvanger';
	$labels['cc'] = 'Kopie';
	$labels['bcc'] = 'Bcc';
	$labels['replyto'] = 'Antwoord-aan';
	$labels['followupto'] = 'Followup-Aan';
	$labels['date'] = 'Datum';
	$labels['size'] = 'Grootte';
	$labels['priority'] = 'Prioriteit';
	$labels['organization'] = 'Organisatie';
	$labels['readstatus'] = 'Gelezen?';
	$labels['listoptions'] = 'Lijstopties...';
	$labels['mailboxlist'] = 'Mappen';
	$labels['folders'] = 'Mappen';
	$labels['messagesfromto'] = 'Bericht $from t/m $to van $count';
	$labels['threadsfromto'] = 'Conversatie $from t/m $to van $count';
	$labels['messagenrof'] = 'Bericht $nr van $count';
	$labels['fromtoshort'] = '$from â $to van $count';
	$labels['copy'] = 'KopiÃ«ren';
	$labels['move'] = 'Verplaats';
	$labels['moveto'] = 'Verplaats naar...';
	$labels['download'] = 'Download';
	$labels['filename'] = 'Bestandsnaam';
	$labels['filesize'] = 'Bestandsgrootte';
	$labels['addtoaddressbook'] = 'Toevoegen aan adresboek';
	$labels['sun'] = 'Zo';
	$labels['mon'] = 'Ma';
	$labels['tue'] = 'Di';
	$labels['wed'] = 'Wo';
	$labels['thu'] = 'Do';
	$labels['fri'] = 'Vr';
	$labels['sat'] = 'Za';
	$labels['sunday'] = 'Zondag';
	$labels['monday'] = 'Maandag';
	$labels['tuesday'] = 'Dinsdag';
	$labels['wednesday'] = 'Woensdag';
	$labels['thursday'] = 'Donderdag';
	$labels['friday'] = 'Vrijdag';
	$labels['saturday'] = 'Zaterdag';
	$labels['jan'] = 'Jan';
	$labels['feb'] = 'Feb';
	$labels['mar'] = 'Mrt';
	$labels['apr'] = 'Apr';
	$labels['may'] = 'Mei';
	$labels['longmay'] = 'Mei';
	$labels['jun'] = 'Jun';
	$labels['jul'] = 'Jul';
	$labels['aug'] = 'Aug';
	$labels['sep'] = 'Sep';
	$labels['oct'] = 'Okt';
	$labels['nov'] = 'Nov';
	$labels['dec'] = 'Dec';
	$labels['longjan'] = 'Januari';
	$labels['longfeb'] = 'Februari';
	$labels['longmar'] = 'Maart';
	$labels['longapr'] = 'April';
	$labels['longjun'] = 'Juni';
	$labels['longjul'] = 'Juli';
	$labels['longaug'] = 'Augustus';
	$labels['longsep'] = 'September';
	$labels['longoct'] = 'Oktober';
	$labels['longnov'] = 'November';
	$labels['longdec'] = 'December';
	$labels['today'] = 'Vandaag';
	$labels['refresh'] = 'Vernieuwen';
	$labels['checkmail'] = 'Controleer op nieuwe berichten';
	$labels['compose'] = 'Nieuw bericht aanmaken';
	$labels['writenewmessage'] = 'Maak een nieuw bericht';
	$labels['reply'] = 'Beantwoorden';
	$labels['replytomessage'] = 'Beantwoord het bericht';
	$labels['replytoallmessage'] = 'Beantwoord lijst of afzender en alle ontvangers';
	$labels['replyall'] = 'Beantwoord alle ontvangers';
	$labels['replylist'] = 'Beantwoord lijst';
	$labels['forward'] = 'Doorsturen';
	$labels['forwardinline'] = 'Doorsturen in bericht';
	$labels['forwardattachment'] = 'Doorsturen als bijlage';
	$labels['forwardmessage'] = 'Bericht doorsturen';
	$labels['deletemessage'] = 'Verwijder het bericht';
	$labels['movemessagetotrash'] = 'Verplaats het bericht naar de prullenbak';
	$labels['printmessage'] = 'Dit bericht afdrukken';
	$labels['previousmessage'] = 'Toon het vorige bericht';
	$labels['firstmessage'] = 'Toon het eerste bericht';
	$labels['nextmessage'] = 'Toon het volgende bericht';
	$labels['lastmessage'] = 'Toon het laatste bericht';
	$labels['backtolist'] = 'Terug naar berichtenoverzicht';
	$labels['viewsource'] = 'Toon bron';
	$labels['mark'] = 'Markeren';
	$labels['markmessages'] = 'Markeer berichten';
	$labels['markread'] = 'Gelezen';
	$labels['markunread'] = 'Ongelezen';
	$labels['markflagged'] = 'Selecteren';
	$labels['markunflagged'] = 'Niet selecteren';
	$labels['moreactions'] = 'Meer acties';
	$labels['more'] = 'Meer';
	$labels['back'] = 'Terug';
	$labels['options'] = 'Opties';
	$labels['select'] = 'Selecteer';
	$labels['all'] = 'Allemaal';
	$labels['none'] = 'Geen';
	$labels['nonesort'] = 'Geen';
	$labels['currpage'] = 'Huidige pagina';
	$labels['unread'] = 'Ongelezen';
	$labels['flagged'] = 'Geselecteerd';
	$labels['unanswered'] = 'Onbeantwoord';
	$labels['deleted'] = 'Verwijderd';
	$labels['invert'] = 'Selectie omdraaien';
	$labels['filter'] = 'Filter';
	$labels['list'] = 'Lijst';
	$labels['threads'] = 'Conversaties';
	$labels['expand-all'] = 'Alles uitklappen';
	$labels['expand-unread'] = 'Ongelezen uitklappen';
	$labels['collapse-all'] = 'Alles inklappen';
	$labels['threaded'] = 'Conversaties';
	$labels['autoexpand_threads'] = 'Klap alle conversaties uit';
	$labels['do_expand'] = 'alle conversaties';
	$labels['expand_only_unread'] = 'alleen met ongelezen berichten';
	$labels['fromto'] = 'Afzender/Ontvanger';
	$labels['flag'] = 'Markeer';
	$labels['attachment'] = 'Bijlage';
	$labels['sentdate'] = 'Verzend datum';
	$labels['arrival'] = 'Aankomst datum';
	$labels['asc'] = 'oplopend';
	$labels['desc'] = 'aflopend';
	$labels['listcolumns'] = 'Kolommen';
	$labels['listsorting'] = 'Sorteer op kolom';
	$labels['listorder'] = 'Sorteervolgorde';
	$labels['listmode'] = 'Weergavemodus';
	$labels['folderactions'] = 'Acties voor map...';
	$labels['compact'] = 'Opschonen';
	$labels['empty'] = 'Legen';
	$labels['quota'] = 'Mailbox quotum';
	$labels['unknown'] = 'onbekend';
	$labels['unlimited'] = 'onbeperkt';
	$labels['quicksearch'] = 'Snel zoeken';
	$labels['resetsearch'] = 'Reset zoekopdracht';
	$labels['searchmod'] = 'Zoekopties';
	$labels['msgtext'] = 'Gehele bericht';
	$labels['openinextwin'] = 'Openen in een nieuw venster';
	$labels['emlsave'] = 'Opslaan (.eml)';
	$labels['editasnew'] = 'Als nieuw bewerken';
	$labels['savemessage'] = 'Bewaar als concept';
	$labels['sendmessage'] = 'Verstuur het bericht nu';
	$labels['addattachment'] = 'Voeg een bijlage toe';
	$labels['charset'] = 'Tekenset';
	$labels['editortype'] = 'Opmaak';
	$labels['returnreceipt'] = 'Ontvangstbevestiging';
	$labels['dsn'] = 'Afleveringsbericht (DSN)';
	$labels['mailreplyintro'] = '$sender schreef op $date:';
	$labels['originalmessage'] = 'Originele bericht';
	$labels['editidents'] = 'Bewerk identiteiten';
	$labels['spellcheck'] = 'Spelling';
	$labels['checkspelling'] = 'Controleer spelling';
	$labels['resumeediting'] = 'Doorgaan met opstellen';
	$labels['revertto'] = 'Wijzig terug in';
	$labels['attach'] = 'Bijvoegen';
	$labels['attachments'] = 'Bijlagen';
	$labels['upload'] = 'Toevoegen';
	$labels['uploadprogress'] = '$percent ($current van $total)';
	$labels['close'] = 'Sluit';
	$labels['messageoptions'] = 'Acties voor bericht...';
	$labels['low'] = 'Laag';
	$labels['lowest'] = 'Laagste';
	$labels['normal'] = 'Normaal';
	$labels['high'] = 'Hoog';
	$labels['highest'] = 'Hoogste';
	$labels['nosubject'] = '(geen onderwerp)';
	$labels['showimages'] = 'Toon afbeeldingen';
	$labels['alwaysshow'] = 'Afbeeldingen van $sender altijd tonen';
	$labels['isdraft'] = 'Dit is een concept.';
	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'Gewone tekst';
	$labels['savesentmessagein'] = 'Bewaar verzonden bericht in';
	$labels['dontsave'] = 'niet bewaren';
	$labels['maxuploadsize'] = 'Maximum toegestane bestandsgrootte is $size';
	$labels['addcc'] = 'Cc toevoegen';
	$labels['addbcc'] = 'Bcc toevoegen';
	$labels['addreplyto'] = 'Antwoord-aan toevoegen';
	$labels['addfollowupto'] = 'Mail-Followup-Aan toevoegen';
	$labels['mdnrequest'] = 'De afzender van dit bericht heeft gevraagd een melding te ontvangen wanneer u dit bericht heeft gelezen. Wilt u deze melding verzenden?';
	$labels['receiptread'] = 'Ontvangstbevestiging (gelezen)';
	$labels['yourmessage'] = 'Dit is een ontvangstbevestiging voor uw bericht';
	$labels['receiptnote'] = 'Let op: Dit bevestigt alleen dat uw bericht bij de geadresseerde is weergegeven. Er is geen garantie dat de geadresseerde het bericht daadwerkelijk heeft gelezen of de inhoud ervan heeft begrepen.';
	$labels['name'] = 'Naam';
	$labels['firstname'] = 'Voornaam';
	$labels['surname'] = 'Achternaam';
	$labels['middlename'] = 'Tweede naam';
	$labels['nameprefix'] = 'Initialen';
	$labels['namesuffix'] = 'Aanhef';
	$labels['nickname'] = 'Bijnaam';
	$labels['jobtitle'] = 'Functietitel';
	$labels['department'] = 'Afdeling';
	$labels['gender'] = 'Geslacht';
	$labels['maidenname'] = 'Meisjesnaam';
	$labels['email'] = 'E-mail';
	$labels['phone'] = 'Telefoon';
	$labels['address'] = 'Adres';
	$labels['street'] = 'Straat';
	$labels['locality'] = 'Stad';
	$labels['zipcode'] = 'Postcode';
	$labels['region'] = 'Provincie/staat';
	$labels['country'] = 'Land';
	$labels['birthday'] = 'Geboortedag';
	$labels['anniversary'] = 'Verjaardag';
	$labels['website'] = 'Website';
	$labels['instantmessenger'] = 'IM';
	$labels['notes'] = 'Notities';
	$labels['male'] = 'Man';
	$labels['female'] = 'Vrouw';
	$labels['manager'] = 'Manager';
	$labels['assistant'] = 'Assistent';
	$labels['typeassistant'] = 'Assistent';
	$labels['spouse'] = 'Echtgenoot';
	$labels['allfields'] = 'Alle velden';
	$labels['search'] = 'Zoeken';
	$labels['advsearch'] = 'Geavanceerd zoeken';
	$labels['advanced'] = 'Geavanceerd';
	$labels['other'] = 'Anders';
	$labels['typeother'] = 'Anders';
	$labels['typehome'] = 'Thuis';
	$labels['typework'] = 'Werk';
	$labels['typemobile'] = 'Mobiel';
	$labels['typemain'] = 'Belangrijkste';
	$labels['typehomefax'] = 'Fax Thuis';
	$labels['typeworkfax'] = 'Fax Werk';
	$labels['typecar'] = 'Auto';
	$labels['typepager'] = 'Pieper';
	$labels['typevideo'] = 'Video';
	$labels['typehomepage'] = 'Website';
	$labels['typeblog'] = 'Blog';
	$labels['typeprofile'] = 'Profiel';
	$labels['addfield'] = 'Veld toevoegen...';
	$labels['addcontact'] = 'Nieuwe contactpersoon toevoegen';
	$labels['editcontact'] = 'Contactpersoon wijzigen';
	$labels['contacts'] = 'Contactpersonen';
	$labels['contactproperties'] = 'Contact eigenschappen';
	$labels['personalinfo'] = 'Persoonlijke informatie';
	$labels['edit'] = 'Wijzig';
	$labels['cancel'] = 'Annuleren';
	$labels['save'] = 'Opslaan';
	$labels['delete'] = 'Verwijder';
	$labels['rename'] = 'Hernoem';
	$labels['addphoto'] = 'Toevoegen';
	$labels['replacephoto'] = 'Vervangen';
	$labels['uploadphoto'] = 'Upload foto';
	$labels['newcontact'] = 'Voeg een nieuwe contactpersoon toe';
	$labels['deletecontact'] = 'Verwijder geselecteerde contactpersonen';
	$labels['composeto'] = 'Stuur een bericht naar';
	$labels['contactsfromto'] = 'Contactpersonen $from t/m $to van $count';
	$labels['print'] = 'Afdrukken';
	$labels['export'] = 'Exporteren';
	$labels['exportvcards'] = 'Exporteer contactpersonen in vCard-formaat';
	$labels['newcontactgroup'] = 'Maak een nieuwe contactgroep';
	$labels['grouprename'] = 'Groep hernoemen';
	$labels['groupdelete'] = 'Groep verwijderen';
	$labels['groupremoveselected'] = 'Verwijder geselecteerde contactpersonen van groep';
	$labels['previouspage'] = 'Vorige pagina';
	$labels['firstpage'] = 'Eerste pagina';
	$labels['nextpage'] = 'Volgende pagina';
	$labels['lastpage'] = 'Laatste pagina';
	$labels['group'] = 'Groep';
	$labels['groups'] = 'Groepen';
	$labels['personaladrbook'] = 'Persoonlijk adresboek';
	$labels['searchsave'] = 'Zoekopdracht opslaan';
	$labels['searchdelete'] = 'Zoekopdracht verwijderen';
	$labels['import'] = 'Importeer';
	$labels['importcontacts'] = 'Contactpersonen importeren';
	$labels['importfromfile'] = 'Importeer van bestand:';
	$labels['importtarget'] = 'Voeg nieuwe contactpersonen toe aan adresboek:';
	$labels['importreplace'] = 'Vervang het complete adresboek';
	$labels['importtext'] = 'U kunt hier contactpersonen importeren vanuit een bestaand adresboek.<br />Op dit moment wordt het <a href="http://nl.wikipedia.org/wiki/VCard">vCard</a>-formaat ondersteund.';
	$labels['done'] = 'Klaar';
	$labels['settingsfor'] = 'Instellingen voor';
	$labels['about'] = 'Over';
	$labels['preferences'] = 'Instellingen';
	$labels['userpreferences'] = 'Gebruikersinstellingen';
	$labels['editpreferences'] = 'Wijzig gebruikersinstellingen';
	$labels['identities'] = 'Identiteiten';
	$labels['manageidentities'] = 'Beheer identiteiten voor dit account';
	$labels['newidentity'] = 'Identiteit toevoegen';
	$labels['newitem'] = 'Nieuw item';
	$labels['edititem'] = 'Wijzig item';
	$labels['preferhtml'] = 'Toon HTML';
	$labels['defaultcharset'] = 'Standaard tekenset';
	$labels['htmlmessage'] = 'HTML-bericht';
	$labels['dateformat'] = 'Datumnotatie';
	$labels['timeformat'] = 'Tijdweergave';
	$labels['prettydate'] = 'Leesbare datums';
	$labels['setdefault'] = 'Stel in als standaard';
	$labels['autodetect'] = 'Automatisch';
	$labels['language'] = 'Taal';
	$labels['timezone'] = 'Tijdzone';
	$labels['pagesize'] = 'Aantal berichten per pagina';
	$labels['signature'] = 'Ondertekening';
	$labels['dstactive'] = 'Zomertijd';
	+$labels['composeextwin'] = 'Berichten in nieuw venster';
	$labels['htmleditor'] = 'Berichten opstellen in HTML-opmaak';
	$labels['htmlonreply'] = 'alleen bij beantwoorden van HTML-berichten';
	$labels['htmlsignature'] = 'HTML-ondertekening';
	$labels['previewpane'] = 'Toon voorbeeldvenster';
	$labels['skin'] = 'Interfacestijl';
	$labels['logoutclear'] = 'Prullenbak legen bij uitloggen';
	$labels['logoutcompact'] = 'Postvak IN opschonen bij uitloggen';
	$labels['uisettings'] = 'Gebruikersinterface';
	$labels['serversettings'] = 'Serverinstellingen';
	$labels['mailboxview'] = 'Mailboxweergave';
	$labels['mdnrequests'] = 'Ontvangstmeldingen';
	$labels['askuser'] = 'altijd aan mij vragen';
	$labels['autosend'] = 'stuur automatisch';
	$labels['autosendknown'] = 'stuur ontvangstbevestiging alleen naar mijn contactpersonen, voor anderen aan mij vragen';
	$labels['autosendknownignore'] = 'stuur ontvangstbevestiging alleen naar mijn contactpersonen, voor anderen negeren';
	$labels['ignore'] = 'negeren';
	$labels['readwhendeleted'] = 'Bericht na verwijderen als gelezen markeren';
	$labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren';
	$labels['skipdeleted'] = 'Verwijderde berichten niet tonen';
	$labels['deletealways'] = 'Verwijder bericht wanneer verplaatsen naar Prullenbak mislukt';
	$labels['deletejunk'] = 'Verwijder direct berichten in Spam';
	$labels['showremoteimages'] = 'Afbeeldingen op afstand weergeven';
	$labels['fromknownsenders'] = 'van bekende afzenders';
	$labels['always'] = 'altijd';
	$labels['showinlineimages'] = 'Bijgevoegde afbeeldingen onder het bericht weergeven';
	$labels['autosavedraft'] = 'Concept automatisch opslaan';
	$labels['everynminutes'] = 'iedere $n minuten';
	$labels['keepalive'] = 'Op nieuwe berichten controleren';
	$labels['never'] = 'nooit';
	$labels['immediately'] = 'onmiddellijk';
	$labels['messagesdisplaying'] = 'Berichtenweergave';
	$labels['messagescomposition'] = 'Berichten aanmaken';
	$labels['mimeparamfolding'] = 'Namen van bijlagen';
	$labels['2231folding'] = 'Volledig RFC 2231 (Thunderbird)';
	$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
	$labels['2047folding'] = 'Volledig RFC 2047 (andere)';
	$labels['force7bit'] = 'Gebruik MIME-codering voor 8-bit karakters';
	$labels['advancedoptions'] = 'Geavanceerde opties';
	$labels['focusonnewmessage'] = 'Focus browserscherm bij nieuw bericht';
	$labels['checkallfolders'] = 'In alle mappen op nieuwe berichten controleren';
	$labels['displaynext'] = 'Ga naar volgend bericht na verwijderen of verplaatsen';
	$labels['defaultfont'] = 'Standaardlettertype voor HTML-berichten';
	$labels['mainoptions'] = 'Hoofdopties';
	$labels['browseroptions'] = 'Browserinstellingen';
	$labels['section'] = 'Sectie';
	$labels['maintenance'] = 'Onderhoud';
	$labels['newmessage'] = 'Nieuw bericht';
	$labels['signatureoptions'] = 'Instellingen voor ondertekening';
	$labels['whenreplying'] = 'Bij antwoorden';
	$labels['replytopposting'] = 'begin bericht boven het origineel';
	$labels['replybottomposting'] = 'begin bericht onder het origineel';
	$labels['replyremovesignature'] = 'Verwijder oorspronkelijke ondertekening van bericht bij beantwoorden';
	$labels['autoaddsignature'] = 'Ondertekening automatisch toevoegen';
	$labels['newmessageonly'] = 'alleen bij nieuwe berichten';
	$labels['replyandforwardonly'] = 'alleen bij antwoorden en doorsturen';
	$labels['replysignaturepos'] = 'Ondertekening plaatsen bij antwoorden of doorsturen';
	$labels['belowquote'] = 'onder het citaat';
	$labels['abovequote'] = 'boven het citaat';
	$labels['insertsignature'] = 'Ondertekening invoegen';
	$labels['previewpanemarkread'] = 'Markeer voorbeeldberichten als gelezen';
	$labels['afternseconds'] = 'Na $n seconden';
	$labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
	$labels['reqdsn'] = 'Vraag altijd om een afleveringsbericht';
	$labels['replysamefolder'] = 'Bewaar reacties in de map van het beantwoorde bericht';
	$labels['defaultaddressbook'] = 'Nieuwe contactpersonen toevoegen aan gekozen adresboek';
	$labels['autocompletesingle'] = 'Alternatieve e-mailadressen niet gebruiken bij automatisch aanvullen';
	$labels['listnamedisplay'] = 'Contactpersonen weergeven als';
	$labels['spellcheckbeforesend'] = 'Controleer spelling voor het versturen van een bericht';
	$labels['spellcheckoptions'] = 'Instellingen spellingscontrole';
	$labels['spellcheckignoresyms'] = 'Negeer woorden met symbolen';
	$labels['spellcheckignorenums'] = 'Negeer woorden met cijfers';
	$labels['spellcheckignorecaps'] = 'Negeer woorden welke volledig uit hoofdletters bestaan';
	$labels['addtodict'] = 'Voeg toe aan woordenboek';
	$labels['mailtoprotohandler'] = 'Registreer protocolhandler voor mailto: links';
	$labels['folder'] = 'Map';
	$labels['foldername'] = 'Mapnaam';
	$labels['subscribed'] = 'Geabonneerd';
	$labels['messagecount'] = 'Berichten';
	$labels['create'] = 'Nieuw';
	$labels['createfolder'] = 'Maak nieuwe map';
	$labels['managefolders'] = 'Beheer mappen';
	$labels['specialfolders'] = 'Speciale mappen';
	$labels['properties'] = 'Eigenschappen';
	$labels['folderproperties'] = 'Map eigenschappen';
	$labels['parentfolder'] = 'Bovenliggende map';
	$labels['location'] = 'Locatie';
	$labels['info'] = 'Informatie';
	$labels['getfoldersize'] = 'Klik om de omvang van de map te berekenen';
	$labels['changesubscription'] = 'Klik voor het wijzigen van de inschrijving';
	$labels['foldertype'] = 'Maptype';
	$labels['personalfolder'] = 'PrivÃ© map';
	$labels['otherfolder'] = 'Map van andere gebruiker';
	$labels['sharedfolder'] = 'Publieke map';
	$labels['sortby'] = 'Sorteer op';
	$labels['sortasc'] = 'Sorteer oplopend';
	$labels['sortdesc'] = 'Sorteer aflopend';
	$labels['undo'] = 'Ongedaan maken';
	$labels['plugin'] = 'Invoegtoepassing';
	$labels['version'] = 'Versie';
	$labels['source'] = 'Broncode';
	$labels['license'] = 'Licentie';
	$labels['support'] = 'Hulp nodig?';
	$labels['B'] = 'B';
	$labels['KB'] = 'KB';
	$labels['MB'] = 'MB';
	$labels['GB'] = 'GB';
	$labels['unicode'] = 'Unicode';
	$labels['english'] = 'Engels';
	$labels['westerneuropean'] = 'West-Europees';
	$labels['easterneuropean'] = 'Oost-Europees';
	$labels['southeasterneuropean'] = 'Zuidoost Europees';
	$labels['baltic'] = 'Baltisch';
	$labels['cyrillic'] = 'Cyrillisch';
	$labels['arabic'] = 'Arabisch';
	$labels['greek'] = 'Grieks';
	$labels['hebrew'] = 'Hebreeuws';
	$labels['turkish'] = 'Turks';
	$labels['nordic'] = 'Noord-Germaans';
	$labels['thai'] = 'Thais';
	$labels['celtic'] = 'Keltisch';
	$labels['vietnamese'] = 'Vietnamees';
	$labels['japanese'] = 'Japans';
	$labels['korean'] = 'Koreaans';
	$labels['chinese'] = 'Chinees';

	diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
	index 5abdf205d..ffb8cd244 100644
	--- a/program/localization/pt_BR/labels.inc
	+++ b/program/localization/pt_BR/labels.inc
	@@ -1,450 +1,451 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| localization/pt_BR/labels.inc \|
	\| \|
	\| Language file of the Roundcube Webmail client \|
	\| Copyright (C) 2012, The Roundcube Dev Team \|
	\| Licensed under the GNU General Public License \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Victor Benincasa <vbenincasa@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$labels = array();
	$labels['welcome'] = 'Bem-vindo ao $product';
	$labels['username'] = 'UsuÃ¡rio';
	$labels['password'] = 'Senha';
	$labels['server'] = 'Servidor';
	$labels['login'] = 'Entrar';
	$labels['logout'] = 'Sair';
	$labels['mail'] = 'E-mail';
	$labels['settings'] = 'ConfiguraÃ§Ãµes';
	$labels['addressbook'] = 'CatÃ¡logo de endereÃ§os';
	$labels['inbox'] = 'Caixa de entrada';
	$labels['drafts'] = 'Rascunhos';
	$labels['sent'] = 'Enviados';
	$labels['trash'] = 'Lixeira';
	$labels['junk'] = 'Spam';
	$labels['subject'] = 'Assunto';
	$labels['from'] = 'De';
	$labels['to'] = 'Para';
	$labels['cc'] = 'CÃ³pia';
	$labels['bcc'] = 'CÃ³pia Oculta (Cco)';
	$labels['replyto'] = 'Responder para';
	$labels['followupto'] = 'Encaminhar para';
	$labels['date'] = 'Data';
	$labels['size'] = 'Tamanho';
	$labels['priority'] = 'Prioridade';
	$labels['organization'] = 'OrganizaÃ§Ã£o';
	$labels['readstatus'] = 'Status de leitura';
	$labels['listoptions'] = 'Lista de opÃ§Ãµes...';
	$labels['mailboxlist'] = 'Pastas';
	$labels['folders'] = 'Pastas';
	$labels['messagesfromto'] = 'Mensagens $from - $to de $count';
	$labels['threadsfromto'] = 'TÃ³picos $from - $to de $count';
	$labels['messagenrof'] = 'Mensagem $nr de $count';
	$labels['fromtoshort'] = '$from - $to de $count';
	$labels['copy'] = 'Copiar';
	$labels['move'] = 'Mover';
	$labels['moveto'] = 'Mover para...';
	$labels['download'] = 'Baixar';
	$labels['filename'] = 'Nome do arquivo';
	$labels['filesize'] = 'Tamanho';
	$labels['addtoaddressbook'] = 'Incluir no catÃ¡logo de endereÃ§os';
	$labels['sun'] = 'Dom.';
	$labels['mon'] = 'Seg.';
	$labels['tue'] = 'Ter.';
	$labels['wed'] = 'Qua.';
	$labels['thu'] = 'Qui.';
	$labels['fri'] = 'Sex.';
	$labels['sat'] = 'SÃ¡b.';
	$labels['sunday'] = 'Domingo';
	$labels['monday'] = 'Segunda-feira';
	$labels['tuesday'] = 'TerÃ§a-feira';
	$labels['wednesday'] = 'Quarta-feira';
	$labels['thursday'] = 'Quinta-feira';
	$labels['friday'] = 'Sexta-feira';
	$labels['saturday'] = 'SÃ¡bado';
	$labels['jan'] = 'Jan.';
	$labels['feb'] = 'Fev.';
	$labels['mar'] = 'Mar.';
	$labels['apr'] = 'Abr.';
	$labels['may'] = 'Mai.';
	$labels['longmay'] = 'Mai.';
	$labels['jun'] = 'Jun.';
	$labels['jul'] = 'Jul.';
	$labels['aug'] = 'Ago.';
	$labels['sep'] = 'Set.';
	$labels['oct'] = 'Out.';
	$labels['nov'] = 'Nov.';
	$labels['dec'] = 'Dez.';
	$labels['longjan'] = 'Janeiro';
	$labels['longfeb'] = 'Fevereiro';
	$labels['longmar'] = 'MarÃ§o';
	$labels['longapr'] = 'Abril';
	$labels['longjun'] = 'Junho';
	$labels['longjul'] = 'Julho';
	$labels['longaug'] = 'Agosto';
	$labels['longsep'] = 'Setembro';
	$labels['longoct'] = 'Outubro';
	$labels['longnov'] = 'Novembro';
	$labels['longdec'] = 'Dezembro';
	$labels['today'] = 'Hoje';
	$labels['refresh'] = 'Atualizar';
	$labels['checkmail'] = 'Verificar se hÃ¡ novas mensagens';
	$labels['compose'] = 'Criar email';
	$labels['writenewmessage'] = 'Criar nova mensagem';
	$labels['reply'] = 'Responder';
	$labels['replytomessage'] = 'Responder para o remetente';
	$labels['replytoallmessage'] = 'Responder para o remetente e todos destinatÃ¡rios';
	$labels['replyall'] = 'Responder a todos';
	$labels['replylist'] = 'Responder para a lista';
	$labels['forward'] = 'Encaminhar';
	$labels['forwardinline'] = 'Encaminhar junto ao corpo da mensagem';
	$labels['forwardattachment'] = 'Encaminhar como anexo';
	$labels['forwardmessage'] = 'Encaminhar a mensagem';
	$labels['deletemessage'] = 'Excluir a mensagem';
	$labels['movemessagetotrash'] = 'Mover a mensagem para a Lixeira';
	$labels['printmessage'] = 'Imprimir a mensagem';
	$labels['previousmessage'] = 'Mensagem Anterior';
	$labels['firstmessage'] = 'Primeira Mensagem';
	$labels['nextmessage'] = 'PrÃ³xima Mensagem';
	$labels['lastmessage'] = 'Ãltima Mensagem';
	$labels['backtolist'] = 'Voltar para a lista de mensagens';
	$labels['viewsource'] = 'Exibir cÃ³digo-fonte';
	$labels['mark'] = 'Marcar';
	$labels['markmessages'] = 'Marcar mensagens';
	$labels['markread'] = 'como lidas';
	$labels['markunread'] = 'como nÃ£o lidas';
	$labels['markflagged'] = 'Como sinalizadas';
	$labels['markunflagged'] = 'Como nÃ£o sinalizadas';
	$labels['moreactions'] = 'Mais aÃ§Ãµes...';
	$labels['more'] = 'Mais';
	$labels['back'] = 'Voltar';
	$labels['options'] = 'OpÃ§Ãµes';
	$labels['select'] = 'Selecionar';
	$labels['all'] = 'Todas';
	$labels['none'] = 'Nenhuma';
	$labels['nonesort'] = 'Nenhuma';
	$labels['currpage'] = 'PÃ¡gina atual';
	$labels['unread'] = 'NÃ£o lidas';
	$labels['flagged'] = 'Marcada';
	$labels['unanswered'] = 'NÃ£o respondida';
	$labels['deleted'] = 'ExcluÃda';
	$labels['invert'] = 'Inverter';
	$labels['filter'] = 'Filtrar';
	$labels['list'] = 'Lista';
	$labels['threads'] = 'TÃ³picos';
	$labels['expand-all'] = 'Expandir Tudo';
	$labels['expand-unread'] = 'Expandir NÃ£o Lidas';
	$labels['collapse-all'] = 'Recolher Tudo';
	$labels['threaded'] = 'Agrupado';
	$labels['autoexpand_threads'] = 'Expandir mensagens agrupadas';
	$labels['do_expand'] = 'todos os tÃ³picos';
	$labels['expand_only_unread'] = 'somente com mensagem(s) nÃ£o lidas';
	$labels['fromto'] = 'De/Para';
	$labels['flag'] = 'Sinalizador';
	$labels['attachment'] = 'Anexo';
	$labels['sentdate'] = 'Data de envio';
	$labels['arrival'] = 'Data de recebimento';
	$labels['asc'] = 'crescente';
	$labels['desc'] = 'decrescente';
	$labels['listcolumns'] = 'Lista de colunas';
	$labels['listsorting'] = 'Coluna para ordenaÃ§Ã£o';
	$labels['listorder'] = 'Ordem da classificaÃ§Ã£o';
	$labels['listmode'] = 'VisualizaÃ§Ã£o em lista';
	$labels['folderactions'] = 'AÃ§Ãµes para as pastas...';
	$labels['compact'] = 'Compactar';
	$labels['empty'] = 'Esvaziar';
	$labels['quota'] = 'Uso de disco';
	$labels['unknown'] = 'desconhecido';
	$labels['unlimited'] = 'ilimitado';
	$labels['quicksearch'] = 'Pesquisa rÃ¡pida';
	$labels['resetsearch'] = 'Limpar';
	$labels['searchmod'] = 'OpÃ§Ãµes da pesquisa';
	$labels['msgtext'] = 'Mensagem inteira';
	$labels['openinextwin'] = 'Abrir em nova janela';
	$labels['emlsave'] = 'Baixar (formato .eml)';
	$labels['editasnew'] = 'Editar como novo';
	$labels['savemessage'] = 'Salvar como Rascunho';
	$labels['sendmessage'] = 'Enviar agora';
	$labels['addattachment'] = 'Anexar um arquivo';
	$labels['charset'] = 'CodificaÃ§Ã£o';
	$labels['editortype'] = 'Tipo de editor';
	$labels['returnreceipt'] = 'ConfirmaÃ§Ã£o de recebimento';
	$labels['dsn'] = 'Recibo de entrega';
	$labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
	$labels['originalmessage'] = 'Mensagem original';
	$labels['editidents'] = 'Editar identidades';
	$labels['spellcheck'] = 'Revisar';
	$labels['checkspelling'] = 'Verificar ortografia';
	$labels['resumeediting'] = 'Continuar a ediÃ§Ã£o';
	$labels['revertto'] = 'Reverter para';
	$labels['attach'] = 'Anexar';
	$labels['attachments'] = 'Anexos';
	$labels['upload'] = 'Enviar arquivo';
	$labels['uploadprogress'] = '$percent ($current de $total)';
	$labels['close'] = 'Fechar';
	$labels['messageoptions'] = 'OpÃ§Ãµes da mensagem...';
	$labels['low'] = 'Baixa';
	$labels['lowest'] = 'Mais baixa';
	$labels['normal'] = 'Normal';
	$labels['high'] = 'Alta';
	$labels['highest'] = 'Mais alta';
	$labels['nosubject'] = '(sem assunto)';
	$labels['showimages'] = 'Exibir imagens';
	$labels['alwaysshow'] = 'Sempre exibir imagens de $sender';
	$labels['isdraft'] = 'Esta Ã© uma mensagem de rascunho.';
	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'Texto simples';
	$labels['savesentmessagein'] = 'Salvar mensagens enviadas em';
	$labels['dontsave'] = 'nÃ£o salvar';
	$labels['maxuploadsize'] = 'Tamanho mÃ¡ximo permitido do arquivo Ã© $size';
	$labels['addcc'] = 'Adicionar CÃ³pia';
	$labels['addbcc'] = 'Adicionar CÃ³pia Oculta';
	$labels['addreplyto'] = 'Adicionar Responder para';
	$labels['addfollowupto'] = 'Adicionar Encaminhar para';
	$labels['mdnrequest'] = 'O remetente desta mensagem deseja ser notificado quando vocÃª ler esta mensagem. VocÃª permite o envio desta notificaÃ§Ã£o?';
	$labels['receiptread'] = 'ConfirmaÃ§Ã£o de Leitura (exibida)';
	$labels['yourmessage'] = 'Esta Ã© uma confirmaÃ§Ã£o de leitura da sua mensagem';
	$labels['receiptnote'] = 'Nota: Esta confirmaÃ§Ã£o de leitura somente informa que a mensagem foi aberta no computador do destinatÃ¡rio. NÃ£o hÃ¡ garantia que o destinatÃ¡rio tenha lido ou compreendido o conteÃºdo da mensagem.';
	$labels['name'] = 'Nome de exibiÃ§Ã£o';
	$labels['firstname'] = 'Primeiro Nome';
	$labels['surname'] = 'Sobrenome';
	$labels['middlename'] = 'Segundo Nome';
	$labels['nameprefix'] = 'Prefixo';
	$labels['namesuffix'] = 'Sufixo';
	$labels['nickname'] = 'Apelido';
	$labels['jobtitle'] = 'OcupaÃ§Ã£o';
	$labels['department'] = 'Departamento';
	$labels['gender'] = 'Sexo';
	$labels['maidenname'] = 'Nome de solteira';
	$labels['email'] = 'E-Mail';
	$labels['phone'] = 'Telefone';
	$labels['address'] = 'EndereÃ§o';
	$labels['street'] = 'Rua';
	$labels['locality'] = 'Cidade';
	$labels['zipcode'] = 'CEP';
	$labels['region'] = 'Estado';
	$labels['country'] = 'PaÃs';
	$labels['birthday'] = 'Data de nascimento';
	$labels['anniversary'] = 'AniversÃ¡rio';
	$labels['website'] = 'Site';
	$labels['instantmessenger'] = 'Mensagem instantÃ¢nea (IM)';
	$labels['notes'] = 'AnotaÃ§Ãµes';
	$labels['male'] = 'masculino';
	$labels['female'] = 'feminino';
	$labels['manager'] = 'Gerente';
	$labels['assistant'] = 'Assistente';
	$labels['typeassistant'] = 'Assistente';
	$labels['spouse'] = 'CÃ´njuge';
	$labels['allfields'] = 'Todos os campos';
	$labels['search'] = 'Pesquisar';
	$labels['advsearch'] = 'Pesquisa AvanÃ§ada';
	$labels['advanced'] = 'AvanÃ§ado';
	$labels['other'] = 'Outro';
	$labels['typeother'] = 'Outro';
	$labels['typehome'] = 'Residencial';
	$labels['typework'] = 'Trabalho';
	$labels['typemobile'] = 'Celular';
	$labels['typemain'] = 'Principal';
	$labels['typehomefax'] = 'Fax Residencial';
	$labels['typeworkfax'] = 'Fax do Trabalho';
	$labels['typecar'] = 'Carro';
	$labels['typepager'] = 'Pager';
	$labels['typevideo'] = 'VÃdeo';
	$labels['typehomepage'] = 'PÃ¡gina pessoal';
	$labels['typeblog'] = 'Blog';
	$labels['typeprofile'] = 'Perfil';
	$labels['addfield'] = 'Adicionar campo...';
	$labels['addcontact'] = 'Adicionar novo contato';
	$labels['editcontact'] = 'Editar contato';
	$labels['contacts'] = 'Contatos';
	$labels['contactproperties'] = 'Propriedades do contato';
	$labels['personalinfo'] = 'InformaÃ§Ãµes pessoais';
	$labels['edit'] = 'Editar';
	$labels['cancel'] = 'Cancelar';
	$labels['save'] = 'Salvar';
	$labels['delete'] = 'Excluir';
	$labels['rename'] = 'Renomear';
	$labels['addphoto'] = 'Adicionar';
	$labels['replacephoto'] = 'Substituir';
	$labels['uploadphoto'] = 'Enviar foto';
	$labels['newcontact'] = 'Criar novo contato';
	$labels['deletecontact'] = 'Exclui os contatos selecionados';
	$labels['composeto'] = 'Compor mensagem para';
	$labels['contactsfromto'] = 'Contatos $from - $to de $count';
	$labels['print'] = 'Imprimir';
	$labels['export'] = 'Exportar';
	$labels['exportvcards'] = 'Exportar os contatos em formato vCard';
	$labels['newcontactgroup'] = 'Criar novo grupo de contatos';
	$labels['grouprename'] = 'Renomear grupo';
	$labels['groupdelete'] = 'Excluir grupo';
	$labels['groupremoveselected'] = 'Remover os contatos selecionados do grupo';
	$labels['previouspage'] = 'PÃ¡gina Anterior';
	$labels['firstpage'] = 'Primeira PÃ¡gina';
	$labels['nextpage'] = 'PrÃ³xima PÃ¡gina';
	$labels['lastpage'] = 'Ãltima PÃ¡gina';
	$labels['group'] = 'Grupo';
	$labels['groups'] = 'Grupos';
	$labels['personaladrbook'] = 'EndereÃ§os pessoais';
	$labels['searchsave'] = 'Salvar pesquisa';
	$labels['searchdelete'] = 'Excluir pesquisa';
	$labels['import'] = 'Importar';
	$labels['importcontacts'] = 'Importar contatos';
	$labels['importfromfile'] = 'Importar do arquivo:';
	$labels['importtarget'] = 'Adicionar novos contatos ao catÃ¡logo de endereÃ§os:';
	$labels['importreplace'] = 'Substituir o catÃ¡logo de endereÃ§os atual';
	$labels['importtext'] = 'VocÃª pode enviar contatos de um catÃ¡logo de endereÃ§os existente.<br/>Os contatos devem ser enviados no formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>.';
	$labels['done'] = 'ConcluÃdo';
	$labels['settingsfor'] = 'ConfiguraÃ§Ãµes para';
	$labels['about'] = 'Sobre';
	$labels['preferences'] = 'PreferÃªncias';
	$labels['userpreferences'] = 'PreferÃªncias do usuÃ¡rio';
	$labels['editpreferences'] = 'Editar preferÃªncias do usuÃ¡rio';
	$labels['identities'] = 'Identidades';
	$labels['manageidentities'] = 'Gerenciar identidades desta conta';
	$labels['newidentity'] = 'Nova identidade';
	$labels['newitem'] = 'Novo item';
	$labels['edititem'] = 'Editar item';
	$labels['preferhtml'] = 'Exibir em HTML';
	$labels['defaultcharset'] = 'Conjunto padrÃ£o de caracteres';
	$labels['htmlmessage'] = 'Mensagem HTML';
	$labels['dateformat'] = 'Formato da data';
	$labels['timeformat'] = 'Formato da hora';
	$labels['prettydate'] = 'Exibir datas amigÃ¡veis';
	$labels['setdefault'] = 'Definir como padrÃ£o';
	$labels['autodetect'] = 'AutomÃ¡tico';
	$labels['language'] = 'Idioma';
	$labels['timezone'] = 'Fuso horÃ¡rio';
	$labels['pagesize'] = 'Mensagens por pÃ¡gina';
	$labels['signature'] = 'Assinatura';
	$labels['dstactive'] = 'HorÃ¡rio de verÃ£o';
	+$labels['composeextwin'] = 'Escrever em nova janela';
	$labels['htmleditor'] = 'Criar mensagens em HTML';
	$labels['htmlonreply'] = 'em resposta Ã mensagem em HTML somente';
	$labels['htmlsignature'] = 'Assinatura em HTML';
	$labels['previewpane'] = 'Exibir prÃ©-visualizaÃ§Ã£o';
	$labels['skin'] = 'AparÃªncia da interface (tema)';
	$labels['logoutclear'] = 'Esvaziar a Lixeira ao sair';
	$labels['logoutcompact'] = 'Compactar a Caixa de Entrada ao sair';
	$labels['uisettings'] = 'Interface de usuÃ¡rio';
	$labels['serversettings'] = 'ConfiguraÃ§Ãµes do Servidor';
	$labels['mailboxview'] = 'ExibiÃ§Ã£o da Caixa de Correio';
	$labels['mdnrequests'] = 'Envio de ConfirmaÃ§Ã£o de Leitura para o remetente';
	$labels['askuser'] = 'solicite minha confirmaÃ§Ã£o';
	$labels['autosend'] = 'enviar confirmaÃ§Ã£o';
	$labels['autosendknown'] = 'enviar confirmaÃ§Ã£o para os meus contatos, caso contrÃ¡rio, pergunte-me';
	$labels['autosendknownignore'] = 'enviar confirmaÃ§Ã£o para os meus contatos, caso contrÃ¡rio, ignore';
	$labels['ignore'] = 'ignorar';
	$labels['readwhendeleted'] = 'Marcar a mensagem como lida ao excluir';
	$labels['flagfordeletion'] = 'Marcar a mensagem para exclusÃ£o ao invÃ©s de excluir';
	$labels['skipdeleted'] = 'NÃ£o exibir mensagens excluÃdas';
	$labels['deletealways'] = 'Excluir as mensagens se movÃª-las para a lixeira falhar';
	$labels['deletejunk'] = 'Apagar as mensagens da pasta de SPAM sem movÃª-las para a lixeira';
	$labels['showremoteimages'] = 'Exibir imagens externas';
	$labels['fromknownsenders'] = 'de remetentes conhecidos';
	$labels['always'] = 'sempre';
	$labels['showinlineimages'] = 'Exibir imagens anexadas abaixo da mensagem';
	$labels['autosavedraft'] = 'Salvar rascunho automaticamente';
	$labels['everynminutes'] = 'a cada $n minuto(s)';
	$labels['keepalive'] = 'Verificar se hÃ¡ novas mensagens';
	$labels['never'] = 'nunca';
	$labels['immediately'] = 'imediatamente';
	$labels['messagesdisplaying'] = 'ExibiÃ§Ã£o de mensagens';
	$labels['messagescomposition'] = 'Redigir mensagens';
	$labels['mimeparamfolding'] = 'Nomes de anexos';
	$labels['2231folding'] = 'RFC 2231 Integral (Thunderbird)';
	$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
	$labels['2047folding'] = 'RFC 2047 Integral (outro)';
	$labels['force7bit'] = 'Usar codificaÃ§Ã£o MIME para caracteres 8-bit';
	$labels['advancedoptions'] = 'OpÃ§Ãµes avanÃ§adas';
	$labels['focusonnewmessage'] = 'Focar janela do navegador ao receber nova mensagem';
	$labels['checkallfolders'] = 'Verificar se hÃ¡ novas mensagens em todas as pastas';
	$labels['displaynext'] = 'Exibir a mensagem seguinte apÃ³s excluir/mover uma mensagem';
	$labels['defaultfont'] = 'Fonte padrÃ£o para mensagens HTML';
	$labels['mainoptions'] = 'OpÃ§Ãµes Principais';
	$labels['browseroptions'] = 'OpÃ§Ãµes de navegaÃ§Ã£o';
	$labels['section'] = 'SeÃ§Ã£o';
	$labels['maintenance'] = 'ManutenÃ§Ã£o';
	$labels['newmessage'] = 'Nova mensagem';
	$labels['signatureoptions'] = 'OpÃ§Ãµes de Assinatura';
	$labels['whenreplying'] = 'Quando responder';
	$labels['replytopposting'] = 'iniciar nova mensagem acima da original';
	$labels['replybottomposting'] = 'iniciar nova mensagem abaixo da original';
	$labels['replyremovesignature'] = 'Remover assinatura original da mensagem ao respondÃª-la';
	$labels['autoaddsignature'] = 'Adicionar assinatura automaticamente';
	$labels['newmessageonly'] = 'somente em novas mensagens';
	$labels['replyandforwardonly'] = 'somente em respostas e encaminhamentos';
	$labels['replysignaturepos'] = 'Inserir assinatura ao responder ou encaminhar';
	$labels['belowquote'] = 'abaixo da citaÃ§Ã£o';
	$labels['abovequote'] = 'acima da citaÃ§Ã£o';
	$labels['insertsignature'] = 'Inserir assinatura';
	$labels['previewpanemarkread'] = 'Marcar mensagens prÃ©-visualizadas como lidas';
	$labels['afternseconds'] = 'depois de $n segundos';
	$labels['reqmdn'] = 'Sempre pedir confirmaÃ§Ã£o de leitura';
	$labels['reqdsn'] = 'Sempre pedir confirmaÃ§Ã£o de entrega';
	$labels['replysamefolder'] = 'Colocar as respostas na mesma pasta da mensagem original';
	$labels['defaultaddressbook'] = 'Adicionar novos contatos para o catÃ¡logo de endereÃ§os selecionado';
	$labels['autocompletesingle'] = 'Ignorar endereÃ§os alternativos no autocompletar';
	$labels['listnamedisplay'] = 'Listar contatos como';
	$labels['spellcheckbeforesend'] = 'Verificar ortografia antes de enviar uma mensagem';
	$labels['spellcheckoptions'] = 'OpÃ§Ãµes do Verificador OrtogrÃ¡fico';
	$labels['spellcheckignoresyms'] = 'Ignorar palavras com sÃmbolos';
	$labels['spellcheckignorenums'] = 'Ignorar palavras com nÃºmeros';
	$labels['spellcheckignorecaps'] = 'Ignorar palavras com todas letras maiÃºsculas';
	$labels['addtodict'] = 'Adicionar ao dicionÃ¡rio';
	$labels['mailtoprotohandler'] = 'Associar links de e-mail (mailto:) para envio de mensagem atravÃ©s do webmail';
	$labels['folder'] = 'Pasta';
	$labels['foldername'] = 'Nome da pasta';
	$labels['subscribed'] = 'Inscrito';
	$labels['messagecount'] = 'Mensagens';
	$labels['create'] = 'Criar';
	$labels['createfolder'] = 'Criar nova pasta';
	$labels['managefolders'] = 'Gerenciar pastas';
	$labels['specialfolders'] = 'Pastas especiais';
	$labels['properties'] = 'Propriedades';
	$labels['folderproperties'] = 'Propriedades da pasta';
	$labels['parentfolder'] = 'Pasta pai';
	$labels['location'] = 'LocalizaÃ§Ã£o';
	$labels['info'] = 'InformaÃ§Ã£o';
	$labels['getfoldersize'] = 'Exibir o tamanho da pasta';
	$labels['changesubscription'] = 'Clique para ativar/desativar';
	$labels['foldertype'] = 'Tipo de Pasta';
	$labels['personalfolder'] = 'Pasta Particular';
	$labels['otherfolder'] = 'Pasta de outro UsuÃ¡rio';
	$labels['sharedfolder'] = 'Pasta PÃºblica';
	$labels['sortby'] = 'Ordenar por';
	$labels['sortasc'] = 'Ascendente';
	$labels['sortdesc'] = 'Descendente';
	$labels['undo'] = 'Desfazer';
	$labels['plugin'] = 'Plugin';
	$labels['version'] = 'VersÃ£o';
	$labels['source'] = 'Fonte';
	$labels['license'] = 'LicenÃ§a';
	$labels['support'] = 'Obter suporte';
	$labels['B'] = 'B';
	$labels['KB'] = 'KB';
	$labels['MB'] = 'MB';
	$labels['GB'] = 'GB';
	$labels['unicode'] = 'Unicode';
	$labels['english'] = 'InglÃªs';
	$labels['westerneuropean'] = 'Oeste Europeu';
	$labels['easterneuropean'] = 'Leste Europeu';
	$labels['southeasterneuropean'] = 'Sudeste Europeu';
	$labels['baltic'] = 'BÃ¡ltico';
	$labels['cyrillic'] = 'CirÃlico';
	$labels['arabic'] = 'Ãrabe';
	$labels['greek'] = 'Grego';
	$labels['hebrew'] = 'Hebraico';
	$labels['turkish'] = 'Turco';
	$labels['nordic'] = 'NÃ³rdico';
	$labels['thai'] = 'TailandÃªs';
	$labels['celtic'] = 'Celta';
	$labels['vietnamese'] = 'Vietnamita';
	$labels['japanese'] = 'JaponÃªs';
	$labels['korean'] = 'Coreano';
	$labels['chinese'] = 'ChinÃªs';

	diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
	index 8b69d22dd..33cb1e43b 100644
	--- a/program/localization/ru_RU/labels.inc
	+++ b/program/localization/ru_RU/labels.inc
	@@ -1,450 +1,451 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| localization/ru_RU/labels.inc \|
	\| \|
	\| Language file of the Roundcube Webmail client \|
	\| Copyright (C) 2012, The Roundcube Dev Team \|
	\| Licensed under the GNU General Public License \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Lanigiro Nainiarku <r00f@itx.com.ua> \|
	+-----------------------------------------------------------------------+
	*/

	$labels = array();
	$labels['welcome'] = 'ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ Ð² $product!';
	$labels['username'] = 'ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ';
	$labels['password'] = 'ÐÐ°ÑÐ¾Ð»Ñ';
	$labels['server'] = 'Ð¡ÐµÑÐ²ÐµÑ';
	$labels['login'] = 'ÐÐ¾Ð¹ÑÐ¸';
	$labels['logout'] = 'ÐÑÑÐ¾Ð´';
	$labels['mail'] = 'ÐÐ¾ÑÑÐ°';
	$labels['settings'] = 'ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸';
	$labels['addressbook'] = 'ÐÐ¾Ð½ÑÐ°ÐºÑÑ';
	$labels['inbox'] = 'ÐÑÐ¾Ð´ÑÑÐ¸Ðµ';
	$labels['drafts'] = 'Ð§ÐµÑÐ½Ð¾Ð²Ð¸ÐºÐ¸';
	$labels['sent'] = 'ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð½ÑÐµ';
	$labels['trash'] = 'ÐÐ¾ÑÐ·Ð¸Ð½Ð°';
	$labels['junk'] = 'Ð¡ÐÐÐ';
	$labels['subject'] = 'Ð¢ÐµÐ¼Ð°';
	$labels['from'] = 'ÐÑ';
	$labels['to'] = 'ÐÐ¾Ð¼Ñ';
	$labels['cc'] = 'ÐÐ¾Ð¿Ð¸Ñ';
	$labels['bcc'] = 'Ð¡ÐºÑÑÑÐ°Ñ';
	$labels['replyto'] = 'ÐÑÐ²ÐµÑÐ¸ÑÑ';
	$labels['followupto'] = 'Followup-To';
	$labels['date'] = 'ÐÐ°ÑÐ°';
	$labels['size'] = 'Ð Ð°Ð·Ð¼ÐµÑ';
	$labels['priority'] = 'ÐÑÐ¸Ð¾ÑÐ¸ÑÐµÑ';
	$labels['organization'] = 'ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ñ';
	$labels['readstatus'] = 'Ð¡ÑÐ°ÑÑÑ Ð¿ÑÐ¾ÑÑÐµÐ½Ð¸Ñ';
	$labels['listoptions'] = 'ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¿Ð¸ÑÐºÐ°...';
	$labels['mailboxlist'] = 'ÐÐ°Ð¿ÐºÐ¸';
	$labels['folders'] = 'ÐÐ°Ð¿ÐºÐ¸';
	$labels['messagesfromto'] = 'Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ñ $from Ð¿Ð¾ $to Ð¸Ð· $count';
	$labels['threadsfromto'] = 'ÐÐ±ÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ñ $from Ð¿Ð¾ $to Ð¸Ð· $count';
	$labels['messagenrof'] = 'Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ $nr Ð¸Ð· $count';
	$labels['fromtoshort'] = '$from â $to Ð¸Ð· $count';
	$labels['copy'] = 'ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ';
	$labels['move'] = 'ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ';
	$labels['moveto'] = 'ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð²...';
	$labels['download'] = 'ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ';
	$labels['filename'] = 'ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð°';
	$labels['filesize'] = 'Ð Ð°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð°';
	$labels['addtoaddressbook'] = 'ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð² ÐºÐ¾Ð½ÑÐ°ÐºÑÑ';
	$labels['sun'] = 'ÐÑ';
	$labels['mon'] = 'ÐÐ½';
	$labels['tue'] = 'ÐÑ';
	$labels['wed'] = 'Ð¡Ñ';
	$labels['thu'] = 'Ð§Ñ';
	$labels['fri'] = 'ÐÑ';
	$labels['sat'] = 'Ð¡Ð±';
	$labels['sunday'] = 'ÐÐ¾ÑÐºÑÐµÑÐµÐ½ÑÐµ';
	$labels['monday'] = 'ÐÐ¾Ð½ÐµÐ´ÐµÐ»ÑÐ½Ð¸Ðº';
	$labels['tuesday'] = 'ÐÑÐ¾ÑÐ½Ð¸Ðº';
	$labels['wednesday'] = 'Ð¡ÑÐµÐ´Ð°';
	$labels['thursday'] = 'Ð§ÐµÑÐ²ÐµÑÐ³';
	$labels['friday'] = 'ÐÑÑÐ½Ð¸ÑÐ°';
	$labels['saturday'] = 'Ð¡ÑÐ±Ð±Ð¾ÑÐ°';
	$labels['jan'] = 'Ð¯Ð½Ð²';
	$labels['feb'] = 'Ð¤ÐµÐ²';
	$labels['mar'] = 'ÐÐ°Ñ';
	$labels['apr'] = 'ÐÐ¿Ñ';
	$labels['may'] = 'ÐÐ°Ð¹';
	$labels['longmay'] = 'ÐÐ°Ð¹';
	$labels['jun'] = 'ÐÑÐ½';
	$labels['jul'] = 'ÐÑÐ»';
	$labels['aug'] = 'ÐÐ²Ð³';
	$labels['sep'] = 'Ð¡ÐµÐ½';
	$labels['oct'] = 'ÐÐºÑ';
	$labels['nov'] = 'ÐÐ¾Ñ';
	$labels['dec'] = 'ÐÐµÐº';
	$labels['longjan'] = 'Ð¯Ð½Ð²Ð°ÑÑ';
	$labels['longfeb'] = 'Ð¤ÐµÐ²ÑÐ°Ð»Ñ';
	$labels['longmar'] = 'ÐÐ°ÑÑ';
	$labels['longapr'] = 'ÐÐ¿ÑÐµÐ»Ñ';
	$labels['longjun'] = 'ÐÑÐ½Ñ';
	$labels['longjul'] = 'ÐÑÐ»Ñ';
	$labels['longaug'] = 'ÐÐ²Ð³ÑÑÑ';
	$labels['longsep'] = 'Ð¡ÐµÐ½ÑÑÐ±ÑÑ';
	$labels['longoct'] = 'ÐÐºÑÑÐ±ÑÑ';
	$labels['longnov'] = 'ÐÐ¾ÑÐ±ÑÑ';
	$labels['longdec'] = 'ÐÐµÐºÐ°Ð±ÑÑ';
	$labels['today'] = 'Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ';
	$labels['refresh'] = 'ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ';
	$labels['checkmail'] = 'ÐÐ¾ÑÑÐ°Ð²Ð¸ÑÑ Ð¿Ð¾ÑÑÑ';
	$labels['compose'] = 'ÐÐ°Ð¿Ð¸ÑÐ°ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ';
	$labels['writenewmessage'] = 'ÐÐ¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ';
	$labels['reply'] = 'ÐÑÐ²ÐµÑÐ¸ÑÑ';
	$labels['replytomessage'] = 'ÐÑÐ²ÐµÑÐ¸ÑÑ';
	$labels['replytoallmessage'] = 'ÐÑÐ²ÐµÑÐ¸ÑÑ Ð¿Ð¾ ÑÐ¿Ð¸ÑÐºÑ Ð¸Ð»Ð¸ Ð¾ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ Ð¸ Ð²ÑÐµÐ¼ Ð¿Ð¾Ð»ÑÑÐ°ÑÐµÐ»ÑÐ¼';
	$labels['replyall'] = 'ÐÑÐ²ÐµÑÐ¸ÑÑ Ð²ÑÐµÐ¼';
	$labels['replylist'] = 'ÐÑÐ²ÐµÑÐ¸ÑÑ Ð² ÑÐ¿Ð¸ÑÐ¾Ðº ÑÐ°ÑÑÑÐ»ÐºÐ¸';
	$labels['forward'] = 'ÐÐµÑÐµÑÐ»Ð°ÑÑ';
	$labels['forwardinline'] = 'ÐÐµÑÐµÑÐ»Ð°ÑÑ Ð² ÑÐµÐ»Ðµ Ð¿Ð¸ÑÑÐ¼Ð°';
	$labels['forwardattachment'] = 'ÐÐµÑÐµÑÐ»Ð°ÑÑ ÐºÐ°Ðº Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ';
	$labels['forwardmessage'] = 'ÐÐµÑÐµÑÐ»Ð°ÑÑ';
	$labels['deletemessage'] = 'Ð ÐºÐ¾ÑÐ·Ð¸Ð½Ñ';
	$labels['movemessagetotrash'] = 'ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð² ÐºÐ¾ÑÐ·Ð¸Ð½Ñ';
	$labels['printmessage'] = 'ÐÐµÑÐ°ÑÑ';
	$labels['previousmessage'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¿ÑÐµÐ´ÑÐ´ÑÑÐµÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ';
	$labels['firstmessage'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¿ÐµÑÐ²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ';
	$labels['nextmessage'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ»ÐµÐ´ÑÑÑÐµÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ';
	$labels['lastmessage'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ';
	$labels['backtolist'] = 'Ð ÑÐ¿Ð¸ÑÐºÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹';
	$labels['viewsource'] = 'ÐÑÑÐ¾Ð´Ð½ÑÐ¹ ÑÐµÐºÑÑ';
	$labels['mark'] = 'ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ';
	$labels['markmessages'] = 'ÐÐ¾Ð¼ÐµÑÐ¸ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ';
	$labels['markread'] = 'ÐÐ°Ðº Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ';
	$labels['markunread'] = 'ÐÐ°Ðº Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ';
	$labels['markflagged'] = 'Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ»Ð°Ð³';
	$labels['markunflagged'] = 'Ð¡Ð½ÑÑÑ ÑÐ»Ð°Ð³';
	$labels['moreactions'] = 'ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ...';
	$labels['more'] = 'ÐÑÐµ';
	$labels['back'] = 'ÐÐ°Ð·Ð°Ð´';
	$labels['options'] = 'ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ';
	$labels['select'] = 'ÐÑÐ±ÑÐ°ÑÑ';
	$labels['all'] = 'ÐÑÐµ';
	$labels['none'] = 'ÐÑÑÑÑÑÑÐ²ÑÐµÑ';
	$labels['nonesort'] = 'ÐÑÑÑÑÑÑÐ²ÑÐµÑ';
	$labels['currpage'] = 'Ð¢ÐµÐºÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°';
	$labels['unread'] = 'ÐÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½ÑÐµ';
	$labels['flagged'] = 'ÐÐ¾Ð¼ÐµÑÐµÐ½Ð½ÑÐµ';
	$labels['unanswered'] = 'ÐÐµÐ¾ÑÐ²ÐµÑÐµÐ½Ð½ÑÐµ';
	$labels['deleted'] = 'Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ð¾Ðµ';
	$labels['invert'] = 'ÐÐ½Ð²ÐµÑÑÐ½Ð¾Ðµ';
	$labels['filter'] = 'Ð¤Ð¸Ð»ÑÑÑ';
	$labels['list'] = 'Ð¡Ð¿Ð¸ÑÐ¾Ðº';
	$labels['threads'] = 'ÐÐ±ÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ';
	$labels['expand-all'] = 'Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ Ð²ÑÐµ';
	$labels['expand-unread'] = 'Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½ÑÐµ';
	$labels['collapse-all'] = 'Ð¡Ð²ÐµÑÐ½ÑÑÑ Ð²ÑÐµ';
	$labels['threaded'] = 'ÐÐ±ÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ';
	$labels['autoexpand_threads'] = 'Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ Ð¾Ð±ÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ';
	$labels['do_expand'] = 'Ð²ÑÐµ Ð¾Ð±ÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ';
	$labels['expand_only_unread'] = 'ÑÐ¾Ð»ÑÐºÐ¾ Ñ Ð½ÐµÐ¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½ÑÐ¼Ð¸ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸ÑÐ¼Ð¸';
	$labels['fromto'] = 'ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ/ÐÐ¾Ð»ÑÑÐ°ÑÐµÐ»Ñ';
	$labels['flag'] = 'Ð¤Ð»Ð°Ð³';
	$labels['attachment'] = 'ÐÐ»Ð¾Ð¶ÐµÐ½Ð¸Ðµ';
	$labels['sentdate'] = 'ÐÐ°ÑÐ° Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¸';
	$labels['arrival'] = 'ÐÐ°ÑÐ° Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ';
	$labels['asc'] = 'Ð¿Ð¾ Ð²Ð¾Ð·ÑÐ°ÑÑÐ°Ð½Ð¸Ñ';
	$labels['desc'] = 'Ð¿Ð¾ ÑÐ±ÑÐ²Ð°Ð½Ð¸Ñ';
	$labels['listcolumns'] = 'ÐÐ¾Ð»Ð¾Ð½ÐºÐ¸';
	$labels['listsorting'] = 'Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾';
	$labels['listorder'] = 'ÐÐ¾ÑÑÐ´Ð¾Ðº ÑÐ¾ÑÑÐ¸ÑÐ¾Ð²ÐºÐ¸';
	$labels['listmode'] = 'Ð ÐµÐ¶Ð¸Ð¼ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ°';
	$labels['folderactions'] = 'ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¸ Ð½Ð°Ð´ Ð¿Ð°Ð¿ÐºÐ¾Ð¹...';
	$labels['compact'] = 'Ð¡Ð¶Ð°ÑÑ';
	$labels['empty'] = 'ÐÐ¿ÑÑÑÐ¾ÑÐ¸ÑÑ';
	$labels['quota'] = 'ÐÐ²Ð¾ÑÐ°';
	$labels['unknown'] = 'Ð½ÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾';
	$labels['unlimited'] = 'Ð±ÐµÐ· Ð¾Ð³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ð¹';
	$labels['quicksearch'] = 'ÐÑÑÑÑÑÐ¹ Ð¿Ð¾Ð¸ÑÐº';
	$labels['resetsearch'] = 'Ð¡Ð±ÑÐ¾Ñ';
	$labels['searchmod'] = 'ÐÐ°ÑÐ¸Ð°Ð½ÑÑ Ð¿Ð¾Ð¸ÑÐºÐ°';
	$labels['msgtext'] = 'ÐÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ';
	$labels['openinextwin'] = 'ÐÑÐºÑÑÑÑ Ð² Ð½Ð¾Ð²Ð¾Ð¼ Ð¾ÐºÐ½Ðµ';
	$labels['emlsave'] = 'Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ (.eml)';
	$labels['editasnew'] = 'Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ°Ðº Ð½Ð¾Ð²Ð¾Ðµ';
	$labels['savemessage'] = 'Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÐµÑÐ½Ð¾Ð²Ð¸Ðº';
	$labels['sendmessage'] = 'ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ ÑÐµÐ¹ÑÐ°Ñ';
	$labels['addattachment'] = 'ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ';
	$labels['charset'] = 'ÐÐ¾Ð´Ð¸ÑÐ¾Ð²ÐºÐ°';
	$labels['editortype'] = 'Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ';
	$labels['returnreceipt'] = 'ÐÐ°Ð¿ÑÐ¾Ñ Ð¾ÑÐ²ÐµÑÐ°';
	$labels['dsn'] = 'Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð¾ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ð¸ Ð´Ð¾ÑÑÐ°Ð²ÐºÐ¸';
	$labels['mailreplyintro'] = '$sender Ð¿Ð¸ÑÐ°Ð» $date:';
	$labels['originalmessage'] = 'ÐÑÑÐ¾Ð´Ð½Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ';
	$labels['editidents'] = 'ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ';
	$labels['spellcheck'] = 'ÐÑÑÐ¾Ð³ÑÐ°ÑÐ¸Ñ';
	$labels['checkspelling'] = 'ÐÑÐ¾Ð²ÐµÑÐ¸ÑÑ Ð¾ÑÑÐ¾Ð³ÑÐ°ÑÐ¸Ñ';
	$labels['resumeediting'] = 'ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ';
	$labels['revertto'] = 'ÐÑÐ¼ÐµÐ½Ð¸ÑÑ Ð¿ÑÐ°Ð²ÐºÐ¸';
	$labels['attach'] = 'ÐÐ»Ð¾Ð¶Ð¸ÑÑ';
	$labels['attachments'] = 'ÐÐ»Ð¾Ð¶ÐµÐ½Ð¸Ñ';
	$labels['upload'] = 'ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ';
	$labels['uploadprogress'] = '$percent ($current Ð¸Ð· $total)';
	$labels['close'] = 'ÐÐ°ÐºÑÑÑÑ';
	$labels['messageoptions'] = 'ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹...';
	$labels['low'] = 'ÐÐ¸Ð·ÐºÐ¸Ð¹';
	$labels['lowest'] = 'ÐÐ¸Ð¶Ð°Ð¹Ñ.';
	$labels['normal'] = 'ÐÐ¾ÑÐ¼.';
	$labels['high'] = 'ÐÑÑÐ¾ÐºÐ¸Ð¹';
	$labels['highest'] = 'ÐÑÑÐ¾Ñ.';
	$labels['nosubject'] = '(Ð±ÐµÐ· ÑÐµÐ¼Ñ)';
	$labels['showimages'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ';
	$labels['alwaysshow'] = 'ÐÑÐµÐ³Ð´Ð° Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸ÑÐ² Ð¿Ð¸ÑÑÐ¼Ð°Ñ Ð¾Ñ $sender';
	$labels['isdraft'] = 'ÐÑÐ¾ ÑÐµÑÐ½Ð¾Ð²Ð¸Ðº.';
	$labels['htmltoggle'] = 'HTML';
	$labels['plaintoggle'] = 'Ð¢ÐµÐºÑÑ';
	$labels['savesentmessagein'] = 'Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð²';
	$labels['dontsave'] = 'Ð½Ðµ ÑÐ¾ÑÑÐ°Ð½ÑÑÑ';
	$labels['maxuploadsize'] = 'ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð° $size';
	$labels['addcc'] = 'ÐÐ¾Ð¿Ð¸Ñ';
	$labels['addbcc'] = 'Ð¡ÐºÑÑÑÐ°Ñ ÐºÐ¾Ð¿Ð¸Ñ';
	$labels['addreplyto'] = 'ÐÐ¾Ð¼Ñ Ð¾ÑÐ²ÐµÑÐ¸ÑÑ';
	$labels['addfollowupto'] = 'ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Followup-To';
	$labels['mdnrequest'] = 'ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð·Ð°Ð¿ÑÐ¾ÑÐ¸Ð» ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð¾ Ð¿ÑÐ¾ÑÑÐµÐ½Ð¸Ð¸. ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ?';
	$labels['receiptread'] = 'Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð¾ Ð¿ÑÐ¾ÑÑÐµÐ½Ð¸Ð¸';
	$labels['yourmessage'] = 'ÐÑÐ¾ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð¾ Ð¿ÑÐ¾ÑÑÐµÐ½Ð¸Ð¸ Ð²Ð°ÑÐµÐ³Ð¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ';
	$labels['receiptnote'] = 'ÐÑÐ¾ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð¾Ð·Ð½Ð°ÑÐ°ÐµÑ ÑÐ¾Ð»ÑÐºÐ¾, ÑÑÐ¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð±ÑÐ»Ð¾ Ð¾ÑÐºÑÑÑÐ¾ Ð¿Ð¾Ð»ÑÑÐ°ÑÐµÐ»ÐµÐ¼, Ð¸ Ð½Ðµ Ð³Ð°ÑÐ°Ð½ÑÐ¸ÑÑÐµÑ ÑÐ¾Ð³Ð¾, ÑÑÐ¾ Ð¾Ð½Ð¾ Ð±ÑÐ»Ð¾ Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð¾ Ð¸ (Ð¸Ð»Ð¸) Ð¿Ð¾Ð½ÑÑÐ¾.';
	$labels['name'] = 'ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ';
	$labels['firstname'] = 'ÐÐ¼Ñ';
	$labels['surname'] = 'Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ';
	$labels['middlename'] = 'ÐÑÑÐµÑÑÐ²Ð¾';
	$labels['nameprefix'] = 'ÐÑÐµÑÐ¸ÐºÑ';
	$labels['namesuffix'] = 'Ð¡ÑÑÑÐ¸ÐºÑ';
	$labels['nickname'] = 'ÐÑÐ¾Ð·Ð²Ð¸ÑÐµ';
	$labels['jobtitle'] = 'ÐÐ¾Ð»Ð¶Ð½Ð¾ÑÑÑ';
	$labels['department'] = 'ÐÑÐ´ÐµÐ»';
	$labels['gender'] = 'ÐÐ¾Ð»';
	$labels['maidenname'] = 'ÐÐµÐ²Ð¸ÑÑÑ ÑÐ°Ð¼Ð¸Ð»Ð¸Ñ';
	$labels['email'] = 'E-Mail';
	$labels['phone'] = 'Ð¢ÐµÐ»ÐµÑÐ¾Ð½';
	$labels['address'] = 'ÐÐ´ÑÐµÑ';
	$labels['street'] = 'Ð£Ð»Ð¸ÑÐ°';
	$labels['locality'] = 'ÐÐ¾ÑÐ¾Ð´';
	$labels['zipcode'] = 'ÐÐ½Ð´ÐµÐºÑ';
	$labels['region'] = 'ÐÐ±Ð»Ð°ÑÑÑ';
	$labels['country'] = 'Ð¡ÑÑÐ°Ð½Ð°';
	$labels['birthday'] = 'ÐÐµÐ½Ñ ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ñ';
	$labels['anniversary'] = 'ÐÐ¾Ð´Ð¾Ð²ÑÐ¸Ð½Ð°';
	$labels['website'] = 'ÐÐµÐ±-ÑÐ°Ð¹Ñ';
	$labels['instantmessenger'] = 'IM';
	$labels['notes'] = 'ÐÐ°Ð¼ÐµÑÐºÐ¸';
	$labels['male'] = 'Ð¼ÑÐ¶ÑÐºÐ¾Ð¹';
	$labels['female'] = 'Ð¶ÐµÐ½ÑÐºÐ¸Ð¹';
	$labels['manager'] = 'ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ';
	$labels['assistant'] = 'ÐÐ¾Ð¼Ð¾ÑÐ½Ð¸Ðº';
	$labels['typeassistant'] = 'ÐÐ¾Ð¼Ð¾ÑÐ½Ð¸Ðº';
	$labels['spouse'] = 'Ð¡ÑÐ¿ÑÑÐ³';
	$labels['allfields'] = 'ÐÑÐµ Ð¿Ð¾Ð»Ñ';
	$labels['search'] = 'ÐÐ¾Ð¸ÑÐº';
	$labels['advsearch'] = 'Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð½ÑÐ¹ Ð¿Ð¾Ð¸ÑÐº';
	$labels['advanced'] = 'ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾';
	$labels['other'] = 'ÐÑÑÐ³Ð¾Ðµ';
	$labels['typeother'] = 'ÐÑÑÐ³Ð¾Ðµ';
	$labels['typehome'] = 'ÐÐ¾Ð¼';
	$labels['typework'] = 'Ð Ð°Ð±Ð¾ÑÐ°';
	$labels['typemobile'] = 'ÐÐ¾Ð±Ð¸Ð»ÑÐ½ÑÐ¹';
	$labels['typemain'] = 'ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹';
	$labels['typehomefax'] = 'ÐÐ¾Ð¼Ð°ÑÐ½Ð¸Ð¹ ÑÐ°ÐºÑ';
	$labels['typeworkfax'] = 'Ð Ð°Ð±Ð¾ÑÐ¸Ð¹ ÑÐ°ÐºÑ';
	$labels['typecar'] = 'ÐÐ²ÑÐ¾Ð¼Ð¾Ð±Ð¸Ð»Ñ';
	$labels['typepager'] = 'ÐÑÐ¹Ð´Ð¶ÐµÑ';
	$labels['typevideo'] = 'ÐÐ¸Ð´ÐµÐ¾';
	$labels['typehomepage'] = 'ÐÐ¾Ð¼Ð°ÑÐ½ÑÑ ÑÑÑÐ°Ð½Ð¸ÑÐ°';
	$labels['typeblog'] = 'ÐÐ»Ð¾Ð³';
	$labels['typeprofile'] = 'ÐÑÐ¾ÑÐ¸Ð»Ñ';
	$labels['addfield'] = 'ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð¿Ð¾Ð»Ðµ...';
	$labels['addcontact'] = 'ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ ÐºÐ¾Ð½ÑÐ°ÐºÑÑ Ð² ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ¾Ð½ÑÐ°ÐºÑÐ¾Ð²';
	$labels['editcontact'] = 'Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ¾Ð½ÑÐ°ÐºÑ';
	$labels['contacts'] = 'ÐÐ¾Ð½ÑÐ°ÐºÑÑ';
	$labels['contactproperties'] = 'Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° ÐºÐ¾Ð½ÑÐ°ÐºÑÐ°';
	$labels['personalinfo'] = 'ÐÐ¸ÑÐ½Ð°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ';
	$labels['edit'] = 'ÐÑÐ°Ð²ÐºÐ°';
	$labels['cancel'] = 'ÐÑÐ¼ÐµÐ½Ð°';
	$labels['save'] = 'Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ';
	$labels['delete'] = 'Ð£Ð´Ð°Ð»Ð¸ÑÑ';
	$labels['rename'] = 'ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ';
	$labels['addphoto'] = 'ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ';
	$labels['replacephoto'] = 'ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ';
	$labels['uploadphoto'] = 'ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ ÑÐ¾ÑÐ¾Ð³ÑÐ°ÑÐ¸Ñ';
	$labels['newcontact'] = 'Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð½Ð¾Ð²ÑÐ¹ ÐºÐ¾Ð½ÑÐ°ÐºÑ';
	$labels['deletecontact'] = 'Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ ÐºÐ¾Ð½ÑÐ°ÐºÑÑ';
	$labels['composeto'] = 'Ð¡Ð¾Ð·Ð´Ð°ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÑ ÐºÐ¾Ð½ÑÐ°ÐºÑÐ¾Ð²';
	$labels['contactsfromto'] = 'ÐÐ¾Ð½ÑÐ°ÐºÑÑ Ñ $from Ð¿Ð¾ $to Ð¸Ð· $count';
	$labels['print'] = 'ÐÐµÑÐ°ÑÑ';
	$labels['export'] = 'ÐÐºÑÐ¿Ð¾ÑÑ';
	$labels['exportvcards'] = 'ÐÐºÑÐ¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ¾Ð½ÑÐ°ÐºÑÑ Ð² ÑÐ¾ÑÐ¼Ð°ÑÐµ vCard';
	$labels['newcontactgroup'] = 'Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð³ÑÑÐ¿Ð¿Ñ ÐºÐ¾Ð½ÑÐ°ÐºÑÐ¾Ð²';
	$labels['grouprename'] = 'ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ Ð³ÑÑÐ¿Ð¿Ñ';
	$labels['groupdelete'] = 'Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð³ÑÑÐ¿Ð¿Ñ';
	$labels['groupremoveselected'] = 'Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÐµ ÐºÐ¾Ð½ÑÐ°ÐºÑÑ Ð¸Ð· Ð³ÑÑÐ¿Ð¿Ñ';
	$labels['previouspage'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¿ÑÐµÐ´ÑÐ´ÑÑÐ¸Ð¹';
	$labels['firstpage'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¿ÐµÑÐ²ÑÐ¹';
	$labels['nextpage'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¹';
	$labels['lastpage'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹';
	$labels['group'] = 'ÐÑÑÐ¿Ð¿Ð°';
	$labels['groups'] = 'ÐÑÑÐ¿Ð¿Ñ';
	$labels['personaladrbook'] = 'ÐÐµÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÐµ Ð°Ð´ÑÐµÑÐ°';
	$labels['searchsave'] = 'Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð·Ð°Ð¿ÑÐ¾Ñ';
	$labels['searchdelete'] = 'Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð·Ð°Ð¿ÑÐ¾Ñ';
	$labels['import'] = 'ÐÐ¼Ð¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ';
	$labels['importcontacts'] = 'ÐÐ¼Ð¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ¾Ð½ÑÐ°ÐºÑÑ';
	$labels['importfromfile'] = 'ÐÐ¼Ð¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¸Ð· ÑÐ°Ð¹Ð»Ð°:';
	$labels['importtarget'] = 'ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð½Ð¾Ð²ÑÐµ ÐºÐ¾Ð½ÑÐ°ÐºÑÑ Ð² Ð°Ð´ÑÐµÑÐ½ÑÑ ÐºÐ½Ð¸Ð³Ñ:';
	$labels['importreplace'] = 'ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ Ð²ÑÑ Ð°Ð´ÑÐµÑÐ½ÑÑ ÐºÐ½Ð¸Ð³Ñ';
	$labels['importtext'] = 'ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð½ÑÐ°ÐºÑÑ Ð¸Ð· ÑÑÑÐµÑÑÐ²ÑÑÑÐµÐ¹ Ð°Ð´ÑÐµÑÐ½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸. ÐÐ° Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ Ð·Ð°Ð³ÑÑÐ·ÐºÐ° Ð² ÑÐ¾ÑÐ¼Ð°ÑÐµ vCard.';
	$labels['done'] = 'ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¾';
	$labels['settingsfor'] = 'ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð´Ð»Ñ';
	$labels['about'] = 'Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ';
	$labels['preferences'] = 'ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸';
	$labels['userpreferences'] = 'ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ';
	$labels['editpreferences'] = 'Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ';
	$labels['identities'] = 'ÐÑÐ¾ÑÐ¸Ð»Ð¸';
	$labels['manageidentities'] = 'Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾ÑÐ¸Ð»ÑÐ¼Ð¸';
	$labels['newidentity'] = 'ÐÐ¾Ð²ÑÐ¹ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ';
	$labels['newitem'] = 'ÐÐ¾Ð²ÑÐ¹';
	$labels['edititem'] = 'ÐÑÐ°Ð²ÐºÐ°';
	$labels['preferhtml'] = 'ÐÑÐµÐ´Ð¿Ð¾ÑÐ¸ÑÐ°ÑÑ HTML';
	$labels['defaultcharset'] = 'ÐÐ°Ð±Ð¾Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² Ð¿Ð¾-ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ';
	$labels['htmlmessage'] = 'Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ HTML';
	$labels['dateformat'] = 'Ð¤Ð¾ÑÐ¼Ð°Ñ Ð´Ð°ÑÑ';
	$labels['timeformat'] = 'Ð¤Ð¾ÑÐ¼Ð°Ñ Ð²ÑÐµÐ¼ÐµÐ½Ð¸';
	$labels['prettydate'] = 'ÐÑÐ°ÑÐ¸Ð²ÑÐµ Ð´Ð°ÑÑ';
	$labels['setdefault'] = 'ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ';
	$labels['autodetect'] = 'ÐÐ¿ÑÐµÐ´ÐµÐ»ÑÑÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸';
	$labels['language'] = 'Ð¯Ð·ÑÐº';
	$labels['timezone'] = 'Ð§Ð°ÑÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾ÑÑ';
	$labels['pagesize'] = 'Ð¡ÑÑÐ¾Ðº Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐµ';
	$labels['signature'] = 'ÐÐ¾Ð´Ð¿Ð¸ÑÑ';
	$labels['dstactive'] = 'ÐÐµÑÐ½ÐµÐµ Ð²ÑÐµÐ¼Ñ';
	+$labels['composeextwin'] = 'ÐÐ°Ð¿Ð¸ÑÐ°ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð² Ð½Ð¾Ð²Ð¾Ð¼ Ð¾ÐºÐ½Ðµ';
	$labels['htmleditor'] = 'Ð¡Ð¾Ð·Ð´Ð°Ð²Ð°ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð² HTML';
	$labels['htmlonreply'] = 'ÑÐ¾Ð»ÑÐºÐ¾ Ð² Ð¾ÑÐ²ÐµÑ Ð½Ð° ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð² HTML';
	$labels['htmlsignature'] = 'ÐÐ¾Ð´Ð¿Ð¸ÑÑ Ð² HTML';
	$labels['previewpane'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð¿ÑÐµÐ²ÑÑ';
	$labels['skin'] = 'Ð¡ÑÐ¸Ð»Ñ Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ñ';
	$labels['logoutclear'] = 'ÐÑÐ¸ÑÐ°ÑÑ ÐºÐ¾ÑÐ·Ð¸Ð½Ñ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ';
	$labels['logoutcompact'] = 'Ð¡Ð¶Ð°ÑÑ ÐÑÐ¾Ð´ÑÑÐ¸Ðµ Ð¿ÑÐ¸ Ð²ÑÑÐ¾Ð´Ðµ';
	$labels['uisettings'] = 'ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ð¹ Ð¸Ð½ÑÐµÑÑÐµÐ¹Ñ';
	$labels['serversettings'] = 'ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐµÑÐ²ÐµÑÐ°';
	$labels['mailboxview'] = 'ÐÐ¸Ð´ Ð¿Ð¾ÑÑÐ¾Ð²Ð¾Ð³Ð¾ ÑÑÐ¸ÐºÐ°';
	$labels['mdnrequests'] = 'Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ Ð¿ÑÐ¾ÑÑÐµÐ½Ð¸Ð¸';
	$labels['askuser'] = 'ÑÐ¿ÑÐ¾ÑÐ¸ÑÑ Ð¿ÐµÑÐµÐ´ Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¾Ð¹';
	$labels['autosend'] = 'Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸';
	$labels['autosendknown'] = 'Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½ÑÐ°ÐºÑÐ°Ð¼ Ð¸Ð· Ð°Ð´ÑÐµÑÐ½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸, Ð² Ð¿ÑÐ¾ÑÐ¸Ð²Ð½Ð¾Ð¼ ÑÐ»ÑÑÐ°Ðµ ÑÐ¿ÑÐ¾ÑÐ¸ÑÑ';
	$labels['autosendknownignore'] = 'Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ ÑÐ¾Ð»ÑÐºÐ¾ ÐºÐ¾Ð½ÑÐ°ÐºÑÐ°Ð¼ Ð¸Ð· Ð°Ð´ÑÐµÑÐ½Ð¾Ð¹ ÐºÐ½Ð¸Ð³Ð¸, Ð¾ÑÑÐ°Ð»ÑÐ½ÑÑ Ð¸Ð³Ð½Ð¾ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ';
	$labels['ignore'] = 'Ð¸Ð³Ð½Ð¾ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ';
	$labels['readwhendeleted'] = 'ÐÐ¾Ð¼ÐµÑÐ°ÑÑ ÐºÐ°Ðº Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½Ð¾Ðµ Ð¿ÑÐ¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ð¸';
	$labels['flagfordeletion'] = 'ÐÐ¾Ð¼ÐµÑÐ°ÑÑ Ð´Ð»Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²Ð¼ÐµÑÑÐ¾ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ';
	$labels['skipdeleted'] = 'ÐÐµ Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ð½ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ';
	$labels['deletealways'] = 'Ð£Ð´Ð°Ð»ÑÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ, ÐµÑÐ»Ð¸ Ð½Ðµ Ð¿Ð¾Ð»ÑÑÐ°ÐµÑÑÑ Ð¿Ð¾Ð¼ÐµÑÑÐ¸ÑÑ Ð¸Ñ Ð² ÐºÐ¾ÑÐ·Ð¸Ð½Ñ';
	$labels['deletejunk'] = 'Ð£Ð´Ð°Ð»ÑÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð¸Ð· Ð¿Ð°Ð¿ÐºÐ¸ Ð¡ÐÐÐ Ð¼Ð¸Ð½ÑÑ ÐÐ¾ÑÐ·Ð¸Ð½Ñ';
	$labels['showremoteimages'] = 'ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ð½ÑÐµ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ';
	$labels['fromknownsenders'] = 'Ð¾Ñ Ð¸Ð·Ð²ÐµÑÑÐ½ÑÑ Ð¾ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»ÐµÐ¹';
	$labels['always'] = 'Ð²ÑÐµÐ³Ð´Ð°';
	$labels['showinlineimages'] = 'ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ Ð²Ð»Ð¾Ð¶ÐµÐ½Ð½ÑÐµ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð²Ð½Ð¸Ð·Ñ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ';
	$labels['autosavedraft'] = 'ÐÐ²ÑÐ¾ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ðµ ÑÐµÑÐ½Ð¾Ð²Ð¸ÐºÐ°';
	$labels['everynminutes'] = 'ÐºÐ°Ð¶Ð´ÑÐµ $n Ð¼Ð¸Ð½ÑÑ';
	$labels['keepalive'] = 'ÐÑÐ¾Ð²ÐµÑÑÑÑ Ð½Ð¾Ð²ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ';
	$labels['never'] = 'Ð½Ð¸ÐºÐ¾Ð³Ð´Ð°';
	$labels['immediately'] = 'Ð½ÐµÐ¼ÐµÐ´Ð»ÐµÐ½Ð½Ð¾';
	$labels['messagesdisplaying'] = 'ÐÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹';
	$labels['messagescomposition'] = 'Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹';
	$labels['mimeparamfolding'] = 'ÐÐ¼ÐµÐ½Ð° Ð²Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹';
	$labels['2231folding'] = 'RFC 2231 (ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ Ð½Ð¾Ð²ÐµÐ¹ÑÐ¸Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼)';
	$labels['miscfolding'] = 'RFC 2047/2231 (Ð½Ð°Ð¸Ð±Ð¾Ð»ÑÑÐ°Ñ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÑ)';
	$labels['2047folding'] = 'RFC 2047 (Ð´Ð»Ñ ÑÑÐ°ÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼)';
	$labels['force7bit'] = 'ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ MIME Ð´Ð»Ñ 8-Ð±Ð¸ÑÐ½ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²';
	$labels['advancedoptions'] = 'ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸';
	$labels['focusonnewmessage'] = 'Ð¤Ð¾ÐºÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¾ÐºÐ½Ð¾ Ð±ÑÐ°ÑÐ·ÐµÑÐ° Ð¿ÑÐ¸ Ð½Ð¾Ð²Ð¾Ð¼ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¸';
	$labels['checkallfolders'] = 'ÐÑÐ¾Ð²ÐµÑÑÑÑ Ð½Ð¾Ð²ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð²Ð¾ Ð²ÑÐµÑ Ð¿Ð°Ð¿ÐºÐ°Ñ';
	$labels['displaynext'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ»ÐµÐ´ÑÑÑÐµÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ, Ð¿Ð¾ÑÐ»Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾';
	$labels['defaultfont'] = 'Ð¨ÑÐ¸ÑÑ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ HTML ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ';
	$labels['mainoptions'] = 'ÐÑÐ½Ð¾Ð²Ð½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸';
	$labels['browseroptions'] = 'ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¾Ð±Ð¾Ð·ÑÐµÐ²Ð°ÑÐµÐ»Ñ';
	$labels['section'] = 'Ð Ð°Ð·Ð´ÐµÐ»';
	$labels['maintenance'] = 'ÐÐ±ÑÐ»ÑÐ¶Ð¸Ð²Ð°Ð½Ð¸Ðµ';
	$labels['newmessage'] = 'ÐÐ¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ';
	$labels['signatureoptions'] = 'ÐÐ¿ÑÐ¸Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸';
	$labels['whenreplying'] = 'ÐÑÐ¸ Ð¾ÑÐ²ÐµÑÐµ';
	$labels['replytopposting'] = 'Ð½Ð°ÑÐ°ÑÑ Ð½Ð¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¿ÐµÑÐµÐ´ ÑÐ¸ÑÐ¸ÑÑÐµÐ¼ÑÐ¼';
	$labels['replybottomposting'] = 'Ð½Ð°ÑÐ°ÑÑ Ð½Ð¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ÑÐ»Ðµ ÑÐ¸ÑÐ¸ÑÑÐµÐ¼Ð¾Ð³Ð¾';
	$labels['replyremovesignature'] = 'Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ Ð¿ÑÐ¸ Ð¾ÑÐ²ÐµÑÐµ';
	$labels['autoaddsignature'] = 'ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ';
	$labels['newmessageonly'] = 'ÑÐ¾Ð»ÑÐºÐ¾ Ð² Ð½Ð¾Ð²ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸ÑÑ';
	$labels['replyandforwardonly'] = 'ÑÐ¾Ð»ÑÐºÐ¾ Ð² Ð¾ÑÐ²ÐµÑÐ°Ñ Ð¸ Ð¿ÐµÑÐµÑÑÐ»ÐºÐ°Ñ';
	$labels['replysignaturepos'] = 'ÐÑÐ¸ÐºÑÐµÐ¿Ð¸ÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ Ð¿ÑÐ¸ Ð¾ÑÐ²ÐµÑÐµ Ð¸ Ð¿ÐµÑÐµÑÑÐ»ÐºÐµ';
	$labels['belowquote'] = 'Ð¿Ð¾ÑÐ»Ðµ ÑÐ¸ÑÐ°ÑÑ';
	$labels['abovequote'] = 'Ð´Ð¾ ÑÐ¸ÑÐ°ÑÑ';
	$labels['insertsignature'] = 'ÐÑÑÐ°Ð²Ð¸ÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ';
	$labels['previewpanemarkread'] = 'ÐÑÐ¼ÐµÑÐ°ÑÑ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐµÐ½Ð½ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ ÐºÐ°Ðº Ð¿ÑÐ¾ÑÐ¸ÑÐ°Ð½Ð½ÑÐµ';
	$labels['afternseconds'] = 'ÑÐµÑÐµÐ· $n ÑÐµÐºÑÐ½Ð´';
	$labels['reqmdn'] = 'ÐÑÐµÐ³Ð´Ð° Ð·Ð°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÑÑ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð¾ Ð´Ð¾ÑÑÐ°Ð²ÐºÐµ';
	$labels['reqdsn'] = 'ÐÑÐµÐ³Ð´Ð° Ð·Ð°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÑÑ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ Ð¾ ÑÐ¾ÑÑÐ¾ÑÐ½Ð¸Ð¸ Ð´Ð¾ÑÑÐ°Ð²ÐºÐ¸';
	$labels['replysamefolder'] = 'ÐÐ¾Ð¼ÐµÑÐ°ÑÑ Ð¾ÑÐ²ÐµÑÑ Ð² ÑÑ Ð¶Ðµ Ð¿Ð°Ð¿ÐºÑ, Ð³Ð´Ðµ Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð¾ÑÐ¸Ð³Ð¸Ð½Ð°Ð»';
	$labels['defaultaddressbook'] = 'ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð½Ð¾Ð²ÑÐµ ÐºÐ¾Ð½ÑÐ°ÐºÑÑ Ð² Ð²ÑÐ±ÑÐ°Ð½Ð½ÑÑ Ð°Ð´ÑÐµÑÐ½ÑÑ ÐºÐ½Ð¸Ð³Ñ';
	$labels['autocompletesingle'] = 'ÐÑÐ¾Ð¿ÑÑÐºÐ°ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð°Ð´ÑÐµÑÐ° Ð² Ð°Ð²ÑÐ¾Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ð¸';
	$labels['listnamedisplay'] = 'ÐÑÐ²Ð¾Ð´Ð¸ÑÑ ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ¾Ð½ÑÐ°ÐºÑÐ¾Ð² ÐºÐ°Ðº';
	$labels['spellcheckbeforesend'] = 'ÐÑÐ¾Ð²ÐµÑÑÑÑ Ð¾ÑÑÐ¾Ð³ÑÐ°ÑÐ¸Ñ Ð¿ÐµÑÐµÐ´ Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¾Ð¹';
	$labels['spellcheckoptions'] = 'ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð¾ÑÑÐ¾Ð³ÑÐ°ÑÐ¸Ð¸';
	$labels['spellcheckignoresyms'] = 'ÐÑÐ¾Ð¿ÑÑÐºÐ°ÑÑ ÑÐ»Ð¾Ð²Ð° Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°Ð¼Ð¸';
	$labels['spellcheckignorenums'] = 'ÐÑÐ¾Ð¿ÑÑÐºÐ°ÑÑ ÑÐ»Ð¾Ð²Ð° Ñ ÑÐ¸ÑÑÐ°Ð¼Ð¸';
	$labels['spellcheckignorecaps'] = 'ÐÑÐ¾Ð¿ÑÑÐºÐ°ÑÑ ÑÐ»Ð¾Ð²Ð° Ð¸Ð· Ð¿ÑÐ¾Ð¿Ð¸ÑÐ½ÑÑ Ð±ÑÐºÐ²';
	$labels['addtodict'] = 'ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð² ÑÐ»Ð¾Ð²Ð°ÑÑ';
	$labels['mailtoprotohandler'] = 'ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÑÐ¸Ðº Ð´Ð»Ñ ÑÑÑÐ»Ð¾Ðº mailto:';
	$labels['folder'] = 'ÐÐ°Ð¿ÐºÐ°';
	$labels['foldername'] = 'ÐÐ¼Ñ Ð¿Ð°Ð¿ÐºÐ¸';
	$labels['subscribed'] = 'ÐÐ¾Ð´Ð¿Ð¸ÑÐ°Ð½';
	$labels['messagecount'] = 'Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ';
	$labels['create'] = 'Ð¡Ð¾Ð·Ð´Ð°ÑÑ';
	$labels['createfolder'] = 'Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð½Ð¾Ð²ÑÑ Ð¿Ð°Ð¿ÐºÑ';
	$labels['managefolders'] = 'Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°Ð¿ÐºÐ°Ð¼Ð¸';
	$labels['specialfolders'] = 'ÐÑÐ¾Ð±ÑÐµ Ð¿Ð°Ð¿ÐºÐ¸';
	$labels['properties'] = 'Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°';
	$labels['folderproperties'] = 'Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð¿Ð°Ð¿ÐºÐ¸';
	$labels['parentfolder'] = 'Ð Ð¾Ð´Ð¸ÑÐµÐ»ÑÑÐºÐ°Ñ Ð¿Ð°Ð¿ÐºÐ°';
	$labels['location'] = 'Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ';
	$labels['info'] = 'ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ';
	$labels['getfoldersize'] = 'ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ°Ð·Ð¼ÐµÑ Ð¿Ð°Ð¿ÐºÐ¸';
	$labels['changesubscription'] = 'ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÑ';
	$labels['foldertype'] = 'Ð¢Ð¸Ð¿ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°';
	$labels['personalfolder'] = 'ÐÑÐ¸Ð²Ð°ÑÐ½ÑÐ¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³';
	$labels['otherfolder'] = 'ÐÐ°ÑÐ°Ð»Ð¾Ð³ Ð´ÑÑÐ³Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ';
	$labels['sharedfolder'] = 'Ð¡Ð¾Ð²Ð¼ÐµÑÑÐ½ÑÐ¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³';
	$labels['sortby'] = 'Ð¡Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾';
	$labels['sortasc'] = 'ÐÐ¾Ð·ÑÐ°ÑÑÐ°Ð½Ð¸Ñ';
	$labels['sortdesc'] = 'Ð£Ð±ÑÐ²Ð°Ð½Ð¸Ñ';
	$labels['undo'] = 'ÐÑÐ¼ÐµÐ½Ð°';
	$labels['plugin'] = 'ÐÐ¾Ð´ÑÐ»Ñ';
	$labels['version'] = 'ÐÐµÑÑÐ¸Ñ';
	$labels['source'] = 'ÐÑÑÐ¾ÑÐ½Ð¸Ðº';
	$labels['license'] = 'ÐÐ¸ÑÐµÐ½Ð·Ð¸Ñ';
	$labels['support'] = 'ÐÐ¾Ð´Ð´ÐµÑÐ¶ÐºÐ°';
	$labels['B'] = 'Ð';
	$labels['KB'] = 'ÐÐ';
	$labels['MB'] = 'ÐÐ';
	$labels['GB'] = 'ÐÐ';
	$labels['unicode'] = 'Unicode';
	$labels['english'] = 'ÐÐ½Ð³Ð»Ð¸Ð¹ÑÐºÐ¸Ð¹';
	$labels['westerneuropean'] = 'ÐÐ°Ð¿Ð°Ð´Ð½Ð¾ÐµÐ²ÑÐ¾Ð¿ÐµÐ¹ÑÐºÐ¸Ð¹';
	$labels['easterneuropean'] = 'ÐÐ¾ÑÑÐ¾ÑÐ½Ð¾ÐµÐ²ÑÐ¾Ð¿ÐµÐ¹ÑÐºÐ¸Ð¹';
	$labels['southeasterneuropean'] = 'Ð®Ð³Ð¾-ÐÐ¾ÑÑÐ¾ÑÐ½Ð¾ÐµÐ²ÑÐ¾Ð¿ÐµÐ¹ÑÐºÐ¸Ð¹';
	$labels['baltic'] = 'ÐÑÐ¸Ð±Ð°Ð»ÑÐ¸Ð¹ÑÐºÐ¸Ð¹';
	$labels['cyrillic'] = 'ÐÐ¸ÑÐ¸Ð»Ð»Ð¸ÑÐ°';
	$labels['arabic'] = 'ÐÑÐ°Ð±ÑÐºÐ¸Ð¹';
	$labels['greek'] = 'ÐÑÐµÑÐµÑÐºÐ¸Ð¹';
	$labels['hebrew'] = 'ÐÐ²ÑÐ¸Ñ';
	$labels['turkish'] = 'Ð¢ÑÑÐµÑÐºÐ¸Ð¹';
	$labels['nordic'] = 'Ð¡ÐºÐ°Ð½Ð´Ð¸Ð½Ð°Ð²ÑÐºÐ¸Ð¹';
	$labels['thai'] = 'Ð¢Ð°Ð¹ÑÐºÐ¸Ð¹';
	$labels['celtic'] = 'ÐÐµÐ»ÑÑÑÐºÐ¸Ð¹';
	$labels['vietnamese'] = 'ÐÑÐµÑÐ½Ð°Ð¼ÑÐºÐ¸Ð¹';
	$labels['japanese'] = 'Ð¯Ð¿Ð¾Ð½ÑÐºÐ¸Ð¹';
	$labels['korean'] = 'ÐÐ¾ÑÐµÐ¹ÑÐºÐ¸Ð¹';
	$labels['chinese'] = 'ÐÐ¸ÑÐ°Ð¹ÑÐºÐ¸Ð¹';

	diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
	index 4ef4d1b51..3a0508025 100644
	--- a/program/steps/addressbook/func.inc
	+++ b/program/steps/addressbook/func.inc
	@@ -1,830 +1,831 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Provide addressbook functionality and GUI objects \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$SEARCH_MODS_DEFAULT = array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1);

	// general definition of contact coltypes
	$CONTACT_COLTYPES = array(
	'name' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('name'), 'category' => 'main'),
	'firstname' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('firstname'), 'category' => 'main'),
	'surname' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('surname'), 'category' => 'main'),
	'email' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('email'), 'subtypes' => array('home','work','other'), 'category' => 'main'),
	'middlename' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('middlename'), 'category' => 'main'),
	'prefix' => array('type' => 'text', 'size' => 8, 'maxlength' => 20, 'limit' => 1, 'label' => rcube_label('nameprefix'), 'category' => 'main'),
	'suffix' => array('type' => 'text', 'size' => 8, 'maxlength' => 20, 'limit' => 1, 'label' => rcube_label('namesuffix'), 'category' => 'main'),
	'nickname' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('nickname'), 'category' => 'main'),
	'jobtitle' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('jobtitle'), 'category' => 'main'),
	'organization' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('organization'), 'category' => 'main'),
	'department' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('department'), 'category' => 'main'),
	'gender' => array('type' => 'select', 'limit' => 1, 'label' => rcube_label('gender'), 'options' => array('male' => rcube_label('male'), 'female' => rcube_label('female')), 'category' => 'personal'),
	'maidenname' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('maidenname'), 'category' => 'personal'),
	'phone' => array('type' => 'text', 'size' => 40, 'maxlength' => 20, 'label' => rcube_label('phone'), 'subtypes' => array('home','home2','work','work2','mobile','main','homefax','workfax','car','pager','video','assistant','other'), 'category' => 'main'),
	'address' => array('type' => 'composite', 'label' => rcube_label('address'), 'subtypes' => array('home','work','other'), 'childs' => array(
	'street' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('street'), 'category' => 'main'),
	'locality' => array('type' => 'text', 'size' => 28, 'maxlength' => 50, 'label' => rcube_label('locality'), 'category' => 'main'),
	'zipcode' => array('type' => 'text', 'size' => 8, 'maxlength' => 15, 'label' => rcube_label('zipcode'), 'category' => 'main'),
	'region' => array('type' => 'text', 'size' => 12, 'maxlength' => 50, 'label' => rcube_label('region'), 'category' => 'main'),
	'country' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('country'), 'category' => 'main'),
	), 'category' => 'main'),
	'birthday' => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => rcube_label('birthday'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
	'anniversary' => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => rcube_label('anniversary'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
	'website' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('website'), 'subtypes' => array('homepage','work','blog','profile','other'), 'category' => 'main'),
	'im' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('instantmessenger'), 'subtypes' => array('aim','icq','msn','yahoo','jabber','skype','other'), 'category' => 'main'),
	'notes' => array('type' => 'textarea', 'size' => 40, 'rows' => 15, 'maxlength' => 500, 'label' => rcube_label('notes'), 'limit' => 1),
	'photo' => array('type' => 'image', 'limit' => 1, 'category' => 'main'),
	'assistant' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('assistant'), 'category' => 'personal'),
	'manager' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('manager'), 'category' => 'personal'),
	'spouse' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('spouse'), 'category' => 'personal'),
	// TODO: define fields for vcards like GEO, KEY
	);

	$PAGE_SIZE = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));

	// Addressbook UI
	if (!$RCMAIL->action && !$OUTPUT->ajax_call) {
	// add list of address sources to client env
	$js_list = $RCMAIL->get_address_sources();

	$source = get_input_value('_source', RCUBE_INPUT_GPC);

	// use first directory by default
	if (!strlen($source) \|\| !isset($js_list[$source]))
	$source = $js_list[key($js_list)]['id'];

	// count all/writeable sources
	$writeable = 0;
	$count = 0;
	foreach ($js_list as $sid => $s) {
	$count++;
	if (!$s['readonly']) {
	$writeable++;
	}
	// unset hidden sources
	if ($s['hidden']) {
	unset($js_list[$sid]);
	}
	}

	$search_mods = $RCMAIL->config->get('addressbook_search_mods', $SEARCH_MODS_DEFAULT);
	$OUTPUT->set_env('search_mods', $search_mods);
	$OUTPUT->set_env('address_sources', $js_list);
	$OUTPUT->set_env('writable_source', $writeable);
	+ $OUTPUT->set_env('compose_extwin', $RCMAIL->config->get('compose_extwin',false));

	$OUTPUT->set_pagetitle(rcube_label('addressbook'));
	$_SESSION['addressbooks_count'] = $count;
	$_SESSION['addressbooks_count_writeable'] = $writeable;

	if (!strlen($source))
	$source = strval(key($js_list));

	$CONTACTS = rcmail_contact_source($source, true);
	}

	// remove undo information...
	if ($undo = $_SESSION['contact_undo']) {
	// ...after timeout
	$undo_time = $RCMAIL->config->get('undo_timeout', 0);
	if ($undo['ts'] < time() - $undo_time)
	$RCMAIL->session->remove('contact_undo');
	}

	// instantiate a contacts object according to the given source
	function rcmail_contact_source($source=null, $init_env=false, $writable=false)
	{
	global $RCMAIL, $OUTPUT, $CONTACT_COLTYPES, $PAGE_SIZE;

	if (!strlen($source)) {
	$source = get_input_value('_source', RCUBE_INPUT_GPC);
	}

	// Get object
	$CONTACTS = $RCMAIL->get_address_book($source, $writable);
	$CONTACTS->set_pagesize($PAGE_SIZE);

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

	if (!empty($_REQUEST['_gid']))
	$CONTACTS->set_group(get_input_value('_gid', RCUBE_INPUT_GPC));

	if (!$init_env)
	return $CONTACTS;

	$OUTPUT->set_env('readonly', $CONTACTS->readonly);
	$OUTPUT->set_env('source', $source);

	// reduce/extend $CONTACT_COLTYPES with specification from the current $CONTACT object
	if (is_array($CONTACTS->coltypes)) {
	// remove cols not listed by the backend class
	$contact_cols = $CONTACTS->coltypes[0] ? array_flip($CONTACTS->coltypes) : $CONTACTS->coltypes;
	$CONTACT_COLTYPES = array_intersect_key($CONTACT_COLTYPES, $contact_cols);
	// add associative coltypes definition
	if (!$CONTACTS->coltypes[0]) {
	foreach ($CONTACTS->coltypes as $col => $colprop) {
	if (is_array($colprop['childs'])) {
	foreach ($colprop['childs'] as $childcol => $childprop)
	$colprop['childs'][$childcol] = array_merge((array)$CONTACT_COLTYPES[$col]['childs'][$childcol], $childprop);
	}
	$CONTACT_COLTYPES[$col] = $CONTACT_COLTYPES[$col] ? array_merge($CONTACT_COLTYPES[$col], $colprop) : $colprop;
	}
	}
	}

	$OUTPUT->set_env('photocol', is_array($CONTACT_COLTYPES['photo']));

	return $CONTACTS;
	}


	function rcmail_default_source($writable=false)
	{
	global $RCMAIL;

	// get list of address sources
	$first = reset($RCMAIL->get_address_sources($writable));

	// use first directory by default
	return $first['id'];
	}

	function rcmail_set_sourcename($abook)
	{
	global $OUTPUT;

	// get address book name (for display)
	if ($abook && $_SESSION['addressbooks_count'] > 1) {
	$name = $abook->get_name();
	if (!$name && $source == 0) {
	$name = rcube_label('personaladrbook');
	}
	$OUTPUT->set_env('sourcename', html_entity_decode($name, ENT_COMPAT, 'UTF-8'));
	}
	}


	function rcmail_directory_list($attrib)
	{
	global $RCMAIL, $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmdirectorylist';

	$out = '';
	$local_id = '0';
	$jsdata = array();

	$line_templ = html::tag('li', array(
	'id' => 'rcmli%s', 'class' => '%s'),
	html::a(array('href' => '%s',
	'rel' => '%s',
	'onclick' => "return ".JS_OBJECT_NAME.".command('list','%s',this)"), '%s'));

	$sources = (array) $OUTPUT->get_env('address_sources');
	reset($sources);

	// currently selected source
	$current = get_input_value('_source', RCUBE_INPUT_GPC);

	foreach ($sources as $j => $source) {
	$id = strval(strlen($source['id']) ? $source['id'] : $j);
	$js_id = JQ($id);

	// set class name(s)
	$class_name = 'addressbook';
	if ($current === $id)
	$class_name .= ' selected';
	if ($source['readonly'])
	$class_name .= ' readonly';
	if ($source['class_name'])
	$class_name .= ' ' . $source['class_name'];

	$name = !empty($source['name']) ? $source['name'] : $id;
	$out .= sprintf($line_templ,
	html_identifier($id),
	$class_name,
	Q(rcmail_url(null, array('_source' => $id))),
	$source['id'],
	$js_id, $name);

	$groupdata = array('out' => $out, 'jsdata' => $jsdata, 'source' => $id);
	if ($source['groups'])
	$groupdata = rcmail_contact_groups($groupdata);
	$jsdata = $groupdata['jsdata'];
	$out = $groupdata['out'];
	}

	$line_templ = html::tag('li', array(
	'id' => 'rcmliS%s', 'class' => '%s'),
	html::a(array('href' => '#', 'rel' => 'S%s',
	'onclick' => "return ".JS_OBJECT_NAME.".command('listsearch', '%s', this)"), '%s'));

	// Saved searches
	$sources = $RCMAIL->user->list_searches(rcube_user::SEARCH_ADDRESSBOOK);
	foreach ($sources as $j => $source) {
	$id = $source['id'];
	$js_id = JQ($id);

	// set class name(s)
	$class_name = 'contactsearch';
	if ($current === $id)
	$class_name .= ' selected';
	if ($source['class_name'])
	$class_name .= ' ' . $source['class_name'];

	$out .= sprintf($line_templ,
	html_identifier($id),
	$class_name,
	$id,
	$js_id, (!empty($source['name']) ? Q($source['name']) : Q($id)));
	}

	$OUTPUT->set_env('contactgroups', $jsdata);
	$OUTPUT->add_gui_object('folderlist', $attrib['id']);
	// add some labels to client
	$OUTPUT->add_label('deletegroupconfirm', 'groupdeleting', 'addingmember', 'removingmember');

	return html::tag('ul', $attrib, $out, html::$common_attrib);
	}


	function rcmail_contact_groups($args)
	{
	global $RCMAIL;

	$groups = $RCMAIL->get_address_book($args['source'])->list_groups();

	if (!empty($groups)) {
	$line_templ = html::tag('li', array(
	'id' => 'rcmliG%s', 'class' => 'contactgroup'),
	html::a(array('href' => '#',
	'rel' => '%s:%s',
	'onclick' => "return ".JS_OBJECT_NAME.".command('listgroup',{'source':'%s','id':'%s'},this)"), '%s'));

	$jsdata = array();
	foreach ($groups as $group) {
	$args['out'] .= sprintf($line_templ,
	html_identifier($args['source'] . $group['ID']),
	$args['source'], $group['ID'],
	$args['source'], $group['ID'], Q($group['name'])
	);
	$args['jsdata']['G'.$args['source'].$group['ID']] = array(
	'source' => $args['source'], 'id' => $group['ID'],
	'name' => $group['name'], 'type' => 'group');
	}
	}

	return $args;
	}


	// return the contacts list as HTML table
	function rcmail_contacts_list($attrib)
	{
	global $CONTACTS, $OUTPUT;

	// define list of cols to be displayed
	$a_show_cols = array('name');

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmAddressList';

	// create XHTML table
	$out = rcube_table_output($attrib, array(), $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->include_script('list.js');

	// add some labels to client
	$OUTPUT->add_label('deletecontactconfirm', 'copyingcontact', 'contactdeleting');

	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();
	$classes = array('person'); // org records will follow some day

	// build contact ID with source ID
	if (isset($row['sourceid'])) {
	$row['ID'] = $row['ID'].'-'.$row['sourceid'];
	}

	// format each col
	foreach ($a_show_cols as $col) {
	$val = $col == 'name' ? rcube_addressbook::compose_list_name($row) : $row[$col];
	$a_row_cols[$col] = Q($val);
	}

	if ($row['readonly'])
	$classes[] = 'readonly';

	$OUTPUT->command($prefix.'add_contact_row', $row['ID'], $a_row_cols, join(' ', $classes));
	}
	}


	// 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/resources/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']);

	if ($attrib['label'])
	$_SESSION['contactcountdisplay'] = $attrib['label'];

	return html::span($attrib, rcube_label('loading'));
	}


	function rcmail_get_rowcount_text($result=null)
	{
	global $CONTACTS, $PAGE_SIZE;

	// read nr of contacts
	if (!$result) {
	$result = $CONTACTS->get_result();
	}

	if ($result->count == 0)
	$out = rcube_label('nocontactsfound');
	else
	$out = rcube_label(array(
	'name' => $_SESSION['contactcountdisplay'] ? $_SESSION['contactcountdisplay'] : 'contactsfromto',
	'vars' => array(
	'from' => $result->first + 1,
	'to' => min($result->count, $result->first + $PAGE_SIZE),
	'count' => $result->count)
	));

	return $out;
	}


	function rcmail_get_type_label($type)
	{
	$label = 'type'.$type;
	if (rcube_label_exists($label, '*', $domain))
	return rcube_label($label, $domain);
	else if (preg_match('/\w+(\d+)$/', $label, $m)
	&& ($label = preg_replace('/(\d+)$/', '', $label))
	&& rcube_label_exists($label, '*', $domain))
	return rcube_label($label, $domain) . ' ' . $m[1];

	return ucfirst($type);
	}


	function rcmail_contact_form($form, $record, $attrib = null)
	{
	global $RCMAIL, $CONFIG;

	// Allow plugins to modify contact form content
	$plugin = $RCMAIL->plugins->exec_hook('contact_form', array(
	'form' => $form, 'record' => $record));

	$form = $plugin['form'];
	$record = $plugin['record'];
	$edit_mode = $RCMAIL->action != 'show';
	$del_button = $attrib['deleteicon'] ? html::img(array('src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 'alt' => rcube_label('delete'))) : rcube_label('delete');
	unset($attrib['deleteicon']);
	$out = '';

	// get default coltypes
	$coltypes = $GLOBALS['CONTACT_COLTYPES'];
	$coltype_labels = array();

	foreach ($coltypes as $col => $prop) {
	if ($prop['subtypes']) {
	$subtype_names = array_map('rcmail_get_type_label', $prop['subtypes']);
	$select_subtype = new html_select(array('name' => '_subtype_'.$col.'[]', 'class' => 'contactselectsubtype'));
	$select_subtype->add($subtype_names, $prop['subtypes']);
	$coltypes[$col]['subtypes_select'] = $select_subtype->show();
	}
	if ($prop['childs']) {
	foreach ($prop['childs'] as $childcol => $cp)
	$coltype_labels[$childcol] = array('label' => $cp['label']);
	}
	}

	foreach ($form as $section => $fieldset) {
	// skip empty sections
	if (empty($fieldset['content']))
	continue;

	$select_add = new html_select(array('class' => 'addfieldmenu', 'rel' => $section));
	$select_add->add(rcube_label('addfield'), '');

	// render head section with name fields (not a regular list of rows)
	if ($section == 'head') {
	$content = '';

	// unset display name if it is composed from name parts
	if ($record['name'] == rcube_addressbook::compose_display_name(array('name' => '') + (array)$record))
	unset($record['name']);

	// group fields
	$field_blocks = array(
	'names' => array('prefix','firstname','middlename','surname','suffix'),
	'displayname' => array('name'),
	'nickname' => array('nickname'),
	'organization' => array('organization'),
	'department' => array('department'),
	'jobtitle' => array('jobtitle'),
	);
	foreach ($field_blocks as $blockname => $colnames) {
	$fields = '';
	foreach ($colnames as $col) {
	// skip cols unknown to the backend
	if (!$coltypes[$col])
	continue;

	// only string values are expected here
	if (is_array($record[$col]))
	$record[$col] = join(' ', $record[$col]);

	if ($RCMAIL->action == 'show') {
	if (!empty($record[$col]))
	$fields .= html::span('namefield ' . $col, Q($record[$col])) . " ";
	}
	else {
	$colprop = (array)$fieldset['content'][$col] + (array)$coltypes[$col];
	$colprop['id'] = 'ff_'.$col;
	if (empty($record[$col]) && !$colprop['visible']) {
	$colprop['style'] = 'display:none';
	$select_add->add($colprop['label'], $col);
	}
	$fields .= rcmail_get_edit_field($col, $record[$col], $colprop, $colprop['type']);
	}
	}
	$content .= html::div($blockname, $fields);
	}

	if ($edit_mode)
	$content .= html::p('addfield', $select_add->show(null));

	$out .= html::tag('fieldset', $attrib, (!empty($fieldset['name']) ? html::tag('legend', null, Q($fieldset['name'])) : '') . $content) ."\n";
	continue;
	}

	$content = '';
	if (is_array($fieldset['content'])) {
	foreach ($fieldset['content'] as $col => $colprop) {
	// remove subtype part of col name
	list($field, $subtype) = explode(':', $col);
	if (!$subtype) $subtype = 'home';
	$fullkey = $col.':'.$subtype;

	// skip cols unknown to the backend
	if (!$coltypes[$field])
	continue;

	// merge colprop with global coltype configuration
	$colprop += $coltypes[$field];
	$label = isset($colprop['label']) ? $colprop['label'] : rcube_label($col);

	// prepare subtype selector in edit mode
	if ($edit_mode && is_array($colprop['subtypes'])) {
	$subtype_names = array_map('rcmail_get_type_label', $colprop['subtypes']);
	$select_subtype = new html_select(array('name' => '_subtype_'.$col.'[]', 'class' => 'contactselectsubtype'));
	$select_subtype->add($subtype_names, $colprop['subtypes']);
	}
	else
	$select_subtype = null;

	if (!empty($colprop['value'])) {
	$values = (array)$colprop['value'];
	}
	else {
	// iterate over possible subtypes and collect values with their subtype
	if (is_array($colprop['subtypes'])) {
	$values = $subtypes = array();
	foreach ($colprop['subtypes'] as $i => $st) {
	$newval = false;
	if ($record[$field.':'.$st]) {
	$subtypes[count($values)] = $st;
	$newval = $record[$field.':'.$st];
	}
	else if ($i == 0 && $record[$field]) {
	$subtypes[count($values)] = $st;
	$newval = $record[$field];
	}
	if ($newval !== false) {
	if (is_array($newval) && isset($newval[0]))
	$values = array_merge($values, $newval);
	else
	$values[] = $newval;
	}
	}
	}
	else {
	$values = $record[$fullkey] ? $record[$fullkey] : $record[$field];
	$subtypes = null;
	}
	}

	// hack: create empty values array to force this field to be displayed
	if (empty($values) && $colprop['visible'])
	$values[] = '';

	if (!is_array($values)) {
	// $values can be an object, don't use (array)$values syntax
	$values = !empty($values) ? array($values) : array();
	}

	$rows = '';
	foreach ($values as $i => $val) {
	if ($subtypes[$i])
	$subtype = $subtypes[$i];

	// render composite field
	if ($colprop['type'] == 'composite') {
	$composite = array(); $j = 0;
	$template = $RCMAIL->config->get($col . '_template', '{'.join('} {', array_keys($colprop['childs'])).'}');
	foreach ($colprop['childs'] as $childcol => $cp) {
	if (!empty($val) && is_array($val)) {
	$childvalue = $val[$childcol] ? $val[$childcol] : $val[$j];
	}
	else {
	$childvalue = '';
	}

	if ($edit_mode) {
	if ($colprop['subtypes'] \|\| $colprop['limit'] != 1) $cp['array'] = true;
	$composite['{'.$childcol.'}'] = rcmail_get_edit_field($childcol, $childvalue, $cp, $cp['type']) . " ";
	}
	else {
	$childval = $cp['render_func'] ? call_user_func($cp['render_func'], $childvalue, $childcol) : Q($childvalue);
	$composite['{'.$childcol.'}'] = html::span('data ' . $childcol, $childval) . " ";
	}
	$j++;
	}

	$coltypes[$field] += (array)$colprop;
	$coltypes[$field]['count']++;
	$val = preg_replace('/\{\w+\}/', '', strtr($template, $composite));
	}
	else if ($edit_mode) {
	// call callback to render/format value
	if ($colprop['render_func'])
	$val = call_user_func($colprop['render_func'], $val, $col);

	$coltypes[$field] = (array)$colprop + $coltypes[$field];

	if ($colprop['subtypes'] \|\| $colprop['limit'] != 1)
	$colprop['array'] = true;

	// load jquery UI datepicker for date fields
	if ($colprop['type'] == 'date') {
	$colprop['class'] .= ($colprop['class'] ? ' ' : '') . 'datepicker';
	if (!$colprop['render_func'])
	$val = rcmail_format_date_col($val);
	}

	$val = rcmail_get_edit_field($col, $val, $colprop, $colprop['type']);
	$coltypes[$field]['count']++;
	}
	else if ($colprop['render_func'])
	$val = call_user_func($colprop['render_func'], $val, $col);
	else if (is_array($colprop['options']) && isset($colprop['options'][$val]))
	$val = $colprop['options'][$val];
	else
	$val = Q($val);

	// use subtype as label
	if ($colprop['subtypes'])
	$label = rcmail_get_type_label($subtype);

	// add delete button/link
	if ($edit_mode && !($colprop['visible'] && $colprop['limit'] == 1))
	$val .= html::a(array('href' => '#del', 'class' => 'contactfieldbutton deletebutton', 'title' => rcube_label('delete'), 'rel' => $col), $del_button);

	// display row with label
	if ($label) {
	$rows .= html::div('row',
	html::div('contactfieldlabel label', $select_subtype ? $select_subtype->show($subtype) : Q($label)) .
	html::div('contactfieldcontent '.$colprop['type'], $val));
	}
	else // row without label
	$rows .= html::div('row', html::div('contactfield', $val));
	}

	// add option to the add-field menu
	if (!$colprop['limit'] \|\| $coltypes[$field]['count'] < $colprop['limit']) {
	$select_add->add($colprop['label'], $col);
	$select_add->_count++;
	}

	// wrap rows in fieldgroup container
	if ($rows) {
	$content .= html::tag('fieldset', array('class' => 'contactfieldgroup ' . ($colprop['subtypes'] ? 'contactfieldgroupmulti ' : '') . 'contactcontroller' . $col, 'style' => ($rows ? null : 'display:none')),
	($colprop['subtypes'] ? html::tag('legend', null, Q($colprop['label'])) : ' ') .
	$rows);
	}
	}

	if (!$content && (!$edit_mode \|\| !$select_add->_count))
	continue;

	// also render add-field selector
	if ($edit_mode)
	$content .= html::p('addfield', $select_add->show(null, array('style' => $select_add->_count ? null : 'display:none')));

	$content = html::div(array('id' => 'contactsection' . $section), $content);
	}
	else {
	$content = $fieldset['content'];
	}

	if ($content)
	$out .= html::tag('fieldset', null, html::tag('legend', null, Q($fieldset['name'])) . $content) ."\n";
	}

	if ($edit_mode) {
	$RCMAIL->output->set_env('coltypes', $coltypes + $coltype_labels);
	$RCMAIL->output->set_env('delbutton', $del_button);
	$RCMAIL->output->add_label('delete');
	}

	return $out;
	}


	function rcmail_contact_photo($attrib)
	{
	global $SOURCE_ID, $CONTACTS, $CONTACT_COLTYPES, $RCMAIL, $CONFIG;

	if ($result = $CONTACTS->get_result())
	$record = $result->first();

	$photo_img = $attrib['placeholder'] ? $CONFIG['skin_path'] . $attrib['placeholder'] : 'program/resources/blank.gif';
	$RCMAIL->output->set_env('photo_placeholder', $photo_img);
	unset($attrib['placeholder']);

	$plugin = $RCMAIL->plugins->exec_hook('contact_photo', array('record' => $record, 'data' => $record['photo']));

	if ($plugin['url'])
	$photo_img = $plugin['url'];
	else if (preg_match('!^https?://!i', $record['photo']))
	$photo_img = $record['photo'];
	else if ($record['photo'])
	$photo_img = $RCMAIL->url(array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $SOURCE_ID));
	else
	$ff_value = '-del-'; // will disable delete-photo action

	$img = html::img(array('src' => $photo_img, 'border' => 1, 'alt' => ''));
	$content = html::div($attrib, $img);

	if ($CONTACT_COLTYPES['photo'] && ($RCMAIL->action == 'edit' \|\| $RCMAIL->action == 'add')) {
	$RCMAIL->output->add_gui_object('contactphoto', $attrib['id']);
	$hidden = new html_hiddenfield(array('name' => '_photo', 'id' => 'ff_photo', 'value' => $ff_value));
	$content .= $hidden->show();
	}

	return $content;
	}


	function rcmail_format_date_col($val)
	{
	global $RCMAIL;
	return format_date($val, $RCMAIL->config->get('date_format', 'Y-m-d'), false);
	}


	function rcmail_contact_key($row, $sort_col)
	{
	$key = $row[$sort_col] . ':' . $row['sourceid'];

	// add email to a key to not skip contacts with the same name (#1488375)
	if (!empty($row['email'])) {
	if (is_array($row['email'])) {
	$key .= ':' . implode(':', $row['email']);
	}
	else {
	$key .= ':' . $row['email'];
	}
	}

	return $key;
	}


	/**
	* Returns contact ID(s) and source(s) from GET/POST data
	*
	* @return array List of contact IDs per-source
	*/
	function rcmail_get_cids()
	{
	// contact ID (or comma-separated list of IDs) is provided in two
	// forms. If _source is an empty string then the ID is a string
	// containing contact ID and source name in form: <ID>-<SOURCE>

	$cid = get_input_value('_cid', RCUBE_INPUT_GPC);
	$source = (string) get_input_value('_source', RCUBE_INPUT_GPC);

	if (!preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid)) {
	return array();
	}

	$cid = explode(',', $cid);
	$got_source = strlen($source);
	$result = array();

	// create per-source contact IDs array
	foreach ($cid as $id) {
	// if _source is not specified we'll find it from decoded ID
	if (!$got_source) {
	if ($sep = strrpos($id, '-')) {
	$contact_id = substr($id, 0, $sep);
	$source_id = substr($id, $sep+1);
	if (strlen($source_id)) {
	$result[(string)$source_id][] = $contact_id;
	}
	}
	}
	else {
	$result[$source][] = $id;
	}
	}

	return $result;
	}

	// register UI objects
	$OUTPUT->add_handlers(array(
	'directorylist' => 'rcmail_directory_list',
	// 'groupslist' => 'rcmail_contact_groups',
	'addresslist' => 'rcmail_contacts_list',
	'addressframe' => 'rcmail_contact_frame',
	'recordscountdisplay' => 'rcmail_rowcount_display',
	'searchform' => array($OUTPUT, 'search_form')
	));

	// register action aliases
	$RCMAIL->register_action_map(array(
	'add' => 'edit.inc',
	'photo' => 'show.inc',
	'group-create' => 'groups.inc',
	'group-rename' => 'groups.inc',
	'group-delete' => 'groups.inc',
	'group-addmembers' => 'groups.inc',
	'group-delmembers' => 'groups.inc',
	'search-create' => 'search.inc',
	'search-delete' => 'search.inc',
	));
	diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc
	index 3806c2c87..c3cbcadca 100644
	--- a/program/steps/addressbook/mailto.inc
	+++ b/program/steps/addressbook/mailto.inc
	@@ -1,78 +1,78 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/mailto.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2007, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Compose a recipient list with all selected contacts \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$cids = rcmail_get_cids();
	$mailto = array();
	$recipients = null;

	foreach ($cids as $source => $cid)
	{
	$CONTACTS = $RCMAIL->get_address_book($source);

	if ($CONTACTS->ready)
	{
	$CONTACTS->set_page(1);
	$CONTACTS->set_pagesize(count($cid) + 2); // +2 to skip counting query
	$recipients = $CONTACTS->search($CONTACTS->primary_key, $cid, 0, true, true, 'email');
	}
	}

	if (!empty($_REQUEST['_gid']) && isset($_REQUEST['_source']))
	{
	$source = get_input_value('_source', RCUBE_INPUT_GPC);
	$CONTACTS = $RCMAIL->get_address_book($source);

	$group_id = get_input_value('_gid', RCUBE_INPUT_GPC);
	$group_data = $CONTACTS->get_group($group_id);

	// group has an email address assigned: use that
	if ($group_data['email']) {
	$mailto[] = format_email_recipient($group_data['email'][0], $group_data['name']);
	}
	else if ($CONTACTS->ready) {
	$CONTACTS->set_group($group_id);
	$CONTACTS->set_page(1);
	$CONTACTS->set_pagesize(200); // limit somehow
	$recipients = $CONTACTS->list_records();
	}
	}

	if ($recipients)
	{
	while (is_object($recipients) && ($rec = $recipients->iterate())) {
	$emails = $CONTACTS->get_col_values('email', $rec, true);
	$mailto[] = format_email_recipient($emails[0], $rec['name']);
	}
	}

	if (!empty($mailto))
	{
	$mailto_str = join(', ', $mailto);
	$mailto_id = substr(md5($mailto_str), 0, 16);
	$_SESSION['mailto'][$mailto_id] = urlencode($mailto_str);
	- $OUTPUT->redirect(array('task' => 'mail', '_action' => 'compose', '_mailto' => $mailto_id));
	+ $OUTPUT->command('open_compose_step', array('_mailto' => $mailto_id));
	}
	else {
	$OUTPUT->show_message('nocontactsfound', 'warning');
	}

	// send response
	$OUTPUT->send();
	diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
	index 7ac9a8d39..2d45105c2 100644
	--- a/program/steps/mail/compose.inc
	+++ b/program/steps/mail/compose.inc
	@@ -1,1663 +1,1674 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/compose.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Compose a new mail message with all headers and attachments \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// define constants for message compose mode
	define('RCUBE_COMPOSE_REPLY', 0x0106);
	define('RCUBE_COMPOSE_FORWARD', 0x0107);
	define('RCUBE_COMPOSE_DRAFT', 0x0108);
	define('RCUBE_COMPOSE_EDIT', 0x0109);

	$MESSAGE_FORM = null;
	$COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GET);
	$COMPOSE = null;

	if ($COMPOSE_ID && $_SESSION['compose_data_'.$COMPOSE_ID])
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];

	// give replicated session storage some time to synchronize
	$retries = 0;
	while ($COMPOSE_ID && !is_array($COMPOSE) && $RCMAIL->db->is_replicated() && $retries++ < 5) {
	usleep(500000);
	$RCMAIL->session->reload();
	if ($_SESSION['compose_data_'.$COMPOSE_ID])
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];
	}

	// 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).
	if (!is_array($COMPOSE))
	{
	// Infinite redirect prevention in case of broken session (#1487028)
	if ($COMPOSE_ID)
	raise_error(array('code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid compose ID"), true, true);

	$COMPOSE_ID = uniqid(mt_rand());
	$_SESSION['compose_data_'.$COMPOSE_ID] = array(
	'id' => $COMPOSE_ID,
	'param' => request2param(RCUBE_INPUT_GET),
	'mailbox' => $RCMAIL->storage->get_folder(),
	);
	$COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];

	// process values like "mailto:foo@bar.com?subject=new+message&cc=another"
	if ($COMPOSE['param']['to']) {
	// #1486037: remove "mailto:" prefix
	$COMPOSE['param']['to'] = preg_replace('/^mailto:/i', '', $COMPOSE['param']['to']);
	$mailto = explode('?', $COMPOSE['param']['to']);
	if (count($mailto) > 1) {
	$COMPOSE['param']['to'] = $mailto[0];
	parse_str($mailto[1], $query);
	foreach ($query as $f => $val)
	$COMPOSE['param'][$f] = $val;
	}
	}

	// select folder where to save the sent message
	$COMPOSE['param']['sent_mbox'] = $RCMAIL->config->get('sent_mbox');

	// pipe compose parameters thru plugins
	$plugin = $RCMAIL->plugins->exec_hook('message_compose', $COMPOSE);
	$COMPOSE['param'] = array_merge($COMPOSE['param'], $plugin['param']);

	// add attachments listed by message_compose hook
	if (is_array($plugin['attachments'])) {
	foreach ($plugin['attachments'] as $attach) {
	// we have structured data
	if (is_array($attach)) {
	$attachment = $attach;
	}
	// only a file path is given
	else {
	$filename = basename($attach);
	$attachment = array(
	'group' => $COMPOSE_ID,
	'name' => $filename,
	'mimetype' => rc_mime_content_type($attach, $filename),
	'path' => $attach,
	);
	}

	// save attachment if valid
	if (($attachment['data'] && $attachment['name']) \|\| ($attachment['path'] && file_exists($attachment['path']))) {
	$attachment = rcmail::get_instance()->plugins->exec_hook('attachment_save', $attachment);
	}

	if ($attachment['status'] && !$attachment['abort']) {
	unset($attachment['data'], $attachment['status'], $attachment['abort']);
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	}
	}
	}

	// check if folder for saving sent messages exists and is subscribed (#1486802)
	if ($sent_folder = $COMPOSE['param']['sent_mbox']) {
	rcmail_check_sent_folder($sent_folder, true);
	}

	// redirect to a unique URL with all parameters stored in session
	$OUTPUT->redirect(array(
	'_action' => 'compose',
	'_id' => $COMPOSE['id'],
	'_search' => $_REQUEST['_search'],
	));
	}


	// add some labels to client
	$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'cancel',
	'nobodywarning', 'notsentwarning', 'notuploadedwarning', 'savingmessage', 'sendingmessage',
	'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'uploadingmany',
	'fileuploaderror', 'sendmessage');

	$OUTPUT->set_env('compose_id', $COMPOSE['id']);
	+$OUTPUT->set_pagetitle(rcube_label('compose'));

	// 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', $RCMAIL->storage->get_folder());
	$OUTPUT->set_env('sig_above', $RCMAIL->config->get('sig_above', false));
	$OUTPUT->set_env('top_posting', intval($RCMAIL->config->get('reply_mode')) > 0);
	$OUTPUT->set_env('recipients_separator', trim($RCMAIL->config->get('recipients_separator', ',')));

	// default font for HTML editor
	$font = rcube_fontdefs($RCMAIL->config->get('default_font', 'Verdana'));
	if ($font && !is_array($font)) {
	$OUTPUT->set_env('default_font', $font);
	}

	// get reference message and set compose mode
	if ($msg_uid = $COMPOSE['param']['draft_uid']) {
	$RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
	$compose_mode = RCUBE_COMPOSE_DRAFT;
	}
	else if ($msg_uid = $COMPOSE['param']['reply_uid'])
	$compose_mode = RCUBE_COMPOSE_REPLY;
	else if ($msg_uid = $COMPOSE['param']['forward_uid'])
	$compose_mode = RCUBE_COMPOSE_FORWARD;
	else if ($msg_uid = $COMPOSE['param']['uid'])
	$compose_mode = RCUBE_COMPOSE_EDIT;

	$config_show_sig = $RCMAIL->config->get('show_sig', 1);
	if ($config_show_sig == 1)
	$OUTPUT->set_env('show_sig', true);
	else if ($config_show_sig == 2 && (empty($compose_mode) \|\| $compose_mode == RCUBE_COMPOSE_EDIT \|\| $compose_mode == RCUBE_COMPOSE_DRAFT))
	$OUTPUT->set_env('show_sig', true);
	else if ($config_show_sig == 3 && ($compose_mode == RCUBE_COMPOSE_REPLY \|\| $compose_mode == RCUBE_COMPOSE_FORWARD))
	$OUTPUT->set_env('show_sig', true);
	else
	$OUTPUT->set_env('show_sig', false);

	// set line length for body wrapping
	$LINE_LENGTH = $RCMAIL->config->get('line_length', 72);

	if (!empty($msg_uid))
	{
	// similar as in program/steps/mail/show.inc
	// re-set 'prefer_html' to have possibility to use html part for compose
	$CONFIG['prefer_html'] = $CONFIG['prefer_html'] \|\| $CONFIG['htmleditor'] \|\| $compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT;
	$MESSAGE = new rcube_message($msg_uid);

	// make sure message is marked as read
	if ($MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN']))
	$RCMAIL->storage->set_flag($msg_uid, 'SEEN');

	if (!empty($MESSAGE->headers->charset))
	$RCMAIL->storage->set_charset($MESSAGE->headers->charset);

	if ($compose_mode == RCUBE_COMPOSE_REPLY)
	{
	$COMPOSE['reply_uid'] = $msg_uid;
	$COMPOSE['reply_msgid'] = $MESSAGE->headers->messageID;
	$COMPOSE['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID);

	if (!empty($COMPOSE['param']['all']))
	$MESSAGE->reply_all = $COMPOSE['param']['all'];

	$OUTPUT->set_env('compose_mode', 'reply');

	// Save the sent message in the same folder of the message being replied to
	if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $COMPOSE['mailbox'])
	&& rcmail_check_sent_folder($sent_folder, false)
	) {
	$COMPOSE['param']['sent_mbox'] = $sent_folder;
	}
	}
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
	{
	if ($MESSAGE->headers->others['x-draft-info'])
	{
	// get reply_uid/forward_uid to flag the original message when sending
	$info = rcmail_draftinfo_decode($MESSAGE->headers->others['x-draft-info']);

	if ($info['type'] == 'reply')
	$COMPOSE['reply_uid'] = $info['uid'];
	else if ($info['type'] == 'forward')
	$COMPOSE['forward_uid'] = $info['uid'];

	$COMPOSE['mailbox'] = $info['folder'];

	// Save the sent message in the same folder of the message being replied to
	if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $info['folder'])
	&& rcmail_check_sent_folder($sent_folder, false)
	) {
	$COMPOSE['param']['sent_mbox'] = $sent_folder;
	}
	}

	if ($MESSAGE->headers->in_reply_to)
	$COMPOSE['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>';

	$COMPOSE['references'] = $MESSAGE->headers->references;
	}
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
	{
	$COMPOSE['forward_uid'] = $msg_uid;
	$OUTPUT->set_env('compose_mode', 'forward');

	if (!empty($COMPOSE['param']['attachment']))
	$MESSAGE->forward_attachment = true;
	}
	}
	else {
	$MESSAGE = new stdClass();
	}

	$MESSAGE->compose = array();

	// get user's identities
	$MESSAGE->identities = $RCMAIL->user->list_identities();
	if (count($MESSAGE->identities))
	{
	foreach ($MESSAGE->identities as $idx => $ident) {
	$ident['email'] = format_email($ident['email']);
	$email = format_email(rcube_idn_to_utf8($ident['email']));

	$MESSAGE->identities[$idx]['email_ascii'] = $ident['email'];
	$MESSAGE->identities[$idx]['ident'] = format_email_recipient($ident['email'], $ident['name']);
	$MESSAGE->identities[$idx]['email'] = $email;
	}
	}

	// Set From field value
	if (!empty($_POST['_from'])) {
	$MESSAGE->compose['from'] = get_input_value('_from', RCUBE_INPUT_POST);
	}
	else if (!empty($COMPOSE['param']['from'])) {
	$MESSAGE->compose['from'] = $COMPOSE['param']['from'];
	}
	else if (count($MESSAGE->identities)) {
	$a_recipients = array();
	$a_names = array();

	// extract all recipients of the reply-message
	if (is_object($MESSAGE->headers) && in_array($compose_mode, array(RCUBE_COMPOSE_REPLY, RCUBE_COMPOSE_FORWARD)))
	{
	$a_to = rcube_mime::decode_address_list($MESSAGE->headers->to, null, true, $MESSAGE->headers->charset);
	foreach ($a_to as $addr) {
	if (!empty($addr['mailto'])) {
	$a_recipients[] = format_email($addr['mailto']);
	$a_names[] = $addr['name'];
	}
	}

	if (!empty($MESSAGE->headers->cc)) {
	$a_cc = rcube_mime::decode_address_list($MESSAGE->headers->cc, null, true, $MESSAGE->headers->charset);
	foreach ($a_cc as $addr) {
	if (!empty($addr['mailto'])) {
	$a_recipients[] = format_email($addr['mailto']);
	$a_names[] = $addr['name'];
	}
	}
	}
	}

	$from_idx = null;
	$found_idx = null;
	$default_identity = 0; // default identity is always first on the list
	$return_path = $MESSAGE->headers->others['return-path'];

	// Select identity
	foreach ($MESSAGE->identities as $idx => $ident) {
	// use From header
	if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
	if ($MESSAGE->headers->from == $ident['ident']) {
	$from_idx = $idx;
	break;
	}
	}
	// reply to yourself
	else if ($compose_mode == RCUBE_COMPOSE_REPLY && $MESSAGE->headers->from == $ident['ident']) {
	$from_idx = $idx;
	break;
	}
	// use replied message recipients
	else if (($found = array_search($ident['email_ascii'], $a_recipients)) !== false) {
	if ($found_idx === null) {
	$found_idx = $idx;
	}
	// match identity name
	if ($a_names[$found] && $ident['name'] && $a_names[$found] == $ident['name']) {
	$from_idx = $idx;
	break;
	}
	}
	}

	// If matching by name+address doesn't found any amtches, get first found address (identity)
	if ($from_idx === null) {
	$from_idx = $found_idx;
	}

	// Fallback using Return-Path
	if ($from_idx === null && $return_path) {
	foreach ($MESSAGE->identities as $idx => $ident) {
	if (strpos($return_path, str_replace('@', '=', $ident['email_ascii']).'@') !== false) {
	$from_idx = $idx;
	break;
	}
	}
	}

	$ident = $MESSAGE->identities[$from_idx !== null ? $from_idx : $default_identity];
	$from_id = $ident['identity_id'];

	$MESSAGE->compose['from_email'] = $ident['email'];
	$MESSAGE->compose['from'] = $from_id;
	}

	// Set other headers
	$a_recipients = array();
	$parts = array('to', 'cc', 'bcc', 'replyto', 'followupto');
	$separator = trim($RCMAIL->config->get('recipients_separator', ',')) . ' ';

	foreach ($parts as $header) {
	$fvalue = '';
	$decode_header = true;

	// we have a set of recipients stored is session
	if ($header == 'to' && ($mailto_id = $COMPOSE['param']['mailto'])
	&& $_SESSION['mailto'][$mailto_id]
	) {
	$fvalue = urldecode($_SESSION['mailto'][$mailto_id]);
	$decode_header = false;

	// make session to not grow up too much
	unset($_SESSION['mailto'][$mailto_id]);
	$COMPOSE['param']['to'] = $fvalue;
	}
	else if (!empty($_POST['_'.$header])) {
	$fvalue = get_input_value('_'.$header, RCUBE_INPUT_POST, TRUE);
	}
	else if (!empty($COMPOSE['param'][$header])) {
	$fvalue = $COMPOSE['param'][$header];
	}
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	// get recipent address(es) out of the message headers
	if ($header == 'to') {
	$mailfollowup = $MESSAGE->headers->others['mail-followup-to'];
	$mailreplyto = $MESSAGE->headers->others['mail-reply-to'];

	// Reply to mailing list...
	if ($MESSAGE->reply_all == 'list' && $mailfollowup)
	$fvalue = $mailfollowup;
	else if ($MESSAGE->reply_all == 'list'
	&& preg_match('/<mailto:([^>]+)>/i', $MESSAGE->headers->others['list-post'], $m))
	$fvalue = $m[1];
	// Reply to...
	else if ($MESSAGE->reply_all && $mailfollowup)
	$fvalue = $mailfollowup;
	else if ($mailreplyto)
	$fvalue = $mailreplyto;
	else if (!empty($MESSAGE->headers->replyto))
	$fvalue = $MESSAGE->headers->replyto;
	else if (!empty($MESSAGE->headers->from))
	$fvalue = $MESSAGE->headers->from;

	// Reply to message sent by yourself (#1487074)
	if (!empty($ident) && $fvalue == $ident['ident']) {
	$fvalue = $MESSAGE->headers->to;
	}
	}
	// add recipient of original message if reply to all
	else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') {
	if ($v = $MESSAGE->headers->to)
	$fvalue .= $v;
	if ($v = $MESSAGE->headers->cc)
	$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
	}
	}
	else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
	// get drafted headers
	if ($header=='to' && !empty($MESSAGE->headers->to))
	$fvalue = $MESSAGE->get_header('to', true);
	else if ($header=='cc' && !empty($MESSAGE->headers->cc))
	$fvalue = $MESSAGE->get_header('cc', true);
	else if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
	$fvalue = $MESSAGE->get_header('bcc', true);
	else if ($header=='replyto' && !empty($MESSAGE->headers->others['mail-reply-to']))
	$fvalue = $MESSAGE->get_header('mail-reply-to');
	else if ($header=='replyto' && !empty($MESSAGE->headers->replyto))
	$fvalue = $MESSAGE->get_header('reply-to');
	else if ($header=='followupto' && !empty($MESSAGE->headers->others['mail-followup-to']))
	$fvalue = $MESSAGE->get_header('mail-followup-to');
	}

	// split recipients and put them back together in a unique way
	if (!empty($fvalue) && in_array($header, array('to', 'cc', 'bcc'))) {
	$to_addresses = rcube_mime::decode_address_list($fvalue, null, $decode_header, $MESSAGE->headers->charset);
	$fvalue = array();

	foreach ($to_addresses as $addr_part) {
	if (empty($addr_part['mailto']))
	continue;

	$mailto = format_email(rcube_idn_to_utf8($addr_part['mailto']));

	if (!in_array($mailto, $a_recipients)
	&& ($header == 'to' \|\| empty($MESSAGE->compose['from_email']) \|\| $mailto != $MESSAGE->compose['from_email'])
	) {
	if ($addr_part['name'] && $addr_part['mailto'] != $addr_part['name'])
	$string = format_email_recipient($mailto, $addr_part['name']);
	else
	$string = $mailto;

	$fvalue[] = $string;
	$a_recipients[] = $addr_part['mailto'];
	}
	}

	$fvalue = implode($separator, $fvalue);
	}

	$MESSAGE->compose[$header] = $fvalue;
	}
	unset($a_recipients);

	// process $MESSAGE body/attachments, set $MESSAGE_BODY/$HTML_MODE vars and some session data
	$MESSAGE_BODY = rcmail_prepare_message_body();


	/**** compose mode functions ******/

	function rcmail_compose_headers($attrib)
	{
	global $MESSAGE;

	list($form_start, $form_end) = get_form_tags($attrib);

	$out = '';
	$part = strtolower($attrib['part']);

	switch ($part)
	{
	case 'from':
	return $form_start . rcmail_compose_header_from($attrib);

	case 'to':
	case 'cc':
	case 'bcc':
	$fname = '_' . $part;
	$header = $param = $part;

	$allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex');
	$field_type = 'html_textarea';
	break;

	case 'replyto':
	case 'reply-to':
	$fname = '_replyto';
	$param = 'replyto';
	$header = 'reply-to';

	case 'followupto':
	case 'followup-to':
	if (!$fname) {
	$fname = '_followupto';
	$param = 'followupto';
	$header = 'mail-followup-to';
	}

	$allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
	$field_type = 'html_inputfield';
	break;
	}

	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($MESSAGE->compose[$param]);
	}

	if ($form_start)
	$out = $form_start.$out;

	// configure autocompletion
	rcube_autocomplete_init();

	return $out;
	}


	function rcmail_compose_header_from($attrib)
	{
	global $MESSAGE, $OUTPUT, $RCMAIL, $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;

	if (count($MESSAGE->identities))
	{
	$a_signatures = array();
	$separator = $RCMAIL->config->get('sig_above')
	&& ($compose_mode == RCUBE_COMPOSE_REPLY \|\| $compose_mode == RCUBE_COMPOSE_FORWARD) ? '---' : '-- ';

	$field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)";
	$select_from = new html_select($field_attrib);

	// create SELECT element
	foreach ($MESSAGE->identities as $sql_arr)
	{
	$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']) && empty($COMPOSE['param']['nosig']))
	{
	$text = $html = $sql_arr['signature'];

	if ($sql_arr['html_signature']) {
	$h2t = new html2text($sql_arr['signature'], false, false);
	$text = trim($h2t->get_text());
	}
	else {
	$html = htmlentities($html, ENT_NOQUOTES, RCMAIL_CHARSET);
	}

	if (!preg_match('/^--[ -]\r?\n/m', $text)) {
	$text = $separator . "\n" . $text;
	$html = $separator . "<br>" . $html;
	}

	if (!$sql_arr['html_signature']) {
	$html = "<pre>" . $html . "</pre>";
	}

	$a_signatures[$identity_id]['text'] = $text;
	$a_signatures[$identity_id]['html'] = $html;
	}
	}

	$out = $select_from->show($MESSAGE->compose['from']);

	// add signatures to client
	$OUTPUT->set_env('signatures', $a_signatures);
	}
	// no identities, display text input field
	else {
	$field_attrib['class'] = 'from_address';
	$input_from = new html_inputfield($field_attrib);
	$out = $input_from->show($MESSAGE->compose['from']);
	}

	return $out;
	}


	function rcmail_compose_editor_mode()
	{
	global $RCMAIL, $MESSAGE, $compose_mode;
	static $useHtml;

	if ($useHtml !== null)
	return $useHtml;

	$html_editor = intval($RCMAIL->config->get('htmleditor'));

	- if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT) {
	+ if (isset($_POST['_is_html'])) {
	+ $useHtml = !empty($_POST['_is_html']);
	+ }
	+ else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT) {
	$useHtml = $MESSAGE->has_html_part(false);
	}
	else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
	$useHtml = ($html_editor == 1 \|\| ($html_editor >= 2 && $MESSAGE->has_html_part(false)));
	}
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
	$useHtml = ($html_editor == 1 \|\| ($html_editor == 3 && $MESSAGE->has_html_part(false)));
	}
	else {
	$useHtml = ($html_editor == 1);
	}

	return $useHtml;
	}


	function rcmail_prepare_message_body()
	{
	global $RCMAIL, $MESSAGE, $COMPOSE, $compose_mode, $LINE_LENGTH, $HTML_MODE;

	// use posted message body
	if (!empty($_POST['_message'])) {
	$body = get_input_value('_message', RCUBE_INPUT_POST, true);
	$isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);
	}
	else if ($COMPOSE['param']['body']) {
	$body = $COMPOSE['param']['body'];
	$isHtml = false;
	}
	// forward as attachment
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $MESSAGE->forward_attachment) {
	$isHtml = rcmail_compose_editor_mode();
	$body = '';
	if (empty($COMPOSE['attachments']))
	rcmail_write_forward_attachment($MESSAGE);
	}
	// reply/edit/draft/forward
	else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY \|\| $RCMAIL->config->get('reply_mode') != -1)) {
	$isHtml = rcmail_compose_editor_mode();

	if (!empty($MESSAGE->parts)) {
	foreach ($MESSAGE->parts as $part) {
	// skip no-content and attachment parts (#1488557)
	if ($part->type != 'content' \|\| !$part->size \|\| $MESSAGE->is_attachment($part)) {
	continue;
	}

	if ($part_body = rcmail_compose_part_body($part, $isHtml)) {
	$body .= ($body ? ($isHtml ? '<br/>' : "\n") : '') . $part_body;
	}
	}
	}
	else {
	$body = rcmail_compose_part_body($MESSAGE, $isHtml);
	}

	// 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 \|\| $compose_mode == RCUBE_COMPOSE_EDIT)
	$body = rcmail_create_draft_body($body, $isHtml);
	}
	else { // new message
	$isHtml = rcmail_compose_editor_mode();
	}

	$plugin = $RCMAIL->plugins->exec_hook('message_compose_body',
	array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode));
	$body = $plugin['body'];
	unset($plugin);

	// add blocked.gif attachment (#1486516)
	if ($isHtml && preg_match('#<img src="\./program/resources/blocked\.gif"#', $body)) {
	if ($attachment = rcmail_save_image('program/resources/blocked.gif', 'image/gif')) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
	$body = preg_replace('#\./program/resources/blocked\.gif#', $url, $body);
	}
	}

	$HTML_MODE = $isHtml;

	return $body;
	}

	function rcmail_compose_part_body($part, $isHtml = false)
	{
	global $RCMAIL, $MESSAGE, $compose_mode;

	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	if (!rcmail_mem_check($part->size * 10)) {
	return '';
	}

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

	// message is cached but not exists (#1485443), or other error
	if ($part->body === false) {
	return '';
	}

	$body = $part->body;

	if ($isHtml) {
	if ($part->ctype_secondary == 'html') {
	}
	else {
	// try to remove the signature
	if ($RCMAIL->config->get('strip_existing_sig', true)) {
	$body = rcmail_remove_signature($body);
	}
	// add HTML formatting
	$body = rcmail_plain_body($body);
	if ($body) {
	$body = '<pre>' . $body . '</pre>';
	}
	}
	}
	else {
	if ($part->ctype_secondary == 'html') {
	// use html part if it has been used for message (pre)viewing
	// decrease line length for quoting
	$len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
	$txt = new html2text($body, false, true, $len);
	$body = $txt->get_text();
	}
	else {
	if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
	$body = rcube_mime::unfold_flowed($body);
	}

	// try to remove the signature
	if ($RCMAIL->config->get('strip_existing_sig', true)) {
	$body = rcmail_remove_signature($body);
	}
	}
	}

	return $body;
	}

	function rcmail_compose_body($attrib)
	{
	global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode, $LINE_LENGTH, $HTML_MODE, $MESSAGE_BODY;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	if (empty($attrib['id']))
	$attrib['id'] = 'rcmComposeBody';

	$attrib['name'] = '_message';

	$isHtml = $HTML_MODE;

	$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) {
	$MESSAGE_BODY = htmlentities($MESSAGE_BODY, ENT_NOQUOTES, RCMAIL_CHARSET);
	$attrib['class'] = 'mce_editor';
	$attrib['is_escaped'] = true;
	$textarea = new html_textarea($attrib);
	$out .= $textarea->show($MESSAGE_BODY);
	}
	else {
	$textarea = new html_textarea($attrib);
	$out .= $textarea->show('');
	// quote plain text, inject into textarea
	$table = get_html_translation_table(HTML_SPECIALCHARS);
	$MESSAGE_BODY = strtr($MESSAGE_BODY, $table);
	$out = substr($out, 0, -11) . $MESSAGE_BODY . '</textarea>';
	}

	$out .= $form_end ? "\n$form_end" : '';

	$OUTPUT->set_env('composebody', $attrib['id']);

	// include HTML editor
	rcube_html_editor();

	// Set language list
	if (!empty($CONFIG['enable_spellcheck'])) {
	$engine = $RCMAIL->config->get('spellcheck_engine','googie');
	$dictionary = (bool) $RCMAIL->config->get('spellcheck_dictionary');
	$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', 'ru'=>'Ð ÑÑÑÐºÐ¸Ð¹', 'fi'=>'Suomi', 'sv'=>'Svenska'));

	// googie works only with two-letter codes
	if ($engine == 'googie') {
	$lang = strtolower(substr($_SESSION['language'], 0, 2));

	$spellcheck_langs_googie = array();
	foreach ($spellcheck_langs as $key => $name)
	$spellcheck_langs_googie[strtolower(substr($key,0,2))] = $name;
	$spellcheck_langs = $spellcheck_langs_googie;
	}
	else {
	$lang = $_SESSION['language'];

	// if not found in the list, try with two-letter code
	if (!$spellcheck_langs[$lang])
	$lang = strtolower(substr($lang, 0, 2));
	}

	if (!$spellcheck_langs[$lang])
	$lang = 'en';

	$OUTPUT->set_env('spell_langs', $spellcheck_langs);
	$OUTPUT->set_env('spell_lang', $lang);

	$editor_lang_set = array();
	foreach ($spellcheck_langs as $key => $name) {
	$editor_lang_set[] = ($key == $lang ? '+' : '') . JQ($name).'='.JQ($key);
	}

	// include GoogieSpell
	$OUTPUT->include_script('googiespell.js');
	$OUTPUT->add_script(sprintf(
	"var googie = new GoogieSpell('%s/images/googiespell/','%s&lang=', %s);\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.lang_learn_word = \"%s\";\n".
	"googie.setLanguages(%s);\n".
	"googie.setCurrentLanguage('%s');\n".
	"googie.setDecoration(false);\n".
	"googie.decorateTextarea('%s');\n".
	"%s.set_env('spellcheck', googie);",
	$RCMAIL->output->get_skin_path(),
	$RCMAIL->url(array('_task' => 'utils', '_action' => 'spell', '_remote' => 1)),
	!empty($dictionary) ? 'true' : 'false',
	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'))),
	JQ(Q(rcube_label('addtodict'))),
	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/resources/blank.gif" style="width:0;height:0;border:none;visibility:hidden;"></iframe>';

	return $out;
	}


	function rcmail_create_reply_body($body, $bodyIsHtml)
	{
	global $RCMAIL, $MESSAGE, $LINE_LENGTH;

	// build reply prefix
	$from = array_pop(rcube_mime::decode_address_list($MESSAGE->get_header('from'), 1, false, $MESSAGE->headers->charset));
	$prefix = rcube_label(array(
	'name' => 'mailreplyintro',
	'vars' => array(
	'date' => format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long')),
	'sender' => $from['name'] ? $from['name'] : rcube_idn_to_utf8($from['mailto']),
	)
	));

	if (!$bodyIsHtml) {
	$body = preg_replace('/\r?\n/', "\n", $body);

	// soft-wrap and quote message text
	$body = rcmail_wrap_and_quote(rtrim($body, "\n"), $LINE_LENGTH);

	$prefix .= "\n";
	$suffix = '';

	if (intval($RCMAIL->config->get('reply_mode')) > 0) { // top-posting
	$prefix = "\n\n\n" . $prefix;
	}
	}
	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 = '<p>' . Q($prefix) . "</p>\n";
	$prefix .= '<blockquote>';

	if (intval($RCMAIL->config->get('reply_mode')) > 0) { // top-posting
	$prefix = '<br>' . $prefix;
	$suffix = '</blockquote>';
	}
	else {
	$suffix = '</blockquote><p></p>';
	}
	}

	return $prefix.$body.$suffix;
	}


	function rcmail_create_forward_body($body, $bodyIsHtml)
	{
	global $RCMAIL, $MESSAGE, $COMPOSE;

	// add attachments
	if (!isset($COMPOSE['forward_attachments']) && is_array($MESSAGE->mime_parts))
	$cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);

	$date = format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long'));
	$charset = $RCMAIL->output->get_charset();

	if (!$bodyIsHtml)
	{
	$prefix = "\n\n\n-------- " . rcube_label('originalmessage') . " --------\n";
	$prefix .= rcube_label('subject') . ': ' . $MESSAGE->subject . "\n";
	$prefix .= rcube_label('date') . ': ' . $date . "\n";
	$prefix .= rcube_label('from') . ': ' . $MESSAGE->get_header('from') . "\n";
	$prefix .= rcube_label('to') . ': ' . $MESSAGE->get_header('to') . "\n";

	if ($MESSAGE->headers->cc)
	$prefix .= rcube_label('cc') . ': ' . $MESSAGE->get_header('cc') . "\n";
	if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
	$prefix .= rcube_label('replyto') . ': ' . $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 /><p>-------- " . rcube_label('originalmessage') . " --------</p>" .
	"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>" .
	"<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	rcube_label('subject'), Q($MESSAGE->subject),
	rcube_label('date'), Q($date),
	rcube_label('from'), Q($MESSAGE->get_header('from'), 'replace'),
	rcube_label('to'), Q($MESSAGE->get_header('to'), 'replace'));

	if ($MESSAGE->headers->cc)
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	rcube_label('cc'),
	Q($MESSAGE->get_header('cc'), 'replace'));

	if ($MESSAGE->headers->replyto && $MESSAGE->headers->replyto != $MESSAGE->headers->from)
	$prefix .= sprintf("<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">%s: </th><td>%s</td></tr>",
	rcube_label('replyto'),
	Q($MESSAGE->get_header('replyto'), 'replace'));

	$prefix .= "</tbody></table><br>";
	}

	return $prefix.$body;
	}


	function rcmail_create_draft_body($body, $bodyIsHtml)
	{
	global $MESSAGE, $OUTPUT, $COMPOSE;

	/**
	* add attachments
	* sizeof($MESSAGE->mime_parts can be 1 - e.g. attachment, but no text!
	*/
	if (empty($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_remove_signature($body)
	{
	global $RCMAIL;

	$body = str_replace("\r\n", "\n", $body);
	$len = strlen($body);
	$sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15);

	while (($sp = strrpos($body, "-- \n", $sp ? -$len+$sp-1 : 0)) !== false) {
	if ($sp == 0 \|\| $body[$sp-1] == "\n") {
	// do not touch blocks with more that X lines
	if (substr_count($body, "\n", $sp) < $sig_max_lines) {
	$body = substr($body, 0, max(0, $sp-1));
	}
	break;
	}
	}

	return $body;
	}


	function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
	{
	global $RCMAIL, $COMPOSE, $compose_mode;

	$cid_map = $messages = array();
	foreach ((array)$message->mime_parts as $pid => $part)
	{
	if ($part->disposition == 'attachment' \|\| ($part->disposition == 'inline' && $bodyIsHtml) \|\| $part->filename) {
	if ($part->ctype_primary == 'message' \|\| $part->ctype_primary == 'multipart') {
	continue;
	}
	if ($part->mimetype == 'application/ms-tnef') {
	continue;
	}
	// skip inline images when forwarding in plain text
	if ($part->content_id && !$bodyIsHtml && $compose_mode == RCUBE_COMPOSE_FORWARD) {
	continue;
	}

	$skip = false;
	if ($part->mimetype == 'message/rfc822') {
	$messages[] = $part->mime_id;
	} else if ($messages) {
	// skip attachments included in message/rfc822 attachment (#1486487)
	foreach ($messages as $mimeid)
	if (strpos($part->mime_id, $mimeid.'.') === 0) {
	$skip = true;
	break;
	}
	}

	if (!$skip && ($attachment = rcmail_save_attachment($message, $pid))) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	if ($bodyIsHtml && ($part->content_id \|\| $part->content_location)) {
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
	if ($part->content_id)
	$cid_map['cid:'.$part->content_id] = $url;
	else
	$cid_map[$part->content_location] = $url;
	}
	}
	}
	}

	$COMPOSE['forward_attachments'] = true;

	return $cid_map;
	}


	function rcmail_write_inline_attachments(&$message)
	{
	global $RCMAIL, $COMPOSE;

	$cid_map = array();
	foreach ((array)$message->mime_parts as $pid => $part) {
	if (($part->content_id \|\| $part->content_location) && $part->filename) {
	if ($attachment = rcmail_save_attachment($message, $pid)) {
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
	$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
	if ($part->content_id)
	$cid_map['cid:'.$part->content_id] = $url;
	else
	$cid_map[$part->content_location] = $url;
	}
	}
	}

	return $cid_map;
	}

	// Creates an attachment from the forwarded message
	function rcmail_write_forward_attachment(&$message)
	{
	global $RCMAIL, $COMPOSE;

	if (strlen($message->subject)) {
	$name = mb_substr($message->subject, 0, 64) . '.eml';
	}
	else {
	$name = 'message_rfc822.eml';
	}

	$mem_limit = parse_bytes(ini_get('memory_limit'));
	$curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 1610241024; // safe value: 16MB
	$data = $path = null;

	// don't load too big attachments into memory
	if ($mem_limit > 0 && $message->size > $mem_limit - $curr_mem) {
	$temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
	$path = tempnam($temp_dir, 'rcmAttmnt');
	if ($fp = fopen($path, 'w')) {
	$RCMAIL->storage->get_raw_body($message->uid, $fp);
	fclose($fp);
	} else
	return false;
	} else {
	$data = $RCMAIL->storage->get_raw_body($message->uid);
	}

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => $name,
	'mimetype' => 'message/rfc822',
	'data' => $data,
	'path' => $path,
	'size' => $path ? filesize($path) : strlen($data),
	);

	$attachment = $RCMAIL->plugins->exec_hook('attachment_save', $attachment);

	if ($attachment['status']) {
	unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
	$COMPOSE['attachments'][$attachment['id']] = $attachment;
	return true;
	} else if ($path) {
	@unlink($path);
	}

	return false;
	}


	function rcmail_save_attachment(&$message, $pid)
	{
	global $COMPOSE;

	$rcmail = rcmail::get_instance();
	$part = $message->mime_parts[$pid];
	$mem_limit = parse_bytes(ini_get('memory_limit'));
	$curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 1610241024; // safe value: 16MB
	$data = $path = null;

	// don't load too big attachments into memory
	if ($mem_limit > 0 && $part->size > $mem_limit - $curr_mem) {
	$temp_dir = unslashify($rcmail->config->get('temp_dir'));
	$path = tempnam($temp_dir, 'rcmAttmnt');
	if ($fp = fopen($path, 'w')) {
	$message->get_part_content($pid, $fp);
	fclose($fp);
	} else
	return false;
	} else {
	$data = $message->get_part_content($pid);
	}

	$mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
	$filename = $part->filename;
	if (!strlen($filename)) {
	if ($mimetype == 'text/html') {
	$filename = rcube_label('htmlmessage');
	}
	else {
	$filename = 'Part_'.$pid;
	}
	$filename .= '.' . $part->ctype_secondary;
	}

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => $filename,
	'mimetype' => $mimetype,
	'content_id' => $part->content_id,
	'data' => $data,
	'path' => $path,
	'size' => $path ? filesize($path) : strlen($data),
	);

	$attachment = $rcmail->plugins->exec_hook('attachment_save', $attachment);

	if ($attachment['status']) {
	unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
	return $attachment;
	} else if ($path) {
	@unlink($path);
	}

	return false;
	}

	function rcmail_save_image($path, $mimetype='')
	{
	global $COMPOSE;

	// handle attachments in memory
	$data = file_get_contents($path);

	$attachment = array(
	'group' => $COMPOSE['id'],
	'name' => rcmail_basename($path),
	'mimetype' => $mimetype ? $mimetype : rc_mime_content_type($path, $name),
	'data' => $data,
	'size' => strlen($data),
	);

	$attachment = rcmail::get_instance()->plugins->exec_hook('attachment_save', $attachment);

	if ($attachment['status']) {
	unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
	return $attachment;
	}

	return false;
	}

	function rcmail_basename($filename)
	{
	// basename() is not unicode safe and locale dependent
	if (stristr(PHP_OS, 'win') \|\| stristr(PHP_OS, 'netware')) {
	return preg_replace('/^.*[\\\\\\/]/', '', $filename);
	} else {
	return preg_replace('/^.*[\/]/', '', $filename);
	}
	}

	function rcmail_compose_subject($attrib)
	{
	global $MESSAGE, $COMPOSE, $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 (preg_match('/^re:/i', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Re: '.$MESSAGE->subject;
	}
	// create a forward-subject
	else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
	if (preg_match('/^fwd:/i', $MESSAGE->subject))
	$subject = $MESSAGE->subject;
	else
	$subject = 'Fwd: '.$MESSAGE->subject;
	}
	// creeate a draft-subject
	else if ($compose_mode == RCUBE_COMPOSE_DRAFT \|\| $compose_mode == RCUBE_COMPOSE_EDIT) {
	$subject = $MESSAGE->subject;
	}
	else if (!empty($COMPOSE['param']['subject'])) {
	$subject = $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, $COMPOSE;

	// add ID if not given
	if (!$attrib['id'])
	$attrib['id'] = 'rcmAttachmentList';

	$out = "\n";
	$jslist = array();

	if (is_array($COMPOSE['attachments'])) {
	if ($attrib['deleteicon']) {
	$button = html::img(array(
	'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
	'alt' => rcube_label('delete')
	));
	}
	else
	$button = Q(rcube_label('delete'));

	foreach ($COMPOSE['attachments'] as $id => $a_prop) {
	if (empty($a_prop))
	continue;

	$out .= html::tag('li', array('id' => 'rcmfile'.$id, 'class' => rcmail_filetype2classname($a_prop['mimetype'], $a_prop['name'])),
	html::a(array(
	'href' => "#delete",
	'title' => rcube_label('delete'),
	'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id),
	'class' => 'delete'),
	$button) . Q($a_prop['name']));

	$jslist['rcmfile'.$id] = array('name' => $a_prop['name'], 'complete' => true, 'mimetype' => $a_prop['mimetype']);
	}
	}

	if ($attrib['deleteicon'])
	$COMPOSE['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
	if ($attrib['cancelicon'])
	$OUTPUT->set_env('cancelicon', $CONFIG['skin_path'] . $attrib['cancelicon']);
	if ($attrib['loadingicon'])
	$OUTPUT->set_env('loadingicon', $CONFIG['skin_path'] . $attrib['loadingicon']);

	$OUTPUT->set_env('attachments', $jslist);
	$OUTPUT->add_gui_object('attachmentlist', $attrib['id']);

	return html::tag('ul', $attrib, $out, html::$common_attrib);
	}


	function rcmail_compose_attachment_form($attrib)
	{
	global $OUTPUT;

	// set defaults
	$attrib += array('id' => 'rcmUploadbox', 'buttons' => 'yes');

	// Get filesize, enable upload progress bar
	$max_filesize = rcube_upload_init();

	$button = new html_inputfield(array('type' => 'button'));

	$out = html::div($attrib,
	$OUTPUT->form_tag(array('id' => $attrib['id'].'Frm', 'name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
	html::div(null, rcmail_compose_attachment_field(array('size' => $attrib['attachmentfieldsize']))) .
	html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
	(get_boolean($attrib['buttons']) ? html::div('buttons',
	$button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
	$button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
	) : '')
	)
	);

	$OUTPUT->add_gui_object('uploadform', $attrib['id'].'Frm');
	return $out;
	}


	function rcmail_compose_attachment_field($attrib)
	{
	$attrib['type'] = 'file';
	$attrib['name'] = '_attachments[]';
	$attrib['multiple'] = 'multiple';

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

	if (isset($_POST['_priority']))
	$sel = $_POST['_priority'];
	else if (intval($MESSAGE->headers->priority) != 3)
	$sel = intval($MESSAGE->headers->priority);
	else
	$sel = 0;

	$out = $form_start ? "$form_start\n" : '';
	$out .= $selector->show($sel);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_receipt_checkbox($attrib)
	{
	global $RCMAIL, $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);

	- if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
	+ if (isset($_POST['_receipt']))
	+ $mdn_default = $_POST['_receipt'];
	+ else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
	$mdn_default = (bool) $MESSAGE->headers->mdn_to;
	else
	$mdn_default = $RCMAIL->config->get('mdn_default');

	$out = $form_start ? "$form_start\n" : '';
	$out .= $checkbox->show($mdn_default);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_dsn_checkbox($attrib)
	{
	global $RCMAIL;

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	if (!isset($attrib['id']))
	$attrib['id'] = 'dsn';

	$attrib['name'] = '_dsn';
	$attrib['value'] = '1';
	$checkbox = new html_checkbox($attrib);

	+ if (isset($_POST['_dsn']))
	+ $dsn_value = $_POST['_dsn'];
	+ else
	+ $dsn_value = $RCMAIL->config->get('dsn_default');
	+
	$out = $form_start ? "$form_start\n" : '';
	- $out .= $checkbox->show($RCMAIL->config->get('dsn_default'));
	+ $out .= $checkbox->show($dsn_value);
	$out .= $form_end ? "\n$form_end" : '';

	return $out;
	}


	function rcmail_editor_selector($attrib)
	{
	// determine whether HTML or plain text should be checked
	$useHtml = rcmail_compose_editor_mode();

	if (empty($attrib['editorid']))
	$attrib['editorid'] = 'rcmComposeBody';

	if (empty($attrib['name']))
	$attrib['name'] = 'editorSelect';

	$attrib['onchange'] = "return rcmail_toggle_editor(this, '".$attrib['editorid']."', '_is_html')";

	$select = new html_select($attrib);

	$select->add(Q(rcube_label('htmltoggle')), 'html');
	$select->add(Q(rcube_label('plaintoggle')), 'plain');

	return $select->show($useHtml ? 'html' : 'plain');

	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)
	{
	global $COMPOSE;

	$attrib['name'] = '_store_target';
	$select = rcmail_mailbox_select(array_merge($attrib, array(
	'noselection' => '- '.rcube_label('dontsave').' -',
	'folder_filter' => 'mail',
	'folder_rights' => 'w',
	)));
	- return $select->show($COMPOSE['param']['sent_mbox'], $attrib);
	+ return $select->show(isset($_POST['_store_target']) ? $_POST['_store_target'] : $COMPOSE['param']['sent_mbox'], $attrib);
	}


	function rcmail_check_sent_folder($folder, $create=false)
	{
	global $RCMAIL;

	// we'll not save the message, so it doesn't matter
	if ($RCMAIL->config->get('no_save_sent_messages')) {
	return true;
	}

	if ($RCMAIL->storage->folder_exists($folder, true)) {
	return true;
	}

	// folder may exist but isn't subscribed (#1485241)
	if ($create) {
	if (!$RCMAIL->storage->folder_exists($folder))
	return $RCMAIL->storage->create_folder($folder, true);
	else
	return $RCMAIL->storage->subscribe($folder);
	}

	return false;
	}


	function get_form_tags($attrib)
	{
	global $RCMAIL, $MESSAGE_FORM, $COMPOSE;

	$form_start = '';
	if (!$MESSAGE_FORM)
	{
	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
	$hiddenfields->add(array('name' => '_action', 'value' => 'send'));
	$hiddenfields->add(array('name' => '_id', 'value' => $COMPOSE['id']));
	$hiddenfields->add(array('name' => '_attachments'));

	$form_start = empty($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
	$form_start .= $hiddenfields->show();
	}

	$form_end = ($MESSAGE_FORM && !strlen($attrib['form'])) ? '</form>' : '';
	$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';

	if (!$MESSAGE_FORM)
	$RCMAIL->output->add_gui_object('messageform', $form_name);

	$MESSAGE_FORM = $form_name;

	return array($form_start, $form_end);
	}


	function rcmail_addressbook_list($attrib = array())
	{
	global $RCMAIL, $OUTPUT;

	$attrib += array('id' => 'rcmdirectorylist');

	$out = '';
	$line_templ = html::tag('li', array(
	'id' => 'rcmli%s', 'class' => '%s'),
	html::a(array('href' => '#list',
	'rel' => '%s',
	'onclick' => "return ".JS_OBJECT_NAME.".command('list-adresses','%s',this)"), '%s'));

	foreach ($RCMAIL->get_address_sources() as $j => $source) {
	$id = strval(strlen($source['id']) ? $source['id'] : $j);
	$js_id = JQ($id);

	// set class name(s)
	$class_name = 'addressbook';
	if ($source['class_name'])
	$class_name .= ' ' . $source['class_name'];

	$out .= sprintf($line_templ,
	html_identifier($id),
	$class_name,
	$source['id'],
	$js_id, (!empty($source['name']) ? Q($source['name']) : Q($id)));
	}

	$OUTPUT->add_gui_object('addressbookslist', $attrib['id']);

	return html::tag('ul', $attrib, $out, html::$common_attrib);
	}

	// return the contacts list as HTML table
	function rcmail_contacts_list($attrib = array())
	{
	global $OUTPUT;

	$attrib += array('id' => 'rcmAddressList');

	// set client env
	$OUTPUT->add_gui_object('contactslist', $attrib['id']);
	$OUTPUT->set_env('pagecount', 0);
	$OUTPUT->set_env('current_page', 0);
	$OUTPUT->include_script('list.js');

	return rcube_table_output($attrib, array(), array('name'), 'ID');
	}


	/**
	* Register a certain container as active area to drop files onto
	*/
	function compose_file_drop_area($attrib)
	{
	global $OUTPUT;

	if ($attrib['id']) {
	$OUTPUT->add_gui_object('filedrop', $attrib['id']);
	$OUTPUT->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
	}
	}


	// 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',
	'filedroparea' => 'compose_file_drop_area',
	'priorityselector' => 'rcmail_priority_selector',
	'editorselector' => 'rcmail_editor_selector',
	'receiptcheckbox' => 'rcmail_receipt_checkbox',
	'dsncheckbox' => 'rcmail_dsn_checkbox',
	'storetarget' => 'rcmail_store_target_selection',
	'addressbooks' => 'rcmail_addressbook_list',
	'addresslist' => 'rcmail_contacts_list',
	));

	$OUTPUT->send('compose');
	diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
	index 4302bf9af..47d1a484a 100644
	--- a/program/steps/mail/func.inc
	+++ b/program/steps/mail/func.inc
	@@ -1,1827 +1,1820 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2010, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Provide webmail functionality and GUI objects \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// setup some global vars used by mail steps
	$SENT_MBOX = $RCMAIL->config->get('sent_mbox');
	$DRAFTS_MBOX = $RCMAIL->config->get('drafts_mbox');
	$SEARCH_MODS_DEFAULT = array(
	'*' => array('subject'=>1, 'from'=>1),
	$SENT_MBOX => array('subject'=>1, 'to'=>1),
	$DRAFTS_MBOX => array('subject'=>1, 'to'=>1)
	);

	// always instantiate storage object (but not connect to server yet)
	$RCMAIL->storage_init();

	// set imap properties and session vars
	if (strlen(trim($mbox = get_input_value('_mbox', RCUBE_INPUT_GPC, true))))
	$RCMAIL->storage->set_folder(($_SESSION['mbox'] = $mbox));
	else if ($RCMAIL->storage)
	$_SESSION['mbox'] = $RCMAIL->storage->get_folder();

	if (!empty($_GET['_page']))
	$RCMAIL->storage->set_page(($_SESSION['page'] = intval($_GET['_page'])));

	// set default sort col/order to session
	if (!isset($_SESSION['sort_col']))
	$_SESSION['sort_col'] = !empty($CONFIG['message_sort_col']) ? $CONFIG['message_sort_col'] : '';
	if (!isset($_SESSION['sort_order']))
	$_SESSION['sort_order'] = strtoupper($CONFIG['message_sort_order']) == 'ASC' ? 'ASC' : 'DESC';

	// set threads mode
	$a_threading = $RCMAIL->config->get('message_threading', array());
	if (isset($_GET['_threads'])) {
	if ($_GET['_threads'])
	$a_threading[$_SESSION['mbox']] = true;
	else
	unset($a_threading[$_SESSION['mbox']]);
	$RCMAIL->user->save_prefs(array('message_threading' => $a_threading));
	}
	$RCMAIL->storage->set_threading($a_threading[$_SESSION['mbox']]);

	// set message set for search result
	if (!empty($_REQUEST['_search']) && isset($_SESSION['search'])
	&& $_SESSION['search_request'] == $_REQUEST['_search']
	) {
	$RCMAIL->storage->set_search_set($_SESSION['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') {
	// connect to storage server and trigger error on failure
	$RCMAIL->storage_connect();

	$mbox_name = $RCMAIL->storage->get_folder();

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

	$RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, rcmail_sort_column());
	$_SESSION['search'] = $RCMAIL->storage->get_search_set();
	$_SESSION['search_request'] = $search_request;
	$OUTPUT->set_env('search_request', $search_request);
	}

	$search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);
	$OUTPUT->set_env('search_mods', $search_mods);
	}

	$threading = (bool) $RCMAIL->storage->get_threading();

	// set current mailbox and some other vars in client environment
	$OUTPUT->set_env('mailbox', $mbox_name);
	$OUTPUT->set_env('pagesize', $RCMAIL->storage->get_pagesize());
	$OUTPUT->set_env('delimiter', $RCMAIL->storage->get_hierarchy_delimiter());
	$OUTPUT->set_env('threading', $threading);
	$OUTPUT->set_env('threads', $threading \|\| $RCMAIL->storage->get_capability('THREAD'));
	$OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0));
	if ($RCMAIL->storage->get_capability('QUOTA')) {
	$OUTPUT->set_env('quota', true);
	}

	- if ($CONFIG['delete_junk'])
	- $OUTPUT->set_env('delete_junk', true);
	- if ($CONFIG['flag_for_deletion'])
	- $OUTPUT->set_env('flag_for_deletion', true);
	- if ($CONFIG['read_when_deleted'])
	- $OUTPUT->set_env('read_when_deleted', true);
	- if ($CONFIG['skip_deleted'])
	- $OUTPUT->set_env('skip_deleted', true);
	- if ($CONFIG['display_next'])
	- $OUTPUT->set_env('display_next', true);
	- if ($CONFIG['forward_attachment'])
	- $OUTPUT->set_env('forward_attachment', true);
	+ foreach (array('delete_junk','flag_for_deletion','read_when_deleted','skip_deleted','display_next','message_extwin','compose_extwin','forward_attachment') as $prop) {
	+ if ($CONFIG[$prop])
	+ $OUTPUT->set_env($prop, true);
	+ }
	+
	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 (!empty($_SESSION['browser_caps']))
	$OUTPUT->set_env('browser_capabilities', $_SESSION['browser_caps']);

	if (!$OUTPUT->ajax_call)
	$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
	'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
	'copy', 'move', 'quota');

	$OUTPUT->set_pagetitle(rcmail_localize_foldername($RCMAIL->storage->mod_folder($mbox_name)));
	}

	/**
	* Returns 'to' if current folder is configured Sent or Drafts
	* or their subfolders, otherwise returns 'from'.
	*
	* @return string Column name
	*/
	function rcmail_message_list_smart_column_name()
	{
	global $RCMAIL;

	$delim = $RCMAIL->storage->get_hierarchy_delimiter();
	$mbox = $RCMAIL->storage->get_folder();
	$sent_mbox = $RCMAIL->config->get('sent_mbox');
	$drafts_mbox = $RCMAIL->config->get('drafts_mbox');

	if (strpos($mbox.$delim, $sent_mbox.$delim) === 0 \|\| strpos($mbox.$delim, $drafts_mbox.$delim) === 0) {
	return 'to';
	}

	return 'from';
	}

	/**
	* Returns configured messages list sorting column name
	* The name is context-sensitive, which means if sorting is set to 'fromto'
	* it will return 'from' or 'to' according to current folder type.
	*
	* @return string Column name
	*/
	function rcmail_sort_column()
	{
	global $RCMAIL;

	if (isset($_SESSION['sort_col'])) {
	$column = $_SESSION['sort_col'];
	}
	else {
	$column = $RCMAIL->config->get('message_sort_col');
	}

	// get name of smart From/To column in folder context
	if ($column == 'fromto') {
	$column = rcmail_message_list_smart_column_name();
	}

	return $column;
	}

	/**
	* Returns configured message list sorting order
	*
	* @return string Sorting order (ASC\|DESC)
	*/
	function rcmail_sort_order()
	{
	global $RCMAIL;

	if (isset($_SESSION['sort_order'])) {
	return $_SESSION['sort_order'];
	}

	return $RCMAIL->config->get('message_sort_order');
	}

	/**
	* return the message list as HTML table
	*/
	function rcmail_message_list($attrib)
	{
	global $CONFIG, $OUTPUT;

	// add some labels to client
	$OUTPUT->add_label('from', 'to');

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcubemessagelist';

	// 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');
	$OUTPUT->set_env('col_movable', !in_array('list_cols', (array)$CONFIG['dont_override']));
	}
	else {
	$a_show_cols = preg_split('/[\s,;]+/', strip_quotes($attrib['columns']));
	$attrib['columns'] = $a_show_cols;
	}

	// save some variables for use in ajax list
	$_SESSION['list_attrib'] = $attrib;
	// make sure 'threads' and 'subject' columns are present
	if (!in_array('subject', $a_show_cols))
	array_unshift($a_show_cols, 'subject');
	if (!in_array('threads', $a_show_cols))
	array_unshift($a_show_cols, 'threads');

	$skin_path = $_SESSION['skin_path'] = $CONFIG['skin_path'];

	// set client env
	$OUTPUT->add_gui_object('messagelist', $attrib['id']);
	$OUTPUT->set_env('autoexpand_threads', intval($CONFIG['autoexpand_threads']));
	$OUTPUT->set_env('sort_col', $_SESSION['sort_col']);
	$OUTPUT->set_env('sort_order', $_SESSION['sort_order']);
	$OUTPUT->set_env('messages', array());
	$OUTPUT->set_env('coltypes', $a_show_cols);

	$OUTPUT->include_script('list.js');

	$thead = '';
	foreach (rcmail_message_list_head($attrib, $a_show_cols) as $cell)
	$thead .= html::tag('td', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);

	return html::tag('table',
	$attrib,
	html::tag('thead', null, html::tag('tr', null, $thead)) .
	html::tag('tbody', null, ''),
	array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
	}


	/**
	* return javascript commands to add rows to the message list
	*/
	function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null)
	{
	global $CONFIG, $RCMAIL, $OUTPUT;

	if (empty($a_show_cols)) {
	if (!empty($_SESSION['list_attrib']['columns']))
	$a_show_cols = $_SESSION['list_attrib']['columns'];
	else
	$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
	}
	else {
	if (!is_array($a_show_cols))
	$a_show_cols = preg_split('/[\s,;]+/', strip_quotes($a_show_cols));
	$head_replace = true;
	}

	$mbox = $RCMAIL->storage->get_folder();

	// make sure 'threads' and 'subject' columns are present
	if (!in_array('subject', $a_show_cols))
	array_unshift($a_show_cols, 'subject');
	if (!in_array('threads', $a_show_cols))
	array_unshift($a_show_cols, 'threads');

	$_SESSION['list_attrib']['columns'] = $a_show_cols;

	// Make sure there are no duplicated columns (#1486999)
	$a_show_cols = array_unique($a_show_cols);

	// Plugins may set header's list_cols/list_flags and other rcube_message_header variables
	// and list columns
	$plugin = $RCMAIL->plugins->exec_hook('messages_list',
	array('messages' => $a_headers, 'cols' => $a_show_cols));

	$a_show_cols = $plugin['cols'];
	$a_headers = $plugin['messages'];

	$thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;

	// get name of smart From/To column in folder context
	if (($f = array_search('fromto', $a_show_cols)) !== false) {
	$smart_col = rcmail_message_list_smart_column_name();
	}

	$OUTPUT->command('set_message_coltypes', $a_show_cols, $thead, $smart_col);

	if (empty($a_headers))
	return;

	// remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here
	foreach (array('threads', 'attachment', 'flag', 'status', 'priority') as $col) {
	if (($key = array_search($col, $a_show_cols)) !== FALSE)
	unset($a_show_cols[$key]);
	}

	// loop through message headers
	foreach ($a_headers as $n => $header) {
	if (empty($header))
	continue;

	$a_msg_cols = array();
	$a_msg_flags = array();

	// format each col; similar as in rcmail_message_list()
	foreach ($a_show_cols as $col) {
	$col_name = $col == 'fromto' ? $smart_col : $col;

	if (in_array($col_name, array('from', 'to', 'cc', 'replyto')))
	$cont = rcmail_address_string($header->$col_name, 3, false, null, $header->charset);
	else if ($col == 'subject') {
	$cont = trim(rcube_mime::decode_header($header->$col, $header->charset));
	if (!$cont) $cont = rcube_label('nosubject');
	$cont = 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 = array_change_key_case(array_map('intval', (array) $header->flags));
	if ($header->depth)
	$a_msg_flags['depth'] = $header->depth;
	else if ($header->has_children)
	$roots[] = $header->uid;
	if ($header->parent_uid)
	$a_msg_flags['parent_uid'] = $header->parent_uid;
	if ($header->has_children)
	$a_msg_flags['has_children'] = $header->has_children;
	if ($header->unread_children)
	$a_msg_flags['unread_children'] = $header->unread_children;
	if ($header->others['list-post'])
	$a_msg_flags['ml'] = 1;
	if ($header->priority)
	$a_msg_flags['prio'] = (int) $header->priority;

	$a_msg_flags['ctype'] = Q($header->ctype);
	$a_msg_flags['mbox'] = $mbox;

	// merge with plugin result (Deprecated, use $header->flags)
	if (!empty($header->list_flags) && is_array($header->list_flags))
	$a_msg_flags = array_merge($a_msg_flags, $header->list_flags);
	if (!empty($header->list_cols) && is_array($header->list_cols))
	$a_msg_cols = array_merge($a_msg_cols, $header->list_cols);

	$OUTPUT->command('add_message_row',
	$header->uid,
	$a_msg_cols,
	$a_msg_flags,
	$insert_top);
	}

	if ($RCMAIL->storage->get_threading()) {
	$OUTPUT->command('init_threads', (array) $roots, $mbox);
	}
	}


	/*
	* Creates <THEAD> for message list table
	*/
	function rcmail_message_list_head($attrib, $a_show_cols)
	{
	global $RCMAIL;

	$skin_path = $_SESSION['skin_path'];
	$image_tag = html::img(array('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'];

	$dont_override = (array)$RCMAIL->config->get('dont_override');
	$disabled_sort = in_array('message_sort_col', $dont_override);
	$disabled_order = in_array('message_sort_order', $dont_override);

	$RCMAIL->output->set_env('disabled_sort_col', $disabled_sort);
	$RCMAIL->output->set_env('disabled_sort_order', $disabled_order);

	// define sortable columns
	if ($disabled_sort)
	$a_sort_cols = $sort_col && !$disabled_order ? array($sort_col) : array();
	else
	$a_sort_cols = array('subject', 'date', 'from', 'to', 'fromto', 'size', 'cc');

	if (!empty($attrib['optionsmenuicon'])) {
	$onclick = 'return ' . JS_OBJECT_NAME . ".command('menu-open', 'messagelistmenu')";
	if ($attrib['optionsmenuicon'] === true \|\| $attrib['optionsmenuicon'] == 'true')
	$list_menu = html::div(array('onclick' => $onclick, 'class' => 'listmenu',
	'id' => 'listmenulink', 'title' => rcube_label('listoptions')));
	else
	$list_menu = html::a(array('href' => '#', 'onclick' => $onclick),
	html::img(array('src' => $skin_path . $attrib['optionsmenuicon'],
	'id' => 'listmenulink', 'title' => rcube_label('listoptions')))
	);
	}
	else
	$list_menu = '';

	$cells = array();

	// get name of smart From/To column in folder context
	if (($f = array_search('fromto', $a_show_cols)) !== false) {
	$smart_col = rcmail_message_list_smart_column_name();
	}

	foreach ($a_show_cols as $col) {
	// get column name
	switch ($col) {
	case 'flag':
	$col_name = '<span class="flagged"> </span>';
	break;
	case 'attachment':
	case 'priority':
	case 'status':
	$col_name = '<span class="' . $col .'"> </span>';
	break;
	case 'threads':
	$col_name = $list_menu;
	break;
	case 'fromto':
	$col_name = Q(rcube_label($smart_col));
	break;
	default:
	$col_name = Q(rcube_label($col));
	}

	// make sort links
	if (in_array($col, $a_sort_cols))
	$col_name = html::a(array('href'=>"./#sort", 'onclick' => 'return '.JS_OBJECT_NAME.".command('sort','".$col."',this)", 'title' => rcube_label('sortby')), $col_name);
	else if ($col_name[0] != '<')
	$col_name = '<span class="' . $col .'">' . $col_name . '</span>';

	$sort_class = $col == $sort_col && !$disabled_order ? " sorted$sort_order" : '';
	$class_name = $col.$sort_class;

	// put it all together
	$cells[] = array('className' => $class_name, 'id' => "rcm$col", 'html' => $col_name);
	}

	return $cells;
	}


	/**
	* return an HTML iframe for loading mail content
	*/
	function rcmail_messagecontent_frame($attrib)
	{
	global $OUTPUT, $RCMAIL;

	if (empty($attrib['id']))
	$attrib['id'] = 'rcmailcontentwindow';

	$attrib['name'] = $attrib['id'];

	if ($RCMAIL->config->get('preview_pane'))
	$OUTPUT->set_env('contentframe', $attrib['id']);
	$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');

	return html::iframe($attrib);
	}


	function rcmail_messagecount_display($attrib)
	{
	global $RCMAIL;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmcountdisplay';

	$RCMAIL->output->add_gui_object('countdisplay', $attrib['id']);

	$content = $RCMAIL->action != 'show' ? rcmail_get_messagecount_text() : rcube_label('loading');

	return html::span($attrib, $content);
	}


	function rcmail_get_messagecount_text($count=NULL, $page=NULL)
	{
	global $RCMAIL;

	if ($page === NULL) {
	$page = $RCMAIL->storage->get_page();
	}

	$page_size = $RCMAIL->storage->get_pagesize();
	$start_msg = ($page-1) * $page_size + 1;

	if ($count!==NULL)
	$max = $count;
	else if ($RCMAIL->action)
	$max = $RCMAIL->storage->count(NULL, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');

	if ($max==0)
	$out = rcube_label('mailboxempty');
	else
	$out = rcube_label(array('name' => $RCMAIL->storage->get_threading() ? 'threadsfromto' : 'messagesfromto',
	'vars' => array('from' => $start_msg,
	'to' => min($max, $start_msg + $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->storage->get_folder());
	}


	function rcmail_send_unread_count($mbox_name, $force=false, $count=null, $mark='')
	{
	global $RCMAIL;

	$old_unseen = rcmail_get_unseen_count($mbox_name);

	if ($count === null)
	$unseen = $RCMAIL->storage->count($mbox_name, 'UNSEEN', $force);
	else
	$unseen = $count;

	if ($unseen != $old_unseen \|\| ($mbox_name == 'INBOX'))
	$RCMAIL->output->command('set_unread_count', $mbox_name, $unseen,
	($mbox_name == 'INBOX'), $unseen && $mark ? $mark : '');

	rcmail_set_unseen_count($mbox_name, $unseen);

	return $unseen;
	}


	function rcmail_set_unseen_count($mbox_name, $count)
	{
	// @TODO: this data is doubled (session and cache tables) if caching is enabled

	// Make sure we have an array here (#1487066)
	if (!is_array($_SESSION['unseen_count']))
	$_SESSION['unseen_count'] = array();

	$_SESSION['unseen_count'][$mbox_name] = $count;
	}


	function rcmail_get_unseen_count($mbox_name)
	{
	if (is_array($_SESSION['unseen_count']) && array_key_exists($mbox_name, $_SESSION['unseen_count']))
	return $_SESSION['unseen_count'][$mbox_name];
	else
	return null;
	}


	/**
	* Sets message is_safe flag according to 'show_images' option value
	*
	* @param object rcube_message Message
	*/
	function rcmail_check_safe(&$message)
	{
	global $RCMAIL;

	if (!$message->is_safe
	&& ($show_images = $RCMAIL->config->get('show_images'))
	&& $message->has_html_part()
	) {
	switch ($show_images) {
	case 1: // known senders only
	// get default addressbook, like in addcontact.inc
	$CONTACTS = $RCMAIL->get_address_book(-1, true);

	if ($CONTACTS) {
	$result = $CONTACTS->search('email', $message->sender['mailto'], 1, false);
	if ($result->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, $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>
	'/<title[^>]>[^<]<\/title>/i', // PHP bug #32547 workaround: remove title tag
	'/^(\0\0\xFE\xFF\|\xFF\xFE\0\0\|\xFE\xFF\|\xFF\xFE\|\xEF\xBB\xBF)/', // byte-order mark (only outlook?)
	'/<html\s[^>]+>/i', // washtml/DOMDocument cannot handle xml namespaces
	);
	$html_replace = array(
	'\\1'.'   '.'\\3',
	'',
	'',
	'<html>',
	);
	$html = preg_replace($html_search, $html_replace, trim($html));

	// PCRE errors handling (#1486856), should we use something like for every preg_* use?
	if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {
	$errstr = "Could not clean up HTML message! PCRE Error: $preg_error.";

	if ($preg_error == PREG_BACKTRACK_LIMIT_ERROR)
	$errstr .= " Consider raising pcre.backtrack_limit!";
	if ($preg_error == PREG_RECURSION_LIMIT_ERROR)
	$errstr .= " Consider raising pcre.recursion_limit!";

	raise_error(array('code' => 620, 'type' => 'php',
	'line' => __LINE__, 'file' => __FILE__,
	'message' => $errstr), true, false);
	return '';
	}

	// fix (unknown/malformed) HTML tags before "wash"
	$html = preg_replace_callback('/(<[\/]*)([^\s>]+)/', 'rcmail_html_tag_callback', $html);

	// charset was converted to UTF-8 in rcube_storage::get_message_part(),
	// change/add charset specification in HTML accordingly,
	// washtml cannot work without that
	$meta = '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />';

	// remove old meta tag and add the new one, making sure
	// that it is placed in the head (#1488093)
	$html = preg_replace('/<meta[^>]+charset=[a-z0-9-_]+[^>]*>/Ui', '', $html);
	$html = preg_replace('/(<head[^>]*>)/Ui', '\\1'.$meta, $html, -1, $rcount);
	if (!$rcount) {
	$html = '<head>' . $meta . '</head>' . $html;
	}

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

	// overwrite washer options with options from plugins
	if (isset($p['html_elements']))
	$wash_opts['html_elements'] = $p['html_elements'];
	if (isset($p['html_attribs']))
	$wash_opts['html_attribs'] = $p['html_attribs'];

	// initialize HTML washer
	$washer = new washtml($wash_opts);

	if (!$p['skip_washer_form_callback'])
	$washer->add_callback('form', 'rcmail_washtml_callback');

	// allow CSS styles, will be sanitized by rcmail_washtml_callback()
	if (!$p['skip_washer_style_callback'])
	$washer->add_callback('style', 'rcmail_washtml_callback');

	// Remove non-UTF8 characters (#1487813)
	$html = rc_utf8_clean($html);

	$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())
	{
	global $RCMAIL;

	// trigger plugin hook
	$data = $RCMAIL->plugins->exec_hook('message_part_before',
	array('type' => $part->ctype_secondary, 'body' => $part->body, 'id' => $part->mime_id)
	+ $p + array('safe' => false, 'plain' => false, 'inline_html' => true));

	// convert html to text/plain
	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 ($data['type'] == 'html') {
	$body = rcmail_wash_html($data['body'], $data, $part->replaces);
	$part->ctype_secondary = $data['type'];
	}
	// text/enriched
	else if ($data['type'] == 'enriched') {
	$part->ctype_secondary = 'html';
	require_once(INSTALL_PATH . 'program/lib/enriched.inc');
	$body = Q(enriched_to_html($data['body']), 'show');
	}
	else {
	// assert plaintext
	$body = $part->body;
	$part->ctype_secondary = $data['type'] = 'plain';
	}

	// free some memory (hopefully)
	unset($data['body']);

	// plaintext postprocessing
	if ($part->ctype_secondary == 'plain')
	$body = rcmail_plain_body($body, $part->ctype_parameters['format'] == 'flowed');

	// allow post-processing of the message body
	$data = $RCMAIL->plugins->exec_hook('message_part_after',
	array('type' => $part->ctype_secondary, 'body' => $body, 'id' => $part->mime_id) + $data);

	return $data['type'] == 'html' ? $data['body'] : html::tag('pre', array(), $data['body']);
	}


	/**
	* Handle links and citation marks in plain text message
	*
	* @param string Plain text string
	* @param boolean Text uses format=flowed
	*
	* @return string Formatted HTML string
	*/
	function rcmail_plain_body($body, $flowed=false)
	{
	global $RCMAIL;

	// make links and email-addresses clickable
	$replacer = new rcube_string_replacer;

	// search for patterns like links and e-mail addresses and replace with tokens
	$body = $replacer->replace($body);

	// split body into single lines
	$body = preg_split('/\r?\n/', $body);
	$quote_level = 0;
	$last = -1;

	// find/mark quoted lines...
	for ($n=0, $cnt=count($body); $n < $cnt; $n++) {
	if ($body[$n][0] == '>' && preg_match('/^(>+\s*)+/', $body[$n], $regs)) {
	$q = strlen(preg_replace('/\s/', '', $regs[0]));
	$body[$n] = substr($body[$n], strlen($regs[0]));

	if ($q > $quote_level) {
	$body[$n] = $replacer->get_replacement($replacer->add(
	str_repeat('<blockquote>', $q - $quote_level))) . $body[$n];
	}
	else if ($q < $quote_level) {
	$body[$n] = $replacer->get_replacement($replacer->add(
	str_repeat('</blockquote>', $quote_level - $q))) . $body[$n];
	}
	else if ($flowed) {
	// previous line is flowed
	if (isset($body[$last]) && $body[$n]
	&& $body[$last][strlen($body[$last])-1] == ' ') {
	// merge lines
	$body[$last] .= $body[$n];
	unset($body[$n]);
	}
	else {
	$last = $n;
	}
	}
	}
	else {
	$q = 0;
	if ($flowed) {
	// sig separator - line is fixed
	if ($body[$n] == '-- ') {
	$last = $last_sig = $n;
	}
	else {
	// remove space-stuffing
	if ($body[$n][0] == ' ')
	$body[$n] = substr($body[$n], 1);

	// previous line is flowed?
	if (isset($body[$last]) && $body[$n]
	&& $last !== $last_sig
	&& $body[$last][strlen($body[$last])-1] == ' '
	) {
	$body[$last] .= $body[$n];
	unset($body[$n]);
	}
	else {
	$last = $n;
	}
	}
	if ($quote_level > 0)
	$body[$last] = $replacer->get_replacement($replacer->add(
	str_repeat('</blockquote>', $quote_level))) . $body[$last];
	}
	else if ($quote_level > 0)
	$body[$n] = $replacer->get_replacement($replacer->add(
	str_repeat('</blockquote>', $quote_level))) . $body[$n];
	}

	$quote_level = $q;
	}

	$body = join("\n", $body);

	// quote plain text (don't use Q() here, to display entities "as is")
	$table = get_html_translation_table(HTML_SPECIALCHARS);
	unset($table['?']);
	$body = strtr($body, $table);

	// colorize signature (up to <sig_max_lines> lines)
	$len = strlen($body);
	$sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15);
	while (($sp = strrpos($body, "-- \n", $sp ? -$len+$sp-1 : 0)) !== false) {
	if ($sp == 0 \|\| $body[$sp-1] == "\n") {
	// do not touch blocks with more that X lines
	if (substr_count($body, "\n", $sp) < $sig_max_lines)
	$body = substr($body, 0, max(0, $sp))
	.'<span class="sig">'.substr($body, $sp).'</span>';
	break;
	}
	}

	// insert url/mailto links and citation tags
	$body = $replacer->resolve($body);

	return $body;
	}


	/**
	* Callback function for washtml cleaning class
	*/
	function rcmail_washtml_callback($tagname, $attrib, $content, $washtml)
	{
	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_entity_decode($content));

	// now check for evil strings like expression, behavior or url()
	if (!preg_match('/expression\|behavior\|javascript:\|import[^a]/i', $stripped)) {
	if (!$washtml->get_config('allow_remote') && stripos($stripped, 'url('))
	$washtml->extlinks = true;
	else
	$out = html::tag('style', array('type' => 'text/css'), $content);
	break;
	}

	default:
	$out = '';
	}

	return $out;
	}


	/**
	* Callback function for HTML tags fixing
	*/
	function rcmail_html_tag_callback($matches)
	{
	$tagname = $matches[2];

	$tagname = preg_replace(array(
	'/:.*$/', // Microsoft's Smart Tags <st1:xxxx>
	'/[^a-z0-9_\[\]\!-]/i', // forbidden characters
	), '', $tagname);

	return $matches[1].$tagname;
	}


	/**
	* return table with message headers
	*/
	function rcmail_message_headers($attrib, $headers=NULL)
	{
	global $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;

	// show these headers
	$standard_headers = array('subject', 'from', 'to', 'cc', 'bcc', 'replyto',
	'mail-reply-to', 'mail-followup-to', 'date', 'priority');
	$exclude_headers = $attrib['exclude'] ? explode(',', $attrib['exclude']) : array();
	$output_headers = array();

	foreach ($standard_headers as $hkey) {
	$ishtml = false;

	if ($headers[$hkey])
	$value = $headers[$hkey];
	else if ($headers['others'][$hkey])
	$value = $headers['others'][$hkey];
	else
	continue;

	if (in_array($hkey, $exclude_headers))
	continue;

	$header_title = rcube_label(preg_replace('/(^mail-\|-)/', '', $hkey));

	if ($hkey == 'date') {
	if ($PRINT_MODE)
	$header_value = format_date($value, $RCMAIL->config->get('date_long', 'x'));
	else
	$header_value = format_date($value);
	}
	else if ($hkey == 'priority') {
	if ($value) {
	$header_value = html::span('prio' . $value, rcmail_localized_priority($value));
	}
	else
	continue;
	}
	else if ($hkey == 'replyto') {
	if ($headers['replyto'] != $headers['from']) {
	$header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
	$ishtml = true;
	}
	else
	continue;
	}
	else if ($hkey == 'mail-reply-to') {
	if ($headers['mail-replyto'] != $headers['reply-to']
	&& $headers['reply-to'] != $headers['from']
	) {
	$header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
	$ishtml = true;
	}
	else
	continue;
	}
	else if ($hkey == 'mail-followup-to') {
	$header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
	$ishtml = true;
	}
	else if (in_array($hkey, array('from', 'to', 'cc', 'bcc'))) {
	$header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
	$ishtml = true;
	}
	else if ($hkey == 'subject' && empty($value))
	$header_value = rcube_label('nosubject');
	else
	$header_value = trim(rcube_mime::decode_header($value, $headers['charset']));

	$output_headers[$hkey] = array(
	'title' => $header_title,
	'value' => $header_value,
	'raw' => $value,
	'html' => $ishtml,
	);
	}

	$plugin = $RCMAIL->plugins->exec_hook('message_headers_output',
	array('output' => $output_headers, 'headers' => $MESSAGE->headers, 'exclude' => $exclude_headers));

	// single header value is requested
	if (!empty($attrib['valueof']))
	return Q($plugin['output'][$attrib['valueof']]['value'], ($attrib['valueof'] == 'subject' ? 'strict' : 'show'));

	// 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' => 'header '.$hkey), $row['html'] ? $row['value'] : Q($row['value'], ($hkey == 'subject' ? 'strict' : 'show')));
	}

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

	/**
	* Convert Priority header value into a localized string
	*/
	function rcmail_localized_priority($value)
	{
	$labels_map = array(
	'1' => 'highest',
	'2' => 'high',
	'3' => 'normal',
	'4' => 'low',
	'5' => 'lowest',
	);

	if ($value && $labels_map[$value])
	return rcube_label($labels_map[$value]);

	return '';
	}

	/**
	* return block to show full message headers
	*/
	function rcmail_message_full_headers($attrib, $headers=NULL)
	{
	global $OUTPUT;

	$html = html::div(array('id' => "all-headers", 'class' => "all", 'style' => 'display:none'), html::div(array('id' => 'headers-source'), ''));
	$html .= html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('show-headers','',this)", 'title' => rcube_label('togglefullheaders')), '');

	$OUTPUT->add_gui_object('all_headers_row', 'all-headers');
	$OUTPUT->add_gui_object('all_headers_box', 'headers-source');

	return html::div($attrib, $html);
	}


	/**
	* 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, $RCMAIL, $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') {
	// unsapported
	if ($part->realtype) {
	if ($part->realtype == 'multipart/encrypted') {
	$out .= html::span('part-notice', rcube_label('encryptedmessage'));
	}
	continue;
	}
	else if (!$part->size) {
	continue;
	}
	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	else if (!rcmail_mem_check($part->size * 10)) {
	$out .= html::span('part-notice', rcube_label('messagetoobig'). ' '
	. html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part='.$part->mime_id
	.'&_mbox='. urlencode($RCMAIL->storage->get_folder()), rcube_label('download')));
	continue;
	}

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

	// message is cached but not exists (#1485443), or other error
	if ($part->body === false) {
	rcmail_message_error($MESSAGE->uid);
	}

	$plugin = $RCMAIL->plugins->exec_hook('message_body_prefix', array(
	'part' => $part, 'prefix' => ''));

	$body = rcmail_print_body($part, array('safe' => $safe_mode, 'plain' => !$CONFIG['prefer_html']));

	if ($part->ctype_secondary == 'html') {
	$body = rcmail_html4inline($body, $attrib['id'], 'rcmBody', $attrs, $safe_mode);
	$div_attr = array('class' => 'message-htmlpart');
	$style = array();

	if (!empty($attrs)) {
	foreach ($attrs as $a_idx => $a_val)
	$style[] = $a_idx . ': ' . $a_val;
	if (!empty($style))
	$div_attr['style'] = implode('; ', $style);
	}

	$out .= html::div($div_attr, $plugin['prefix'] . $body);
	}
	else
	$out .= html::div('message-part', $plugin['prefix'] . $body);
	}
	}
	}
	else {
	// Check if we have enough memory to handle the message in it
	// #1487424: we need up to 10x more memory than the body
	if (!rcmail_mem_check(strlen($MESSAGE->body) * 10)) {
	$out .= html::span('part-notice', rcube_label('messagetoobig'). ' '
	. html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part=0'
	.'&_mbox='. urlencode($RCMAIL->storage->get_folder()), rcube_label('download')));
	}
	else {
	$plugin = $RCMAIL->plugins->exec_hook('message_body_prefix', array(
	'part' => $MESSAGE, 'prefix' => ''));

	$out .= html::div('message-part', $plugin['prefix'] . html::tag('pre', array(),
	rcmail_plain_body(Q($MESSAGE->body, 'strict', false))));
	}
	}

	// list images after mail body
	if ($CONFIG['inline_images'] && !empty($MESSAGE->attachments)) {
	foreach ($MESSAGE->attachments as $attach_prop) {
	// skip inline images
	if ($attach_prop->content_id && $attach_prop->disposition == 'inline') {
	continue;
	}

	// Content-Type: image/*...
	if (rcmail_part_image_type($attach_prop)) {
	$out .= html::tag('hr') . html::p(array('align' => "center"),
	html::img(array(
	'src' => $MESSAGE->get_part_url($attach_prop->mime_id, true),
	'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);
	}

	function rcmail_part_image_type($part)
	{
	$rcmail = rcmail::get_instance();

	// Skip TIFF images if browser doesn't support this format...
	$tiff_support = !empty($_SESSION['browser_caps']) && !empty($_SESSION['browser_caps']['tif']);
	// until we can convert them to JPEG
	$tiff_support = $tiff_support \|\| $rcmail->config->get('im_convert_path');

	// Content-type regexp
	$mime_regex = $tiff_support ? '/^image\//i' : '/^image\/(?!tif)/i';

	// Content-Type: image/*...
	if (preg_match($mime_regex, $part->mimetype)) {
	return $part->mimetype;
	}

	// Many clients use application/octet-stream, we'll detect mimetype
	// by checking filename extension

	// Supported image filename extensions to image type map
	$types = array(
	'jpg' => 'image/jpeg',
	'jpeg' => 'image/jpeg',
	'png' => 'image/png',
	'gif' => 'image/gif',
	'bmp' => 'image/bmp',
	);
	if ($tiff_support) {
	$types['tif'] = 'image/tiff';
	$types['tiff'] = 'image/tiff';
	}

	if ($part->filename
	&& preg_match('/^application\/octet-stream$/i', $part->mimetype)
	&& preg_match('/\.([^.])$/i', $part->filename, $m)
	&& ($extension = strtolower($m[1]))
	&& isset($types[$extension])
	) {
	return $types[$extension];
	}
	}

	/**
	* 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]);
	$body = $replacer->replace($body);
	}

	return $body;
	}


	/**
	* modify a HTML message that it can be displayed inside a HTML page
	*/
	function rcmail_html4inline($body, $container_id, $body_id='', &$attributes=null, $allow_remote=false)
	{
	$last_style_pos = 0;
	$cont_id = $container_id.($body_id ? ' div.'.$body_id : '');

	// find STYLE tags
	while (($pos = stripos($body, '<style', $last_style_pos)) && ($pos2 = stripos($body, '</style>', $pos)))
	{
	$pos = strpos($body, '>', $pos) + 1;
	$len = $pos2 - $pos;

	// replace all css definitions with #container [def]
	$styles = substr($body, $pos, $len);
	$styles = rcmail_mod_css_styles($styles, $cont_id, $allow_remote);

	$body = substr_replace($body, $styles, $pos, $len);
	$last_style_pos = $pos2 + strlen($styles) - $len;
	}

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

	$body = preg_replace(array(
	// add comments arround html and other tags
	'/(<!DOCTYPE[^>]*>)/i',
	'/(<\?xml[^>]*>)/i',
	'/(<\/?html[^>]*>)/i',
	'/(<\/?head[^>]*>)/i',
	'/(<title[^>]>.<\/title>)/Ui',
	'/(<\/?meta[^>]*>)/i',
	// quote <? of php and xml files that are specified as text/html
	'/<\?/',
	'/\?>/',
	// replace <body> with <div>
	'/<body([^>]*)>/i',
	'/<\/body>/i',
	),
	array(
	'<!--\\1-->',
	'<!--\\1-->',
	'<!--\\1-->',
	'<!--\\1-->',
	'<!--\\1-->',
	'<!--\\1-->',
	'<?',
	'?>',
	'<div class="'.$body_id.'"\\1>',
	'</div>',
	),
	$body);

	$attributes = array();

	// Handle body attributes that doesn't play nicely with div elements
	$regexp = '/<div class="' . preg_quote($body_id, '/') . '"([^>]*)/';
	if (preg_match($regexp, $body, $m)) {
	$attrs = $m[0];
	// Get bgcolor, we'll set it as background-color of the message container
	if ($m[1] && preg_match('/bgcolor=["\']([a-z0-9#]+)["\']/', $attrs, $mb)) {
	$attributes['background-color'] = $mb[1];
	$attrs = preg_replace('/bgcolor=["\']([a-z0-9#]+)["\']/', '', $attrs);
	}
	// Get background, we'll set it as background-image of the message container
	if ($m[1] && preg_match('/background=["\']([^"\'>\s]+)["\']/', $attrs, $mb)) {
	$attributes['background-image'] = 'url('.$mb[1].')';
	$attrs = preg_replace('/background=["\']([^"\'>\s]+)["\']/', '', $attrs);
	}
	if (!empty($attributes)) {
	$body = preg_replace($regexp, rtrim($attrs), $body, 1);
	}

	// handle body styles related to background image
	if ($attributes['background-image']) {
	// get body style
	if (preg_match('/#'.preg_quote($cont_id, '/').'\s+\{([^}]+)}/i', $body, $m)) {
	// get background related style
	if (preg_match_all('/(background-position\|background-repeat)\s:\s([^;]+);/i', $m[1], $ma, PREG_SET_ORDER)) {
	foreach ($ma as $style)
	$attributes[$style[1]] = $style[2];
	}
	}
	}
	}
	// make sure there's 'rcmBody' div, we need it for proper css modification
	// its name is hardcoded in rcmail_message_body() also
	else {
	$body = '<div class="' . $body_id . '">' . $body . '</div>';
	}

	return $body;
	}


	/**
	* parse link attributes and set correct target
	*/
	function rcmail_alter_html_link($matches)
	{
	global $RCMAIL;

	// Support unicode/punycode in top-level domain part
	$EMAIL_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]@[^&@"\'.][^@&"\']\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}\|xn--[a-z0-9]{2,}))';

	$tag = $matches[1];
	$attrib = parse_attrib_string($matches[2]);
	$end = '>';

	// Remove non-printable characters in URL (#1487805)
	if ($attrib['href'])
	$attrib['href'] = preg_replace('/[\x00-\x1F]/', '', $attrib['href']);

	if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
	$tempurl = 'tmp-' . md5($attrib['href']) . '.css';
	$_SESSION['modcssurls'][$tempurl] = $attrib['href'];
	$attrib['href'] = $RCMAIL->url(array('task' => 'utils', 'action' => 'modcss', 'u' => $tempurl, 'c' => $GLOBALS['rcmail_html_container_id']));
	$end = ' />';
	}
	else if (preg_match('/^mailto:'.$EMAIL_PATTERN.'(\?[^"\'>]+)?/i', $attrib['href'], $mailto)) {
	$attrib['href'] = $mailto[0];
	$attrib['onclick'] = sprintf(
	"return %s.command('compose','%s',this)",
	JS_OBJECT_NAME,
	JQ($mailto[1].$mailto[3]));
	}
	else if (empty($attrib['href']) && !$attrib['name']) {
	$attrib['href'] = './#NOP';
	$attrib['onclick'] = 'return false';
	}
	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, $default_charset=null, $title=null)
	{
	global $RCMAIL, $PRINT_MODE, $CONFIG;

	$a_parts = rcube_mime::decode_address_list($input, null, true, $default_charset);

	if (!sizeof($a_parts))
	return $input;

	$c = count($a_parts);
	$j = 0;
	$out = '';
	$allvalues = array();

	if ($addicon && !isset($_SESSION['writeable_abook'])) {
	$_SESSION['writeable_abook'] = $RCMAIL->get_address_sources(true) ? true : false;
	}

	foreach ($a_parts as $part) {
	$j++;
	$name = $part['name'];
	$mailto = $part['mailto'];
	$string = $part['string'];

	// IDNA ASCII to Unicode
	if ($name == $mailto)
	$name = rcube_idn_to_utf8($name);
	if ($string == $mailto)
	$string = rcube_idn_to_utf8($string);
	$mailto = rcube_idn_to_utf8($mailto);

	if ($PRINT_MODE) {
	$out .= sprintf('%s <%s>', Q($name), $mailto);
	}
	else if (check_email($part['mailto'], false)) {
	if ($linked) {
	$address = html::a(array(
	'href' => 'mailto:'.$mailto,
	'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($mailto)),
	'title' => $mailto,
	'class' => "rcmContactAddress",
	),
	Q($name ? $name : $mailto));
	}
	else {
	$address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
	Q($name ? $name : $mailto));
	}

	if ($addicon && $_SESSION['writeable_abook']) {
	$address .= html::a(array(
	'href' => "#add",
	'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, $string),
	'title' => rcube_label('addtoaddressbook'),
	'class' => 'rcmaddcontact',
	),
	html::img(array(
	'src' => $CONFIG['skin_path'] . $addicon,
	'alt' => "Add contact",
	)));
	}
	}
	else {
	$address = '';
	if ($name)
	$address .= Q($name);
	if ($mailto)
	$address .= (strlen($address) ? ' ' : '') . sprintf('<%s>', Q($mailto));
	}

	$address = html::span('adr', $address);
	$allvalues[] = $address;

	if (!$moreadrs)
	$out .= ($out ? ', ' : '') . $address;

	if ($max && $j == $max && $c > $j) {
	if ($linked) {
	$moreadrs = $c - $j;
	}
	else {
	$out .= '...';
	break;
	}
	}
	}

	if ($moreadrs) {
	$out .= ' ' . html::a(array(
	'href' => '#more',
	'class' => 'morelink',
	'onclick' => sprintf("return %s.show_popup_dialog('%s','%s')",
	JS_OBJECT_NAME,
	JQ(join(', ', $allvalues)),
	JQ($title))
	),
	Q(rcube_label(array('name' => 'andnmore', 'vars' => array('nr' => $moreadrs)))));
	}

	return $out;
	}


	/**
	* Wrap text to a given number of characters per line
	* but respect the mail quotation of replies messages (>).
	* Finally add another quotation level by prpending the lines
	* with >
	*
	* @param string Text to wrap
	* @param int The line width
	* @return string The wrapped text
	*/
	function rcmail_wrap_and_quote($text, $length = 72)
	{
	// Rebuild the message body with a maximum of $max chars, while keeping quoted message.
	$max = max(75, $length + 8);
	$lines = preg_split('/\r?\n/', trim($text));
	$out = '';

	foreach ($lines as $line) {
	// don't wrap already quoted lines
	if ($line[0] == '>')
	$line = '>' . rtrim($line);
	else if (mb_strlen($line) > $max) {
	$newline = '';
	foreach(explode("\n", rc_wordwrap($line, $length - 2)) as $l) {
	if (strlen($l))
	$newline .= '> ' . $l . "\n";
	else
	$newline .= ">\n";
	}
	$line = rtrim($newline);
	}
	else
	$line = '> ' . $line;

	// Append the line
	$out .= $line . "\n";
	}

	return $out;
	}


	function rcmail_draftinfo_encode($p)
	{
	$parts = array();
	foreach ($p as $key => $val)
	$parts[] = $key . '=' . ($key == 'folder' ? base64_encode($val) : $val);

	return join('; ', $parts);
	}


	function rcmail_draftinfo_decode($str)
	{
	$info = array();
	foreach (preg_split('/;\s+/', $str) as $part) {
	list($key, $val) = explode('=', $part, 2);
	if ($key == 'folder')
	$val = base64_decode($val);
	$info[$key] = $val;
	}

	return $info;
	}


	function rcmail_message_part_controls($attrib)
	{
	global $MESSAGE, $RCMAIL;

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

	$filename = $part->filename;
	if (empty($filename) && $attach_prop->mimetype == 'text/html') {
	$filename = rcube_label('htmlmessage');
	}

	if (!empty($filename)) {
	$table->add('title', Q(rcube_label('filename')));
	$table->add('header', Q($filename));
	$table->add('download-link', html::a(array('href' => './?'.str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING'])), Q(rcube_label('download'))));
	}

	$table->add('title', Q(rcube_label('filesize')));
	$table->add('header', Q($RCMAIL->message_part_size($part)));

	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($id)
	{
	if (!isset($_SESSION['compose_data_'.$id]))
	return;

	$rcmail = rcmail::get_instance();
	$rcmail->plugins->exec_hook('attachments_cleanup', array('group' => $id));
	$rcmail->session->remove('compose_data_'.$id);
	}


	/**
	* Send the MDN response
	*
	* @param mixed $message Original message object (rcube_message) or UID
	* @param array $smtp_error SMTP error array (reference)
	*
	* @return boolean Send status
	*/
	function rcmail_send_mdn($message, &$smtp_error)
	{
	global $RCMAIL;

	if (!is_object($message) \|\| !is_a($message, 'rcube_message'))
	$message = new rcube_message($message);

	if ($message->headers->mdn_to && empty($message->headers->flags['MDNSENT']) &&
	($RCMAIL->storage->check_permflag('MDNSENT') \|\| $RCMAIL->storage->check_permflag('*')))
	{
	$identity = $RCMAIL->user->get_identity();
	$sender = format_email_recipient($identity['email'], $identity['name']);
	$recipient = array_shift(rcube_mime::decode_address_list(
	$message->headers->mdn_to, 1, true, $message->headers->charset));
	$mailto = $recipient['mailto'];

	$compose = new Mail_mime("\r\n");

	$compose->setParam('text_encoding', 'quoted-printable');
	$compose->setParam('html_encoding', 'quoted-printable');
	$compose->setParam('head_encoding', 'quoted-printable');
	$compose->setParam('head_charset', RCMAIL_CHARSET);
	$compose->setParam('html_charset', RCMAIL_CHARSET);
	$compose->setParam('text_charset', RCMAIL_CHARSET);

	// compose headers array
	$headers = array(
	'Date' => rcmail_user_date(),
	'From' => $sender,
	'To' => $message->headers->mdn_to,
	'Subject' => rcube_label('receiptread') . ': ' . $message->subject,
	'Message-ID' => rcmail_gen_message_id(),
	'X-Sender' => $identity['email'],
	'References' => trim($message->headers->references . ' ' . $message->headers->messageID),
	);

	if ($agent = $RCMAIL->config->get('useragent'))
	$headers['User-Agent'] = $agent;

	$body = rcube_label("yourmessage") . "\r\n\r\n" .
	"\t" . rcube_label("to") . ': ' . rcube_mime::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->setContentType('multipart/report', array('report-type'=> 'disposition-notification'));
	$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, $smtp_error, $body_file);

	if ($sent)
	{
	$RCMAIL->storage->set_flag($message->uid, 'MDNSENT');
	return true;
	}
	}

	return false;
	}


	// Fixes some content-type names
	function rcmail_fix_mimetype($name)
	{
	// Some versions of Outlook create garbage Content-Type:
	// application/pdf.A520491B_3BF7_494D_8855_7FAC2C6C0608
	if (preg_match('/^application\/pdf.+/', $name))
	$name = 'application/pdf';

	return $name;
	}

	function rcmail_search_filter($attrib)
	{
	global $OUTPUT, $CONFIG;

	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');
	if (!$CONFIG['skip_deleted']) {
	$select_filter->add(rcube_label('deleted'), 'DELETED');
	$select_filter->add(rcube_label('undeleted'), 'UNDELETED');
	}
	$select_filter->add(rcube_label('priority').': '.rcube_label('highest'), 'HEADER X-PRIORITY 1');
	$select_filter->add(rcube_label('priority').': '.rcube_label('high'), 'HEADER X-PRIORITY 2');
	$select_filter->add(rcube_label('priority').': '.rcube_label('normal'), 'NOT HEADER X-PRIORITY 1 NOT HEADER X-PRIORITY 2 NOT HEADER X-PRIORITY 4 NOT HEADER X-PRIORITY 5');
	$select_filter->add(rcube_label('priority').': '.rcube_label('low'), 'HEADER X-PRIORITY 4');
	$select_filter->add(rcube_label('priority').': '.rcube_label('lowest'), 'HEADER X-PRIORITY 5');

	$out = $select_filter->show($_SESSION['search_filter']);

	$OUTPUT->add_gui_object('search_filter', $attrib['id']);

	return $out;
	}

	function rcmail_message_error($uid=null)
	{
	global $RCMAIL;

	// Set env variables for messageerror.html template
	if ($RCMAIL->action == 'show') {
	$mbox_name = $RCMAIL->storage->get_folder();
	$RCMAIL->output->set_env('mailbox', $mbox_name);
	$RCMAIL->output->set_env('uid', null);
	}
	// display error message
	$RCMAIL->output->show_message('messageopenerror', 'error');
	// ... display message error page
	$RCMAIL->output->send('messageerror');
	}

	// 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',
	'messagefullheaders' => 'rcmail_message_full_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'),
	));

	// register action aliases
	$RCMAIL->register_action_map(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',
	'group-expand' => 'autocomplete.inc',
	));
	diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
	index 029bc5f8d..f89660719 100644
	--- a/program/steps/mail/show.inc
	+++ b/program/steps/mail/show.inc
	@@ -1,311 +1,312 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/mail/show.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Display a mail message similar as a usual mail application does \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$PRINT_MODE = $RCMAIL->action=='print' ? TRUE : FALSE;

	// Read browser capabilities and store them in session
	if ($caps = get_input_value('_caps', RCUBE_INPUT_GET)) {
	$browser_caps = array();
	foreach (explode(',', $caps) as $cap) {
	$cap = explode('=', $cap);
	$browser_caps[$cap[0]] = $cap[1];
	}
	$_SESSION['browser_caps'] = $browser_caps;
	}

	// similar code as in program/steps/mail/get.inc
	if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
	$MESSAGE = new rcube_message($uid);

	// if message not found (wrong UID)...
	if (empty($MESSAGE->headers)) {
	rcmail_message_error($uid);
	}

	$mbox_name = $RCMAIL->storage->get_folder();

	// show images?
	rcmail_check_safe($MESSAGE);

	// set message charset as default
	if (!empty($MESSAGE->headers->charset))
	$RCMAIL->storage->set_charset($MESSAGE->headers->charset);

	$OUTPUT->set_pagetitle(abbreviate_string($MESSAGE->subject, 128, '...', true));

	// 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('delimiter', $RCMAIL->storage->get_hierarchy_delimiter());
	$OUTPUT->set_env('mailbox', $mbox_name);
	+ $OUTPUT->set_env('compose_extwin', $RCMAIL->config->get('compose_extwin',false));

	// mimetypes supported by the browser (default settings)
	$mimetypes = $RCMAIL->config->get('client_mimetypes', 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,image/bmp,image/tiff,application/x-javascript,application/pdf,application/x-shockwave-flash');
	$mimetypes = is_string($mimetypes) ? explode(',', $mimetypes) : (array)$mimetypes;

	// Remove unsupported types, which makes that attachment which cannot be
	// displayed in a browser will be downloaded directly without displaying an overlay page
	if (empty($_SESSION['browser_caps']['pdf']) && ($key = array_search('application/pdf', $mimetypes)) !== false) {
	unset($mimetypes[$key]);
	}
	if (empty($_SESSION['browser_caps']['flash']) && ($key = array_search('application/x-shockwave-flash', $mimetypes)) !== false) {
	unset($mimetypes[$key]);
	}
	if (empty($_SESSION['browser_caps']['tif']) && ($key = array_search('image/tiff', $mimetypes)) !== false) {
	// we can convert tiff to jpeg
	if (!$RCMAIL->config->get('im_convert_path')) {
	unset($mimetypes[$key]);
	}
	}

	$OUTPUT->set_env('mimetypes', $mimetypes);

	if ($CONFIG['drafts_mbox'])
	$OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
	if ($CONFIG['trash_mbox'])
	$OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
	if ($CONFIG['junk_mbox'])
	$OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']);
	if ($CONFIG['delete_junk'])
	$OUTPUT->set_env('delete_junk', true);
	if ($CONFIG['flag_for_deletion'])
	$OUTPUT->set_env('flag_for_deletion', true);
	if ($CONFIG['read_when_deleted'])
	$OUTPUT->set_env('read_when_deleted', true);
	if ($CONFIG['skip_deleted'])
	$OUTPUT->set_env('skip_deleted', true);
	if ($CONFIG['display_next'])
	$OUTPUT->set_env('display_next', true);
	if ($MESSAGE->headers->others['list-post'])
	$OUTPUT->set_env('list_post', true);
	if ($CONFIG['forward_attachment'])
	$OUTPUT->set_env('forward_attachment', true);

	if (!$OUTPUT->ajax_call)
	$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
	'movingmessage', 'deletingmessage', 'markingmessage');

	// check for unset disposition notification
	if ($MESSAGE->headers->mdn_to
	&& empty($MESSAGE->headers->flags['MDNSENT'])
	&& empty($MESSAGE->headers->flags['SEEN'])
	&& ($RCMAIL->storage->check_permflag('MDNSENT') \|\| $RCMAIL->storage->check_permflag('*'))
	&& $mbox_name != $CONFIG['drafts_mbox']
	&& $mbox_name != $CONFIG['sent_mbox']
	) {
	$mdn_cfg = intval($CONFIG['mdn_requests']);

	if ($mdn_cfg == 1 \|\| (($mdn_cfg == 3 \|\| $mdn_cfg == 4) && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
	// Send MDN
	if (rcmail_send_mdn($MESSAGE, $smtp_error))
	$OUTPUT->show_message('receiptsent', 'confirmation');
	else if ($smtp_error)
	$OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
	else
	$OUTPUT->show_message('errorsendingreceipt', 'error');
	}
	else if ($mdn_cfg != 2 && $mdn_cfg != 4) {
	// Ask user
	$OUTPUT->add_label('mdnrequest');
	$OUTPUT->set_env('mdn_request', true);
	}
	}

	if (empty($MESSAGE->headers->flags['SEEN'])
	&& ($RCMAIL->action == 'show' \|\| ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0))
	) {
	$RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid,
	'mailbox' => $mbox_name, 'message' => $MESSAGE));
	}
	}



	function rcmail_message_attachments($attrib)
	{
	global $PRINT_MODE, $MESSAGE, $RCMAIL;

	$out = $ol = '';

	if (sizeof($MESSAGE->attachments)) {
	foreach ($MESSAGE->attachments as $attach_prop) {
	$filename = $attach_prop->filename;
	if (empty($filename) && $attach_prop->mimetype == 'text/html') {
	$filename = rcube_label('htmlmessage');
	}

	if ($PRINT_MODE) {
	$size = $RCMAIL->message_part_size($attach_prop);
	$ol .= html::tag('li', null, Q(sprintf("%s (%s)", $filename, $size)));
	}
	else {
	if (mb_strlen($filename) > 50) {
	$filename = abbreviate_string($filename, 50);
	$title = $filename;
	}
	else {
	$title = '';
	}

	$ol .= html::tag('li', rcmail_filetype2classname($attach_prop->mimetype, $filename),
	html::a(array(
	'href' => $MESSAGE->get_part_url($attach_prop->mime_id, false),
	'onclick' => sprintf(
	'return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)',
	JS_OBJECT_NAME,
	$attach_prop->mime_id,
	rcmail_fix_mimetype($attach_prop->mimetype)),
	'title' => Q($title),
	),
	Q($filename)));
	}
	}

	$out = html::tag('ul', $attrib, $ol, html::$common_attrib);
	}

	return $out;
	}

	function rcmail_remote_objects_msg()
	{
	global $MESSAGE, $RCMAIL;

	$attrib['id'] = 'remote-objects-message';
	$attrib['class'] = 'notice';
	$attrib['style'] = 'display: none';

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

	function rcmail_message_buttons()
	{
	global $MESSAGE, $RCMAIL, $CONFIG;

	$mbox = $RCMAIL->storage->get_folder();
	$delim = $RCMAIL->storage->get_hierarchy_delimiter();
	$dbox = $CONFIG['drafts_mbox'];

	// the message is not a draft
	if ($mbox != $dbox && strpos($mbox, $dbox.$delim) !== 0) {
	return '';
	}

	$attrib['id'] = 'message-buttons';
	$attrib['class'] = 'notice';

	$msg = Q(rcube_label('isdraft')) . ' ';
	$msg .= html::a(array('href' => "#edit", 'onclick' => JS_OBJECT_NAME.".command('edit')"), Q(rcube_label('edit')));

	return html::div($attrib, $msg);
	}

	function rcmail_message_objects($attrib)
	{
	global $RCMAIL, $MESSAGE;

	if (!$attrib['id'])
	$attrib['id'] = 'message-objects';

	$content = array(
	rcmail_message_buttons(),
	rcmail_remote_objects_msg(),
	);

	$plugin = $RCMAIL->plugins->exec_hook('message_objects',
	array('content' => $content, 'message' => $MESSAGE));

	$content = implode("\n", $plugin['content']);

	return html::div($attrib, $content);
	}

	function rcmail_contact_exists($email)
	{
	global $RCMAIL;

	if ($email) {
	// @TODO: search in all address books?
	$CONTACTS = $RCMAIL->get_address_book(-1, true);
	$existing = $CONTACTS->search('email', $email, true, false);
	if ($existing->count)
	return true;
	}

	return false;
	}

	function rcmail_message_contactphoto($attrib)
	{
	global $RCMAIL, $MESSAGE;

	$placeholder = $attrib['placeholder'] ? $RCMAIL->config->get('skin_path') . $attrib['placeholder'] : null;
	if ($MESSAGE->sender)
	$photo_img = $RCMAIL->url(array('_task' => 'addressbook', '_action' => 'photo', '_email' => $MESSAGE->sender['mailto'], '_alt' => $placeholder));
	else
	$photo_img = $placeholder ? $placeholder : 'program/resources/blank.gif';

	return html::img(array('src' => $photo_img) + $attrib);
	}


	$OUTPUT->add_handlers(array(
	'messageattachments' => 'rcmail_message_attachments',
	'mailboxname' => 'rcmail_mailbox_name_display',
	'messageobjects' => 'rcmail_message_objects',
	'contactphoto' => 'rcmail_message_contactphoto',
	));


	if ($RCMAIL->action=='print' && $OUTPUT->template_exists('messageprint'))
	$OUTPUT->send('messageprint', false);
	else if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
	$OUTPUT->send('messagepreview', false);
	else
	$OUTPUT->send('message', false);


	// mark message as read
	if ($MESSAGE && $MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN']) &&
	($RCMAIL->action == 'show' \|\| ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0)))
	{
	if ($RCMAIL->storage->set_flag($MESSAGE->uid, 'SEEN')) {
	if ($count = rcmail_get_unseen_count($mbox_name)) {
	rcmail_set_unseen_count($mbox_name, $count - 1);
	}
	}
	}

	exit;

	diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
	index ba42e81f7..d5ccbb2d7 100644
	--- a/program/steps/settings/func.inc
	+++ b/program/steps/settings/func.inc
	@@ -1,989 +1,1011 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Provide functionality for user's settings & preferences \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	if (!$OUTPUT->ajax_call)
	$OUTPUT->set_pagetitle(rcube_label('preferences'));


	// similar function as /steps/settings/identities.inc::rcmail_identity_frame()
	function rcmail_preferences_frame($attrib)
	{
	global $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmprefsframe';

	$attrib['name'] = $attrib['id'];

	$OUTPUT->set_env('contentframe', $attrib['name']);
	$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');

	return html::iframe($attrib);
	}


	function rcmail_sections_list($attrib)
	{
	global $RCMAIL;

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmsectionslist';

	list($list, $cols) = rcmail_user_prefs();

	// create XHTML table
	$out = rcube_table_output($attrib, $list, $cols, 'id');

	// set client env
	$RCMAIL->output->add_gui_object('sectionslist', $attrib['id']);
	$RCMAIL->output->include_script('list.js');

	return $out;
	}


	function rcmail_identities_list($attrib)
	{
	global $OUTPUT, $RCMAIL;

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmIdentitiesList';

	// get identities list and define 'mail' column
	$list = $RCMAIL->user->list_identities();
	foreach ($list as $idx => $row)
	$list[$idx]['mail'] = trim($row['name'] . ' <' . rcube_idn_to_utf8($row['email']) .'>');

	// get all identites from DB and define list of cols to be displayed
	$plugin = $RCMAIL->plugins->exec_hook('identities_list', array(
	'list' => $list,
	'cols' => array('mail')));

	// @TODO: use <UL> instead of <TABLE> for identities list
	// create XHTML table
	$out = rcube_table_output($attrib, $plugin['list'], $plugin['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, $id = null, $hidden = null)
	{
	global $EDIT_FORM, $RCMAIL;

	$form_start = $form_end = '';

	if (empty($EDIT_FORM)) {
	$request_key = $action . (isset($id) ? '.'.$id : '');
	$form_start = $RCMAIL->output->request_form(array(
	'name' => 'form',
	'method' => 'post',
	'task' => $RCMAIL->task,
	'action' => $action,
	'request' => $request_key,
	'noclose' => true
	) + $attrib);

	if (is_array($hidden)) {
	$hiddenfields = new html_hiddenfield($hidden);
	$form_start .= $hiddenfields->show();
	}

	$form_end = !strlen($attrib['form']) ? '</form>' : '';

	$EDIT_FORM = !empty($attrib['form']) ? $attrib['form'] : 'form';
	$RCMAIL->output->add_gui_object('editform', $EDIT_FORM);
	}

	return array($form_start, $form_end);
	}


	function rcmail_user_prefs($current=null)
	{
	global $RCMAIL;

	$sections['general'] = array('id' => 'general', 'section' => rcube_label('uisettings'));
	$sections['mailbox'] = array('id' => 'mailbox', 'section' => rcube_label('mailboxview'));
	- $sections['compose'] = array('id' => 'compose', 'section' => rcube_label('messagescomposition'));
	$sections['mailview'] = array('id' => 'mailview','section' => rcube_label('messagesdisplaying'));
	+ $sections['compose'] = array('id' => 'compose', 'section' => rcube_label('messagescomposition'));
	$sections['addressbook'] = array('id' => 'addressbook','section' => rcube_label('addressbook'));
	$sections['folders'] = array('id' => 'folders', 'section' => rcube_label('specialfolders'));
	$sections['server'] = array('id' => 'server', 'section' => rcube_label('serversettings'));

	// hook + define list cols
	$plugin = $RCMAIL->plugins->exec_hook('preferences_sections_list',
	array('list' => $sections, 'cols' => array('section')));

	$sections = $plugin['list'];

	$config = $RCMAIL->config->all();
	$no_override = array_flip($RCMAIL->config->get('dont_override', array()));

	foreach ($sections as $idx => $sect) {

	if ($current && $sect['id'] != $current)
	continue;

	$blocks = array();

	switch ($sect['id']) {
	// general
	case 'general':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	);

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

	$blocks['main']['options']['language'] = array(
	'title' => html::label($field_id, Q(rcube_label('language'))),
	'content' => $select_lang->show($RCMAIL->user->language),
	);
	}

	// timezone selection
	if (!isset($no_override['timezone'])) {
	$field_id = 'rcmfd_timezone';
	$select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id));
	$select_timezone->add(rcube_label('autodetect'), 'auto');

	$zones = array();
	foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
	try {
	$tz = new DateTimeZone($tzs);
	$date = new DateTime('2012-12-21', $tz);
	$offset = $date->format('Z') + 45000;
	$sortkey = sprintf('%06d.%s', $offset, $tzs);
	$zones[$sortkey] = array($tzs, $date->format('P'));
	}
	catch (Exception $e) {}
	}

	ksort($zones);
	foreach ($zones as $zone) {
	list($tzs, $offset) = $zone;
	$select_timezone->add('(GMT ' . $offset . ') ' . strtr($tzs, '_', ' '), $tzs);
	}

	$blocks['main']['options']['timezone'] = array(
	'title' => html::label($field_id, Q(rcube_label('timezone'))),
	'content' => $select_timezone->show((string)$config['timezone']),
	);
	}

	// date/time formatting
	if (!isset($no_override['time_format'])) {
	$reftime = mktime(7,30,0);
	$field_id = 'rcmfd_time_format';
	$select_time = new html_select(array('name' => '_time_format', 'id' => $field_id));
	foreach ((array)$RCMAIL->config->get('time_formats', array('G:i', 'H:i', 'g:i a', 'h:i A')) as $choice)
	$select_time->add(date($choice, $reftime), $choice);

	$blocks['main']['options']['time_format'] = array(
	'title' => html::label($field_id, Q(rcube_label('timeformat'))),
	'content' => $select_time->show($RCMAIL->config->get('time_format')),
	);
	}

	if (!isset($no_override['date_format'])) {
	$refdate = mktime(12,30,0,7,24);
	$field_id = 'rcmfd_date_format';
	$select_date = new html_select(array('name' => '_date_format', 'id' => $field_id));
	foreach ((array)$RCMAIL->config->get('date_formats', array('Y-m-d','d-m-Y','Y/m/d','m/d/Y','d/m/Y','d.m.Y','j.n.Y')) as $choice)
	$select_date->add(date($choice, $refdate), $choice);

	$blocks['main']['options']['date_format'] = array(
	'title' => html::label($field_id, Q(rcube_label('dateformat'))),
	'content' => $select_date->show($config['date_format']),
	);
	}

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

	$blocks['main']['options']['prettydate'] = array(
	'title' => html::label($field_id, Q(rcube_label('prettydate'))),
	'content' => $input_prettydate->show($config['prettydate']?1:0),
	);
	}

	// 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_radiobutton(array('name'=>'_skin'));

	$blocks['skin'] = array('name' => Q(rcube_label('skin')),);

	foreach($skins as $skin) {
	$thumbnail = "./skins/$skin/thumbnail.png";
	if (!is_file($thumbnail))
	$thumbnail = './program/resources/blank.gif';

	$skinname = ucfirst($skin);
	$author_link = $license_link = '';
	$meta = @json_decode(@file_get_contents("./skins/$skin/meta.json"), true);
	if (is_array($meta) && $meta['name']) {
	$skinname = $meta['name'];
	$author_link = $meta['url'] ? html::a(array('href' => $meta['url'], 'target' => '_blank'), Q($meta['author'])) : Q($meta['author']);
	$license_link = $meta['license-url'] ? html::a(array('href' => $meta['license-url'], 'target' => '_blank'), Q($meta['license'])) : Q($meta['license']);
	}

	$blocks['skin']['options'][$skin]['content'] = html::label(array('class' => 'skinselection'),
	html::span('skinitem', $input_skin->show($config['skin'], array('value' => $skin, 'id' => $field_id.$skin))) .
	html::span('skinitem', html::img(array('src' => $thumbnail, 'class' => 'skinthumbnail', 'alt' => $skin, 'width' => 64, 'height' => 64))) .
	html::span('skinitem', html::span('skinname', Q($skinname)) . html::br() .
	html::span('skinauthor', $author_link ? 'by ' . $author_link : '') . html::br() .
	html::span('skinlicense', $license_link ? rcube_label('license').': ' . $license_link : ''))
	);
	}
	}
	}

	$product_name = $RCMAIL->config->get('product_name', 'Roundcube Webmail');
	$RCMAIL->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');",
	JS_OBJECT_NAME, JQ($product_name)), 'foot');

	$blocks['browser'] = array(
	'name' => Q(rcube_label('browseroptions')),
	'options' => array('mailtoprotohandler' => array(
	'content' => html::a(array(
	'href' => '#',
	'id' => 'mailtoprotohandler'), Q(rcube_label('mailtoprotohandler'))),
	)),
	);

	break;

	// Mailbox view (mail screen)
	case 'mailbox':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'new_message' => array('name' => Q(rcube_label('newmessage'))),
	);

	// 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,
	'onchange' => "$('#rcmfd_preview_pane_mark_read').prop('disabled', !this.checked)"));

	$blocks['main']['options']['preview_pane'] = array(
	'title' => html::label($field_id, Q(rcube_label('previewpane'))),
	'content' => $input_preview->show($config['preview_pane']?1:0),
	);
	}

	// show config parameter for preview pane auto mark as read delay
	if (!isset($no_override['preview_pane_mark_read'])) {
	// apply default if config option is not set at all
	$config['preview_pane_mark_read'] = $RCMAIL->config->get('preview_pane_mark_read', 0);

	$field_id = 'rcmfd_preview_pane_mark_read';
	$select_delay = new html_select(array('name' => '_preview_pane_mark_read', 'id' => $field_id,
	'disabled' => $config['preview_pane']?0:1));

	$select_delay->add(rcube_label('never'), '-1');
	$select_delay->add(rcube_label('immediately'), 0);
	foreach(array(5, 10, 20, 30) as $sec)
	$select_delay->add(rcube_label(array('name' => 'afternseconds', 'vars' => array('n' => $sec))), $sec);

	$blocks['main']['options']['preview_pane_mark_read'] = array(
	'title' => html::label($field_id, Q(rcube_label('previewpanemarkread'))),
	'content' => $select_delay->show(intval($config['preview_pane_mark_read'])),
	);
	}

	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('autosendknown'), 3);
	$select_mdn_requests->add(rcube_label('autosendknownignore'), 4);
	$select_mdn_requests->add(rcube_label('ignore'), 2);

	$blocks['main']['options']['mdn_requests'] = array(
	'title' => html::label($field_id, Q(rcube_label('mdnrequests'))),
	'content' => $select_mdn_requests->show($config['mdn_requests']),
	);
	}

	$storage = $RCMAIL->get_storage();
	$threading_supported = $storage->get_capability('THREAD');

	if (!isset($no_override['autoexpand_threads']) && $threading_supported) {
	$field_id = 'rcmfd_autoexpand_threads';
	$select_autoexpand_threads = new html_select(array('name' => '_autoexpand_threads', 'id' => $field_id));
	$select_autoexpand_threads->add(rcube_label('never'), 0);
	$select_autoexpand_threads->add(rcube_label('do_expand'), 1);
	$select_autoexpand_threads->add(rcube_label('expand_only_unread'), 2);

	$blocks['main']['options']['autoexpand_threads'] = array(
	'title' => html::label($field_id, Q(rcube_label('autoexpand_threads'))),
	'content' => $select_autoexpand_threads->show($config['autoexpand_threads']),
	);
	}

	// show page size selection
	if (!isset($no_override['mail_pagesize'])) {
	$field_id = 'rcmfd_mail_pagesize';
	$input_pagesize = new html_inputfield(array('name' => '_mail_pagesize', 'id' => $field_id, 'size' => 5));

	$size = intval($config['mail_pagesize'] ? $config['mail_pagesize'] : $config['pagesize']);

	$blocks['main']['options']['pagesize'] = array(
	'title' => html::label($field_id, Q(rcube_label('pagesize'))),
	'content' => $input_pagesize->show($size ? $size : 50),
	);
	}

	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' => 'everynminutes', 'vars' => array('n' => $min))), $min);
	}

	$blocks['new_message']['options']['keep_alive'] = array(
	'title' => html::label($field_id, Q(rcube_label('keepalive'))),
	'content' => $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));

	$blocks['new_message']['options']['check_all_folders'] = array(
	'title' => html::label($field_id, Q(rcube_label('checkallfolders'))),
	'content' => $input_check_all->show($config['check_all_folders']?1:0),
	);
	}

	break;

	// Message viewing
	case 'mailview':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	);

	+ // show checkbox to open message view in new window
	+ if (!isset($no_override['message_extwin'])) {
	+ $field_id = 'rcmfd_message_extwin';
	+ $input_msgextwin = new html_checkbox(array('name' => '_message_extwin', 'id' => $field_id, 'value' => 1));
	+
	+ $blocks['main']['options']['message_extwin'] = array(
	+ 'title' => html::label($field_id, Q(rcube_label('showinextwin'))),
	+ 'content' => $input_msgextwin->show($config['message_extwin']?1:0),
	+ );
	+ }
	+
	// 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' => "$('#rcmfd_show_images').prop('disabled', !this.checked).val(0)"));

	$blocks['main']['options']['prefer_html'] = array(
	'title' => html::label($field_id, Q(rcube_label('preferhtml'))),
	'content' => $input_preferhtml->show($config['prefer_html']?1:0),
	);
	}

	if (!isset($no_override['default_charset'])) {
	$field_id = 'rcmfd_default_charset';

	$blocks['main']['options']['default_charset'] = array(
	'title' => html::label($field_id, Q(rcube_label('defaultcharset'))),
	'content' => $RCMAIL->output->charset_selector(array(
	'name' => '_default_charset', 'selected' => $config['default_charset']
	))
	);
	}

	if (!isset($no_override['show_images'])) {
	$field_id = 'rcmfd_show_images';
	$input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id,
	'disabled' => !$config['prefer_html']));
	$input_show_images->add(rcube_label('never'), 0);
	$input_show_images->add(rcube_label('fromknownsenders'), 1);
	$input_show_images->add(rcube_label('always'), 2);

	$blocks['main']['options']['show_images'] = array(
	'title' => html::label($field_id, Q(rcube_label('showremoteimages'))),
	'content' => $input_show_images->show($config['prefer_html'] ? $config['show_images'] : 0),
	);
	}

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

	$blocks['main']['options']['inline_images'] = array(
	'title' => html::label($field_id, Q(rcube_label('showinlineimages'))),
	'content' => $input_inline_images->show($config['inline_images']?1:0),
	);
	}

	// "display after delete" checkbox
	if (!isset($no_override['display_next'])) {
	$field_id = 'rcmfd_displaynext';
	$input_displaynext = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['display_next'] = array(
	'title' => html::label($field_id, Q(rcube_label('displaynext'))),
	'content' => $input_displaynext->show($config['display_next']?1:0),
	);
	}

	break;

	// Mail composition
	case 'compose':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))),
	'sig' => array('name' => Q(rcube_label('signatureoptions'))),
	);

	+ // show checkbox to compose messages in a new window
	+ if (!isset($no_override['compose_extwin'])) {
	+ $field_id = 'rcmfdcompose_extwin';
	+ $input_compextwin = new html_checkbox(array('name' => '_compose_extwin', 'id' => $field_id, 'value' => 1));
	+
	+ $blocks['main']['options']['compose_extwin'] = array(
	+ 'title' => html::label($field_id, Q(rcube_label('composeextwin'))),
	+ 'content' => $input_compextwin->show($config['compose_extwin']?1:0),
	+ );
	+ }
	+
	if (!isset($no_override['htmleditor'])) {
	$field_id = 'rcmfd_htmleditor';
	$select_htmleditor = new html_select(array('name' => '_htmleditor', 'id' => $field_id));
	$select_htmleditor->add(rcube_label('never'), 0);
	$select_htmleditor->add(rcube_label('always'), 1);
	$select_htmleditor->add(rcube_label('htmlonreply'), 2);
	$select_htmleditor->add(rcube_label('htmlonreplyandforward'), 3);

	$blocks['main']['options']['htmleditor'] = array(
	'title' => html::label($field_id, Q(rcube_label('htmleditor'))),
	'content' => $select_htmleditor->show(intval($config['htmleditor'])),
	);
	}

	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(1, 3, 5, 10) as $i => $min)
	$select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60);

	$blocks['main']['options']['draft_autosave'] = array(
	'title' => html::label($field_id, Q(rcube_label('autosavedraft'))),
	'content' => $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);

	$blocks['main']['options']['mime_param_folding'] = array(
	'advanced' => true,
	'title' => html::label($field_id, Q(rcube_label('mimeparamfolding'))),
	'content' => $select_param_folding->show($config['mime_param_folding']),
	);
	}

	if (!isset($no_override['force_7bit'])) {
	$field_id = 'rcmfd_force_7bit';
	$input_7bit = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['force_7bit'] = array(
	'title' => html::label($field_id, Q(rcube_label('force7bit'))),
	'content' => $input_7bit->show($config['force_7bit']?1:0),
	);
	}

	if (!isset($no_override['mdn_default'])) {
	$field_id = 'rcmfd_mdn_default';
	$input_mdn = new html_checkbox(array('name' => '_mdn_default', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['mdn_default'] = array(
	'title' => html::label($field_id, Q(rcube_label('reqmdn'))),
	'content' => $input_mdn->show($config['mdn_default']?1:0),
	);
	}

	if (!isset($no_override['dsn_default'])) {
	$field_id = 'rcmfd_dsn_default';
	$input_dsn = new html_checkbox(array('name' => '_dsn_default', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['dsn_default'] = array(
	'title' => html::label($field_id, Q(rcube_label('reqdsn'))),
	'content' => $input_dsn->show($config['dsn_default']?1:0),
	);
	}

	if (!isset($no_override['reply_same_folder'])) {
	$field_id = 'rcmfd_reply_same_folder';
	$input_reply_same_folder = new html_checkbox(array('name' => '_reply_same_folder', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['reply_same_folder'] = array(
	'title' => html::label($field_id, Q(rcube_label('replysamefolder'))),
	'content' => $input_reply_same_folder->show($config['reply_same_folder']?1:0),
	);
	}

	if (!isset($no_override['reply_mode'])) {
	$field_id = 'rcmfd_reply_mode';
	$select_replymode = new html_select(array('name' => '_reply_mode', 'id' => $field_id,
	'onchange' => "\$('#rcmfd_sig_above').attr('disabled',this.selectedIndex<2)"));
	$select_replymode->add(rcube_label('replyempty'), -1);
	$select_replymode->add(rcube_label('replybottomposting'), 0);
	$select_replymode->add(rcube_label('replytopposting'), 1);

	$blocks['main']['options']['reply_mode'] = array(
	'title' => html::label($field_id, Q(rcube_label('whenreplying'))),
	'content' => $select_replymode->show(intval($config['reply_mode'])),
	);
	}

	if (!isset($no_override['spellcheck_before_send']) && $config['enable_spellcheck']) {
	$field_id = 'rcmfd_spellcheck_before_send';
	$input_spellcheck = new html_checkbox(array('name' => '_spellcheck_before_send', 'id' => $field_id, 'value' => 1));

	$blocks['spellcheck']['options']['spellcheck_before_send'] = array(
	'title' => html::label($field_id, Q(rcube_label('spellcheckbeforesend'))),
	'content' => $input_spellcheck->show($config['spellcheck_before_send']?1:0),
	);
	}

	if ($config['enable_spellcheck']) {
	foreach (array('syms', 'nums', 'caps') as $key) {
	$key = 'spellcheck_ignore_'.$key;
	if (!isset($no_override[$key])) {
	$input_spellcheck = new html_checkbox(array('name' => '_'.$key, 'id' => 'rcmfd_'.$key, 'value' => 1));

	$blocks['spellcheck']['options'][$key] = array(
	'title' => html::label($field_id, Q(rcube_label(str_replace('_', '', $key)))),
	'content' => $input_spellcheck->show($config[$key]?1:0),
	);
	}
	}
	}

	if (!isset($no_override['show_sig'])) {
	$field_id = 'rcmfd_show_sig';
	$select_show_sig = new html_select(array('name' => '_show_sig', 'id' => $field_id));
	$select_show_sig->add(rcube_label('never'), 0);
	$select_show_sig->add(rcube_label('always'), 1);
	$select_show_sig->add(rcube_label('newmessageonly'), 2);
	$select_show_sig->add(rcube_label('replyandforwardonly'), 3);

	$blocks['sig']['options']['show_sig'] = array(
	'title' => html::label($field_id, Q(rcube_label('autoaddsignature'))),
	'content' => $select_show_sig->show($RCMAIL->config->get('show_sig', 1)),
	);
	}

	if (!isset($no_override['sig_above'])) {
	$field_id = 'rcmfd_sig_above';
	$select_sigabove = new html_select(array('name' => '_sig_above', 'id' => $field_id, 'disabled' => $config['reply_mode'] < 1));
	$select_sigabove->add(rcube_label('belowquote'), 0);
	$select_sigabove->add(rcube_label('abovequote'), 1);

	$blocks['sig']['options']['sig_above'] = array(
	'title' => html::label($field_id, Q(rcube_label('replysignaturepos'))),
	'content' => $select_sigabove->show($config['sig_above']?1:0),
	);
	}

	if (!isset($no_override['strip_existing_sig'])) {
	$field_id = 'rcmfd_strip_existing_sig';
	$input_stripexistingsig = new html_checkbox(array('name' => '_strip_existing_sig', 'id' => $field_id, 'value' => 1));

	$blocks['sig']['options']['strip_existing_sig'] = array(
	'title' => html::label($field_id, Q(rcube_label('replyremovesignature'))),
	'content' => $input_stripexistingsig->show($config['strip_existing_sig']?1:0),
	);
	}

	if (!isset($no_override['forward_attachment'])) {
	$field_id = 'rcmfd_forward_attachment';
	$select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id));
	$select->add(rcube_label('inline'), 0);
	$select->add(rcube_label('asattachment'), 1);

	$blocks['main']['options']['forward_attachment'] = array(
	'title' => html::label($field_id, Q(rcube_label('forwardmode'))),
	'content' => $select->show(intval($config['forward_attachment'])),
	);
	}

	if (!isset($no_override['default_font'])) {
	$field_id = 'rcmfd_default_font';
	$fonts = rcube_fontdefs();
	$default_font = $config['default_font'] ? $config['default_font'] : 'Verdana';

	$select = '<select name="_default_font" id="'.$field_id.'">';
	foreach ($fonts as $fname => $font)
	$select .= '<option value="'.$fname.'"'
	. ($fname == $default_font ? ' selected="selected"' : '')
	. ' style=\'font-family: ' . $font . '\'>'
	. Q($fname) . '</option>';
	$select .= '</select>';

	$blocks['main']['options']['default_font'] = array(
	'title' => html::label($field_id, Q(rcube_label('defaultfont'))),
	'content' => $select
	);
	}

	break;


	// Addressbook config
	case 'addressbook':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	);

	if (!isset($no_override['default_addressbook'])
	&& ($books = $RCMAIL->get_address_sources(true))
	) {
	$field_id = 'rcmfd_default_addressbook';
	$select_abook = new html_select(array('name' => '_default_addressbook', 'id' => $field_id));

	foreach ($books as $book) {
	$select_abook->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
	}

	$blocks['main']['options']['default_addressbook'] = array(
	'title' => html::label($field_id, Q(rcube_label('defaultaddressbook'))),
	'content' => $select_abook->show($config['default_addressbook']),
	);
	}

	// show addressbook listing mode selection
	if (!isset($no_override['addressbook_name_listing'])) {
	$field_id = 'rcmfd_addressbook_name_listing';
	$select_listing = new html_select(array('name' => '_addressbook_name_listing', 'id' => $field_id));
	$select_listing->add(rcube_label('name'), 0);
	$select_listing->add(rcube_label('firstname') . ' ' . rcube_label('surname'), 1);
	$select_listing->add(rcube_label('surname') . ' ' . rcube_label('firstname'), 2);
	$select_listing->add(rcube_label('surname') . ', ' . rcube_label('firstname'), 3);

	$blocks['main']['options']['list_name_listing'] = array(
	'title' => html::label($field_id, Q(rcube_label('listnamedisplay'))),
	'content' => $select_listing->show($config['addressbook_name_listing']),
	);
	}

	// show addressbook sort column
	if (!isset($no_override['addressbook_sort_col'])) {
	$field_id = 'rcmfd_addressbook_sort_col';
	$select_sort = new html_select(array('name' => '_addressbook_sort_col', 'id' => $field_id));
	$select_sort->add(rcube_label('name'), 'name');
	$select_sort->add(rcube_label('firstname'), 'firstname');
	$select_sort->add(rcube_label('surname'), 'surname');

	$blocks['main']['options']['sort_col'] = array(
	'title' => html::label($field_id, Q(rcube_label('listsorting'))),
	'content' => $select_sort->show($config['addressbook_sort_col']),
	);
	}

	// show addressbook page size selection
	if (!isset($no_override['addressbook_pagesize'])) {
	$field_id = 'rcmfd_addressbook_pagesize';
	$input_pagesize = new html_inputfield(array('name' => '_addressbook_pagesize', 'id' => $field_id, 'size' => 5));

	$size = intval($config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize']);

	$blocks['main']['options']['pagesize'] = array(
	'title' => html::label($field_id, Q(rcube_label('pagesize'))),
	'content' => $input_pagesize->show($size ? $size : 50),
	);
	}

	if (!isset($no_override['autocomplete_single'])) {
	$field_id = 'rcmfd_autocomplete_single';
	$checkbox = new html_checkbox(array('name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['autocomplete_single'] = array(
	'title' => html::label($field_id, Q(rcube_label('autocompletesingle'))),
	'content' => $checkbox->show($config['autocomplete_single']?1:0),
	);
	}

	break;

	// Special IMAP folders
	case 'folders':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	);

	// Configure special folders
	if (!isset($no_override['default_folders'])) {
	// load folders list only when needed
	if ($current) {
	$select = rcmail_mailbox_select(array(
	'noselection' => '---',
	'realnames' => true,
	'maxlength' => 30,
	'folder_filter' => 'mail',
	'folder_rights' => 'w',
	// #1486114, #1488279
	'onchange' => "if ($(this).val() == 'INBOX') $(this).val('')",
	));
	}
	else // dummy select
	$select = new html_select();

	if (!isset($no_override['drafts_mbox']))
	$blocks['main']['options']['drafts_mbox'] = array(
	'title' => Q(rcube_label('drafts')),
	'content' => $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox")),
	);

	if (!isset($no_override['sent_mbox']))
	$blocks['main']['options']['sent_mbox'] = array(
	'title' => Q(rcube_label('sent')),
	'content' => $select->show($config['sent_mbox'], array('name' => "_sent_mbox")),
	);

	if (!isset($no_override['junk_mbox']))
	$blocks['main']['options']['junk_mbox'] = array(
	'title' => Q(rcube_label('junk')),
	'content' => $select->show($config['junk_mbox'], array('name' => "_junk_mbox")),
	);

	if (!isset($no_override['trash_mbox']))
	$blocks['main']['options']['trash_mbox'] = array(
	'title' => Q(rcube_label('trash')),
	'content' => $select->show($config['trash_mbox'], array('name' => "_trash_mbox")),
	);
	}

	break;

	// Server settings
	case 'server':

	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'maintenance' => array('name' => Q(rcube_label('maintenance'))),
	);

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

	$blocks['main']['options']['read_when_deleted'] = array(
	'title' => html::label($field_id, Q(rcube_label('readwhendeleted'))),
	'content' => $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));

	$blocks['main']['options']['flag_for_deletion'] = array(
	'title' => html::label($field_id, Q(rcube_label('flagfordeletion'))),
	'content' => $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));

	$blocks['main']['options']['skip_deleted'] = array(
	'title' => html::label($field_id, Q(rcube_label('skipdeleted'))),
	'content' => $input_purge->show($config['skip_deleted']?1:0),
	);
	}

	if (!isset($no_override['delete_always'])) {
	$field_id = 'rcmfd_delete_always';
	$input_delete_always = new html_checkbox(array('name' => '_delete_always', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['delete_always'] = array(
	'title' => html::label($field_id, Q(rcube_label('deletealways'))),
	'content' => $input_delete_always->show($config['delete_always']?1:0),
	);
	}

	if (!isset($no_override['delete_junk'])) {
	$field_id = 'rcmfd_delete_junk';
	$input_delete_junk = new html_checkbox(array('name' => '_delete_junk', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['delete_junk'] = array(
	'title' => html::label($field_id, Q(rcube_label('deletejunk'))),
	'content' => $input_delete_junk->show($config['delete_junk']?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));

	$blocks['maintenance']['options']['logout_purge'] = array(
	'title' => html::label($field_id, Q(rcube_label('logoutclear'))),
	'content' => $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));

	$blocks['maintenance']['options']['logout_expunge'] = array(
	'title' => html::label($field_id, Q(rcube_label('logoutcompact'))),
	'content' => $input_expunge->show($config['logout_expunge']?1:0),
	);
	}

	break;
	}

	$data = $RCMAIL->plugins->exec_hook('preferences_list', array('section' => $sect['id'], 'blocks' => $blocks));
	$found = false;

	// create output
	foreach ($data['blocks'] as $block) {
	if (!empty($block['content']) \|\| !empty($block['options'])) {
	$found = true;
	break;
	}
	}

	if (!$found)
	unset($sections[$idx]);
	else
	$sections[$idx]['blocks'] = $data['blocks'];
	}

	return array($sections, $plugin['cols']);
	}


	function rcmail_get_skins()
	{
	$path = 'skins';
	$skins = array();

	$dir = opendir($path);

	if (!$dir)
	return false;

	while (($file = readdir($dir)) !== false)
	{
	$filename = $path.'/'.$file;
	if (!preg_match('/^\./', $file) && is_dir($filename) && is_readable($filename))
	$skins[] = $file;
	}

	closedir($dir);

	return $skins;
	}


	function rcmail_folder_options($mailbox)
	{
	global $RCMAIL;

	$options = $RCMAIL->get_storage()->folder_info($mailbox);
	$options['protected'] = $options['is_root'] \|\| ($options['special'] && $RCMAIL->config->get('protect_default_folders'));

	return $options;
	}

	/**
	* Updates (or creates) folder row in the subscriptions table
	*
	* @param string $name Folder name
	* @param string $oldname Old folder name (for update)
	* @param bool $subscribe Checks subscription checkbox
	* @param string $class CSS class name for folder row
	*/
	function rcmail_update_folder_row($name, $oldname=null, $subscribe=false, $class_name=null)
	{
	global $RCMAIL, $OUTPUT;

	$default_folders = (array) $RCMAIL->config->get('default_folders');
	$protect_folders = $RCMAIL->config->get('protect_default_folders');

	$storage = $RCMAIL->get_storage();
	$delimiter = $storage->get_hierarchy_delimiter();
	$name_utf8 = rcube_charset_convert($name, 'UTF7-IMAP');
	$protected = $protect_folders && in_array($name, $default_folders);

	$foldersplit = explode($delimiter, $storage->mod_folder($name));
	$level = count($foldersplit) - 1;
	$display_name = str_repeat('    ', $level)
	. Q($protected ? rcmail_localize_foldername($name) : rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP'));

	if ($oldname === null)
	$OUTPUT->command('add_folder_row', $name_utf8, $display_name, $protected, $subscribe,
	false, $class_name);
	else
	$OUTPUT->command('replace_folder_row', rcube_charset_convert($oldname, 'UTF7-IMAP'),
	$name_utf8, $display_name, $protected, $class_name);
	}


	// register UI objects
	$OUTPUT->add_handlers(array(
	'prefsframe' => 'rcmail_preferences_frame',
	'sectionslist' => 'rcmail_sections_list',
	'identitieslist' => 'rcmail_identities_list',
	));

	// register action aliases
	$RCMAIL->register_action_map(array(
	'folders' => 'folders.inc',
	'rename-folder' => 'folders.inc',
	'delete-folder' => 'folders.inc',
	'subscribe' => 'folders.inc',
	'unsubscribe' => 'folders.inc',
	'purge' => 'folders.inc',
	'folder-size' => 'folders.inc',
	'add-identity' => 'edit_identity.inc',
	));
	diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
	index d1627ecea..db7b134c4 100644
	--- a/program/steps/settings/save_prefs.inc
	+++ b/program/steps/settings/save_prefs.inc
	@@ -1,216 +1,218 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/save_prefs.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Save user preferences to DB and to the current session \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$CURR_SECTION = get_input_value('_section', RCUBE_INPUT_POST);

	$a_user_prefs = array();

	// set options for specified section
	switch ($CURR_SECTION)
	{
	case 'general':
	$a_user_prefs = array(
	'language' => isset($_POST['_language']) ? get_input_value('_language', RCUBE_INPUT_POST) : $CONFIG['language'],
	'timezone' => isset($_POST['_timezone']) ? get_input_value('_timezone', RCUBE_INPUT_POST) : $CONFIG['timezone'],
	'date_format' => isset($_POST['_date_format']) ? get_input_value('_date_format', RCUBE_INPUT_POST) : $CONFIG['date_format'],
	'time_format' => isset($_POST['_time_format']) ? get_input_value('_time_format', RCUBE_INPUT_POST) : ($CONFIG['time_format'] ? $CONFIG['time_format'] : 'H:i'),
	'prettydate' => isset($_POST['_pretty_date']) ? TRUE : FALSE,
	'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
	);

	// compose derived date/time format strings
	if ((isset($_POST['_date_format']) \|\| isset($_POST['_time_format'])) && $a_user_prefs['date_format'] && $a_user_prefs['time_format']) {
	$a_user_prefs['date_short'] = 'D ' . $a_user_prefs['time_format'];
	$a_user_prefs['date_long'] = $a_user_prefs['date_format'] . ' ' . $a_user_prefs['time_format'];
	}

	break;

	case 'mailbox':
	$a_user_prefs = array(
	'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
	'preview_pane_mark_read' => isset($_POST['_preview_pane_mark_read']) ? intval($_POST['_preview_pane_mark_read']) : $CONFIG['preview_pane_mark_read'],
	'autoexpand_threads' => isset($_POST['_autoexpand_threads']) ? intval($_POST['_autoexpand_threads']) : 0,
	'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 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,
	'mail_pagesize' => is_numeric($_POST['_mail_pagesize']) ? max(2, intval($_POST['_mail_pagesize'])) : $CONFIG['mail_pagesize'],
	);

	break;

	case 'mailview':
	$a_user_prefs = array(
	+ 'message_extwin' => intval($_POST['_message_extwin']),
	'prefer_html' => isset($_POST['_prefer_html']) ? TRUE : FALSE,
	'inline_images' => isset($_POST['_inline_images']) ? TRUE : FALSE,
	'show_images' => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0,
	'display_next' => isset($_POST['_display_next']) ? TRUE : FALSE,
	'default_charset' => get_input_value('_default_charset', RCUBE_INPUT_POST),
	);

	break;

	case 'compose':
	$a_user_prefs = array(
	+ 'compose_extwin' => intval($_POST['_compose_extwin']),
	'htmleditor' => intval($_POST['_htmleditor']),
	'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
	'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
	'force_7bit' => isset($_POST['_force_7bit']) ? TRUE : FALSE,
	'mdn_default' => isset($_POST['_mdn_default']) ? TRUE : FALSE,
	'dsn_default' => isset($_POST['_dsn_default']) ? TRUE : FALSE,
	'reply_same_folder' => isset($_POST['_reply_same_folder']) ? TRUE : FALSE,
	'spellcheck_before_send' => isset($_POST['_spellcheck_before_send']) ? TRUE : FALSE,
	'spellcheck_ignore_syms' => isset($_POST['_spellcheck_ignore_syms']) ? TRUE : FALSE,
	'spellcheck_ignore_nums' => isset($_POST['_spellcheck_ignore_nums']) ? TRUE : FALSE,
	'spellcheck_ignore_caps' => isset($_POST['_spellcheck_ignore_caps']) ? TRUE : FALSE,
	'show_sig' => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1,
	'reply_mode' => isset($_POST['_reply_mode']) ? intval($_POST['_reply_mode']) : 0,
	'strip_existing_sig' => isset($_POST['_strip_existing_sig']),
	'sig_above' => !empty($_POST['_sig_above']) && $_POST['_reply_mode'] > 0,
	'default_font' => get_input_value('_default_font', RCUBE_INPUT_POST),
	'forward_attachment' => !empty($_POST['_forward_attachment']),
	);

	break;

	case 'addressbook':
	$a_user_prefs = array(
	'default_addressbook' => get_input_value('_default_addressbook', RCUBE_INPUT_POST, true),
	'autocomplete_single' => isset($_POST['_autocomplete_single']) ? TRUE : FALSE,
	'addressbook_sort_col' => get_input_value('_addressbook_sort_col', RCUBE_INPUT_POST),
	'addressbook_name_listing' => intval(get_input_value('_addressbook_name_listing', RCUBE_INPUT_POST)),
	'addressbook_pagesize' => is_numeric($_POST['_addressbook_pagesize']) ? max(2, intval($_POST['_addressbook_pagesize'])) : $CONFIG['addressbook_pagesize'],
	);

	break;

	case 'server':
	$a_user_prefs = array(
	'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,
	'delete_always' => isset($_POST['_delete_always']) ? TRUE : FALSE,
	'delete_junk' => isset($_POST['_delete_junk']) ? TRUE : FALSE,
	'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE,
	'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
	);

	break;

	case 'folders':
	$a_user_prefs = array(
	'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST, true),
	'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST, true),
	'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST, true),
	'trash_mbox' => get_input_value('_trash_mbox', RCUBE_INPUT_POST, true),
	);

	break;
	}

	$plugin = rcmail::get_instance()->plugins->exec_hook('preferences_save',
	array('prefs' => $a_user_prefs, 'section' => $CURR_SECTION));

	$a_user_prefs = $plugin['prefs'];

	// don't override these parameters
	foreach ((array)$CONFIG['dont_override'] as $p)
	$a_user_prefs[$p] = $CONFIG[$p];


	// verify some options
	switch ($CURR_SECTION)
	{
	case 'general':

	// switch UI language
	if (isset($_POST['_language']) && $a_user_prefs['language'] != $_SESSION['language']) {
	$RCMAIL->load_language($a_user_prefs['language']);
	$OUTPUT->command('reload', 500);
	}

	// switch skin (if valid, otherwise unset the pref and fall back to default)
	if (!$OUTPUT->set_skin($a_user_prefs['skin']))
	unset($a_user_prefs['skin']);
	else if ($RCMAIL->config->get('skin') != $a_user_prefs['skin'])
	$OUTPUT->command('reload', 500);

	$a_user_prefs['timezone'] = (string) $a_user_prefs['timezone'];

	break;
	case 'mailbox':

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

	// force min size
	if ($a_user_prefs['mail_pagesize'] < 1)
	$a_user_prefs['mail_pagesize'] = 10;

	if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['mail_pagesize'] > $CONFIG['max_pagesize']))
	$a_user_prefs['mail_pagesize'] = (int) $CONFIG['max_pagesize'];

	break;
	case 'addressbook':

	// force min size
	if ($a_user_prefs['addressbook_pagesize'] < 1)
	$a_user_prefs['addressbook_pagesize'] = 10;

	if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['addressbook_pagesize'] > $CONFIG['max_pagesize']))
	$a_user_prefs['addressbook_pagesize'] = (int) $CONFIG['max_pagesize'];

	break;
	case 'folders':

	// special handling for 'default_folders'
	if (in_array('default_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_folders'] = array('INBOX');
	foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
	if ($a_user_prefs[$p])
	$a_user_prefs['default_folders'][] = $a_user_prefs[$p];
	}
	}

	break;
	}

	// Save preferences
	if (!$plugin['abort'])
	$saved = $RCMAIL->user->save_prefs($a_user_prefs);
	else
	$saved = $plugin['result'];

	if ($saved)
	$OUTPUT->show_message('successfullysaved', 'confirmation');
	else
	$OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');

	// display the form again
	rcmail_overwrite_action('edit-prefs');

	diff --git a/skins/classic/common.css b/skins/classic/common.css
	index 735a73614..8f5daee2e 100644
	--- a/skins/classic/common.css
	+++ b/skins/classic/common.css
	@@ -1,977 +1,982 @@
	/*** Roundcube\|Mail basic styles ***/

	body
	{
	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
	margin: 8px;
	background-color: #F6F6F6;
	color: #000;
	font-size: 12px;
	}

	body.iframe
	{
	margin: 20px 0 0 0;
	background-color: #FFF;
	}

	body.extwin
	{
	margin: 10px;
	}

	td, th, div, p, select, input, textarea
	{
	font-size: 12px;
	font-family: inherit;
	}

	th
	{
	font-weight: normal;
	}

	h3
	{
	font-size: 18px;
	}

	a, a:active, a:visited
	{
	color: #000;
	outline: none;
	}

	a.button, a.button:visited, a.tab, a.tab:visited, a.axislist
	{
	color: #000;
	text-decoration: none;
	}

	a.tab
	{
	width: 80px;
	display: block;
	text-align: center;
	}

	hr
	{
	height: 1px;
	background-color: #666;
	border-style: none;
	}

	input[type="text"],
	input[type="button"],
	input[type="password"],
	textarea
	{
	border: 1px solid #666;
	color: #333;
	background-color: #FFF;
	}

	input, textarea
	{
	color: black;
	padding: 1px 3px;
	}

	input.placeholder,
	textarea.placeholder,
	input:-moz-placeholder,
	textarea:-moz-placeholder
	{
	color: #aaa;
	}

	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.button[disabled],
	input.button[disabled]:hover
	{
	color: #aaa;
	border-color: #ccc;
	}

	input.mainaction
	{
	font-weight: bold;
	border: 1px solid #999;
	}

	img
	{
	border: 0;
	}

	.alttext
	{
	font-size: 11px;
	}

	.hint
	{
	color: #666;
	font-size: 11px;
	}

	.formlinks a,
	.formlinks a:visited
	{
	color: #CC0000;
	font-size: 11px;
	text-decoration: none;
	}

	.formlinks a.disabled,
	.formlinks a.disabled:visited
	{
	color: #999999;
	}

	/** common user interface objects */

	#mainscreen
	{
	position: absolute;
	top: 85px;
	right: 20px;
	bottom: 20px;
	left: 20px;
	}

	+.extwin #mainscreen
	+{
	+ top: 43px;
	+}
	+
	body > #logo
	{
	margin-left: 12px;
	cursor: pointer;
	}

	#taskbar
	{
	position: absolute;
	top: 0px;
	right: 0px;
	height: 24px;
	left: 250px;
	background: url(images/taskbar.png) top right no-repeat;
	padding: 10px 6px 5px 0px;
	text-align: right;
	white-space: nowrap;
	z-index: 2;
	}

	#taskbar a
	{
	font-size: 11px;
	color: #666666;
	text-decoration: none;
	padding: 6px 12px 6px 26px;
	background: url(images/taskicons.gif) no-repeat;
	}

	#taskbar a:hover
	{
	color: #333333;
	}

	#taskbar a.button-mail
	{
	background-position: 0 0;
	}

	#taskbar a.button-addressbook
	{
	background-position: 0 -25px;
	}

	#taskbar a.button-settings
	{
	background-position: 0 -50px;
	}

	#taskbar a.button-logout
	{
	background-position: 0 -75px;
	}

	body > #message
	{
	position: absolute;
	display: none;
	top: -1px;
	margin-left: -225px;
	left: 50%;
	z-index: 5000;
	opacity: 0.85;
	}

	body > #message div
	{
	width: 400px;
	margin: 0px;
	min-height: 22px;
	padding: 8px 10px 8px 46px;
	}

	body > #message div.notice,
	body > #messagebody .part-notice,
	#message-objects div.notice
	{
	background: url(images/display/icons.png) 6px 3px no-repeat;
	background-color: #F7FDCB;
	border: 1px solid #C2D071;
	}

	body > #message div.error,
	body > #message div.warning,
	#message-objects div.warning,
	#message-objects div.error
	{
	background: url(images/display/icons.png) 6px -97px no-repeat;
	background-color: #EF9398;
	border: 1px solid #DC5757;
	}

	body > #message div.confirmation,
	#message-objects div.confirmation
	{
	background: url(images/display/icons.png) 6px -47px no-repeat;
	background-color: #A6EF7B;
	border: 1px solid #76C83F;
	}

	body > #message div.loading,
	#message-objects div.loading
	{
	background: url(images/display/loading.gif) 6px 3px no-repeat;
	background-color: #EBEBEB;
	border: 1px solid #CCCCCC;
	}

	body > #message a
	{
	cursor: pointer;
	text-decoration: underline;
	}

	.box
	{
	border: 1px solid #999;
	}

	.boxtitle
	{
	height: 12px !important;
	padding: 2px 10px 5px 5px;
	border-bottom: 1px solid #999;
	color: #333;
	font-size: 11px;
	font-weight: bold;
	overflow: hidden;
	text-overflow: ellipsis;
	-o-text-overflow: ellipsis;
	white-space: nowrap;
	background: url(images/listheader.gif) top left repeat-x #CCC;
	}

	.boxtitle .rightalign
	{
	float: right;
	}

	body.iframe .boxtitle
	{
	position: fixed;
	top: 0;
	left: 0;
	width: 100%;
	}

	.boxcontent
	{
	padding: 15px 10px 10px 10px;
	background-color: #F2F2F2;
	}

	.boxcontent table td.title
	{
	color: #666;
	padding-right: 10px;
	}

	.boxlistcontent
	{
	position: absolute;
	top: 20px;
	bottom: 22px;
	left: 0;
	right: 0;
	width: 100%;
	overflow-y: auto;
	overflow-x: hidden;
	}

	.boxsubject
	{
	position: absolute;
	top: 0px;
	left: 0px;
	right: 0px;
	overflow: hidden;
	height: 22px;
	border-bottom: 1px solid #999;
	background: url(images/listheader.gif) top left repeat-x #CCC;
	}

	.boxfooter
	{
	position: absolute;
	bottom: 0px;
	left: 0px;
	right: 0px;
	overflow: hidden;
	height: 22px;
	border-top: 1px solid #999;
	background: url(images/listheader.gif) top left repeat-x #CCC;
	}

	.boxfooter a.button,
	.boxfooter a.buttonPas
	{
	display: block;
	float: left;
	width: 34px;
	height: 22px;
	padding: 0px;
	margin: 0;
	overflow: hidden;
	background: url(images/icons/groupactions.png) 0 0 no-repeat transparent;
	opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
	}

	.boxfooter a.groupactions
	{
	background-position: 0 -26px;
	}

	.boxfooter a.delgroup {
	background-position: 0 -49px;
	}

	.boxfooter a.buttonPas
	{
	opacity: 0.35;
	}

	.pagenav span
	{
	color: #444;
	font-size: 11px;
	text-shadow: white 1px 1px;
	white-space: nowrap;
	}

	.pagenav a.button,
	.pagenav a.buttonPas
	{
	display: block;
	float: left;
	width: 11px;
	height: 11px;
	padding: 0;
	margin: 1px;
	margin-top: 2px;
	overflow: hidden;
	background: url(images/pagenav.gif) 0 0 no-repeat transparent;
	opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
	}

	.pagenav a.buttonPas {
	opacity: 0.35;
	}

	.pagenav a.firstpageSel {
	background-position: 0 -11px;
	}

	.pagenav a.prevpage {
	background-position: -11px 0;
	}

	.pagenav a.prevpageSel {
	background-position: -11px -11px;
	}

	.pagenav a.nextpage {
	background-position: -22px 0;
	}

	.pagenav a.nextpageSel {
	background-position: -22px -11px;
	}

	.pagenav a.lastpage {
	background-position: -33px 0;
	}

	.pagenav a.lastpageSel {
	background-position: -33px -11px;
	}

	.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; cursor: row-resize;
	background-position: center 2px;
	}

	.splitter-v
	{
	cursor: e-resize; cursor: col-resize;
	background-position: 2px center;
	}

	.popupmenu
	{
	position: absolute;
	top: 32px;
	left: 90px;
	width: auto;
	display: none;
	background-color: #fff;
	background-color: rgba(255, 255, 255, 0.95);
	border: 1px solid #999;
	padding: 4px;
	z-index: 240;
	border-radius: 3px;
	-moz-border-radius: 3px;
	-webkit-border-radius: 3px;
	-moz-box-shadow: 1px 1px 12px #999;
	-webkit-box-shadow: #999 1px 1px 12px;
	}

	.popupmenu ul
	{
	margin: -4px 0;
	padding: 0;
	list-style: none;
	}

	.popupmenu ul li
	{
	font-size: 11px;
	white-space: nowrap;
	min-width: 100px;
	margin: 3px -4px;
	}

	.popupmenu li a
	{
	display: block;
	color: #a0a0a0;
	padding: 2px 10px;
	text-decoration: none;
	min-height: 14px;
	background: transparent;
	}

	.popupmenu li a.active,
	.popupmenu li a.active:active,
	.popupmenu li a.active:visited
	{
	color: #333;
	}

	.popupmenu li a.active:hover,
	.popupmenu.selectable li a.selected:hover
	{
	color: #fff;
	background-color: #c00;
	}

	.popupmenu li.block input
	{
	float: left;
	}

	.popupmenu.selectable li a.selected
	{
	background: url(images/messageicons.png) 2px -372px no-repeat;
	}

	.popupmenu.selectable li a
	{
	padding-left: 20px;
	}

	.darkbg
	{
	background-color: #F2F2F2 !important;
	}

	.dropbutton,
	.dropbutton span
	{
	float: left;
	height: 32px;
	}

	.dropbutton:hover
	{
	/* background: url(images/dbutton.png) 0 0 no-repeat transparent; */
	}

	.dropbutton span
	{
	width: 9px;
	background: url(images/dbutton.png) -53px 0 no-repeat transparent;
	}

	.dropbutton span:hover
	{
	cursor: pointer;
	background-position: -74px 0;
	}

	img.uploading
	{
	width: 16px;
	height: 16px;
	}

	/*** 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: url(images/listheader.gif) top left repeat-x #CCC;
	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: 10px;
	width: 190px;
	height: 20px;
	text-align: right;
	background: url(images/searchfield.gif) top left no-repeat;
	}

	#searchreset
	{
	position: absolute;
	top: 3px;
	right: 12px;
	text-decoration: none;
	}

	#searchmenulink
	{
	position: absolute;
	top: 3px;
	right: 168px;
	}

	#quicksearchbar img
	{
	vertical-align: middle;
	}

	#quicksearchbox
	{
	position: absolute;
	top: 2px;
	left: 24px;
	width: 140px;
	height: 15px;
	font-size: 11px;
	padding: 0px;
	border: none;
	}

	/*** roundcube webmail pre-defined classes ***/

	#rcmversion
	{
	position: absolute;
	bottom: 10px;
	right: 20px;
	text-align: right;
	white-space: nowrap;
	font-size: 8pt;
	color: #999;
	}

	#rcmdraglayer
	{
	min-width: 300px;
	width: auto !important;
	width: 300px;
	border: 1px solid #999999;
	background-color: #fff;
	padding-left: 8px;
	padding-right: 8px;
	padding-top: 3px;
	padding-bottom: 3px;
	font-size: 11px;
	white-space: nowrap;
	opacity: 0.82;
	border-radius: 3px;
	-moz-border-radius: 3px;
	-webkit-border-radius: 3px;
	-moz-box-shadow: 1px 1px 12px #999;
	-webkit-box-shadow: #999 1px 1px 12px;
	}

	.draglayercopy:before
	{
	position: absolute;
	bottom: -5px;
	left: -6px;
	content: " ";
	width: 14px;
	height: 14px;
	background: url(images/messageactions.png) -2px -128px no-repeat;
	}

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

	#login-form
	{
	margin-left: auto;
	margin-right: auto;
	margin-top: 50px;
	width: 400px;
	border: 1px solid #999;
	}

	#login-form table td.title
	{
	text-align: right;
	white-space: nowrap;
	}

	#login-form table
	{
	width: 1%;
	margin: auto;
	}

	#login-form table td.input input
	{
	width: 200px;
	}

	#login-bottomline
	{
	width: 400px;
	margin: 5em auto;
	font-size: 85%;
	text-align: center;
	color: #666;
	}

	#console
	{
	opacity: 0.8;
	}

	.disabled,
	a.disabled
	{
	color: #999;
	}

	font.bold
	{
	font-weight: bold;
	}


	/*** onclick menu list ***/

	ul.toolbarmenu
	{
	margin: -4px 0 -4px 0;
	padding: 0;
	list-style: none;
	}

	ul.toolbarmenu li
	{
	font-size: 11px;
	white-space: nowrap;
	min-width: 130px;
	margin: 2px -4px;
	}

	ul.toolbarmenu li a
	{
	display: block;
	color: #a0a0a0;
	padding: 1px 12px 3px 28px;
	text-decoration: none;
	min-height: 14px;
	}

	ul.toolbarmenu li a.active,
	ul.toolbarmenu li a.active:active,
	ul.toolbarmenu li a.active:visited
	{
	color: #333;
	}

	ul.toolbarmenu li input
	{
	vertical-align: middle;
	}

	ul.toolbarmenu li hr
	{
	color: #ccc;
	width: 130px;
	height: 1px;
	margin: 2px 1px 2px 1px;
	}

	ul.toolbarmenu li img
	{
	float: left;
	margin: 0 2px;
	}

	div.popupmenu ul li.separator_below,
	ul.toolbarmenu li.separator_below
	{
	border-bottom: 1px solid #ccc;
	margin-bottom: 2px;
	padding-bottom: 2px;
	}

	div.popupmenu ul li.separator_above,
	ul.toolbarmenu li.separator_above
	{
	border-top: 1px solid #ccc;
	margin-top: 2px;
	padding-top: 2px;
	}

	#searchmenu
	{
	width: 160px;
	}

	#searchmenu ul.toolbarmenu
	{
	margin: 0;
	}

	#searchmenu ul.toolbarmenu li
	{
	margin: 1px 4px 1px;
	}


	/*** tabbed interface elements ***/

	div.tabsbar,
	#tabsbar
	{
	position: absolute;
	top: 50px;
	left: 220px;
	right: 20px;
	height: 22px;
	border-bottom: 1px solid #999999;
	white-space: nowrap;
	}

	div.tabsbar
	{
	top: 35px;
	left: 12px;
	right: 12px;
	}

	span.tablink,
	span.tablink-selected
	{
	float: left;
	height: 23px !important;
	height: 22px;
	overflow: hidden;
	background: url(images/tabs-left.gif) top left no-repeat;
	}

	span.tablink
	{
	cursor: pointer;
	}

	span.tablink-selected
	{
	cursor: default;
	background-position: 0px -23px;
	}

	span.tablink a,
	span.tablink-selected a
	{
	display: inline-block;
	padding: 5px 10px 0 5px;
	margin-left: 5px;
	height: 23px;
	color: #555555;
	max-width: 185px;
	text-decoration: none;
	overflow: hidden;
	text-overflow: ellipsis;
	-o-text-overflow: ellipsis;
	background: url(images/tabs-right.gif) top right no-repeat;
	}

	span.tablink-selected a
	{
	cursor: inherit;
	color: #000000;
	background-position: right -23px;
	}

	fieldset
	{
	margin-bottom: 1em;
	border: 1px solid #999999;
	padding: 4px 8px 9px 8px;
	}

	legend
	{
	color: #999999;
	}

	fieldset.tabbed
	{
	margin-top: 22px;
	padding-top: 12px;
	}

	.quota_text {
	text-align: center;
	font-size: 10px;
	color: #666;
	border: 1px solid #999;
	cursor: default;
	}
	.quota_bg { background-color: white; }
	.quota_high { background: url(images/quota-colors.png) repeat-x 0 -28px #f90509; }
	.quota_mid { background: url(images/quota-colors.png) repeat-x 0 -14px #e3e909; }
	.quota_low { background: url(images/quota-colors.png) repeat-x 0 0px #05f905; }
	.quota_text_high { color: white; }
	.quota_text_mid { color: #666; }
	.quota_text_low { color: #666; }
	diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
	index 302e95002..eebb55708 100644
	--- a/skins/classic/includes/messagetoolbar.html
	+++ b/skins/classic/includes/messagetoolbar.html
	@@ -1,61 +1,63 @@
	<div id="messagetoolbar">
	-<roundcube:if condition="template:name == 'message'" />
	+<roundcube:if condition="template:name == 'message' && env:extwin" />
	+<roundcube:button command="close" type="link" class="button back" classAct="button back" classSel="button backSel" title="close" content=" " />
	+<roundcube:elseif condition="template:name == 'message'" />
	<roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
	<roundcube:else />
	<roundcube:button command="checkmail" type="link" class="button checkmail" classAct="button checkmail" classSel="button checkmailSel" title="checkmail" content=" " />
	-<roundcube:endif />
	<roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
	+<roundcube:endif />
	<roundcube:button command="reply" type="link" class="buttonPas reply" classAct="button reply" classSel="button replySel" title="replytomessage" content=" " />
	<span class="dropbutton">
	<roundcube:button command="reply-all" type="link" class="buttonPas replyAll" classAct="button replyAll" classSel="button replyAllSel" title="replytoallmessage" content=" " />
	<span id="replyallmenulink" onclick="rcmail_ui.show_popup('replyallmenu');return false"></span>
	</span>
	<span class="dropbutton">
	<roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " />
	<span id="forwardmenulink" onclick="rcmail_ui.show_popup('forwardmenu');return false"></span>
	</span>
	<roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletemessage" content=" " />
	<roundcube:container name="toolbar" id="messagetoolbar" />
	<roundcube:button name="markmenulink" id="markmenulink" type="link" class="button markmessage" title="markmessages" onclick="rcmail_ui.show_popup('markmenu');return false" content=" " />
	<roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="moreactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " />
	<roundcube:if condition="template:name == 'message'" />
	<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" folder_filter="mail" />
	<roundcube:endif />
	</div>

	<div id="forwardmenu" class="popupmenu">
	<ul>
	<li><roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
	<li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li>
	<roundcube:container name="forwardmenu" id="forwardmenu" />
	</ul>
	</div>

	<div id="replyallmenu" class="popupmenu">
	<ul>
	<li><roundcube:button command="reply-all" label="replyall" prop="sub" classAct="replyalllink active" class="replyalllink" /></li>
	<li><roundcube:button command="reply-list" label="replylist" prop="sub" classAct="replylistlink active" class="replylistlink" /></li>
	<roundcube:container name="replyallmenu" id="replyallmenu" />
	</ul>
	</div>

	<div id="messagemenu" class="popupmenu">
	<ul class="toolbarmenu">
	<li><roundcube:button class="printlink" command="print" label="printmessage" classAct="printlink active" /></li>
	<li><roundcube:button class="downloadlink" command="download" label="emlsave" classAct="downloadlink active" /></li>
	<li><roundcube:button class="editlink" command="edit" prop="new" label="editasnew" classAct="editlink active" /></li>
	<li class="separator_below"><roundcube:button class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /></li>
	<li><roundcube:button class="openlink" command="open" label="openinextwin" target="_blank" classAct="openlink active" /></li>
	<roundcube:container name="messagemenu" id="messagemenu" />
	</ul>
	</div>

	<div id="markmessagemenu" class="popupmenu">
	<ul class="toolbarmenu">
	<li><roundcube:button command="mark" prop="read" label="markread" classAct="readlink active" class="readlink" /></li>
	<li><roundcube:button command="mark" prop="unread" label="markunread" classAct="unreadlink active" class="unreadlink" /></li>
	<li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="flaggedlink active" class="flaggedlink" /></li>
	<li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="unflaggedlink active" class="unflaggedlink" /></li>
	<roundcube:container name="markmenu" id="markmessagemenu" />
	</ul>
	</div>
	diff --git a/skins/classic/mail.css b/skins/classic/mail.css
	index f899dbdfb..7408d49f1 100644
	--- a/skins/classic/mail.css
	+++ b/skins/classic/mail.css
	@@ -1,1537 +1,1554 @@
	/*** Roundcube\|Mail mail task styles ***/


	#messagetoolbar
	{
	position: absolute;
	top: 47px;
	left: 205px;
	right: 10px;
	height: 35px;
	min-width: 650px;
	white-space: nowrap;
	/* border: 1px solid #cccccc; */
	}

	+.extwin #messagetoolbar
	+{
	+ top: 5px;
	+ left: 20px;
	+}
	+
	#messagetoolbar a,
	#messagetoolbar select
	{
	display: block;
	float: left;
	padding-right: 10px;
	}

	#messagetoolbar a.button,
	#messagetoolbar a.buttonPas {
	display: block;
	float: left;
	width: 32px;
	height: 32px;
	padding: 0;
	margin: 0 5px;
	overflow: hidden;
	background: url(images/mail_toolbar.png) 0 0 no-repeat transparent;
	opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
	}

	#messagetoolbar a.buttonPas {
	opacity: 0.35;
	}

	#messagetoolbar a.button.selected {
	background-color: #ddd;
	margin-left: 4px;
	margin-right: 4px;
	margin-top: -1px;
	border: 1px solid #ccc;
	border-radius: 3px;
	-moz-border-radius: 3px;
	-webkit-border-radius: 3px;
	}

	#messagetoolbar a.checkmailSel {
	background-position: 0 -32px;
	}

	#messagetoolbar a.back {
	background-position: -32px 0;
	}

	#messagetoolbar a.backSel {
	background-position: -32px -32px;
	}

	#messagetoolbar a.compose {
	background-position: -64px 0;
	}

	#messagetoolbar a.composeSel {
	background-position: -64px -32px;
	}

	#messagetoolbar a.reply {
	background-position: -96px 0;
	}

	#messagetoolbar a.replySel {
	background-position: -96px -32px;
	}

	#messagetoolbar a.replyAll {
	background-position: -128px 0;
	}

	#messagetoolbar a.replyAllSel {
	background-position: -128px -32px;
	}

	#messagetoolbar a.forward {
	background-position: -160px 0;
	}

	#messagetoolbar a.forwardSel {
	background-position: -160px -32px;
	}

	#messagetoolbar a.delete {
	background-position: -192px 0;
	}

	#messagetoolbar a.deleteSel {
	background-position: -192px -32px;
	}

	#messagetoolbar a.markmessage {
	background-position: -256px 0;
	}

	#messagetoolbar a.messagemenu {
	background-position: -288px 0;
	}

	#messagetoolbar a.spellcheck {
	background-position: -384px 0;
	}

	#messagetoolbar a.spellcheckSel {
	background-position: -384px -32px;
	}

	#messagetoolbar a.attach {
	background-position: -352px 0;
	}

	#messagetoolbar a.attachSel {
	background-position: -352px -32px;
	}

	#messagetoolbar a.insertsig {
	background-position: -448px 0;
	}

	#messagetoolbar a.insertsigSel {
	background-position: -448px -32px;
	}

	#messagetoolbar a.savedraft {
	background-position: -322px 0;
	}

	#messagetoolbar a.savedraftSel {
	background-position: -322px -32px;
	}

	#messagetoolbar a.send {
	background-position: -416px 0;
	}

	#messagetoolbar a.sendSel {
	background-position: -416px -32px;
	}

	#messagetoolbar select.mboxlist
	{
	position: relative;
	margin: 0 8px;
	top: 7px;
	}

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

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

	#messagemenu li a.active:hover,
	#markmessagemenu li a.active:hover
	{
	color: #fff;
	background-color: #c00;
	}

	#messagemenu li a
	{
	background: url(images/messageactions.png) no-repeat 7px 0;
	background-position: 7px 20px;
	}

	#messagemenu li a.printlink
	{
	background-position: 7px 1px;
	}

	#messagemenu li a.downloadlink
	{
	background-position: 7px -17px;
	}

	#messagemenu li a.sourcelink
	{
	background-position: 7px -35px;
	}

	#messagemenu li a.openlink
	{
	background-position: 7px -53px;
	}

	#messagemenu li a.editlink
	{
	background-position: 7px -71px;
	}

	#markmessagemenu li a,
	#compose-attachments li a
	{
	background: url(images/messageicons.png) no-repeat;
	}

	#markmessagemenu li a.readlink
	{
	background-position: 7px -51px;
	}

	#markmessagemenu li a.unreadlink
	{
	background-position: 7px -119px;
	}

	#markmessagemenu li a.flaggedlink
	{
	background-position: 7px -153px;
	}

	#markmessagemenu li a.unflaggedlink
	{
	background-position: 7px -136px;
	}

	#searchfilter
	{
	white-space: nowrap;
	position: absolute;
	right: 198px;
	vertical-align: middle;
	}

	#searchfilter label
	{
	font-size: 11px;
	}

	#mailleftcontainer
	{
	position: absolute;
	top: 0;
	left: 0;
	bottom: 0;
	width: 195px;
	}

	#mailrightcontainer
	{
	position: absolute;
	top: 0;
	left: 170px;
	bottom: 0;
	right: 0;
	min-width: 600px;
	}

	#mailrightcontent
	{
	position: absolute;
	top: 0;
	left: 0;
	right: 0;
	bottom: 0;
	}

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

	#mailcontframe
	{
	position: absolute;
	width: 100%;
	top: 0;
	bottom: 0;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	overflow: hidden;
	}

	#mailpreviewframe
	{
	position: absolute;
	width: 100%;
	top: 205px;
	bottom: 0px;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	}

	#messagecontframe
	{
	position: relative;
	top: 0px;
	left: 0px;
	right: 0px;
	bottom: 0px;
	width: 100%;
	height: 100%;
	min-height: 100%; /* Chrome 14 bug */
	}

	#messagepartframe
	{
	width: 100%;
	height: 100%;
	min-height: 100%; /* Chrome 14 bug */
	border: 1px solid #999999;
	background-color: #F9F9F9;
	}


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

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

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


	/** mailbox list styles */

	#mailboxlist-container
	{
	position: absolute;
	top: 0;
	left: 0;
	width: 100%;
	bottom: 0;
	border: 1px solid #999;
	background-color: #F9F9F9;
	}

	#mailboxlist
	{
	position:relative;
	height: auto;
	margin: 0px;
	padding: 0px;
	list-style-image: none;
	list-style-type: none;
	overflow: hidden;
	white-space: nowrap;
	background-color: #FFF;
	}

	#mailboxlist li
	{
	display: block;
	position: relative;
	font-size: 11px;
	background: url(images/icons/folders.png) 5px 0 no-repeat;
	border-bottom: 1px solid #EBEBEB;
	}

	#mailboxlist li ul li:last-child
	{
	border-bottom: none;
	}

	#mailboxlist li div
	{
	position: absolute;
	left: 8px !important;
	left: -16px;
	top: 1px;
	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-position: 5px -18px;
	}

	#mailboxlist li.drafts
	{
	background-position: 5px -37px;
	}

	#mailboxlist li.sent
	{
	background-position: 5px -54px;
	}

	#mailboxlist li.junk
	{
	background-position: 5px -73px;
	}

	#mailboxlist li.trash
	{
	background-position: 5px -91px;
	}

	#mailboxlist li a
	{
	cursor: default;
	display: block;
	position: relative;
	padding-left: 25px;
	padding-top: 2px;
	padding-bottom: 2px;
	text-decoration: none;
	height: 15px;
	}

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

	#mailboxlist li.virtual > a
	{
	color: #666;
	}

	#mailboxlist li.recent > a
	{
	color: #0066FF;
	}

	#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: #FFF;
	color: blue;
	font-weight: normal;
	}

	#listcontrols
	{
	position: relative;
	white-space: nowrap;
	line-height: 22px;
	padding: 0 4px;
	width: auto;
	min-width: 300px;
	}

	#listcontrols a,
	#listcontrols span
	{
	display: block;
	float: left;
	font-size: 11px;
	}

	#listcontrols span input
	{
	vertical-align: middle;
	}

	#listcontrols a.button,
	#listcontrols a.buttonPas
	{
	display: block;
	float: left;
	width: 15px;
	height: 15px;
	padding: 0;
	margin-top: 4px;
	margin-right: 2px;
	overflow: hidden;
	background: url(images/mail_footer.png) 0 0 no-repeat transparent;
	opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
	}

	#listcontrols a.buttonPas
	{
	opacity: 0.35;
	}

	#listcontrols a.all {
	background-position: -30px 0;
	}

	#listcontrols a.allsel {
	background-position: -30px -15px;
	}

	#listcontrols a.page {
	background-position: -135px 0;
	}

	#listcontrols a.pagesel {
	background-position: -135px -15px;
	}

	#listcontrols a.unread {
	background-position: -45px 0;
	}

	#listcontrols a.unreadsel {
	background-position: -45px -15px;
	}

	#listcontrols a.invert {
	background-position: -60px 0;
	}

	#listcontrols a.invertsel {
	background-position: -60px -15px;
	}

	#listcontrols a.none {
	background-position: -75px 0;
	}

	#listcontrols a.nonesel {
	background-position: -75px -15px;
	}

	#listcontrols a.expand-all {
	background-position: -90px 0;
	}

	#listcontrols a.expand-allsel {
	background-position: -90px -15px;
	}

	#listcontrols a.collapse-all {
	background-position: -105px 0;
	}

	#listcontrols a.collapse-allsel {
	background-position: -105px -15px;
	}

	#listcontrols a.expand-unread {
	background-position: -120px 0;
	}

	#listcontrols a.expand-unreadsel {
	background-position: -120px -15px;
	}

	#countcontrols
	{
	position: absolute;
	top: 4px;
	right: 4px;
	white-space: nowrap;
	font-size: 11px;
	}

	#countcontrols a.button,
	#countcontrols a.buttonPas
	{
	float: right;
	}


	/** message list styles */

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

	#messagelist
	{
	width: 100%;
	display: table;
	table-layout: fixed;
	}

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

	#messagelist thead tr td.sortedASC,
	#messagelist thead tr td.sortedDESC
	{
	background-position: 0 -26px;
	}

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

	#messagelist thead tr td.sortedDESC a
	{
	background: url(images/icons/sort.gif) right -14px no-repeat;
	}

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

	#messagelist thead tr td.size
	{
	text-align: left;
	}

	#messagelist thead tr td.subject
	{
	padding-left: 18px;
	width: 99%;
	}

	#messagelist tbody tr td
	{
	height: 20px;
	padding: 0;
	font-size: 11px;
	overflow: hidden;
	vertical-align: middle;
	white-space: nowrap;
	text-overflow: ellipsis;
	-o-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 td img
	{
	vertical-align: middle;
	display: inline-block;
	}

	#messagelist tbody tr td.flag,
	#messagelist tbody tr td.status,
	#messagelist tbody tr td.subject span.status
	{
	cursor: pointer;
	}

	#messagelist tr td.flag span,
	#messagelist tr td.status span,
	#messagelist tr td.attachment span,
	#messagelist tr td.priority span
	{
	display: block;
	width: 15px;
	}

	#messagelist tr td div.collapsed,
	#messagelist tr td div.expanded,
	#messagelist tr td.threads div.listmenu,
	#messagelist tr td.attachment span.attachment,
	#messagelist tr td.attachment span.report,
	#messagelist tr td.priority span.priority,
	#messagelist tr td.priority span.prio1,
	#messagelist tr td.priority span.prio2,
	#messagelist tr td.priority span.prio3,
	#messagelist tr td.priority span.prio4,
	#messagelist tr td.priority span.prio5,
	#messagelist tr td.flag span.flagged,
	#messagelist tr td.flag span.unflagged,
	#messagelist tr td.flag span.unflagged:hover,
	#messagelist tr td.status span.status,
	#messagelist tr td.status span.msgicon,
	#messagelist tr td.status span.deleted,
	#messagelist tr td.status span.unread,
	#messagelist tr td.status span.unreadchildren,
	#messagelist tr td.subject span.msgicon,
	#messagelist tr td.subject span.deleted,
	#messagelist tr td.subject span.unread,
	#messagelist tr td.subject span.replied,
	#messagelist tr td.subject span.forwarded,
	#messagelist tr td.subject span.unreadchildren
	{
	display: inline-block;
	vertical-align: middle;
	height: 17px;
	width: 15px;
	background: url(images/messageicons.png) center no-repeat;
	}

	#messagelist tr td.attachment span.attachment
	{
	background-position: 0 -170px;
	}

	#messagelist tr td.attachment span.report
	{
	background-position: 0 -255px;
	}

	#messagelist tr td.priority span.priority
	{
	background-position: 0 -309px;
	}

	#messagelist tr td.priority span.prio5
	{
	background-position: 0 -358px;
	}

	#messagelist tr td.priority span.prio4
	{
	background-position: 0 -340px;
	}

	#messagelist tr td.priority span.prio3
	{
	background-position: 0 -324px;
	}

	#messagelist tr td.priority span.prio2
	{
	background-position: 0 -309px;
	}

	#messagelist tr td.priority span.prio1
	{
	background-position: 0 -290px;
	}

	#messagelist tr td.flag span.flagged
	{
	background-position: 0 -153px;
	}

	#messagelist tr td.flag span.unflagged:hover
	{
	background-position: 0 -136px;
	}

	#messagelist tr td.subject span.msgicon,
	#messagelist tr td.subject span.unreadchildren
	{
	background-position: 0 -51px;
	margin: 0 2px;
	}

	#messagelist tr td.subject span.replied
	{
	background-position: 0 -85px;
	}

	#messagelist tr td.subject span.forwarded
	{
	background-position: 0 -68px;
	}

	#messagelist tr td.subject span.replied.forwarded
	{
	background-position: 0 -102px;
	}

	#messagelist tr td.status span.msgicon,
	#messagelist tr td.flag span.unflagged,
	#messagelist tr td.status span.unreadchildren
	{
	background-position: 0 17px; /* no icon */
	}

	#messagelist tr td.status span.msgicon:hover
	{
	background-position: 0 -272px;
	}

	#messagelist tr td.status span.deleted,
	#messagelist tr td.subject span.deleted
	{
	background-position: 0 -187px;
	}

	#messagelist tr td.status span.status,
	#messagelist tr td.status span.unread,
	#messagelist tr td.subject span.unread
	{
	background-position: 0 -119px;
	}

	#messagelist tr td div.collapsed
	{
	background-position: 0 -221px;
	cursor: pointer;
	}

	#messagelist tr td div.expanded
	{
	background-position: 0 -204px;
	cursor: pointer;
	}

	#messagelist tr td.threads div.listmenu
	{
	background-position: 0 -238px;
	cursor: pointer;
	}

	#messagelist tbody tr td.subject
	{
	width: 99%;
	}

	#messagelist tbody tr td.subject a
	{
	cursor: default;
	vertical-align: middle; /* #1487091 */
	}

	/* thread parent message with unread children */
	#messagelist tbody tr.unroot td.subject a
	{
	text-decoration: underline;
	}

	#messagelist tr td.attachment,
	#messagelist tr td.threads,
	#messagelist tr td.status,
	#messagelist tr td.flag,
	#messagelist tr td.priority
	{
	width: 17px;
	padding: 0 0 0 2px;
	}

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

	#messagelist tr td.fromto,
	#messagelist tr td.from,
	#messagelist tr td.to,
	#messagelist tr td.cc,
	#messagelist tr td.replyto
	{
	width: 180px;
	padding: 0 2px;
	}

	#messagelist tr td.date
	{
	width: 118px;
	padding: 0 2px;
	}

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

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

	#listmenu
	{
	padding: 6px;
	}

	#listmenu legend
	{
	color: #999999;
	}

	#listmenu fieldset
	{
	border: 1px solid #999999;
	margin: 0 5px;
	float: left;
	}

	#listmenu div
	{
	padding: 8px 0 3px 0;
	text-align: center;
	clear: both;
	}

	/*** tree indicators ***/

	td span.branch div
	{
	float: left;
	height: 16px;
	}

	td span.branch div.tree
	{
	height: 17px;
	width: 15px;
	background: url(images/tree.gif) 0px 0px no-repeat;
	}

	td span.branch div.l1
	{
	background-position: 0px 0px; /* L */
	}

	td span.branch div.l2
	{
	background-position: -30px 0px; /* \| */
	}

	td span.branch div.l3
	{
	background-position: -15px 0px; /* \|- */
	}


	/** message view styles */

	#messageframe
	{
	position: absolute;
	top: 0;
	left: 180px;
	right: 0;
	bottom: 0;
	border: 1px solid #999;
	background-color: #FFF;
	overflow: auto;
	z-index: 1;
	}

	+.extwin #messageframe
	+{
	+ left: 0;
	+}
	+
	div.messageheaderbox
	{
	margin: -14px 8px 0px 8px;
	border: 1px solid #ccc;
	}

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

	#messagebody #full-headers,
	#messagebody table.headers-table
	{
	width: auto;
	margin: 6px 8px;
	background-color: #F4F4F4;
	}

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

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

	table.headers-table tr td.header
	{
	width: 99%;
	}

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

	table.headers-table tr td.header span
	{
	white-space: nowrap;
	}

	#attachment-list
	{
	margin: 0;
	padding: 0 4px 0 8px;
	min-height: 16px;
	list-style-image: none;
	list-style-type: none;
	background: url(images/icons/attachment.png) 4px 2px no-repeat #DFDFDF;
	}

	#messageframe #attachment-list
	{
	border-bottom: 1px solid #ccc;
	}

	.messageheaderbox #attachment-list
	{
	border-top: 1px solid #ccc;
	}

	#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,
	div.message-htmlpart
	{
	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;
	font-size: 12px;
	white-space: -moz-pre-wrap !important;
	white-space: pre-wrap !important;
	white-space: pre;
	}

	div.message-part span.sig
	{
	color: #666666;
	}

	div.message-part blockquote
	{
	color: blue;
	border-left: 2px solid blue;
	border-right: 2px solid blue;
	background-color: #F6F6F6;
	margin: 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 div.message-htmlpart
	{
	margin: 8px;
	}

	div.message-htmlpart div.rcmBody
	{
	margin: 8px;
	}

	#messagebody span.part-notice
	{
	display: block;
	}

	#message-objects div,
	#messagebody span.part-notice
	{
	margin: 8px;
	min-height: 20px;
	padding: 10px 10px 6px 46px;
	}

	#message-objects div a,
	#messagebody span.part-notice a
	{
	color: #666666;
	padding-left: 10px;
	}

	#message-objects div a:hover,
	#messagebody span.part-notice a:hover
	{
	color: #333333;
	}

	-#messageviewlink
	+#openextwinlink
	{
	position: absolute;
	top: 8px;
	right: 10px;
	width: 15px;
	height: 15px;
	border: 0;
	}

	+#compose-headers #openextwinlink
	+{
	+ top: 4px;
	+ right: 2px;
	+}
	+
	#full-headers
	{
	color: #666666;
	text-align: center;
	padding: 2px 6px;
	border-bottom: 1px solid #ccc;
	background-color: #EBEBEB;
	}

	.messageheaderbox #full-headers
	{
	border-bottom: 0;
	}

	div.more-headers
	{
	cursor: pointer;
	height: 8px;
	border-bottom: 0;
	}

	div.show-headers
	{
	background: url(images/icons/down_small.gif) no-repeat center;
	}

	div.hide-headers
	{
	background: url(images/icons/up_small.gif) no-repeat center;
	}

	#headers-source
	{
	margin: 2px 0;
	padding: 0.5em;
	height: 145px;
	background: white;
	overflow: auto;
	font-size: 11px;
	border: 1px solid #CCC;
	display: none;
	text-align: left;
	color: #333;
	}


	/** message compose styles */

	#compose-container
	{
	position: absolute;
	top: 0;
	left: 185px;
	right: 0;
	bottom: 0;
	margin: 0;
	}

	#compose-div
	{
	position: absolute;
	top: 85px;
	bottom: 0;
	margin: 0;
	width: 100%;
	}

	#compose-div .boxfooter
	{
	height: 22px;
	background: none;
	border-top: 0;
	}

	#compose-div .boxlistcontent
	{
	bottom: 23px;
	}

	#compose-body
	{
	position: absolute;
	left: 0;
	right: 0;
	top: 0;
	bottom: 0;
	margin: 0;
	font-size: 9pt;
	font-family: monospace;
	border: 1px solid #999;
	resize: none;
	}

	#compose-body_tbl
	{
	border: 1px solid #999;
	}

	#compose-body_tbl td
	{
	border: none;
	}

	#compose-body_tbl tr.mceFirst td.mceToolbar
	{
	border-bottom: 1px solid #ccc;
	}

	#compose-headers
	{
	width: 100%;
	}

	#compose-headers td.editfield
	{
	padding-right: 8px;
	width: 95%;
	}

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

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

	#compose-headers td textarea,
	#compose-headers td input
	{
	resize: none;
	width: 100%;
	border: 1px solid #999;
	}

	#compose-headers td textarea
	{
	height: 32px;
	}

	input.from_address
	{
	width: 80% !important;
	}

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

	#compose-editorfooter
	{
	position: absolute;
	right: 0;
	bottom: 0;
	text-align: right;
	}

	#compose-editorfooter label
	{
	font-size: 11px;
	font-weight: bold;
	color: #666;
	}

	#compose-buttons
	{
	position: absolute;
	left: 0;
	bottom: 0;
	width: auto;
	}

	#compose-attachments
	{
	position: absolute;
	top: 0;
	left: 0;
	bottom: 0;
	width: 175px;
	border: 1px solid #999;
	background-color: #F9F9F9;
	}

	#compose-attachments.droptarget.hover
	{
	background-color: #F0F0EE;
	box-shadow: 0 0 5px 0 #999;
	-moz-box-shadow: 0 0 5px 0 #999;
	-o-box-shadow: 0 0 5px 0 #999;
	}

	#compose-attachments ul
	{
	margin: 0px;
	padding: 0px;
	background-color: #FFF;
	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;
	text-overflow: ellipsis;
	-o-text-overflow: ellipsis;
	}

	#compose-attachments li a
	{
	text-indent: -5000px;
	width: 17px;
	height: 16px;
	display: inline-block;
	text-decoration: none;
	}

	#compose-attachments li img
	{
	vertical-align: middle;
	}

	#compose-attachments li a.delete,
	#compose-attachments li a.cancelupload
	{
	background-position: 0px -392px;
	}

	#compose-attachments li span
	{
	line-height: 18px;
	vertical-align: middle;
	}

	#attachment-form
	{
	padding: 6px;
	}

	#attachment-form div
	{
	padding: 2px;
	}

	#attachment-form div.buttons
	{
	margin-top: 4px;
	}

	#quota
	{
	position: absolute;
	top: 3px;
	right: 8px;
	width: 100px;
	}

	#quotaimg
	{
	position: absolute;
	top: 3px;
	right: 6px;
	z-index: 101;
	}
	diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html
	index 23998ee0f..e2164659c 100644
	--- a/skins/classic/templates/compose.html
	+++ b/skins/classic/templates/compose.html
	@@ -1,160 +1,168 @@
	<!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="productname" /> :: <roundcube:label name="compose" /></title>
	<roundcube:include file="/includes/links.html" />
	<roundcube:if condition="config:enable_spellcheck" />
	<link rel="stylesheet" type="text/css" href="/googiespell.css" />
	<roundcube:endif />
	<script type="text/javascript" src="/functions.js"></script>
	<script type="text/javascript" src="/splitter.js"></script>
	<style type="text/css">
	#compose-attachments { width: <roundcube:exp expression="!empty(cookie:composesplitterv) ? cookie:composesplitterv-5 : 175" />px; }
	#compose-container { left: <roundcube:exp expression="!empty(cookie:composesplitterv) ? cookie:composesplitterv+5 : 185" />px;
	<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:composesplitterv) ? cookie:composesplitterv+5 : 180).')+\\'px\\');') : ''" />
	}
	</style>
	</head>
	+<roundcube:if condition="env:extwin" />
	+<body class="extwin" onload="rcube_init_mail_ui()">
	+<roundcube:else />
	<body onload="rcube_init_mail_ui()">
	-
	<roundcube:include file="/includes/taskbar.html" />
	<roundcube:include file="/includes/header.html" />
	+<roundcube:endif />

	<form name="form" action="./" method="post">

	<div id="messagetoolbar">
	+<roundcube:if condition="env:extwin" />
	+ <roundcube:button command="close" type="link" class="button back" classAct="button back" classSel="button backSel" title="close" content=" " />
	+<roundcube:else />
	<roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
	+<roundcube:endif />
	<roundcube:button command="send" type="link" class="buttonPas send" classAct="button send" classSel="button sendSel" title="sendmessage" content=" " />
	<roundcube:if condition="config:enable_spellcheck" />
	<span class="dropbutton">
	<roundcube:button command="spellcheck" type="link" class="buttonPas spellcheck" classAct="button spellcheck" classSel="button spellcheckSel" title="checkspelling" content=" " />
	<span id="spellmenulink" onclick="rcmail_ui.show_popup('spellmenu');return false"></span>
	</span>
	<roundcube:endif />
	<roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attachSel" title="addattachment" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
	<roundcube:button command="insert-sig" type="link" class="buttonPas insertsig" classAct="button insertsig" classSel="button insertsigSel" title="insertsignature" content=" " />
	<roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " />
	<roundcube:container name="toolbar" id="compose-toolbar" />
	<roundcube:button name="messageoptions" id="composemenulink" type="link" class="button messagemenu" title="messageoptions" onclick="rcmail_ui.show_popup('composemenu', true);return false" content=" " />
	</div>

	<div id="mainscreen">

	<div id="compose-attachments">
	<div class="boxtitle"><roundcube:label name="attachments" /></div>
	<div class="boxlistcontent">
	<roundcube:object name="composeAttachmentList" id="attachmentslist" loadingIcon="/images/display/loading_blue.gif" />
	</div>
	<div class="boxfooter">
	<roundcube:button name="uploadmenulink" id="uploadmenulink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
	</div>
	</div>
	<roundcube:object name="fileDropArea" id="compose-attachments" />

	<script type="text/javascript">
	var composesplitv = new rcube_splitter({id:'composesplitterv', p1: 'compose-attachments', p2: 'compose-container', orientation: 'v', relative: true, start: 175});
	rcmail.add_onload('composesplitv.init()');
	</script>

	<div id="compose-container">
	<div id="compose-headers-div" style="width: 100%;">
	<table border="0" cellspacing="0" cellpadding="1" id="compose-headers">
	<tr>
	<td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
	<td class="editfield formlinks">
	<roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" />
	<a href="#identities" onclick="return rcmail.command('identities')"><roundcube:label name="editidents" /></a>
	+ <roundcube:button command="extwin" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="openextwinlink" condition="!env:extwin" />
	</td>
	</tr><tr>
	<td class="title top"><label for="_to"><roundcube:label name="to" /></label></td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="2" tabindex="2" /></td>
	</tr><tr id="compose-cc">
	<td class="title top">
	<a href="#cc" onclick="return rcmail_ui.hide_header_form('cc');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
	<label for="_cc"><roundcube:label name="cc" /></label>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="2" tabindex="3" /></td>
	</tr><tr id="compose-bcc">
	<td class="title top">
	<a href="#bcc" onclick="return rcmail_ui.hide_header_form('bcc');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
	<label for="_bcc"><roundcube:label name="bcc" /></label>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="2" tabindex="4" /></td>
	</tr><tr id="compose-replyto">
	<td class="title top">
	<a href="#replyto" onclick="return rcmail_ui.hide_header_form('replyto');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
	<label for="_replyto"><roundcube:label name="replyto" /></label>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td>
	</tr><tr id="compose-followupto">
	<td class="title top">
	<a href="#followupto" onclick="return rcmail_ui.hide_header_form('followupto');"><img src="/images/icons/minus.gif" alt="" width="13" height="11" title="<roundcube:label name='delete' />" /></a>
	<label for="_followupto"><roundcube:label name="followupto" /></label>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="followupto" form="form" id="_followupto" size="70" tabindex="7" /></td>
	</tr><tr>
	<td></td>
	<td class="formlinks">
	<a href="#cc" onclick="return rcmail_ui.show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a>
	<span class="separator">\|</span>
	<a href="#bcc" onclick="return rcmail_ui.show_header_form('bcc')" id="bcc-link"><roundcube:label name="addbcc" /></a>
	<span class="separator">\|</span>
	<a href="#reply-to" onclick="return rcmail_ui.show_header_form('replyto')" id="replyto-link"><roundcube:label name="addreplyto" /></a>
	<span class="separator">\|</span>
	<a href="#followup-to" onclick="return rcmail_ui.show_header_form('followupto')" id="followupto-link"><roundcube:label name="addfollowupto" /></a>
	</td>
	</tr><tr>
	<td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
	<td class="editfield"><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="8" /></td>
	</tr>
	</table>
	</div>
	<div id="compose-div">
	<div class="boxlistcontent" style="overflow: hidden; top: 0">
	<roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="9" />
	</div>
	<div class="boxfooter">
	<div id="compose-buttons">
	<roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="10" />
	<roundcube:button type="input" command="list" class="button" label="cancel" tabindex="11" />
	</div>
	<div id="compose-editorfooter">
	<roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
	<span>
	<label><roundcube:label name="editortype" /></label>
	<roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" />
	</span>
	<roundcube:endif />
	</div>
	</div>
	</div>
	</div>

	</div>

	<div id="composeoptionsmenu" class="popupmenu">
	<table>
	<tr>
	<td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td>
	<td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td>
	</tr><tr>
	<td><label for="rcmcomposedsn"><roundcube:label name="dsn" />:</label></td>
	<td><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /></td>
	</tr><tr>
	<td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td>
	<td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td>
	</tr><roundcube:if condition="!config:no_save_sent_messages" /><tr>
	<td><label><roundcube:label name="savesentmessagein" />:</label></td>
	<td><roundcube:object name="storetarget" maxlength="30" /></td>
	</tr><roundcube:endif />
	</table>
	</div>

	<div id="spellmenu" class="popupmenu selectable"></div>

	</form>

	<roundcube:object name="composeAttachmentForm" id="attachment-form" attachmentFieldSize="40" class="popupmenu" />

	</body>
	</html>
	diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html
	index c03376e4a..9b7cb9f1c 100644
	--- a/skins/classic/templates/message.html
	+++ b/skins/classic/templates/message.html
	@@ -1,59 +1,66 @@
	<!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" />
	<script type="text/javascript" src="/splitter.js"></script>
	<script type="text/javascript" src="/functions.js"></script>
	<style type="text/css">
	#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 170" />px; }
	#messageframe { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180" />px;
	<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180).')+\\'px\\');') : ''" />
	}
	</style>
	</head>
	+<roundcube:if condition="env:extwin" />
	+<body class="extwin" onload="rcube_init_mail_ui()">
	+<roundcube:else />
	<body onload="rcube_init_mail_ui()">

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

	<div id="mainscreen">
	+<roundcube:if condition="!env:extwin" />
	<div id="mailleftcontainer">
	<div id="mailboxlist-container">
	<div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div>
	<div class="boxlistcontent">
	<roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
	</div>
	<div class="boxfooter"></div>
	</div>
	</div>
	+<roundcube:endif />

	<div id="messageframe">
	<div class="boxlistcontent" style="top:0; overflow-x:auto">
	<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
	<roundcube:object name="messageFullHeaders" id="full-headers" />
	<roundcube:object name="messageAttachments" id="attachment-list" />
	<roundcube:object name="messageObjects" id="message-objects" />
	<roundcube:object name="messageBody" id="messagebody" />
	</div>
	<div class="boxfooter">
	<div id="countcontrols" class="pagenav">
	<roundcube:button command="lastmessage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastmessage" content=" " />
	<roundcube:button command="nextmessage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextmessage" content=" " />
	<roundcube:object name="messageCountDisplay" style="padding:0 .5em; float:right" />
	<roundcube:button command="previousmessage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previousmessage" content=" " />
	<roundcube:button command="firstmessage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstmessage" content=" " />
	</div>
	</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/classic/templates/messagepreview.html b/skins/classic/templates/messagepreview.html
	index a606311e1..78b2306f6 100644
	--- a/skins/classic/templates/messagepreview.html
	+++ b/skins/classic/templates/messagepreview.html
	@@ -1,20 +1,20 @@
	<!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" />
	</head>
	<body class="iframe">

	<div class="messageheaderbox">
	-<roundcube:button command="permaurl" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="messageviewlink" target="_blank" />
	+<roundcube:button command="extwin" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="openextwinlink" />
	<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
	<roundcube:object name="messageFullHeaders" id="full-headers" />
	<roundcube:object name="messageAttachments" id="attachment-list" />
	</div>

	<roundcube:object name="messageObjects" id="message-objects" />
	<roundcube:object name="messageBody" id="messagebody" />

	</body>
	</html>
	diff --git a/skins/larry/ie7hacks.css b/skins/larry/ie7hacks.css
	index 893ffdfef..f07d79a65 100644
	--- a/skins/larry/ie7hacks.css
	+++ b/skins/larry/ie7hacks.css
	@@ -1,189 +1,185 @@
	/**
	* Roundcube webmail CSS hacks for IE 7
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*/

	/* #1488618 */
	#mainscreen {
	height: expression((parseInt(document.documentElement.clientHeight)-108)+'px');
	}
	#mainscreen.offset {
	height: expression((parseInt(document.documentElement.clientHeight)-150)+'px');
	}

	input.button {
	display: inline;
	font-size: 90%;
	}

	a.iconbutton,
	a.deletebutton,
	.boxpagenav a.icon,
	.pagenav a.button span.inner,
	.boxfooter .listbutton .inner,
	.attachmentslist li a.delete,
	.attachmentslist li a.cancelupload,
	.previewheader .iconlink {
	/* workaround for text-indent which also offsets the background image */
	text-indent: 0;
	font-size: 0;
	line-height: 0;
	overflow: hidden;
	text-align: right;
	text-decoration: none;
	}

	.boxpagenav a.icon {
	color: #bbd3da;
	}

	.pagenav a.button,
	.pagenav a.button span.inner,
	.previewheader .iconlink,
	#uploadform a.iconlink {
	display: inline;
	}

	.pagenavbuttons {
	top: 4px;
	}

	.dropbutton .dropbuttontip {
	right: -2px;
	}

	#login-form .box-inner form {
	margin: 0;
	}

	#login-form #message div {
	float: left;
	display: block;
	width: 200px;
	margin-left: 130px;
	white-space: nowrap;
	text-align: left;
	}

	#messageheader.previewheader .iconlink {
	color: #fff;
	height: 14px;
	}

	#uploadform a.iconlink {
	text-indent: 0px;
	}

	.boxfooter .countdisplay {
	top: -12px;
	}

	ul.toolbarmenu li a {
	width: 140px;
	}

	#threadselectmenu li a {
	width: 160px;
	}

	#messagemenu li a {
	width: 170px;
	}

	#rcmKSearchpane {
	width: 400px;
	}
	#rcmKSearchpane ul li {
	width: 380px;
	text-overflow: ellipsis;
	}


	table.listing,
	table.records-table {
	display: block;
	width: auto;
	border-collapse: expression('separate', cellSpacing = '0');
	}

	.records-table tbody td span {
	white-space: nowrap;
	}

	table.listing {
	width: 100%;
	}

	ul.toolbarmenu li label {
	margin: 0;
	padding: 3px 8px;
	}

	#quicksearchbar input {
	padding-top: 4px;
	padding-bottom: 2px;
	}

	#messagelistfooter #listcontrols,
	#messagelistfooter #listselectors,
	#messagelistfooter #countcontrols,
	.pagenav .countdisplay {
	display: inline;
	}

	#messagelistfooter #countcontrols {
	position: relative;
	top: -4px;
	}

	#messagecontframe,
	#preferences-frame {
	position: absolute;
	left: 0;
	right: 0;
	top: 0;
	bottom: 0;
	}

	-#composeoptionsbox {
	- padding-top: 2px;
	-}
	-
	#composeoptionstoggle {
	display: inline;
	top: 3px;
	}

	.propform {
	margin: 0;
	}

	.propform fieldset legend {
	color: #333;
	margin-left: -5px;
	padding-left: 0;
	}

	.contactfieldgroup legend {
	margin-left: -14px;
	}

	.contactfieldcontent .contactfieldbutton {
	top: -6px;
	}

	.tabsbar {
	height: 15px;
	padding-bottom: 15px;
	}

	.tabsbar .tablink {
	padding: 0 1px 0 0;
	}

	diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css
	index 93f483c11..83ea946fa 100644
	--- a/skins/larry/iehacks.css
	+++ b/skins/larry/iehacks.css
	@@ -1,161 +1,157 @@
	/**
	* Roundcube webmail CSS hacks for IE < 9
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*
	* $Id$
	*/

	input.button {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
	}

	.formbuttons input.button {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7b7b7b', endColorstr='#606060', GradientType=0);
	}

	.formbuttons input.button:active {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5c5c5c', endColorstr='#7b7b7b', GradientType=0);
	}

	input.button.mainaction {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#505050', endColorstr='#2a2e31', GradientType=0);
	}

	input.button.mainaction:active {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#2a2e31', endColorstr='#505050', GradientType=0);
	}

	a.button {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
	}

	a.button.pressed,
	a.button:active,
	input.button:active {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e6e6e6', endColorstr='#f9f9f9', GradientType=0);
	}

	.pagenav.dark a.button {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d8d8d8', endColorstr='#bababa', GradientType=0);
	}

	.pagenav.dark a.button.pressed {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bababa', endColorstr='#d8d8d8', GradientType=0);
	}

	#message.statusbar {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eaeaea', endColorstr='#c8c8c8', GradientType=0);
	}

	.ui-dialog.popupmessage .ui-dialog-titlebar {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e3e3e3', endColorstr='#cfcfcf', GradientType=0);
	}

	.ui-dialog.popupmessage .ui-widget-content {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dcdcdc', GradientType=0);
	}

	#topnav {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#404040', endColorstr='#060606', GradientType=0);
	}

	.records-table tr.selected td {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', GradientType=0);
	}

	.contentbox .boxtitle,
	body.iframe .boxtitle {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dfdfdf', GradientType=0);
	}

	#login-form input.button {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e2e2e2', GradientType=0);
	}

	#login-form input.button:active {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dcdcdc', endColorstr='#f9f9f9', GradientType=0);
	}

	.toolbar a.button {
	filter: none;
	}

	a.menuselector {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#dddddd', GradientType=0);
	}

	a.menuselector:active {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd', endColorstr='#f8f8f8', GradientType=0);
	}

	.googie_list td.googie_list_onhover,
	ul.toolbarmenu li a.active:hover,
	#rcmKSearchpane ul li.selected {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00aad6', endColorstr='#008fc9', GradientType=0);
	}

	.tabsbar .tablink {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#d3d3d3 50%, #f8f8f8', GradientType=0);
	}

	.tabsbar .selected a {
	background-color: #fff;
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#efefef', GradientType=0);
	}

	.toolbar a.button.disabled,
	.boxpagenav a.icon.disabled,
	.pagenav a.button.disabled span.inner,
	.boxfooter .listbutton.disabled .inner,
	.dropbutton a.button.disabled + .dropbuttontip {
	background-image: url(images/buttons.gif);
	}

	/* addressbook.css */

	.contactfieldgroup {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7f7f7', endColorstr='#eeeeee', GradientType=0);
	}

	.contactfieldgroup legend {
	margin: -8px -8px 8px -8px;
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0f0f0', endColorstr='#d6d6d6', GradientType=0);
	}


	/* mail.css */

	#messagelistfooter {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb', endColorstr='#c6c6c6', GradientType=0);
	}

	#mailboxlist li.mailbox .unreadcount {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#82acb5', endColorstr='#6a939f', GradientType=0);
	}

	#mailboxlist li.mailbox.selected > a .unreadcount {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#005d76', endColorstr='#004558', GradientType=0);
	}

	#messageheader, #partheader, #composeheaders {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f0f0f0', GradientType=0);
	}

	-#previewheaderstoggle {
	+.moreheaderstoggle {
	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbfbfb', endColorstr='#e9e9e9', GradientType=1);
	}

	-#composeoptionsbox {
	- border-top: 1px solid #999;
	-}
	-
	#messagelist tbody tr td span.branch div {
	float: left;
	height: 18px;
	}
	diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png
	index 0d3b5cc7a..c70a96088 100644
	Binary files a/skins/larry/images/buttons.png and b/skins/larry/images/buttons.png differ
	diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
	index 9187c6f46..25bcc0b64 100644
	--- a/skins/larry/includes/header.html
	+++ b/skins/larry/includes/header.html
	@@ -1,28 +1,34 @@
	<div id="header">
	<div id="topline">
	<div class="topleft">
	<roundcube:button name="about" type="link" label="about" class="about-link" onclick="UI.show_about(this);return false" />
	<roundcube:if condition="config:support_url" />
	<a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link" id="supportlink"><roundcube:label name="support" /></a>
	<roundcube:endif />
	</div>
	<div class="topright">
	- <span class="username"><roundcube:object name="username" /></span>
	- <roundcube:button command="logout" label="logout" class="button-logout" />
	+ <roundcube:if condition="!env:extwin" />
	+ <span class="username"><roundcube:object name="username" /></span>
	+ <roundcube:button command="logout" label="logout" class="button-logout" />
	+ <roundcube:else />
	+ <roundcube:button command="close" label="close" class="closelink" />
	+ <roundcube:endif />
	</div>
	</div>

	+<roundcube:if condition="!env:extwin" />
	<div id="topnav">
	<div id="taskbar" class="topright">
	<roundcube:button command="mail" label="mail" class="button-mail" classSel="button-mail button-selected" innerClass="button-inner" />
	<roundcube:button command="addressbook" label="addressbook" class="button-addressbook" classSel="button-addressbook button-selected" innerClass="button-inner" />
	<roundcube:container name="taskbar" id="taskbar" />
	<roundcube:button command="settings" label="settings" class="button-settings" classSel="button-settings button-selected" innerClass="button-inner" />
	</div>
	<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
	</div>
	+<roundcube:endif />

	<br style="clear:both" />
	</div>


	diff --git a/skins/larry/mail.css b/skins/larry/mail.css
	index 76ca4edfa..20a13f62f 100644
	--- a/skins/larry/mail.css
	+++ b/skins/larry/mail.css
	@@ -1,1371 +1,1391 @@
	/**
	* Roundcube webmail styles for the Email section
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	* Screendesign by FLINT / Büro für Gestaltung, bueroflint.com
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*
	* $Id$
	*/

	#mailview-left {
	position: absolute;
	top: 0;
	left: 0;
	width: 220px;
	bottom: 0;
	z-index: 2;
	}

	#mailview-right {
	position: absolute;
	top: 0;
	left: 232px;
	right: 0;
	bottom: 0;
	z-index: 3;
	}

	+#mailview-right.fullwidth {
	+ left: 0;
	+}
	+
	#mailview-top {
	position: absolute;
	top: 42px;
	left: 0;
	width: 100%;
	bottom: 28px;
	}

	#mailview-top.fullheight {
	border-radius: 4px 4px 0 0;
	}

	#mailview-bottom {
	position: absolute;
	left: 0;
	bottom: 0;
	width: 100%;
	- height: 26px;
	+ height: 27px;
	+ border-radius: 0 0 4px 4px;
	+ border-top: none;
	}

	#folderlist-header {
	width: 100%;
	height: 12px;
	top: 32px;
	}

	#mailboxcontainer,
	#messagelistcontainer {
	position: absolute;
	top: 42px;
	left: 0;
	width: 100%;
	bottom: 0;
	}

	#messagelistcontainer {
	top: 0;
	bottom: 30px;
	overflow: auto;
	}

	#messagelistfooter {
	position: absolute;
	bottom: 0;
	left: 0;
	right: 0;
	height: 22px;
	padding: 4px 6px;
	border-top: 1px solid #ddd;
	background: #ebebeb;
	background: -moz-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ebebeb), color-stop(100%,#c6c6c6));
	background: -o-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
	background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
	background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
	border-radius: 0 0 4px 4px;
	}

	#mailview-top.fullheight #messagelistfooter {
	border-radius: 0;
	}

	#messagelistfooter.rightalign {
	text-align: right;
	}

	#messagelistfooter #countcontrols {
	display: inline-block;
	}

	#messagelistfooter #listcontrols,
	#messagelistfooter #listselectors {
	display: inline-block;
	margin-right: 2em;
	vertical-align: middle;
	}

	#messagelistfooter #listselectors .menuselector {
	margin-top: -2px;
	}

	a.iconbutton.listmode {
	width: 26px;
	height: 20px;
	background-position: 0 -477px;
	}

	a.iconbutton.threadmode {
	width: 26px;
	height: 20px;
	background-position: 0 -497px;
	}

	a.iconbutton.listmode.selected {
	background-position: -26px -477px;
	}

	a.iconbutton.threadmode.selected {
	background-position: -26px -497px;
	}

	#mailboxlist li.mailbox {
	position: relative;
	background-repeat: no-repeat;
	background-position: 6px 2px;
	}

	#mailboxlist li:first-child {
	border-radius: 4px 4px 0 0;
	}

	#mailboxlist li.mailbox a {
	padding-left: 36px;
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	background-image: url(images/listicons.png);
	background-repeat: no-repeat;
	background-position: 6px 3px;
	}

	#mailboxlist li.mailbox.unread a {
	padding-right: 36px;
	}

	#mailboxlist li.mailbox.selected > a {
	background-position: 6px -21px;
	}

	#mailboxlist li.mailbox.inbox > a {
	background-position: 6px -189px;
	}

	#mailboxlist li.mailbox.inbox.selected > a {
	background-position: 6px -213px;
	}

	#mailboxlist li.mailbox.drafts > a {
	background-position: 6px -238px;
	}

	#mailboxlist li.mailbox.drafts.selected > a {
	background-position: 6px -262px;
	}

	#mailboxlist li.mailbox.sent > a {
	background-position: 6px -286px;
	}

	#mailboxlist li.mailbox.sent.selected > a {
	background-position: 6px -310px;
	}

	#mailboxlist li.mailbox.junk > a {
	background-position: 6px -334px;
	}

	#mailboxlist li.mailbox.junk.selected > a {
	background-position: 6px -358px;
	}

	#mailboxlist li.mailbox.trash > a {
	background-position: 6px -382px;
	}

	#mailboxlist li.mailbox.trash.selected > a {
	background-position: 6px -406px;
	}

	#mailboxlist li.mailbox.archive > a {
	background-position: 6px -1699px;
	}

	#mailboxlist li.mailbox.archive.selected > a {
	background-position: 6px -1723px;
	}

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

	#mailboxlist li.virtual > a {
	color: #aaa;
	}

	#mailboxlist li.recent > a {
	color: #017cb4;
	}

	#mailboxlist li.mailbox ul {
	list-style: none;
	margin: 0;
	padding: 0;
	border-top: 1px solid #bbd3da;
	}

	#mailboxlist li.mailbox ul li {
	padding-left: 26px;
	}

	#mailboxlist li.mailbox ul li a {
	background-position: 6px -93px;
	}

	#mailboxlist li.mailbox ul li.selected > a {
	background-position: 6px -117px;
	}

	#mailboxlist li.mailbox ul li:last-child {
	border-bottom: 0;
	}

	#mailboxlist li.mailbox div.collapsed,
	#mailboxlist li.mailbox div.expanded {
	position: absolute;
	top: 13px;
	left: 19px;
	width: 13px;
	height: 13px;
	background: url(images/listicons.png) -3px -144px no-repeat;
	cursor: pointer;
	}

	#mailboxlist li.mailbox div.expanded {
	background-position: -3px -168px;
	}

	#mailboxlist li.mailbox.selected > div.collapsed {
	background-position: -23px -144px;
	}

	#mailboxlist li.mailbox.selected > div.expanded {
	background-position: -23px -168px;
	}


	#mailboxlist li.mailbox ul li div.collapsed,
	#mailboxlist li.mailbox ul li div.expanded {
	left: 43px;
	top: 14px;
	}

	#mailboxlist li.mailbox .unreadcount {
	position: absolute;
	top: 3px;
	right: 6px;
	min-width: 1.8em;
	padding: 2px 4px;
	background: #82acb5;
	background: -moz-linear-gradient(top, #82acb5 0%, #6a939f 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#82acb5), color-stop(100%,#6a939f));
	background: -o-linear-gradient(top, #82acb5 0%, #6a939f 100%);
	background: -ms-linear-gradient(top, #82acb5 0%, #6a939f 100%);
	background: linear-gradient(top, #82acb5 0%, #6a939f 100%);
	box-shadow: inset 0 1px 1px 0 #536d72;
	-o-box-shadow: inset 0 1px 1px 0 #536d72;
	-webkit-box-shadow: inset 0 1px 1px 0 #536d72;
	-moz-box-shadow: inset 0 1px 1px 0 #536d72;
	border-radius: 9px;
	color: #fff;
	text-align: center;
	font-weight: bold;
	text-shadow: none;
	}

	#mailboxlist li.mailbox.selected > a .unreadcount {
	background: #005d76;
	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
	background: linear-gradient(top, #005d76 0%, #004558 100%);
	box-shadow: inset 0 1px 1px 0 #003645;
	-o-box-shadow: inset 0 1px 1px 0 #003645;
	-webkit-box-shadow: inset 0 1px 1px 0 #003645;
	-moz-box-shadow: inset 0 1px 1px 0 #003645;
	}

	#mailboxlist li.mailbox.recent > a .unreadcount {
	background: #017cb4;
	background: -moz-linear-gradient(top, #017cb4 0%, #006ca4 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#017cb4), color-stop(100%,#006ca4));
	background: -o-linear-gradient(top, #017cb4 0%, #006ca4 100%);
	background: -ms-linear-gradient(top, #017cb4 0%, #006ca4 100%);
	background: linear-gradient(top, #017cb4 0%, #006ca4 100%);
	box-shadow: inset 0 1px 1px 0 #005080;
	-o-box-shadow: inset 0 1px 1px 0 #005080;
	-webkit-box-shadow: inset 0 1px 1px 0 #005080;
	-moz-box-shadow: inset 0 1px 1px 0 #005080;
	}

	#searchfilter {
	position: absolute;
	right: 256px;
	width: auto;
	top: 7px;
	}

	#searchfilter select {
	height: 26px;
	}

	#mailview-left select.mailboxlist {
	position: relative;
	top: 10px;
	width: 100%;
	}

	#messagetoolbar {
	position: absolute;
	top: -6px;
	left: 0;
	height: 40px;
	white-space: nowrap;
	z-index: 10;
	}

	#messagetoolbar.fullwidth {
	right: 0;
	}

	#messagetoolbar .toolbarselect {
	position: absolute;
	bottom: 6px;
	right: 3px;
	}

	#messagesearchtools {
	position: absolute;
	right: 0;
	top: 0;
	width: 400px;
	}

	#mailpreviewtoggle {
	display: block;
	position: absolute;
	top: 6px;
	right: 4px;
	width: 20px;
	height: 18px;
	background: url(images/buttons.png) -3px -458px no-repeat;
	}

	#mailpreviewtoggle.enabled {
	background-position: -28px -458px;
	}


	/* message list */

	#messagelist thead td:first-child {
	border-radius: 4px 0 0 0; /* for Chrome */
	}

	#messagelist tr td.attachment,
	#messagelist tr td.threads,
	#messagelist tr td.status,
	#messagelist tr td.flag,
	#messagelist tr td.priority {
	width: 20px;
	padding: 2px 3px;
	}

	.webkit #messagelist tr td.attachment,
	.webkit #messagelist tr td.threads,
	.webkit #messagelist tr td.status,
	.webkit #messagelist tr td.flag,
	.webkit #messagelist tr td.priority {
	width: 26px;
	}

	#messagelist tr td.threads {
	width: 26px;
	}

	.webkit #messagelist tr td.threads {
	width: 30px;
	}

	#messagelist tr td.threads,
	#messagelist tr td.threads + td {
	border-left: 0;
	}

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

	#messagelist thead tr td.size {
	text-align: left;
	}

	#messagelist tr td.fromto,
	#messagelist tr td.from,
	#messagelist tr td.to,
	#messagelist tr td.cc,
	#messagelist tr td.replyto {
	width: 200px;
	}

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

	#messagelist tr.message {
	/* background-color: #fff; */
	}

	#messagelist tr.thread.expanded td {
	background-color: #ededed;
	}

	#messagelist tr.unread {
	font-weight: bold;
	/* background-color: #fff; */
	}

	#messagelist tr.flagged td,
	#messagelist tr.flagged td a {
	color: #f30;
	}

	#messagelist thead tr td.sortedASC a,
	#messagelist thead tr td.sortedDESC a {
	color: #004458;
	text-decoration: underline;
	background: url(images/listicons.png) right -912px no-repeat;
	}

	#messagelist thead tr td.sortedASC a {
	background-position: right -944px;
	}

	#messagelist td img {
	vertical-align: middle;
	display: inline-block;
	}

	#messagelist tbody td a {
	color: #333;
	text-decoration: none;
	white-space: nowrap;
	cursor: default;
	}

	#messagelist tbody tr td.flag,
	#messagelist tbody tr td.status,
	#messagelist tbody tr td.subject span.status {
	cursor: pointer;
	}

	#messagelist tr td.flag span,
	#messagelist tr td.status span,
	#messagelist tr td.attachment span,
	#messagelist tr td.priority span {
	display: block;
	width: 20px;
	}

	#messagelist tr td div.collapsed,
	#messagelist tr td div.expanded,
	#messagelist tr td.threads div.listmenu,
	#messagelist tr td.attachment span.attachment,
	#messagelist tr td.attachment span.report,
	#messagelist tr td.priority span.priority,
	#messagelist tr td.priority span.prio1,
	#messagelist tr td.priority span.prio2,
	#messagelist tr td.priority span.prio3,
	#messagelist tr td.priority span.prio4,
	#messagelist tr td.priority span.prio5,
	#messagelist tr td.flag span.flagged,
	#messagelist tr td.flag span.unflagged,
	#messagelist tr td.flag span.unflagged:hover,
	#messagelist tr td.status span.status,
	#messagelist tr td.status span.msgicon,
	#messagelist tr td.status span.deleted,
	#messagelist tr td.status span.unread,
	#messagelist tr td.status span.unreadchildren,
	#messagelist tr td.subject span.msgicon,
	#messagelist tr td.subject span.deleted,
	#messagelist tr td.subject span.unread,
	#messagelist tr td.subject span.replied,
	#messagelist tr td.subject span.forwarded,
	#messagelist tr td.subject span.unreadchildren {
	display: inline-block;
	vertical-align: middle;
	height: 18px;
	width: 20px;
	padding: 0;
	background: url(images/listicons.png) -100px 0 no-repeat;
	}

	#messagelist tbody tr td.attachment span.attachment {
	background-position: 0 -996px;
	}

	#messagelist thead tr td.attachment span.attachment {
	background-position: -24px -997px;
	}

	#messagelist tbody tr td.attachment span.report {
	background-position: -24px -1116px;
	}

	#messagelist tr td.priority span.prio5 {
	background-position: 0 -1905px;
	}

	#messagelist tr td.priority span.prio4 {
	background-position: 0 -1885px;
	}

	#messagelist tr td.priority span.prio2 {
	background-position: 0 -1865px;
	}

	#messagelist tr td.priority span.prio1 {
	background-position: 0 -1845px;
	}

	#messagelist tbody tr td.flag span.flagged {
	background-position: 0 -1036px;
	}

	#messagelist thead tr td.flag span.flagged {
	background-position: -24px -1036px;
	}

	#messagelist tr td.status span.msgicon:hover {
	background-position: -23px -1056px;
	}

	#messagelist tr td.flag span.unflagged:hover {
	background-position: -23px -1076px;
	}

	#messagelist tr td.subject span.msgicon,
	#messagelist tr td.subject span.unreadchildren {
	background-position: 0 -1056px;
	margin: 0 1px 0 0;
	width: 24px;
	}

	#messagelist tr td.subject span.replied {
	background-position: 0 -1076px;
	}

	#messagelist tr td.subject span.forwarded {
	background-position: 0 -1096px;
	}

	#messagelist tr td.subject span.replied.forwarded {
	background-position: 0 -1116px;
	}

	#messagelist tr td.status span.msgicon,
	#messagelist tr td.flag span.unflagged,
	#messagelist tr td.status span.unreadchildren {
	background-position: 0 1056px; /* no icon */
	}
	/*
	#messagelist tr td.status span.msgicon:hover {
	background-position: 0 -272px;
	}
	*/
	#messagelist tr td.status span.deleted,
	#messagelist tr td.status span.deleted:hover,
	#messagelist tr td.subject span.deleted {
	background-position: -22px -1096px;
	}

	#messagelist tr td.status span.status,
	#messagelist tr td.status span.unread,
	#messagelist tr td.subject span.unread,
	#messagelist tr td.status span.unread:hover {
	background-position: 0 -1016px;
	}

	#messagelist thead tr td.status span.status {
	background-position: -24px -1016px;
	}

	#messagelist tr td div.collapsed {
	background-position: 0 -1136px;
	cursor: pointer;
	}

	#messagelist tr td div.expanded {
	background-position: 0 -1156px;
	cursor: pointer;
	}

	#messagelist tr td.threads div.listmenu {
	background-position: 0 -976px;
	cursor: pointer;
	width: 26px;
	}

	#messagelist thead tr td.subject,
	#messagelist tbody tr td.subject {
	width: 99%;
	white-space: nowrap;
	}

	#messagelist tbody tr td.subject a {
	cursor: default;
	vertical-align: middle; /* #1487091 */
	}

	/* thread parent message with unread children */
	#messagelist tbody tr.unroot td.subject a {
	text-decoration: underline;
	}

	/** tree indicators **/

	#messagelist tbody tr td span.branch div {
	display: inline-block;
	}

	#messagelist tbody tr td span.branch div.tree {
	width: 15px;
	}

	#listoptions ul.proplist {
	min-width: 16em;
	}

	/** message view **/

	#mailpreviewframe {
	display: none;
	position: absolute;
	top: 0;
	left: 0;
	width: 100%;
	bottom: 28px;
	}

	#messagecontframe {
	border: 0;
	border-radius: 4px 4px 0 0;
	}

	#messagecontent {
	position: absolute;
	top: 110px;
	left: 0;
	width: 100%;
	bottom: 27px;
	overflow: auto;
	}

	#messageheader,
	#partheader,
	#composeheaders {
	position: relative;
	padding: 3px 0;
	background: #f9f9f9;
	background: -moz-linear-gradient(top, #fff 0%, #f0f0f0 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fff), color-stop(100%,#f0f0f0));
	background: -o-linear-gradient(top, #fff 0%, #f0f0f0 100%);
	background: -ms-linear-gradient(top, #fff 0%, #f0f0f0 100%);
	background: linear-gradient(top, #fff 0%, #f0f0f0 100%);
	border-bottom: 1px solid #dfdfdf;
	}

	#mailview-right #messageheader {
	border-radius: 4px 4px 0 0;
	padding-left: 78px;
	/* avoid headers eating up all the vertical space */
	max-height: 50%;
	overflow: auto;
	}

	h2.subject {
	font-size: 15px;
	margin: 0 15em 0 0;
	padding: 4px 8px 2px 8px;
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	#mailview-right #messageheader h2.subject {
	margin-left: -56px;
	}

	h3.subject {
	font-size: 14px;
	margin: 0 8em 0 0;
	padding: 8px 8px 4px 8px;
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.headers-table td {
	color: #666;
	padding: 2px 8px;
	}

	.headers-table td.header,
	.ui-dialog-content.popup span.adr {
	font-weight: bold;
	}

	.headers-table td.header-title {
	white-space: nowrap;
	}

	.headers-table td.header a,
	.ui-dialog-content.popup span.adr a {
	color: #666;
	text-decoration: none;
	}

	.headers-table td.header a:hover,
	.ui-dialog-content.popup span.adr a:hover {
	text-decoration: underline;
	}

	.headers-table td.subject {
	color: #333;
	font-size: 110%;
	font-weight: bold;
	}

	.headers-table td.header span,
	.ui-dialog-content.popup span.adr {
	white-space: nowrap;
	}

	.headers-table td.header a.morelink {
	color: #0069a6;
	white-space: nowrap;
	font-weight: normal;
	}

	.rcmaddcontact {
	position: relative;
	top: 1px;
	margin-left: 0.5em;
	}

	.rcmaddcontact imp {
	width: 20px;
	height: 13px;
	}

	#preview-allheaders {
	display: none;
	}

	#preview-allheaders td.header-title,
	#preview-shortheaders td.header-title {
	padding-left: 0;
	}

	#preview-shortheaders td.header {
	padding-right: 18px;
	}

	-#previewheaderstoggle {
	+.moreheaderstoggle {
	display: block;
	position: absolute;
	top: 0;
	left: 0;
	bottom: 0;
	width: 18px;
	padding: 0;
	outline: none;
	background: #f2f2f2;
	background: -moz-linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
	background: -webkit-gradient(linear, left top, right top, color-stop(0,#fbfbfb), color-stop(100%,#e9e9e9));
	background: -o-linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
	background: -ms-linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
	background: linear-gradient(left, #fbfbfb 0, #e9e9e9 100%);
	border-right: 1px solid #dfdfdf;
	border-radius: 3px 0 0 0; /* for Opera */
	}

	-#previewheaderstoggle .iconlink {
	+.moreheaderstoggle .iconlink {
	display: inline-block;
	position: absolute;
	top: 8px;
	left: 0;
	width: 18px;
	height: 16px;
	background: url(images/buttons.png) -27px -242px no-repeat;
	}

	-#previewheaderstoggle.remove .iconlink {
	+.moreheaderstoggle.remove .iconlink {
	top: auto;
	bottom: 5px;
	background-position: -5px -242px;
	}

	#full-headers {
	position: relative;
	}

	div.more-headers {
	position: absolute;
	top: -12px;
	right: 10px;
	width: 12px;
	height: 10px;
	cursor: pointer;
	- background: url(images/buttons.png) center -1619px no-repeat;
	+ background: url(images/buttons.png) center -1579px no-repeat;
	}

	div.hide-headers {
	- background-position: center -1629px;
	+ background-position: center -1589px;
	}

	#all-headers {
	position: relative;
	margin: 4px 10px;
	padding: 0;
	height: 180px;
	border: 1px solid #ccc;
	border-radius: 4px;
	background: #fdfdfd;
	-moz-box-shadow: inset 0 0 1px 1px rgba(0,0,0, 0.1);
	-webkit-box-shadow: inset 0 0 1px 1px rgba(0,0,0, 0.1);
	-o-box-shadow: inset 0 0 1px 1px rgba(0,0,0, 0.1);
	box-shadow: inset 0 0 1px 1px rgba(0,0,0, 0.1);
	}

	#headers-source {
	display: none;
	position: absolute;
	top: 0;
	left: 0;
	right: 0;
	bottom: 0;
	padding: 3px 6px;
	overflow: auto;
	text-align: left;
	color: #333;
	}

	#messageheader.previewheader #all-headers {
	margin-left: 0;
	}

	#messageheader.previewheader {
	position: relative;
	height: auto;
	min-height: 52px;
	padding: 0 0 3px 72px;
	}

	#messageheader.previewheader h3.subject {
	padding: 8px 8px 2px 0;
	}

	#messageheader.previewheader #contactphoto {
	display: block;
	position: absolute;
	top: 11px;
	left: 30px;
	width: 32px;
	height: 32px;
	overflow: hidden;
	background: url(images/contactpic_32px.png) center center no-repeat #fff;
	border-radius: 3px;
	}

	#messageheader.previewheader #contactphoto img {
	width: 32px;
	height: auto;
	border-radius: 3px;
	}

	#messageheader #contactphoto {
	display: block;
	position: absolute;
	top: 34px;
	left: 30px;
	width: 48px;
	height: 48px;
	overflow: hidden;
	border-radius: 4px;
	border: 1px solid #e6e6e6;
	background: url(images/contactpic_48px.png) center center no-repeat #fff;
	}

	#messageheader #contactphoto img {
	width: 48px;
	height: auto;
	border-radius: 4px;
	}

	#messageheader #countcontrols {
	position: absolute;
	top: 8px;
	right: 8px;
	width: 20em;
	text-align: right;
	white-space: nowrap;
	}

	#messageheader .pagenav .countdisplay {
	min-width: 0;
	padding-right: 0.5em;
	white-space: nowrap;
	}

	#messagecontent .leftcol,
	#messagepreview .leftcol {
	margin-right: 252px;
	overflow-x: auto;
	}

	#messagecontent .rightcol,
	#messagepreview .rightcol {
	float: right;
	/*
	position: absolute;
	top: 10px;
	right: 10px;
	height: 90%;
	*/
	width: 230px;
	margin: 8px;
	min-height: 200px;
	background: #f0f0f0;
	padding: 8px;
	border-radius: 4px;
	}

	#messagebody {
	margin: 8px;
	}

	#message-objects div,
	#messagebody span.part-notice {
	margin: 8px;
	}

	#message-objects div.notice,
	#message-buttons div.notice {
	display: block;
	color: #960;
	border: 1px solid #ffdf0e;
	background-color: #fef893;
	background-position: 5px -85px;
	padding: 6px 12px 4px 30px;
	white-space: normal;
	}

	#message-objects div a.button,
	#messagebody span.part-notice a.button {
	margin-left: 10px;
	}

	div.message-part,
	div.message-htmlpart {
	padding: 0 2px 10px 2px;
	border-top: 2px solid #f0f0f0;
	}

	#messagebody div:first-child {
	border-top: 0;
	}

	div.message-part pre,
	div.message-htmlpart pre,
	div.message-part div.pre {
	margin: 0px;
	padding: 0px;
	font-family: monospace;
	font-size: 12px;
	white-space: -moz-pre-wrap !important;
	white-space: pre-wrap !important;
	white-space: pre;
	}

	div.message-part span.sig {
	color: #666666;
	}

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

	#messagebody > hr {
	color: #fff;
	background: #fff;
	border: 0;
	border-bottom: 2px solid #f0f0f0;
	}

	#messagebody > p > img {
	max-width: 80%;
	}

	#messagepartcontainer {
	position: absolute;
	top: 60px;
	left: 0px;
	right: 0px;
	bottom: 0px;
	}

	#messagepartframe {
	border: 0;
	}

	/* message composition */

	#composeview-left {
	position: absolute;
	top: 0;
	left: 0;
	width: 250px;
	bottom: 0;
	}

	#composeview-right {
	position: absolute;
	top: 0;
	left: 262px;
	right: 0;
	bottom: 0;
	}

	#compose-contacts {
	position: absolute;
	top: 42px;
	left: 0;
	width: 100%;
	bottom: 0;
	}

	#compose-contacts #directorylist {
	border-bottom: 4px solid #c7e3ef;
	}

	#compose-contacts .scroller {
	top: 65px;
	border-top: 1px solid #fff;
	}

	#contacts-table {
	table-layout: fixed;
	}

	#contacts-table td {
	width: 100%;
	}

	#contacts-table td span {
	display: block;
	}

	#contacts-table td span.email {
	display: inline;
	color: #69939e;
	font-style: italic;
	margin-left: 0.5em;
	}

	#compose-contacts li a, #contacts-table td {
	background: url(images/listicons.png) -100px 0 no-repeat;
	overflow: hidden;
	padding-left: 36px;
	text-overflow: ellipsis;
	}

	#contacts-table tr:first-child td {
	border-top: 0;
	}

	#compose-contacts li.addressbook a {
	background-position: 6px -766px;
	}

	#compose-contacts li.addressbook.selected a {
	background-position: 6px -791px;
	}

	#contacts-table td.contactgroup {
	background-position: 6px -1555px;
	}

	#contacts-table tr.unfocused td.contactgroup,
	#contacts-table tr.selected td.contactgroup {
	background-position: 6px -1579px;
	}

	#contacts-table td.contact {
	background-position: 6px -1603px;
	}

	#contacts-table tr.unfocused td.contact,
	#contacts-table tr.selected td.contact {
	background-position: 6px -1627px;
	}

	-
	#compose-content {
	position: absolute;
	top: 42px;
	left: 0;
	width: 100%;
	bottom: 28px;
	- border-bottom-left-radius: 0;
	- border-bottom-right-radius: 0;
	+ border-radius: 4px 4px 0 0;
	+ border-bottom: none;
	overflow: hidden;
	}

	#composeheaders {
	border-radius: 4px 4px 0 0;
	- -webkit-box-shadow: 0 2px 3px 0 #999;
	- -moz-box-shadow: 0 2px 3px 0 #999;
	- box-shadow: 0 2px 3px 0 #999;
	- border-bottom: 0;
	+ padding-left: 19px;
	}

	#composebuttons {
	position: absolute;
	- top: 8px;
	- right: 8px;
	+ top: 6px;
	+ right: 6px;
	width: auto;
	white-space: nowrap;
	z-index: 100;
	}

	+#composebuttons a.button.extwin {
	+ padding: 2px 3px;
	+}
	+
	.compose-headers {
	width: 99%;
	- margin: 4px 0;
	+ margin-bottom: 2px;
	}

	.compose-headers td {
	- padding: 4px 4px 4px 8px;
	+ padding: 2px 4px;
	}

	.compose-headers td.title {
	width: 11%;
	white-space: nowrap;
	+ padding-left: 6px;
	}

	.compose-headers td.title label {
	float: left;
	}

	.compose-headers td.title a.iconbutton {
	float: right;
	position: relative;
	top: -2px;
	width: 15px;
	}

	.compose-headers td.editfield {
	width: 90%;
	padding-left: 4px;
	}

	.compose-headers td.editfield a.iconlink {
	margin-left: 0.5em;
	}

	.compose-headers td.formlinks {
	padding: 0 4px;
	}

	.compose-headers td.top {
	vertical-align: top;
	padding-top: 10px;
	}

	.compose-headers td textarea,
	.compose-headers td input {
	width: 100%;
	resize: none;
	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
	font-size: 11px;
	}

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

	-#composeoptionsbox {
	- padding: 4px 8px 0 8px;
	- background: #d2d2d2;
	- border-bottom: 1px solid #e8e8e8;
	- -webkit-box-shadow: 0 2px 3px 0 #999;
	- -moz-box-shadow: 0 2px 3px 0 #999;
	- box-shadow: 0 2px 3px 0 #999;
	- white-space: nowrap;
	-}
	-
	#composeoptions {
	display: none;
	- padding: 2px 0;
	+ padding: 2px 0 0 8px;
	white-space: normal;
	+ border-top: 1px solid #dfdfdf;
	+ box-shadow: inset 0 1px 0 0 #fff;
	+ -o-box-shadow: inset 0 1px 0 0 #fff;
	+ -webkit-box-shadow: inset 0 1px 0 0 #fff;
	+ -moz-box-shadow: inset 0 1px 0 0 #fff;
	+
	}

	.composeoption {
	+ color: #666;
	padding-right: 22px;
	white-space: nowrap;
	}

	#composeoptions .composeoption {
	display: inline-block;
	- padding: 4px 28px 4px 0;
	+ padding: 4px 22px 4px 0;
	}

	#composeoptions .composeoption:last-child {
	padding-right: 4px;
	}

	-#composeoptionstoggle {
	- display: inline-block;
	- position: relative;
	- top: -1px;
	- left: 6px;
	- width: 20px;
	- height: 18px;
	- background: url(images/buttons.png) -3px -1640px no-repeat;
	- text-decoration: none;
	-}
	-
	-#composeoptionstoggle.enabled {
	- background-position: -28px -1640px;
	+.mozilla .composeoption input {
	+ vertical-align: -3px;
	}

	#composeview-bottom {
	position: relative;
	width: 100%;
	height: 200px;
	}

	#composebodycontainer {
	position: absolute;
	top: 0;
	left: 0;
	right: 260px;
	bottom: 0;
	}

	+#composebodycontainer.buttons {
	+ bottom: 42px;
	+}
	+
	#composebody {
	position: absolute;
	top: 1px;
	left: 0;
	bottom: 0;
	width: 99%;
	border: 0;
	border-radius: 0;
	padding: 8px 0 8px 8px;
	- box-shadow: none;
	resize: none;
	font-family: monospace;
	font-size: 9pt;
	outline: none;
	+ box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.2);
	+ -moz-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.2);
	+ -webkit-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.2);
	+ -o-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.2);
	}

	#composebody:active,
	#composebody:focus {
	+ box-shadow: inset 0 0 3px 2px rgba(71,135,177, 0.9);
	+ -moz-box-shadow: inset 0 0 3px 2px rgba(71,135,177, 0.9);
	+ -webkit-box-shadow: inset 0 0 3px 2px rgba(71,135,177, 0.9);
	+ -o-box-shadow: inset 0 0 3px 2px rgba(71,135,177, 0.9);
	}

	#compose-attachments {
	position: absolute;
	right: 0;
	top: 1px;
	bottom: 0;
	width: 240px;
	background: #f0f0f0;
	border-style: solid;
	border-color: #f0f0f0 #f0f0f0 #f0f0f0 #ddd;
	border-width: 1px;
	padding: 8px;
	overflow: auto;
	}

	#compose-attachments.droptarget {
	background-image: url(images/filedrop.png);
	background-position: center bottom;
	background-repeat: no-repeat;
	}

	#compose-attachments.droptarget.hover,
	#compose-attachments.droptarget.active {
	border-color: #019bc6;
	box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
	-moz-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
	-webkit-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
	-o-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
	}

	#compose-attachments.droptarget.hover {
	background-color: #d9ecf4;
	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	}

	+#composeview-bottom .formbuttons.floating {
	+ position: absolute;
	+ width: auto;
	+ right: 260px;
	+ z-index: 200;
	+ padding-bottom: 8px;
	+}
	+
	.defaultSkin table.mceLayout,
	.defaultSkin table.mceLayout tr.mceLast td {
	border: 0 !important;
	}

	+.defaultSkin td.mceToolbar {
	+ border: 0 !important;
	+}
	+
	+.defaultSkin table.mceLayout tr.mceFirst td {
	+ background: #f0f0f0;
	+}
	+
	#composebody_toolbargroup {
	border-bottom: 1px solid #ddd;
	}

	#uploadform a.iconlink {
	margin-left: 1em;
	text-indent: -5000px;
	}

	#uploadform form div {
	margin: 4px 0;
	}

	diff --git a/skins/larry/styles.css b/skins/larry/styles.css
	index 340688078..9127fbe7c 100644
	--- a/skins/larry/styles.css
	+++ b/skins/larry/styles.css
	@@ -1,2052 +1,2071 @@
	/**
	* Roundcube webmail styles for skin "Larry"
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	* Screendesign by FLINT / BÃ¼ro fÃ¼r Gestaltung, bueroflint.com
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*
	* $Id$
	*/

	body {
	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
	font-size: 11px;
	color: #333;
	background: url(images/linen.jpg) repeat #d1d5d8;
	margin: 0;
	}

	body.noscroll {
	/* also avoids bounce effect in Chrome and Safari */
	overflow: hidden;
	}

	a {
	color: #0069a6;
	}

	a:visited {
	color: #0186ba;
	}

	img {
	border: 0;
	}

	input[type="text"],
	input[type="password"],
	textarea {
	margin: 0; /* Safari by default adds a margin */
	padding: 4px;
	border: 1px solid #b2b2b2;
	border-radius: 4px;
	box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
	-moz-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
	-webkit-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
	-o-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
	}

	input[type="text"]:focus,
	input[type="password"]:focus,
	input.button:focus,
	textarea:focus {
	border-color: #4787b1;
	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	outline: none;
	}

	input.placeholder,
	textarea.placeholder {
	color: #aaa;
	}

	.bold {
	font-weight: bold;
	}

	/* buttons */

	input.button {
	display: inline-block;
	margin: 0 2px;
	padding: 2px 5px;
	color: #525252;
	text-shadow: 0px 1px 1px #fff;
	border: 1px solid #c0c0c0;
	border-radius: 4px;
	background: #f7f7f7;
	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-o-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-webkit-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-moz-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	text-decoration: none;
	outline: none;
	}

	.formbuttons input.button {
	color: #ddd;
	font-size: 110%;
	text-shadow: 0px 1px 1px #333;
	padding: 4px 12px;
	border-color: #465864;
	border-radius: 5px;
	background: #7a7b7d;
	background: -moz-linear-gradient(top, #7b7b7b 0%, #606060 100%); /* FF3.6+ */
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b7b7b), color-stop(100%,#606060)); /* Chrome,Safari4+ */
	background: -o-linear-gradient(top, #7b7b7b 0%, #606060 100%); /* Opera 11.10+ */
	background: -ms-linear-gradient(top, #7b7b7b 0%, #606060 100%); /* IE10+ */
	background: linear-gradient(top, #7b7b7b 0%, #606060 100%); /* W3C */
	box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
	-o-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
	-webkit-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
	-moz-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
	}

	.formbuttons input.button:hover,
	.formbuttons input.button:focus,
	input.button.mainaction:hover,
	input.button.mainaction:focus {
	color: #f2f2f2;
	border-color: #465864;
	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
	}

	.formbuttons input.button:active {
	color: #fff;
	background: -moz-linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5c5c5c), color-stop(100%,#7b7b7b));
	background: -o-linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
	background: -ms-linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
	background: linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
	}

	input.button.mainaction {
	color: #ededed;
	text-shadow: 0px 1px 1px #333;
	border-color: #1f262c;
	background: #505050;
	background: -moz-linear-gradient(top, #505050 0%, #2a2e31 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#505050), color-stop(100%,#2a2e31));
	background: -o-linear-gradient(top, #505050 0%, #2a2e31 100%);
	background: -ms-linear-gradient(top, #505050 0%, #2a2e31 100%);
	background: linear-gradient(top, #505050 0%, #2a2e31 100%);
	box-shadow: inset 0 1px 0 0 #777;
	-moz-box-shadow: inset 0 1px 0 0 #777;
	-webkit-box-shadow: inset 0 1px 0 0 #777;
	-o-box-shadow: inset 0 1px 0 0 #777;
	}

	input.button.mainaction:active {
	color: #fff;
	background: #515151;
	background: -moz-linear-gradient(top, #2a2e31 0%, #505050 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2a2e31), color-stop(100%,#505050));
	background: -o-linear-gradient(top, #2a2e31 0%, #505050 100%);
	background: -ms-linear-gradient(top, #2a2e31 0%, #505050 100%);
	background: linear-gradient(top, #2a2e31 0%, #505050 100%);
	}

	input.button[disabled],
	input.button[disabled]:hover,
	input.button.mainaction[disabled] {
	color: #aaa !important;
	}

	input.mainaction {
	font-weight: bold;
	}

	/ link buttons /

	a.button {
	display: inline-block;
	margin: 0 2px;
	padding: 2px 5px;
	color: #525252;
	text-shadow: 0px 1px 1px #fff;
	border: 1px solid #c6c6c6;
	border-radius: 4px;
	background: #f7f7f7;
	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-o-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-webkit-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-moz-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	text-decoration: none;
	}

	a.button:focus,
	input.button:focus {
	border-color: #4fadd5;
	box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	-moz-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	-webkit-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	-o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	outline: none;
	}

	label.disabled,
	a.button.disabled {
	color: #999;
	}

	a.button.disabled,
	input.button.disabled,
	input.button[disabled],
	a.button.disabled:hover,
	input.button.disabled:hover,
	input.button[disabled]:hover {
	border-color: #c6c6c6;
	box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
	-o-box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
	-webkit-box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
	-moz-box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
	}

	a.button.disabled span.inner {
	opacity: 0.4;
	filter: alpha(opacity=40);
	}

	a.button.pressed,
	a.button:active,
	input.button:active {
	background: #e6e6e6;
	background: -moz-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e6e6e6), color-stop(100%,#f9f9f9));
	background: -o-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	background: -ms-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	background: linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	}

	.pagenav.dark a.button {
	font-weight: bold;
	border-color: #e6e6e6;
	background: #d8d8d8;
	background: -moz-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d8d8d8), color-stop(100%,#bababa));
	background: -o-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
	background: -ms-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
	background: linear-gradient(top, #d8d8d8 0%, #bababa 100%);
	box-shadow: 0 1px 1px 0 #999;
	-o-box-shadow: 0 1px 1px 0 #999;
	-webkit-box-shadow: 0 1px 1px 0 #999;
	-moz-box-shadow: 0 1px 1px 0 #999;
	}

	.pagenav.dark a.button.pressed {
	background: #bababa;
	background: -moz-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#bababa), color-stop(100%,#d8d8d8));
	background: -o-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
	background: -ms-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
	background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
	}

	.pagenav a.button {
	padding: 1px 3px;
	height: 16px;
	vertical-align: middle;
	margin-bottom: 1px;
	}

	.pagenav a.button span.inner {
	display: inline-block;
	width: 16px;
	height: 13px;
	text-indent: 1000px;
	overflow: hidden;
	background: url(images/buttons.png) -6px -211px no-repeat;
	}

	.pagenav a.prevpage span.inner {
	background-position: -7px -226px;
	}

	.pagenav a.nextpage span.inner {
	background-position: -28px -226px;
	}

	.pagenav a.lastpage span.inner {
	background-position: -28px -211px;
	}

	.pagenav a.pageup span.inner {
	background-position: -7px -241px;
	}

	.pagenav a.pagedown span.inner {
	background-position: -29px -241px;
	}

	.pagenav a.reply span.inner {
	background-position: -7px -256px;
	}

	.pagenav a.forward span.inner {
	background-position: -29px -256px;
	}

	.pagenav a.replyall span.inner {
	background-position: -7px -271px;
	}

	.pagenav a.extwin span.inner {
	background-position: -29px -271px;
	}

	.pagenav .countdisplay {
	display: inline-block;
	padding: 3px 1em 0 1em;
	text-shadow: 0px 1px 1px #fff;
	min-width: 16em;
	}

	.pagenavbuttons {
	position: relative;
	top: -2px;
	}

	a.iconbutton {
	display: inline-block;
	width: 24px;
	height: 18px;
	text-decoration: none;
	text-indent: -5000px;
	background: url(images/buttons.png) -1000px 0 no-repeat;
	}

	a.iconbutton.disabled {
	opacity: 0.4;
	filter: alpha(opacity=40);
	cursor: default;
	}

	a.iconbutton.searchoptions {
	background-position: -2px -317px;
	}

	a.iconbutton.reset {
	background-position: -25px -317px;
	}

	a.iconbutton.cancel {
	background-position: -7px -377px;
	}

	a.iconlink {
	display: inline-block;
	color: #888;
	text-decoration: none;
	white-space: nowrap;
	padding: 2px 8px 2px 20px;
	background: url(images/buttons.png) -1000px 0 no-repeat;
	}

	a.iconlink:hover {
	text-decoration: underline;
	}

	a.iconlink.delete {
	background-position: -7px -337px;
	}

	a.iconlink.add {
	background-position: -7px -357px;
	}

	a.iconlink.remove {
	background-position: -7px -378px;
	}

	a.iconlink.cancel {
	background-position: -7px -397px;
	}

	a.iconlink.edit {
	background-position: -7px -417px;
	}

	a.iconlink.upload {
	background-position: -6px -437px;
	}


	/* message bar */

	#message div.loading,
	#message div.warning,
	#message div.error,
	#message div.notice,
	#message div.confirmation,
	#message-objects div.notice {
	color: #555;
	font-weight: bold;
	padding: 6px 30px 6px 25px;
	display: inline-block;
	white-space: nowrap;
	background: url(images/messages.png) 0 5px no-repeat;
	cursor: default;
	}

	#message div.warning {
	color: #960;
	background-position: 0 -86px;
	}

	#message div.error {
	color: #cf2734;
	background-position: 0 -55px;
	}

	#message div.confirmation {
	color: #093;
	background-position: 0 -25px;
	}

	#message div.loading {
	background: url(images/ajaxloader.gif) 2px 6px no-repeat;
	}

	#message div a,
	#message div span {
	padding-right: 0.5em;
	text-decoration: none;
	}

	#message div a:hover {
	text-decoration: underline;
	cursor: pointer;
	}

	#message.statusbar {
	position: absolute;
	bottom: 0;
	left: 0;
	right: 0;
	height: 27px;
	padding-left: 8px;
	border-top: 1px solid #ddd;
	border-radius: 0 0 4px 4px;
	background: #eaeaea;
	background: -moz-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eaeaea), color-stop(100%,#c8c8c8));
	background: -o-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
	background: -ms-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
	background: linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.ui-dialog.error .ui-dialog-title,
	.ui-dialog.warning .ui-dialog-title,
	.ui-dialog.confirmation .ui-dialog-title {
	padding-left: 25px;
	background: url(images/messages.png) 0 5px no-repeat;
	text-shadow: 0 1px 1px #fff;
	}

	.ui-dialog.warning .ui-dialog-title {
	color: #960;
	background-position: 0 -90px;
	}

	.ui-dialog.error .ui-dialog-title {
	color: #cf2734;
	background-position: 0 -60px;
	}

	.ui-dialog.confirmation .ui-dialog-title {
	color: #093;
	background-position: 0 -30px;
	}

	.ui-dialog.popupmessage .ui-dialog-titlebar {
	padding: 8px 1em 4px 1em;
	background: #e3e3e3;
	background: -moz-linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e3e3e3), color-stop(100%,#cfcfcf));
	background: -o-linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
	background: -ms-linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
	background: linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
	}

	.ui-dialog.popupmessage .ui-widget-content {
	font-size: 12px;
	background: #eee;
	background: -moz-linear-gradient(top, #eee 0%, #dcdcdc 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eee), color-stop(100%,#dcdcdc));
	background: -o-linear-gradient(top, #eee 0%, #dcdcdc 100%);
	background: -ms-linear-gradient(top, #eee 0%, #dcdcdc 100%);
	background: linear-gradient(top, #eee 0%, #dcdcdc 100%);
	}


	/* basic page layout */

	#topline {
	height: 18px;
	background: url(images/linen_header.jpg) repeat #666;
	border-bottom: 1px solid #4f4f4f;
	padding: 2px 0 2px 10px;
	color: #aaa;
	}

	#topnav {
	height: 46px;
	margin-bottom: 10px;
	padding: 0 0 0 10px;
	background: #111;
	background: -moz-linear-gradient(top, #404040 0%, #060606 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#404040), color-stop(100%,#060606));
	background: -o-linear-gradient(top, #404040 0%, #060606 100%);
	background: -ms-linear-gradient(top, #404040 0%, #060606 100%);
	background: linear-gradient(top, #404040 0%, #060606 100%);
	}

	#topline a,
	#topnav a {
	color: #eee;
	text-decoration: none;
	}

	#topline a:hover {
	text-decoration: underline;
	}

	#toplogo {
	padding-top: 2px;
	cursor: pointer;
	}

	.topleft {
	float: left;
	}

	.topright {
	float: right;
	}

	.closelink {
	display: inline-block;
	padding: 2px 10px 2px 20px;
	}

	#topline span.username {
	padding-right: 1em;
	}

	#topline .topleft a {
	display: inline-block;
	padding: 2px 0.8em 0 0;
	color: #aaa;
	}

	#topline a.button-logout {
	display: inline-block;
	padding: 2px 10px 2px 20px;
	background: url(images/buttons.png) -6px -193px no-repeat;
	color: #fff;
	}


	/* taskbar */

	#taskbar a {
	display: inline-block;
	height: 34px;
	padding: 12px 10px 0 6px;
	}

	#taskbar a span.button-inner {
	display: inline-block;
	font-size: 110%;
	font-weight: normal;
	text-shadow: 0px 1px 1px black;
	padding: 5px 0 0 34px;
	height: 19px;
	background: url(images/buttons.png) -1000px 0 no-repeat;
	}

	#taskbar a.button-selected {
	color: #3cf;
	background-color: #2c2c2c;
	}

	#taskbar a.button-mail span.button-inner {
	background-position: 0 2px;
	}

	#taskbar a.button-mail:hover span.button-inner,
	#taskbar a.button-mail.button-selected span.button-inner {
	background-position: 0 -22px;
	}

	#taskbar a.button-addressbook span.button-inner {
	background-position: 0 -48px;
	}

	#taskbar a.button-addressbook:hover span.button-inner,
	#taskbar a.button-addressbook.button-selected span.button-inner {
	background-position: 0 -72px;
	}

	#taskbar a.button-settings span.button-inner {
	background-position: 0 -96px;
	}

	#taskbar a.button-settings:hover span.button-inner,
	#taskbar a.button-settings.button-selected span.button-inner {
	background-position: 0 -120px;
	}

	#taskbar a.button-calendar span.button-inner {
	background-position: 0 -144px;
	}

	#taskbar a.button-calendar:hover span.button-inner,
	#taskbar a.button-calendar.button-selected span.button-inner {
	background-position: 0 -168px;
	}

	#mainscreen {
	position: absolute;
	top: 88px;
	left: 10px;
	right: 10px;
	bottom: 20px;
	}

	+.extwin #mainscreen {
	+ top: 40px;
	+}
	+
	#mainscreen.offset {
	top: 130px;
	}

	#mainscreen .offset {
	margin-top: 42px;
	}

	.uibox {
	border: 1px solid #a3a3a3;
	border-radius: 4px;
	overflow: hidden;
	box-shadow: 0 0 2px #999;
	-o-box-shadow: 0 0 2px #999;
	-webkit-box-shadow: 0 0 2px #999;
	-moz-box-shadow: 0 0 2px #999;
	background: #fff;
	}

	.minwidth {
	position: absolute;
	top: 0;
	left: 0;
	bottom: 0;
	width: 100%;
	min-width: 1024px;
	}

	.scroller {
	overflow: auto;
	}

	.readtext {
	width: 42em;
	padding: 12px;
	font-size: 12px;
	}

	.readtext > h1,
	.readtext > h2,
	.readtext > h3 {
	margin-top: 0;
	}

	.watermark {
	background-image: url(images/watermark.jpg);
	background-position: center;
	background-repeat: no-repeat;
	}

	/* lists */

	.listbox {
	background: #d9ecf4;
	overflow: hidden;
	}

	.listbox .scroller {
	position: absolute;
	top: 0;
	left: 0;
	width: 100%;
	bottom: 0;
	overflow-x: hidden;
	overflow-y: auto;
	}

	.listbox .scroller.withfooter {
	bottom: 42px;
	}

	.listbox .boxtitle + .scroller {
	top: 34px;
	}

	.boxtitle,
	.uibox .listing thead td {
	font-size: 12px;
	font-weight: bold;
	padding: 10px 8px 3px 8px;
	height: 20px; /* doesn't affect table-cells in FF */
	margin: 0;
	text-shadow: 0px 1px 1px #fff;
	border-bottom: 1px solid #bbd3da;
	white-space: nowrap;
	}

	.uibox .listing thead td {
	padding-bottom: 8px;
	height: auto;
	}

	.uibox .boxtitle,
	.uibox .listing thead td {
	background: #b0ccd7;
	color: #004458;
	border-radius: 4px 4px 0 0;
	}

	.listbox .listitem,
	.listbox .tablink,
	.listing tbody td,
	.listing li {
	display: block;
	border-top: 1px solid #fff;
	border-bottom: 1px solid #bbd3da;
	cursor: default;
	font-weight: normal;
	}

	.listbox .listitem a,
	.listbox .tablink a,
	.listing tbody td,
	.listing li a {
	display: block;
	color: #376572;
	text-shadow: 0px 1px 1px #fff;
	text-decoration: none;
	cursor: default;
	padding: 6px 8px 2px 8px;
	height: 17px; /* doesn't affect table-cells in FF */
	white-space: nowrap;
	}

	.listing tbody td {
	display: table-cell;
	padding-bottom: 5px;
	height: auto;
	min-height: 14px;
	}

	.webkit .listing tbody td {
	height: 14px;
	}

	.listbox .listitem.selected,
	.listbox .tablink.selected,
	.listbox .listitem.selected > a,
	.listbox .tablink.selected > a,
	.listing tbody tr.unfocused td,
	.listing tbody tr.selected td,
	.listing li.selected,
	.listing li.selected > a {
	color: #004458;
	font-weight: bold;
	background-color: #c7e3ef;
	}

	ul.listing {
	display: block;
	list-style: none;
	margin: 0;
	padding: 0;
	}

	ul.listing li {
	background-color: #d9ecf4;
	}

	ul.listing li.droptarget,
	table.listing tr.droptarget td {
	background-color: #e8e798;
	}

	table.listing,
	table.layout {
	border: 0;
	width: 100%;
	border-spacing: 0;
	}

	table.layout td {
	vertical-align: top;
	}

	.listbox .boxfooter {
	position: absolute;
	bottom: 0;
	left: 0;
	width: 100%;
	height: 42px;
	border-top: 1px solid #ccdde4;
	background: #d9ecf4;
	-webkit-box-shadow: inset 0 1px 0 0 #fff;
	-moz-box-shadow: inset 0 1px 0 0 #fff;
	box-shadow: inset 0 1px 0 0 #fff;
	white-space: nowrap;
	overflow: hidden;
	}

	.uibox .boxfooter {
	border-radius: 0 0 4px 4px;
	}

	.boxfooter .listbutton {
	display: inline-block;
	text-decoration: none;
	width: 48px;
	border-right: 1px solid #fff;
	background: #c7e3ef;
	padding: 3px 0;
	margin-top: 1px;
	}

	.uibox .boxfooter .listbutton:first-child {
	border-radius: 0 0 0 4px;
	}

	.boxfooter .listbutton .inner {
	display: inline-block;
	width: 48px;
	height: 35px;
	text-indent: -5000px;
	background: url(images/buttons.png) -1000px 0 no-repeat;
	}

	.boxfooter .listbutton.add .inner {
	background-position: 10px -1301px;
	}

	.boxfooter .listbutton.delete .inner {
	background-position: 10px -1342px;
	}

	.boxfooter .listbutton.groupactions .inner {
	background-position: 5px -1382px;
	}

	.boxfooter .listbutton.addto .inner {
	background-position: 5px -1422px;
	}

	.boxfooter .listbutton.addcc .inner {
	background-position: 5px -1462px;
	}

	.boxfooter .listbutton.addbcc {
	width: 54px;
	}

	.boxfooter .listbutton.addbcc .inner {
	width: 54px;
	background-position: 2px -1502px;
	}

	.boxfooter .listbutton.removegroup .inner {
	background-position: 5px -1540px;
	}

	.boxfooter .listbutton.disabled .inner {
	opacity: 0.4;
	filter: alpha(opacity=40);
	}

	.boxfooter .countdisplay {
	display: inline-block;
	position: relative;
	top: 10px;
	color: #69929e;
	padding: 3px 6px;
	}

	.boxpagenav {
	position: absolute;
	top: 10px;
	right: 6px;
	width: auto;
	}

	.boxpagenav a.icon {
	display: inline-block;
	padding: 1px 3px;
	height: 13px;
	width: 14px;
	text-indent: 1000px;
	vertical-align: bottom;
	overflow: hidden;
	background: url(images/buttons.png) -4px -286px no-repeat;
	}

	.boxpagenav a.icon.prevpage {
	background-position: -4px -301px;
	}

	.boxpagenav a.icon.nextpage {
	background-position: -28px -301px;
	}

	.boxpagenav a.icon.lastpage {
	background-position: -28px -286px;
	}

	.boxpagenav a.icon.disabled {
	opacity: 0.4;
	filter: alpha(opacity=40);
	}

	.centerbox {
	width: 40em;
	margin: 16px auto;
	}

	.errorbox {
	width: 40em;
	padding: 20px;
	}

	.errorbox h3 {
	font-size: 16px;
	margin-top: 0;
	}


	/* Records table */

	table.records-table {
	display: table;
	width: 100%;
	table-layout: fixed;
	border-collapse: collapse;
	border-spacing: 0;
	border: 1px solid #bbd3da;
	}

	.boxlistcontent .records-table {
	border: 0;
	}

	.records-table thead td {
	color: #69939e;
	font-size: 11px;
	font-weight: bold;
	background: #d6eaf3;
	background: -moz-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
	background: -webkit-gradient(linear, left top, right top, color-stop(0,#e3f2f6), color-stop(8%,#d6eaf3), color-stop(100%,#d6eaf3));
	background: -o-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
	background: -ms-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px ,#d6eaf3 100%);
	background: linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
	border-left: 1px solid #bbd3da;
	padding: 8px 7px;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.records-table.sortheader thead td {
	padding: 0;
	}

	.records-table thead td a,
	.records-table thead td span {
	display: block;
	padding: 7px 7px;
	color: #69939e;
	text-decoration: none;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.records-table tbody td {
	padding: 2px 7px;
	border-bottom: 1px solid #ddd;
	border-left: 1px dotted #bbd3da;
	white-space: nowrap;
	cursor: default;
	overflow: hidden;
	text-overflow: ellipsis;
	background-color: #fff;
	}

	.records-table thead tr td:first-child,
	.records-table tbody tr td:first-child {
	border-left: 0;
	}

	.records-table tr.selected td {
	color: #fff !important;
	background: #019bc6;
	background: -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
	background: -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	background: -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	background: linear-gradient(top, #019bc6 0%, #017cb4 100%);
	}

	.records-table tr.selected td a,
	.records-table tr.selected td span {
	color: #fff !important;
	}

	.records-table tr.unfocused td {
	color: #fff !important;
	background: #4db0d2 !important;
	}

	.records-table tr.unfocused td a,
	.records-table tr.unfocused td span {
	color: #fff !important;
	}

	.records-table tr.deleted td,
	.records-table tr.deleted td a {
	color: #ccc !important;
	}


	/* iFrames */

	#aboutframe {
	width: 97%;
	height: 100%;
	border: 0;
	padding: 0;
	}

	body.iframe {
	background: #fff;
	margin: 38px 0 10px 0;
	}

	body.iframe.floatingbuttons {
	margin-bottom: 40px;
	}

	body.iframe.fullheight {
	margin: 0;
	}

	.contentbox .boxtitle,
	body.iframe .boxtitle {
	color: #777;
	background: #eee;
	background: -moz-linear-gradient(top, #eee 0%, #dfdfdf 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eee), color-stop(100%,#dfdfdf));
	background: -o-linear-gradient(top, #eee 0%, #dfdfdf 100%);
	background: -ms-linear-gradient(top, #eee 0%, #dfdfdf 100%);
	background: linear-gradient(top, #eee 0%, #dfdfdf 100%);
	border-bottom: 1px solid #ccc;
	}

	body.iframe .boxtitle {
	position: fixed;
	top: 0;
	left: 0;
	width: 100%;
	z-index: 100;
	}

	-body.iframe .footerleft.floating {
	+body.iframe .footerleft.floating,
	+#composeview-bottom .formbuttons.floating {
	position: fixed;
	left: 0;
	bottom: 0;
	width: 100%;
	z-index: 110;
	background: #fff;
	padding-top: 8px;
	padding-bottom: 12px;
	}

	-body.iframe .footerleft.floating:before {
	+body.iframe .footerleft.floating:before,
	+#composeview-bottom .formbuttons.floating:before {
	content: " ";
	position: absolute;
	top: -6px;
	left: 0;
	width: 100%;
	height: 6px;
	background: url(images/overflowshadow.png) top center no-repeat;
	}

	.boxcontent {
	padding: 10px;
	}

	.contentbox .scroller {
	position: absolute;
	top: 34px;
	left: 0;
	right: 0;
	bottom: 28px;
	overflow: auto;
	}

	.iframebox {
	position: absolute;
	top: 0;
	left: 0;
	right: 0;
	bottom: 28px;
	}

	.footerleft {
	padding: 0 12px 4px 12px;
	}

	.propform fieldset {
	margin-bottom: 20px;
	border: 0;
	padding: 0;
	}

	.propform fieldset legend {
	display: block;
	font-size: 14px;
	font-weight: bold;
	padding-bottom: 10px;
	margin-bottom: 0;
	}

	.propform fieldset fieldset legend {
	color: #666;
	font-size: 12px;
	}

	fieldset.floating {
	float: left;
	margin-right: 10px;
	margin-bottom: 10px;
	}

	table.propform {
	width: 100%;
	border-spacing: 0;
	border-collapse: collapse;
	}

	ul.proplist li,
	table.propform td {
	width: 80%;
	padding: 4px 10px;
	background: #eee;
	border-bottom: 2px solid #fff;
	}

	table.propform td.title {
	width: 20%;
	color: #333;
	padding-right: 20px;
	white-space: nowrap;
	}

	table.propform .mceLayout td {
	padding: 0;
	border-bottom: 0;
	}

	ul.proplist {
	list-style: none;
	margin: 0;
	padding: 0;
	}

	ul.proplist li {
	width: auto;
	}

	#pluginbody {
	position: absolute;
	top: 0;
	left: 0;
	right: 0;
	bottom: 0;
	}


	/* Login form */

	#login-form {
	position: relative;
	width: 580px;
	margin: 20ex auto 2ex auto;
	}

	#login-form .box-inner {
	width: 430px;
	background: url(images/linen_login.jpg) top left no-repeat #5c5c5c;
	margin: 0 50px;
	padding: 10px 24px 24px 24px;
	border: 1px solid #333;
	border-radius: 5px;
	box-shadow: inset 0 0 1px #ccc;
	-o-box-shadow: inset 0 0 1px #ccc;
	-webkit-box-shadow: inset 0 0 1px #ccc;
	-moz-box-shadow: inset 0 0 1px #ccc;
	}

	#login-form .box-bottom {
	background: url(images/login_shadow.png) top center no-repeat;
	margin-top: -3px;
	padding-top: 10px;
	}

	#login-form td.input {
	width: 80%;
	padding: 8px;
	}

	#login-form input[type="text"],
	#login-form input[type="password"] {
	width: 100%;
	border-color: #666;
	}

	#login-form input.button {
	color: #444;
	text-shadow: 0px 1px 1px #fff;
	border-color: #f9f9f9;
	background: #f9f9f9;
	background: -moz-linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e2e2e2));
	background: -o-linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
	background: -ms-linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
	background: linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
	box-shadow: inset 0 1px 0 0 #fff;
	-moz-box-shadow: inset 0 1px 0 0 #fff;
	-webkit-box-shadow: inset 0 1px 0 0 #fff;
	-o-box-shadow: inset 0 1px 0 0 #fff;
	}

	#login-form input.button:hover,
	#login-form input.button:focus {
	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9), inset 0 1px 0 0 #fff;
	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9), inset 0 1px 0 0 #fff;
	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9), inset 0 1px 0 0 #fff;
	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9), inset 0 1px 0 0 #fff;
	}

	#login-form input.button:active {
	color: #333;
	background: -moz-linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dcdcdc), color-stop(100%,#f9f9f9));
	background: -o-linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
	background: -ms-linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
	background: linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
	}

	#login-form form table {
	width: 98%;
	}

	#login-form td.title {
	width: 20%;
	white-space: nowrap;
	color: #cecece;
	text-shadow: 0px 1px 1px black;
	text-align: right;
	padding-right: 1em;
	}

	#login-form p.formbuttons {
	margin-top: 2em;
	text-align: center;
	}

	#login-form #logo {
	margin-bottom: 20px;
	}

	#login-form #message {
	min-height: 40px;
	padding: 5px 25px;
	text-align: center;
	}

	#login-form #message div {
	display: inline-block;
	padding-right: 0;
	}

	#bottomline {
	font-size: 90%;
	text-align: center;
	margin-top: 2em;
	}



	/* quicksearch /

	#quicksearchbar {
	position: absolute;
	right: 1px;
	top: 0;
	width: 240px;
	}

	#quicksearchbar input {
	width: 176px;
	margin: 0;
	margin-top: 7px;
	padding: 3px 30px 3px 34px;
	height: 18px;
	background: #f1f1f1;
	border-color: #ababab;
	font-weight: bold;
	font-size: 11px;
	}

	#quicksearchbar #searchmenulink {
	position: absolute;
	top: 12px;
	left: 6px;
	}

	#quicksearchbar #searchreset {
	position: absolute;
	top: 11px;
	right: 1px;
	}


	/* toolbar */

	.toolbar .spacer {
	display: inline-block;
	width: 24px;
	height: 40px;
	padding: 0;
	}

	.toolbar a.button {
	text-align: center;
	font-size: 10px;
	color: #555;
	min-width: 50px;
	max-width: 75px;
	height: 13px;
	overflow: hidden;
	text-overflow: ellipsis;
	white-space: nowrap;
	padding: 28px 2px 0 2px;
	text-shadow: 0px 1px 1px #eee;
	box-shadow: none;
	-moz-box-shadow: none;
	-webkit-box-shadow: none;
	-o-box-shadow: none;
	background: url(images/buttons.png) -100px 0 no-repeat transparent;
	border: 0;
	}

	.toolbar a.button.disabled {
	opacity: 0.4;
	filter: alpha(opacity=40);
	}

	.dropbutton {
	display: inline-block;
	position: relative;
	}

	.dropbutton .dropbuttontip {
	display: block;
	position: absolute;
	right: 0;
	top: 0;
	height: 42px;
	width: 18px;
	background: url(images/buttons.png) 0 -1255px no-repeat;
	cursor: pointer;
	}

	.dropbutton .dropbuttontip:hover {
	background-position: -26px -1255px;
	}

	.dropbutton a.button.disabled + .dropbuttontip {
	opacity: 0.5;
	filter: alpha(opacity=50);
	}

	.dropbutton a.button.disabled + .dropbuttontip:hover {
	background-position: 0 -1255px;
	}

	.dropbutton a.button {
	margin-left: 0;
	padding-left: 0;
	margin-right: 0;
	padding-right: 0;
	}

	.toolbar a.button.back {
	background-position: 0 -1216px;
	}

	.toolbar a.button.checkmail {
	background-position: center -1176px;
	}

	.toolbar a.button.compose {
	background-position: center -530px;
	}

	.toolbar a.button.reply {
	background-position: center -570px;
	}

	.toolbar a.button.reply-all {
	min-width: 64px;
	background-position: left -610px;
	}

	.toolbar a.button.forward {
	min-width: 64px;
	background-position: left -650px;
	}

	.toolbar a.button.delete {
	background-position: center -690px;
	}

	.toolbar a.button.archive {
	background-position: center -730px;
	}

	.toolbar a.button.junk {
	background-position: center -770px;
	}

	.toolbar a.button.print {
	background-position: center -810px;
	}

	.toolbar a.button.markmessage {
	background-position: center -1094px;
	}

	.toolbar a.button.more {
	background-position: center -850px;
	}

	.toolbar a.button.attach {
	background-position: center -890px;
	}

	.toolbar a.button.spellcheck {
	min-width: 64px;
	background-position: left -930px;
	}

	.toolbar a.button.spellcheck.selected {
	- background-position: left -1580px;
	+ background-position: left -1620px;
	color: #1978a1;
	}

	.toolbar a.button.insertsig {
	background-position: center -1135px;
	}

	.toolbar a.button.search {
	background-position: center -970px;
	}

	.toolbar a.button.import {
	background-position: center -1012px;
	}

	.toolbar a.button.export {
	background-position: center -1054px;
	}

	+.toolbar a.button.send {
	+ background-position: center -1660px;
	+}
	+
	+.toolbar a.button.savedraft {
	+ background-position: center -1700px;
	+}
	+
	+.toolbar a.button.close {
	+ background-position: 0 -1745px;
	+}
	+
	+
	a.menuselector {
	display: inline-block;
	border: 1px solid #ababab;
	border-radius: 4px;
	background: #f8f8f8;
	background: -moz-linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#dddddd));
	background: -o-linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
	background: -ms-linear-gradient(top, #f9f9f9 0%, #dddddd 100%);
	background: linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
	text-decoration: none;
	color: #333;
	cursor: pointer;
	white-space: nowrap;
	}

	a.menuselector .handle {
	display: inline-block;
	padding: 0 32px 0 6px;
	height: 20px;
	line-height: 19px;
	text-shadow: 0px 1px 1px #fff;
	background: url(images/selector.png) right center no-repeat;
	border-radius: 4px;
	}

	a.menuselector:active {
	background: #dddddd;
	background: -moz-linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dddddd), color-stop(100%,#f8f8f8));
	background: -o-linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
	background: -ms-linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
	background: linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
	text-decoration: none;
	}

	select.decorated {
	position: relative;
	z-index: 10;
	opacity: 0;
	height: 22px;
	cursor: pointer;
	filter: alpha(opacity=0);
	-khtml-appearance: none;
	-webkit-appearance: none;
	}

	html.opera select.decorated {
	opacity: 1;
	}

	select.decorated option {
	color: #fff;
	background: #444;
	border: 0;
	border-top: 1px solid #5a5a5a;
	border-bottom: 1px solid #333;
	text-shadow: 0px 1px 1px #333;
	padding: 4px 6px;
	outline: none;
	}


	/* quota indicator */

	#quotadisplay {
	left: 6px;
	font-size: 12px;
	font-weight: bold;
	text-shadow: 0px 1px 1px #fff;
	padding-left: 30px;
	height: 18px;
	background: url(images/quota.png) -100px 0 no-repeat;
	}

	/* popup menus */

	.popupmenu,
	#rcmKSearchpane {
	display: none;
	position: absolute;
	top: 32px;
	left: 90px;
	width: auto;
	background: #444;
	border: 1px solid #999;
	z-index: 240;
	border-radius: 4px;
	box-shadow: 0 2px 6px 0 #333;
	-moz-box-shadow: 0 2px 6px 0 #333;
	-webkit-box-shadow: 0 2px 6px 0 #333;
	-o-box-shadow: 0 2px 6px 0 #333;
	}

	.popupmenu.dropdown {
	border-radius: 0 0 4px 4px;
	border-top: 0;
	}

	ul.toolbarmenu,
	#rcmKSearchpane ul {
	margin: 0;
	padding: 0;
	list-style: none;
	}

	.googie_list td,
	ul.toolbarmenu li,
	#rcmKSearchpane ul li {
	color: #fff;
	white-space: nowrap;
	min-width: 130px;
	margin: 0;
	border-top: 1px solid #5a5a5a;
	border-bottom: 1px solid #333;
	}

	.googie_list tr:first-child td,
	ul.toolbarmenu li:first-child,
	select.decorated option:first-child {
	border-top: 0;
	}

	.googie_list tr:last-child td,
	ul.toolbarmenu li:last-child,
	select.decorated option:last-child {
	border-bottom: 0;
	}

	.googie_list td span,
	ul.toolbarmenu li a {
	display: block;
	color: #666;
	text-shadow: 0px 1px 1px #333;
	text-decoration: none;
	min-height: 14px;
	padding: 6px 10px 6px 10px;
	}

	.googie_list td span {
	padding: 3px 10px;
	}

	.googie_list td span,
	ul.toolbarmenu li a.active {
	color: #fff;
	cursor: default;
	}

	.googie_list td.googie_list_onhover,
	ul.toolbarmenu li a.active:hover,
	#rcmKSearchpane ul li.selected,
	select.decorated option:hover,
	select.decorated option[selected='selected'] {
	background-color: #00aad6;
	background: -moz-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00aad6), color-stop(100%,#008fc9));
	background: -o-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	background: -ms-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	background: linear-gradient(top, #00aad6 0%, #008fc9 100%);
	}

	ul.toolbarmenu.iconized li a,
	ul.toolbarmenu.selectable li a {
	padding-left: 30px;
	}

	ul.toolbarmenu.selectable li a.selected {
	background: url(images/messages.png) 4px -27px no-repeat;
	}

	ul.toolbarmenu li label {
	display: block;
	color: #fff;
	padding: 4px 8px;
	text-shadow: 0px 1px 1px #333;
	}

	ul.toolbarmenu li a.icon {
	color: #eee;
	padding: 2px 6px;
	}

	ul.toolbarmenu li span.icon {
	display: block;
	min-height: 14px;
	padding: 4px 4px 1px 24px;
	height: 17px;
	background-image: url(images/listicons.png);
	background-position: -100px 0;
	background-repeat: no-repeat;
	opacity: 0.2;
	filter: alpha(opacity=20);
	}

	ul.toolbarmenu li a.active span.icon {
	opacity: 0.99;
	filter: alpha(opacity=100);
	}

	ul.toolbarmenu li span.read {
	background-position: 0 -1220px;
	}

	ul.toolbarmenu li span.unread {
	background-position: 0 -1196px;
	}

	ul.toolbarmenu li span.flagged {
	background-position: 0 -1244px;
	}

	ul.toolbarmenu li span.unflagged {
	background-position: 0 -1268px;
	}

	ul.toolbarmenu li span.mail {
	background-position: 0 -1293px;
	}

	ul.toolbarmenu li span.list {
	background-position: 0 -1317px;
	}

	ul.toolbarmenu li span.invert {
	background-position: 0 -1340px;
	}

	ul.toolbarmenu li span.cross {
	background-position: 0 -1365px;
	}

	ul.toolbarmenu li span.print {
	background-position: 0 -1436px;
	}

	ul.toolbarmenu li span.download {
	background-position: 0 -1412px;
	}

	ul.toolbarmenu li span.edit {
	background-position: 0 -1388px;
	}

	ul.toolbarmenu li span.viewsource {
	background-position: 0 -1460px;
	}

	ul.toolbarmenu li span.extwin {
	background-position: 0 -1484px;
	}

	ul.toolbarmenu li span.conversation {
	background-position: 0 -1532px;
	}

	#rcmKSearchpane {
	border-radius: 0 0 4px 4px;
	border-top: 0;
	}

	#rcmKSearchpane ul li {
	text-shadow: 0px 1px 1px #333;
	text-decoration: none;
	min-height: 14px;
	padding: 6px 10px 6px 10px;
	border: 0;
	cursor: default;
	}

	.popupdialog {
	display: none;
	padding: 10px;
	}

	.popupdialog .formbuttons {
	margin: 20px 0 4px 0;
	}

	.ui-dialog .prompt input {
	display: block;
	margin: 8px 0;
	}

	.hint {
	margin: 4px 0;
	color: #999;
	text-shadow: 0px 1px 1px #fff;
	}

	.splitter {
	user-select: none;
	-moz-user-select: none;
	-khtml-user-select: none;
	position: absolute;
	background: url(images/splitter.png) center no-repeat;
	}

	.splitter-h {
	height: 10px;
	width: 100%;
	cursor: n-resize;
	cursor: row-resize;
	background-position: center 0;
	}

	.splitter-v {
	width: 10px;
	height: 100%;
	cursor: e-resize;
	cursor: col-resize;
	background-position: 0 center;
	}

	#rcmdraglayer {
	min-width: 260px;
	width: auto !important;
	width: 260px;
	padding: 6px 8px;
	background: #444;
	border: 1px solid #555;
	border-radius: 4px;
	box-shadow: 0 2px 6px 0 #333;
	-moz-box-shadow: 0 2px 6px 0 #333;
	-webkit-box-shadow: 0 2px 6px 0 #333;
	-o-box-shadow: 0 2px 6px 0 #333;
	z-index: 250;
	color: #ccc;
	white-space: nowrap;
	opacity: 0.92;
	filter: alpha(opacity=92);
	text-shadow: 0px 1px 1px #333;
	}

	#rcmdraglayer:after {
	content: "";
	position: absolute;
	top: 6px;
	left: -6px;
	border-style: solid;
	border-width: 6px 6px 6px 0;
	border-color: transparent #444;
	/* reduce the damage in FF3.0 */
	display: block;
	width: 0;
	z-index: 251;
	}

	.draglayercopy:before {
	position: absolute;
	bottom: -6px;
	left: -6px;
	content: " ";
	width: 16px;
	height: 16px;
	background: url(images/buttons.png) -7px -358px no-repeat;
	z-index: 255;
	}


	/* attachment list */

	.attachmentslist {
	list-style: none;
	margin: 0;
	padding: 0;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.attachmentslist li {
	display: block;
	position: relative;
	background: url(images/filetypes.png) 0 0 no-repeat;
	margin-bottom: 1px;
	}

	.attachmentslist li.pdf {
	background-position: 0 -26px;
	}

	.attachmentslist li.doc,
	.attachmentslist li.docx,
	.attachmentslist li.msword {
	background-position: 0 -52px;
	}

	.attachmentslist li.odt {
	background-position: 0 -78px;
	}

	.attachmentslist li.xls,
	.attachmentslist li.xlsx,
	.attachmentslist li.msexcel {
	background-position: 0 -104px;
	}

	.attachmentslist li.ods {
	background-position: 0 -130px;
	}

	.attachmentslist li.zip,
	.attachmentslist li.gz {
	background-position: 0 -156px;
	}

	.attachmentslist li.rar {
	background-position: 0 -182px;
	}

	.attachmentslist li.image {
	background-position: 0 -208px;
	}

	.attachmentslist li.jpg,
	.attachmentslist li.jpeg {
	background-position: 0 -234px;
	}

	.attachmentslist li.png {
	background-position: 0 -260px;
	}

	.attachmentslist li.m4p {
	background-position: 0 -286px;
	}

	.attachmentslist li.mp3,
	.attachmentslist li.audio {
	background-position: 0 -312px;
	}

	.attachmentslist li.video {
	background-position: 0 -338px;
	}

	.attachmentslist li.txt,
	.attachmentslist li.text {
	background-position: 0 -416px;
	}

	.attachmentslist li.ics,
	.attachmentslist li.calendar {
	background-position: 0 -364px;
	}

	.attachmentslist li.vcard {
	background-position: 0 -390px;
	}

	.attachmentslist li.html {
	background-position: 0 -442px;
	}

	.attachmentslist li a,
	#compose-attachments ul li {
	display: block;
	color: #333;
	font-weight: bold;
	padding: 8px 4px 3px 30px;
	text-shadow: 0px 1px 1px #fff;
	text-decoration: none;
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	#compose-attachments ul li {
	padding-right: 28px;
	}

	.attachmentslist li a:hover {
	text-decoration: underline;
	}

	.attachmentslist li.uploading {
	background: url(images/ajaxloader.gif) 2px 6px no-repeat;
	}

	.attachmentslist li a.delete,
	.attachmentslist li a.cancelupload {
	position: absolute;
	top: 6px;
	right: 0;
	width: 24px;
	height: 18px;
	padding: 0;
	text-decoration: none;
	text-indent: -5000px;
	background: url(images/buttons.png) -7px -337px no-repeat;
	}

	.attachmentslist li a.cancelupload {
	background-position: -7px -377px;
	}


	/* fieldset tabs */

	.tabsbar {
	margin-bottom: 12px;
	padding-top: 15px;
	height: 27px;
	white-space: nowrap;
	}

	.ui-dialog-content .tabsbar {
	margin-bottom: 0;
	}

	.tabsbar .tablink {
	padding: 15px 1px 15px 0;
	background: #f8f8f8;
	background: -moz-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(50%,#d3d3d3), color-stop(100%,#f8f8f8));
	background: -webkit-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: -o-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: -ms-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	}

	.tabsbar .tablink:last-child {
	background: none;
	}

	.tabsbar .tablink:last-child a {
	border-right: 0;
	}

	.tabsbar .tablink a {
	padding: 15px;
	color: #999;
	font-size: 12px;
	font-weight: bold;
	text-decoration: none;
	background: #fff;
	border-right: 1px solid #fafafa;
	}

	.tabsbar .tablink.selected a {
	color: #004458;
	background: #f6f6f6;
	background: -moz-linear-gradient(top, #fff 40%, #efefef 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(40%,#fff), color-stop(100%,#efefef));
	background: -o-linear-gradient(top, #fff 40%, #efefef 100%);
	background: -ms-linear-gradient(top, #fff 40%, #efefef 100%);
	background: linear-gradient(top, #fff 40%, #efefef 100%);
	}

	fieldset.tab {
	border: 0;
	padding: 0;
	margin-left: 0;
	}
	diff --git a/skins/larry/svggradients.css b/skins/larry/svggradients.css
	index 5b3fedbfc..06c6f4732 100644
	--- a/skins/larry/svggradients.css
	+++ b/skins/larry/svggradients.css
	@@ -1,178 +1,178 @@
	/**
	* Roundcube webmail SVG-based gradients for IE 9
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*
	* $Id$
	*/

	input.button {
	background-image: url(svggradient.php?c=f9f9f9;e6e6e6);
	}

	.formbuttons input.button {
	background-image: url(svggradient.php?c=7b7b7b;606060);
	}

	.formbuttons input.button:active {
	background-image: url(svggradient.php?c=5c5c5c;7b7b7b);
	}

	input.button.mainaction {
	background-image: url(svggradient.php?c=505050;2a2e31);
	}

	input.button.mainaction:active {
	background-image: url(svggradient.php?c=2a2e31;505050);
	}

	a.button {
	background-image: url(svggradient.php?c=f9f9f9;e6e6e6);
	}

	a.button.pressed,
	a.button:active,
	input.button:active {
	background-image: url(svggradient.php?c=e6e6e6;f9f9f9);
	}

	.pagenav.dark a.button {
	background-image: url(svggradient.php?c=d8d8d8;bababa);
	}

	.pagenav.dark a.button.pressed {
	background-image: url(svggradient.php?c=bababa;d8d8d8);
	}

	#message.statusbar {
	background-image: url(svggradient.php?c=eaeaea;c8c8c8);
	}

	.ui-dialog.popupmessage .ui-dialog-titlebar {
	background-image: url(svggradient.php?c=e3e3e3;cfcfcf);
	}

	.ui-dialog.popupmessage .ui-widget-content {
	background-image: url(svggradient.php?c=eeeeee;dcdcdc);
	}

	#topnav {
	background-image: url(svggradient.php?c=404040;060606);
	}

	.records-table tr.selected td {
	background-image: url(svggradient.php?c=019bc6;017cb4);
	}

	.contentbox .boxtitle,
	body.iframe .boxtitle {
	background-image: url(svggradient.php?c=eeeeee;dfdfdf);
	/* background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20preserveAspectRatio%3D%22none%22%20version%3D%221.0%22%20width%3D%22100%25%22%20height%3D%22100%25%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%22mLG1%22%20x1%3D%220%25%22%20y1%3D%220%25%22%20x2%3D%220%25%22%20y2%3D%22100%25%22%20spreadMethod%3D%22pad%22%3E%3Cstop%20offset%3D%220%25%22%20stop-color%3D%22%23eeeeee%22%20stop-opacity%3D%221%22/%3E%3Cstop%20offset%3D%22100%25%22%20stop-color%3D%22%23dfdfdf%22%20stop-opacity%3D%221%22/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20style%3D%22fill%3Aurl%28%23mLG1%29%3B%22/%3E%3C/svg%3E);*/
	}

	#login-form input.button {
	background-image: url(svggradient.php?c=f9f9f9;e2e2e2);
	}

	#login-form input.button:active {
	background-image: url(svggradient.php?c=dcdcdc;f9f9f9);
	}

	.toolbar a.button {
	filter: none;
	}

	a.menuselector {
	background-image: url(svggradient.php?c=f8f8f8;dddddd);
	}

	a.menuselector:active {
	background-image: url(svggradient.php?c=dddddd;f8f8f8);
	}

	.googie_list td.googie_list_onhover,
	ul.toolbarmenu li a.active:hover,
	#rcmKSearchpane ul li.selected {
	background-image: url(svggradient.php?c=00aad6;008fc9);
	}

	.tabsbar .tablink {
	background-image: url(svggradient.php?c=f8f8f8;d3d3d3,50;f8f8f8);
	outline: none;
	}

	.tabsbar .tablink.selected a {
	background-image: url(svggradient.php?c=ffffff;efefef);
	outline: none;
	}


	/* addressbook.css */

	.contactfieldgroup {
	background-image: url(svggradient.php?c=f7f7f7;eeeeee);
	}

	.contactfieldgroup legend {
	background-image: url(svggradient.php?c=f0f0f0;d6d6d6);
	}


	/* mail.css */

	#mailboxlist li.mailbox .unreadcount {
	background-image: url(svggradient.php?c=82acb5;6a939f);
	}

	#mailboxlist li.mailbox.selected .unreadcount {
	background-image: url(svggradient.php?c=005d76;004558);
	}

	#messageheader, #partheader, #composeheaders {
	background-image: url(svggradient.php?c=ffffff;f0f0f0);
	}

	-#previewheaderstoggle {
	+.moreheaderstoggle {
	background-image: url(svggradient.php?c=fbfbfb;e9e9e9&h=1);
	}

	#messagelistfooter {
	background-image: url(svggradient.php?c=ebebeb;c6c6c6);
	}

	/* jqueryui theme */

	.ui-menu .ui-menu-item a.ui-state-hover,
	.ui-menu .ui-menu-item a.ui-state-active {
	background-image: url(svggradient.php?c=00aad6;008fc9) !important;
	}

	.ui-button.ui-state-default {
	background-image: url(svggradient.php?c=f9f9f9;e6e6e6) !important;
	}

	.ui-button.ui-state-active {
	background-image: url(svggradient.php?c=e6e6e6;f9f9f9) !important;
	}

	.ui-tabs .ui-tabs-nav li {
	background-image: url(svggradient.php?c=f8f8f8;d3d3d3,50;d3d3d3) !important;
	}

	.ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
	background-image: url(svggradient.php?c=fafafa,40;e4e4e4) !important;
	}

	.ui-datepicker td a.ui-state-default {
	background-image: url(svggradient.php?c=e6e6e6;d6d6d6) !important;
	}

	.ui-datepicker td a.ui-state-active {
	background-image: url(svggradient.php?c=00acd4;008fc7) !important;
	}

	diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
	index ef49ece90..de3b5bfff 100644
	--- a/skins/larry/templates/compose.html
	+++ b/skins/larry/templates/compose.html
	@@ -1,191 +1,193 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	<roundcube:if condition="config:enable_spellcheck" />
	<link rel="stylesheet" type="text/css" href="/googiespell.css" />
	<roundcube:endif />
	</head>
	-<body>
	+<roundcube:if condition="env:extwin" /><body class="extwin"><roundcube:else /><body><roundcube:endif />

	-<div class="minwidth">
	<roundcube:include file="/includes/header.html" />

	<div id="mainscreen">

	+<!-- toolbar -->
	+<div id="messagetoolbar" class="fullwidth">
	+<div id="mailtoolbar" class="toolbar">
	+ <roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="cancel" condition="!env:extwin" />
	+ <roundcube:button command="close" type="link" class="button close disabled" classAct="button close" classSel="button close pressed" label="cancel" condition="env:extwin" />
	+ <span class="spacer"></span>
	+ <roundcube:button command="send" type="link" class="button send" classAct="button send" classSel="button send pressed" label="send" title="sendmessage" />
	+ <roundcube:button command="savedraft" type="link" class="button savedraft" classAct="button savedraft" classSel="button savedraft pressed" label="save" title="savemessage" />
	+ <span class="spacer"></span>
	+ <roundcube:if condition="config:enable_spellcheck" />
	+ <span class="dropbutton">
	+ <roundcube:button command="spellcheck" type="link" class="button spellcheck disabled" classAct="button spellcheck" classSel="button spellcheck pressed" label="spellcheck" title="checkspelling" />
	+ <span class="dropbuttontip" id="spellmenulink" onclick="UI.show_popup('spellmenu');return false"></span>
	+ </span>
	+ <roundcube:endif />
	+ <roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attach pressed" label="attach" title="addattachment" onclick="UI.show_uploadform();return false" />
	+ <roundcube:button command="insert-sig" type="link" class="button insertsig disabled" classAct="button insertsig" classSel="button insertsig pressed" label="signature" title="insertsignature" />
	+ <roundcube:container name="toolbar" id="compose-toolbar" />
	+</div>
	+</div>
	+
	<div id="composeview-left">

	<!-- inline address book -->
	<div id="compose-contacts" class="uibox listbox">
	<h2 class="boxtitle"><roundcube:label name="contacts" /></h2>
	<roundcube:object name="addressbooks" id="directorylist" class="listing" />
	<div class="scroller withfooter">
	<roundcube:object name="addresslist" id="contacts-table" class="listing" noheader="true" />
	</div>
	<div class="boxfooter">
	<roundcube:button command="add-recipient" prop="to" type="link" title="to" class="listbutton addto disabled" classAct="listbutton addto" innerClass="inner" content="To+" /><roundcube:button command="add-recipient" prop="cc" type="link" title="cc" class="listbutton addcc disabled" classAct="listbutton addcc" innerClass="inner" content="Cc+" /><roundcube:button command="add-recipient" prop="bcc" type="link" title="bcc" class="listbutton addbcc disabled" classAct="listbutton addbcc" innerClass="inner" content="Bcc+" />
	</div>
	<div class="boxpagenav">
	<roundcube:button command="firstpage" type="link" class="icon firstpage disabled" classAct="icon firstpage" title="firstpage" content="\|&lt;" />
	<roundcube:button command="previouspage" type="link" class="icon prevpage disabled" classAct="icon prevpage" title="previouspage" content="&lt;" />
	<roundcube:button command="nextpage" type="link" class="icon nextpage disabled" classAct="icon nextpage" title="nextpage" content="&gt;" />
	<roundcube:button command="lastpage" type="link" class="icon lastpage disabled" classAct="icon lastpage" title="lastpage" content="&gt;\|" />
	</div>
	</div>

	</div>

	<div id="composeview-right">

	-<!-- toolbar -->
	-<div id="messagetoolbar" class="fullwidth">
	-<div id="mailtoolbar" class="toolbar">
	- <roundcube:if condition="config:enable_spellcheck" />
	- <span class="dropbutton">
	- <roundcube:button command="spellcheck" type="link" class="button spellcheck disabled" classAct="button spellcheck" classSel="button spellcheck pressed" label="spellcheck" title="checkspelling" />
	- <span class="dropbuttontip" id="spellmenulink" onclick="UI.show_popup('spellmenu');return false"></span>
	- </span>
	- <roundcube:endif />
	- <roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attach pressed" label="attach" title="addattachment" onclick="UI.show_uploadform();return false" />
	- <roundcube:button command="insert-sig" type="link" class="button insertsig disabled" classAct="button insertsig" classSel="button insertsig pressed" label="signature" title="insertsignature" />
	- <roundcube:container name="toolbar" id="compose-toolbar" />
	-</div>
	-</div>
	-
	<form name="form" action="./" method="post" id="compose-content" class="uibox">

	<!-- message headers -->
	<div id="composeheaders">
	+<a href="#options" id="composeoptionstoggle" class="moreheaderstoggle"><span class="iconlink" title="<roundcube:label name='options' />"></span></a>

	<table class="headers-table compose-headers">
	<tbody>
	<tr>
	<td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
	<td class="editfield">
	<roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" />
	<a href="#identities" onclick="return rcmail.command('identities')" class="iconlink edit"><roundcube:label name="editidents" /></a>
	</td>
	</tr><tr>
	<td class="title top"><label for="_to"><roundcube:label name="to" /></label></td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="1" tabindex="2" /></td>
	</tr><tr id="compose-cc">
	<td class="title top">
	<label for="_cc"><roundcube:label name="cc" /></label>
	<a href="#cc" onclick="return UI.hide_header_row('cc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="1" tabindex="3" /></td>
	</tr><tr id="compose-bcc">
	<td class="title top">
	<label for="_bcc"><roundcube:label name="bcc" /></label>
	<a href="#bcc" onclick="return UI.hide_header_row('bcc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
	</td>
	<td colspan="2" class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="1" tabindex="4" /></td>
	</tr><tr id="compose-replyto">
	<td class="title top">
	<label for="_replyto"><roundcube:label name="replyto" /></label>
	<a href="#replyto" onclick="return UI.hide_header_row('replyto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td>
	</tr><tr id="compose-followupto">
	<td class="title top">
	<label for="_followupto"><roundcube:label name="followupto" /></label>
	<a href="#followupto" onclick="return UI.hide_header_row('followupto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
	</td>
	<td class="editfield"><roundcube:object name="composeHeaders" part="followupto" form="form" id="_followupto" size="70" tabindex="7" /></td>
	</tr><tr>
	<td></td>
	<td class="formlinks">
	<a href="#cc" onclick="return UI.show_header_row('cc')" id="cc-link" class="iconlink add"><roundcube:label name="addcc" /></a>
	<a href="#bcc" onclick="return UI.show_header_row('bcc')" id="bcc-link" class="iconlink add"><roundcube:label name="addbcc" /></a>
	<a href="#reply-to" onclick="return UI.show_header_row('replyto')" id="replyto-link" class="iconlink add"><roundcube:label name="addreplyto" /></a>
	<a href="#followup-to" onclick="return UI.show_header_row('followupto')" id="followupto-link" class="iconlink add"><roundcube:label name="addfollowupto" /></a>
	</td>
	</tr><tr>
	<td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
	<td class="editfield"><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="8" /></td>
	</tr>
	</tbody>
	</table>

	-<div id="composebuttons" class="formbuttons">
	- <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="11" />
	- <roundcube:button type="input" command="savedraft" class="button" label="savemessage" tabindex="12" />
	- <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="13" />
	-</div>
	-
	+<div id="composebuttons" class="pagenav formbuttons">
	+ <roundcube:button command="extwin" type="link" class="button extwin" classSel="button extwin pressed" innerClass="inner" title="openinextwin" content="[]" condition="!env:extwin" />
	</div>

	<!-- (collapsable) message options -->
	-<div id="composeoptionsbox">
	+<div id="composeoptions">
	+ <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
	<span class="composeoption">
	- <label><roundcube:label name="options" />
	- <a href="#options" id="composeoptionstoggle"> </a></label>
	+ <label><roundcube:label name="editortype" />
	+ <roundcube:object name="editorSelector" editorid="composebody" tabindex="14" /></label>
	</span>
	-
	- <div id="composeoptions">
	- <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
	- <span class="composeoption">
	- <label><roundcube:label name="editortype" />
	- <roundcube:object name="editorSelector" editorid="composebody" tabindex="14" /></label>
	- </span>
	- <roundcube:endif />
	- <span class="composeoption">
	- <label for="rcmcomposepriority"><roundcube:label name="priority" />
	- <roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></label>
	- </span>
	- <span class="composeoption">
	- <label><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /> <roundcube:label name="returnreceipt" /></label>
	- </span>
	- <span class="composeoption">
	- <label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /> <roundcube:label name="dsn" /></label>
	- </span>
	- <roundcube:if condition="!config:no_save_sent_messages" />
	- <span class="composeoption">
	- <label><roundcube:label name="savesentmessagein" /> <roundcube:object name="storetarget" maxlength="30" style="max-width:12em" /></label>
	- </span>
	- <roundcube:endif />
	- <roundcube:container name="composeoptions" id="composeoptions" />
	- </div>
	+ <roundcube:endif />
	+ <span class="composeoption">
	+ <label for="rcmcomposepriority"><roundcube:label name="priority" />
	+ <roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></label>
	+ </span>
	+ <span class="composeoption">
	+ <label><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /> <roundcube:label name="returnreceipt" /></label>
	+ </span>
	+ <span class="composeoption">
	+ <label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /> <roundcube:label name="dsn" /></label>
	+ </span>
	+ <roundcube:if condition="!config:no_save_sent_messages" />
	+ <span class="composeoption">
	+ <label><roundcube:label name="savesentmessagein" /> <roundcube:object name="storetarget" maxlength="30" style="max-width:12em" /></label>
	+ </span>
	+ <roundcube:endif />
	+ <roundcube:container name="composeoptions" id="composeoptions" />
	+</div>
	+
	</div>

	<!-- message compose body -->
	<div id="composeview-bottom">
	<div id="composebodycontainer">
	<roundcube:object name="composeBody" id="composebody" form="form" cols="70" rows="20" tabindex="9" />
	</div>
	<div id="compose-attachments" class="rightcol">
	<div style="text-align:center; margin-bottom:20px">
	- <roundcube:button name="addattachment" type="input" class="button" classSel="button pressed" label="addattachment" onclick="UI.show_uploadform();return false" tabindex="10" />
	+ <roundcube:button name="addattachment" type="input" class="button" classSel="button pressed" label="addattachment" onclick="UI.show_uploadform();return false" />
	</div>
	<roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" />
	<roundcube:object name="fileDropArea" id="compose-attachments" />
	</div>
	+<!--
	+ <div id="composeformbuttons" class="footerleft formbuttons floating">
	+ <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="11" />
	+ <roundcube:button type="input" command="savedraft" class="button" label="savemessage" tabindex="12" />
	+ <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="13" />
	+ </div>
	+-->
	</div>

	</form>

	<div id="mailview-bottom" class="uibox">
	<roundcube:object name="message" id="message" class="statusbar" />
	</div>

	</div><!-- end mailview-right -->

	</div><!-- end mainscreen -->

	-</div><!-- end minwidth -->
	-
	<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='addattachment' />">
	<roundcube:object name="composeAttachmentForm" id="uploadform" attachmentFieldSize="40" buttons="no" />
	<div class="formbuttons">
	<roundcube:button command="send-attachment" type="input" class="button mainaction" label="upload" />
	<roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />
	</div>
	</div>

	<div id="spellmenu" class="popupmenu"></div>

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

	</body>
	</html>
	diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
	index e99f2066a..f7e188f5f 100644
	--- a/skins/larry/templates/message.html
	+++ b/skins/larry/templates/message.html
	@@ -1,72 +1,80 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	</head>
	-<body class="noscroll">
	+<roundcube:if condition="env:extwin" /><body class="noscroll extwin"><roundcube:else /><body class="noscroll"><roundcube:endif />

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

	<div id="mainscreen">

	<!-- toolbar -->
	<div id="messagetoolbar" class="toolbar fullwidth">
	+<roundcube:if condition="!env:extwin" />
	<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
	<span class="spacer"></span>
	+<roundcube:endif />
	<roundcube:include file="/includes/mailtoolbar.html" />
	<div class="toolbarselect">
	<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mailboxlist decorated" folder_filter="mail" />
	</div>
	</div>

	+<roundcube:if condition="!env:extwin" />
	+
	<div id="mailview-left">

	<!-- folders list -->
	<div id="mailboxcontainer" class="uibox listbox">
	<div class="scroller">
	<roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" />
	</div>
	</div>

	</div>

	<div id="mailview-right" class="offset uibox">
	+<roundcube:else />
	+
	+<div id="mailview-right" class="offset fullwidth uibox">
	+<roundcube:endif />

	<div id="messageheader">
	-<span id="previewheaderstoggle"></span>
	+<span class="moreheaderstoggle"></span>

	<h2 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h2>
	<roundcube:object name="messageHeaders" class="headers-table" addicon="/images/addcontact.png" exclude="subject" max="20" />
	<roundcube:object name="messageFullHeaders" id="full-headers" />

	<!-- record navigation -->
	<div id="countcontrols" class="pagenav">
	<roundcube:object name="messageCountDisplay" class="countdisplay" />
	<roundcube:button command="previousmessage" type="link" class="button prevpage disabled" classAct="button prevpage" classSel="button prevpage pressed" innerClass="inner" title="previousmessage" content="&lt;" />
	<roundcube:button command="nextmessage" type="link" class="button nextpage disabled" classAct="button nextpage" classSel="button nextpage pressed" innerClass="inner" title="nextmessage" content="&gt;" />
	</div>

	<div id="contactphoto"><roundcube:object name="contactphoto" /></div>
	</div>

	<div id="messagecontent">
	<div class="rightcol">
	<roundcube:object name="messageAttachments" id="attachment-list" class="attachmentslist" />
	</div>
	<div class="leftcol">
	<roundcube:object name="messageObjects" id="message-objects" />
	<roundcube:object name="messageBody" id="messagebody" />
	</div>
	</div>

	<roundcube:object name="message" id="message" class="statusbar" />

	</div><!-- end mailview-right -->

	</div><!-- end mainscreen -->

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

	</body>
	</html>
	diff --git a/skins/larry/templates/messagepreview.html b/skins/larry/templates/messagepreview.html
	index de02b050b..9eb4d1e00 100644
	--- a/skins/larry/templates/messagepreview.html
	+++ b/skins/larry/templates/messagepreview.html
	@@ -1,57 +1,57 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	</head>
	<body class="iframe fullheight">

	<div id="messageheader" class="previewheader">
	<h3 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h3>

	-<a href="#details" id="previewheaderstoggle"><span class="iconlink" title="<roundcube:label name='togglemoreheaders' />"></span></a>
	+<a href="#details" id="previewheaderstoggle" class="moreheaderstoggle"><span class="iconlink" title="<roundcube:label name='togglemoreheaders' />"></span></a>
	<div id="contactphoto"><roundcube:object name="contactphoto" /></div>

	<table class="headers-table" id="preview-shortheaders"><tbody><tr>
	<roundcube:if condition="env:mailbox == config:drafts_mbox \|\| env:mailbox == config:sent_mbox">
	<td class="header-title"><roundcube:label name="to" /></td>
	<td class="header from"><roundcube:object name="messageHeaders" valueOf="to" max="3" addicon="/images/addcontact.png" /></td>
	<roundcube:else />
	<td class="header-title"><roundcube:label name="from" /></td>
	<td class="header from"><roundcube:object name="messageHeaders" valueOf="from" addicon="/images/addcontact.png" /></td>
	<roundcube:endif />
	<td class="header-title"><roundcube:label name="date" /></td>
	<td class="header date"><span><roundcube:object name="messageHeaders" valueOf="date" /></span></td>
	</tr></tbody></table>

	<roundcube:object name="messageHeaders" id="preview-allheaders" class="headers-table" addicon="/images/addcontact.png" max="10" exclude="subject,replyto" />

	<roundcube:object name="messageFullHeaders" id="full-headers" />

	<!-- record navigation -->
	<div id="countcontrols" class="pagenav">
	<roundcube:if condition="env:mailbox != config:drafts_mbox">
	<roundcube:button command="reply" type="link" class="button reply" classSel="button reply pressed" innerClass="inner" title="replytomessage" content="<-" />
	<roundcube:button command="reply-all" type="link" class="button replyall" classSel="button replyall pressed" innerClass="inner" title="replytoallmessage" content="<<-" />
	<roundcube:button command="forward" type="link" class="button forward" classSel="button forward pressed" innerClass="inner" title="forwardmessage" content="->" />

	<roundcube:endif />
	- <roundcube:button command="permaurl" type="link" class="button extwin" classSel="button extwin pressed" innerClass="inner" title="openinextwin" content="[]" target="_blank" />
	+ <roundcube:button command="extwin" type="link" class="button extwin" classSel="button extwin pressed" innerClass="inner" title="openinextwin" content="[]" />
	</div>

	</div>

	<div id="messagepreview">
	<div class="rightcol">
	<roundcube:object name="messageAttachments" id="attachment-list" class="attachmentslist" />
	</div>
	<div class="leftcol">
	<roundcube:object name="messageObjects" id="message-objects" />
	<roundcube:object name="messageBody" id="messagebody" />
	</div>
	</div>

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

	</body>
	</html>
	diff --git a/skins/larry/ui.js b/skins/larry/ui.js
	index 42d5237ea..da4f2300e 100644
	--- a/skins/larry/ui.js
	+++ b/skins/larry/ui.js
	@@ -1,1164 +1,1174 @@
	/**
	* Roundcube functions for default skin interface
	*
	* Copyright (c) 2011, The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*/


	function rcube_mail_ui()
	{
	var env = {};
	var popups = {};
	var popupconfig = {
	forwardmenu: { editable:1 },
	searchmenu: { editable:1, callback:searchmenu },
	listoptions: { editable:1 },
	dragmessagemenu: { sticky:1 },
	groupmenu: { above:1 },
	mailboxmenu: { above:1 },
	- composeoptionsmenu: { editable:1, overlap:1 },
	spellmenu: { callback: spellmenu },
	// toggle: #1486823, #1486930
	'attachment-form': { editable:1, above:1, toggle:!bw.ie&&!bw.linux },
	'upload-form': { editable:1, toggle:!bw.ie&&!bw.linux }
	};

	var me = this;
	var mailviewsplit;
	var compose_headers = {};

	// export public methods
	this.set = setenv;
	this.init = init;
	this.init_tabs = init_tabs;
	this.show_about = show_about;
	this.show_popup = show_popup;
	this.set_searchmod = set_searchmod;
	this.show_uploadform = show_uploadform;
	this.show_header_row = show_header_row;
	this.hide_header_row = hide_header_row;


	/**
	*
	*/
	function setenv(key, val)
	{
	env[key] = val;
	}

	/**
	* Initialize UI
	* Called on document.ready
	*/
	function init()
	{
	rcmail.addEventListener('message', message_displayed);

	/* mail task */
	if (rcmail.env.task == 'mail') {
	rcmail.addEventListener('menu-open', show_listoptions);
	rcmail.addEventListener('menu-save', save_listoptions);
	rcmail.addEventListener('responseafterlist', function(e){ switch_view_mode(rcmail.env.threading ? 'thread' : 'list') });

	var dragmenu = $('#dragmessagemenu');
	if (dragmenu.length) {
	rcmail.gui_object('message_dragmenu', 'dragmessagemenu');
	popups.dragmessagemenu = dragmenu;
	}

	if (rcmail.env.action == 'show' \|\| rcmail.env.action == 'preview') {
	rcmail.addEventListener('aftershow-headers', function() { layout_messageview(); });
	rcmail.addEventListener('afterhide-headers', function() { layout_messageview(); });
	$('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); return false });
	}
	else if (rcmail.env.action == 'compose') {
	rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 200); });
	rcmail.addEventListener('aftersend-attachment', show_uploadform);
	rcmail.addEventListener('add-recipient', function(p){ show_header_row(p.field, true); });
	layout_composeview();

	// Show input elements with non-empty value
	var field, fields = ['cc', 'bcc', 'replyto', 'followupto'];
	for (var f=0; f < fields.length; f++) {
	if ((field = $('#_'+fields[f])) && field.length && field.val() != '')
	show_header_row(fields[f], true);
	}

	- $('#composeoptionstoggle').parent().click(function(){
	- $('#composeoptionstoggle').toggleClass('enabled');
	+ $('#composeoptionstoggle').click(function(){
	+ $('#composeoptionstoggle').toggleClass('remove');
	$('#composeoptions').toggle();
	layout_composeview();
	return false;
	}).css('cursor', 'pointer');

	+ // toggle compose options if opened in new window and they were visible before
	+ if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose' && $('#composeoptionstoggle', opener.document).hasClass('remove'))
	+ $('#composeoptionstoggle').click();
	+
	new rcube_splitter({ id:'composesplitterv', p1:'#composeview-left', p2:'#composeview-right',
	orientation:'v', relative:true, start:248, min:170, size:12, render:layout_composeview }).init();
	}
	else if (rcmail.env.action == 'list' \|\| !rcmail.env.action) {
	var previewframe = $('#mailpreviewframe').is(':visible');
	$('#mailpreviewtoggle').addClass(previewframe ? 'enabled' : 'closed').click(function(e){ toggle_preview_pane(e); return false });
	$('#maillistmode').addClass(rcmail.env.threading ? '' : 'selected').click(function(e){ switch_view_mode('list'); return false });
	$('#mailthreadmode').addClass(rcmail.env.threading ? 'selected' : '').click(function(e){ switch_view_mode('thread'); return false });

	mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom',
	orientation:'h', relative:true, start:310, min:150, size:12, offset:4 });
	if (previewframe)
	mailviewsplit.init();

	new rcube_scroller('#folderlist-content', '#folderlist-header', '#folderlist-footer');

	rcmail.addEventListener('setquota', update_quota);
	}

	if ($('#mailview-left').length) {
	new rcube_splitter({ id:'mailviewsplitterv', p1:'#mailview-left', p2:'#mailview-right',
	orientation:'v', relative:true, start:226, min:150, size:12, callback:render_mailboxlist, render:resize_leftcol }).init();
	}
	}
	/* settings task */
	else if (rcmail.env.task == 'settings') {
	rcmail.addEventListener('init', function(){
	var tab = '#settingstabpreferences';
	if (rcmail.env.action)
	tab = '#settingstab' + (rcmail.env.action.indexOf('identity')>0 ? 'identities' : rcmail.env.action.replace(/\./g, ''));

	$(tab).addClass('selected')
	.children().first().removeAttr('onclick').click(function() { return false; });
	});

	if (rcmail.env.action == 'folders') {
	new rcube_splitter({ id:'folderviewsplitter', p1:'#folderslist', p2:'#folder-details',
	orientation:'v', relative:true, start:266, min:180, size:12 }).init();

	new rcube_scroller('#folderslist-content', '#folderslist-header', '#folderslist-footer');

	rcmail.addEventListener('setquota', update_quota);
	}
	else if (rcmail.env.action == 'identities') {
	new rcube_splitter({ id:'identviewsplitter', p1:'#identitieslist', p2:'#identity-details',
	orientation:'v', relative:true, start:266, min:180, size:12 }).init();
	}
	else if (rcmail.env.action == 'preferences' \|\| !rcmail.env.action) {
	new rcube_splitter({ id:'prefviewsplitter', p1:'#sectionslist', p2:'#preferences-box',
	orientation:'v', relative:true, start:266, min:180, size:12 }).init();
	}
	}
	/* addressbook task */
	else if (rcmail.env.task == 'addressbook') {
	rcmail.addEventListener('afterupload-photo', show_uploadform);

	if (rcmail.env.action == '') {
	new rcube_splitter({ id:'addressviewsplitterd', p1:'#addressview-left', p2:'#addressview-right',
	orientation:'v', relative:true, start:226, min:150, size:12, render:resize_leftcol }).init();
	new rcube_splitter({ id:'addressviewsplitter', p1:'#addresslist', p2:'#contacts-box',
	orientation:'v', relative:true, start:286, min:270, size:12 }).init();

	new rcube_scroller('#directorylist-content', '#directorylist-header', '#directorylist-footer');
	}
	}

	// set min-width to show all toolbar buttons
	var screen = $('.minwidth');
	if (screen.length) {
	screen.css('min-width', $('.toolbar').width() + $('#quicksearchbar').parent().width() + 20);
	}

	// turn a group of fieldsets into tabs
	$('.tabbed').each(function(idx, elem){ init_tabs(elem); })

	// decorate select elements
	$('select.decorated').each(function(){
	if (bw.opera) {
	$(this).removeClass('decorated');
	return;
	}

	var select = $(this),
	height = Math.max(select.height(), 26) - 2,
	width = select.width() - 22,
	title = $('option', this).first().text();

	if ($('option:selected', this).val() != '')
	title = $('option:selected', this).text();

	var overlay = $('<a class="menuselector"><span class="handle">' + title + '</span></a>')
	.css('position', 'absolute')
	.offset(select.position())
	.insertAfter(select);

	overlay.children().width(width).height(height).css('line-height', (height - 1) + 'px');

	select.change(function() {
	var val = $('option:selected', this).text();
	$(this).next().children().html(val);
	});

	var parent = select.parent();
	if (parent.css('position') != 'absolute')
	parent.css('position', 'relative');

	// re-set original select width to fix click action and options width in some browsers
	select.width(overlay.width());
	});

	$(document.body)
	.bind('mouseup', body_mouseup)
	.bind('keyup', function(e){
	if (e.keyCode == 27) {
	for (var id in popups) {
	if (popups[id].is(':visible'))
	show_popup(id, false);
	}
	}
	});

	$('iframe').load(function(e){
	// this = iframe
	var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
	$(doc).mouseup(body_mouseup);
	})
	.contents().mouseup(body_mouseup);

	// don't use $(window).resize() due to some unwanted side-effects
	window.onresize = resize;
	resize();
	}

	/**
	* Handler for mouse-up events on the document body.
	* This will close all open popup menus
	*/
	function body_mouseup(e)
	{
	var config, obj, target = e.target;
	if (target.className == 'inner')
	target = e.target.parentNode;
	for (var id in popups) {
	obj = popups[id];
	config = popupconfig[id];
	if (obj.is(':visible')
	&& target.id != id+'link'
	&& !config.toggle
	&& (!config.editable \|\| !target_overlaps(target, obj.get(0)))
	&& (!config.sticky \|\| !rcube_mouse_is_over(e, obj.get(0)))
	) {
	var myid = id+'';
	window.setTimeout(function(){ show_popupmenu(myid, false) }, 10);
	}
	}
	}

	/**
	* Update UI on window resize
	*/
	function resize()
	{
	if (rcmail.env.task == 'mail') {
	if (rcmail.env.action == 'show' \|\| rcmail.env.action == 'preview')
	layout_messageview();
	else if (rcmail.env.action == 'compose')
	layout_composeview();
	}

	// make iframe footer buttons float if scrolling is active
	$('body.iframe .footerleft').each(function(){
	var footer = $(this),
	body = $(document.body),
	floating = footer.hasClass('floating'),
	overflow = body.outerHeight(true) > $(window).height();

	if (overflow != floating) {
	var action = overflow ? 'addClass' : 'removeClass';
	footer[action]('floating');
	body[action]('floatingbuttons');
	}
	});
	}

	/**
	* Triggered when a new user message is displayed
	*/
	function message_displayed(p)
	{
	// show a popup dialog on errors
	if (p.type == 'error' && rcmail.env.task != 'login') {
	if (me.message_timer) {
	window.clearTimeout(me.message_timer);
	}
	if (!me.messagedialog) {
	me.messagedialog = $('<div>').addClass('popupdialog').hide();
	}

	var msg = p.message,
	pos = $(p.object).offset();
	pos.top -= (rcmail.env.task == 'login' ? 20 : 160);

	if (me.messagedialog.is(':visible'))
	msg = me.messagedialog.html() + '<p>' + p.message + '</p>';

	me.messagedialog.html(msg)
	.dialog({
	resizable: false,
	closeOnEscape: true,
	dialogClass: 'popupmessage ' + p.type,
	title: env.errortitle,
	close: function() {
	me.messagedialog.dialog('destroy').hide();
	},
	position: ['center', pos.top],
	hide: { effect:'drop', direction:'down' },
	width: 420,
	minHeight: 90
	}).show();

	me.message_timer = window.setTimeout(function(){ me.messagedialog.dialog('close'); }, Math.max(2000, p.timeout / 2));
	}
	}


	/**
	* Adjust UI objects of the mail view screen
	*/
	function layout_messageview()
	{
	$('#messagecontent').css('top', ($('#messageheader').outerHeight() + 1) + 'px');
	$('#message-objects div a').addClass('button');

	if (!$('#attachment-list li').length) {
	$('div.rightcol').hide();
	$('div.leftcol').css('margin-right', '0');
	}
	}


	function render_mailboxlist(splitter)
	{
	// TODO: implement smart shortening of long folder names
	}


	function resize_leftcol(splitter)
	{
	// STUB
	}


	function layout_composeview()
	{
	var body = $('#composebody'),
	form = $('#compose-content'),
	bottom = $('#composeview-bottom'),
	- w, h;
	+ w, h, bh, ovflw, btns = 0,
	+ minheight = 300,

	- bottom.css('height', (form.height() - bottom.position().top) + 'px');
	+ bh = (form.height() - bottom.position().top);
	+ ovflw = minheight - bh;
	+ btns = ovflw > -100 ? 0 : 40;
	+ bottom.css('height', Math.max(minheight, bh) + 'px');
	+ form.css('overflow', ovflw > 0 ? 'auto' : 'hidden');

	w = body.parent().width() - 5;
	h = body.parent().height() - 16;
	body.width(w).height(h);

	$('#composebody_tbl').width((w+8)+'px').height('').css('margin-top', '1px');
	$('#composebody_ifr').width((w+8)+'px').height((h-40)+'px');
	$('#googie_edit_layer').height(h+'px');
	+// $('#composebodycontainer')[(btns ? 'addClass' : 'removeClass')]('buttons');
	+// $('#composeformbuttons')[(btns ? 'show' : 'hide')]();

	var abooks = $('#directorylist');
	$('#compose-contacts .scroller').css('top', abooks.position().top + abooks.outerHeight());
	}


	function update_quota(p)
	{
	var step = 24, step_count = 20,
	y = p.total ? Math.ceil(p.percent / 100 * step_count) * step : 0;

	// never show full-circle if quota is close to 100% but below.
	if (p.total && y == step * step_count && p.percent < 100)
	y -= step;

	$('#quotadisplay').css('background-position', '0 -'+y+'px');
	}


	/**
	* Trigger for popup menus
	*/
	function show_popup(popup, show, config)
	{
	// auto-register menu object
	if (config \|\| !popupconfig[popup])
	popupconfig[popup] = $.extend(popupconfig[popup] \|\| {}, config);

	var visible = show_popupmenu(popup, show),
	config = popupconfig[popup];
	if (typeof config.callback == 'function')
	config.callback(visible);
	}

	/**
	* Show/hide a specific popup menu
	*/
	function show_popupmenu(popup, show)
	{
	var obj = popups[popup],
	config = popupconfig[popup],
	ref = $('#'+popup+'link'),
	above = config.above;

	if (!obj) {
	obj = popups[popup] = $('#'+popup);
	obj.appendTo(document.body); // move them to top for proper absolute positioning
	}

	if (!obj \|\| !obj.length)
	return false;

	if (typeof show == 'undefined')
	show = obj.is(':visible') ? false : true;
	else if (config.toggle && show && obj.is(':visible'))
	show = false;

	if (show && ref) {
	var parent = ref.parent(),
	win = $(window),
	pos;

	if (parent.hasClass('dropbutton'))
	ref = parent;

	pos = ref.offset();
	ref.offsetHeight = ref.outerHeight();
	if (!above && pos.top + ref.offsetHeight + obj.height() > win.height())
	above = true;
	if (pos.left + obj.width() > win.width())
	pos.left = win.width() - obj.width() - 12;

	obj.css({ left:pos.left, top:(pos.top + (above ? -obj.height() : ref.offsetHeight)) });
	}

	obj[show?'show':'hide']();

	// hide drop-down elements on buggy browsers
	if (bw.ie6 && config.overlap) {
	$('select').css('visibility', show?'hidden':'inherit');
	$('select', obj).css('visibility', 'inherit');
	}

	return show;
	}

	/**
	*
	*/
	function target_overlaps(target, elem)
	{
	while (target.parentNode) {
	if (target.parentNode == elem)
	return true;
	target = target.parentNode;
	}
	return false;
	}


	/**
	* Show/hide the preview pane
	*/
	function toggle_preview_pane(e)
	{
	var button = $(e.target),
	frame = $('#mailpreviewframe'),
	visible = !frame.is(':visible'),
	splitter = mailviewsplit.pos \|\| parseInt(rcmail.get_cookie('mailviewsplitter') \|\| 320),
	topstyles, bottomstyles, uid;

	frame.toggle();
	button.removeClass().addClass(visible ? 'enabled' : 'closed');

	if (visible) {
	$('#mailview-top').removeClass('fullheight').css({ bottom:'auto' });
	$('#mailview-bottom').css({ height:'auto' });

	rcmail.env.contentframe = 'messagecontframe';
	if (uid = rcmail.message_list.get_single_selection())
	rcmail.show_message(uid, false, true);

	// let the splitter set the correct size and position
	if (mailviewsplit.handle) {
	mailviewsplit.handle.show();
	mailviewsplit.resize();
	}
	else
	mailviewsplit.init();
	}
	else {
	rcmail.env.contentframe = null;
	rcmail.show_contentframe(false);

	$('#mailview-top').addClass('fullheight').css({ height:'auto', bottom:'28px' });
	$('#mailview-bottom').css({ top:'auto', height:'26px' });

	if (mailviewsplit.handle)
	mailviewsplit.handle.hide();
	}

	if (visible && uid && rcmail.message_list)
	rcmail.message_list.scrollto(uid);

	rcmail.command('save-pref', { name:'preview_pane', value:(visible?1:0) });
	}


	/**
	* Switch between short and full headers display in message preview
	*/
	function toggle_preview_headers(button)
	{
	$('#preview-shortheaders').toggle();
	var full = $('#preview-allheaders').toggle(),
	button = $('a#previewheaderstoggle');

	// add toggle button to full headers table
	if (full.is(':visible'))
	button.attr('href', '#hide').removeClass('add').addClass('remove')
	else
	button.attr('href', '#details').removeClass('remove').addClass('add')
	}


	/**
	*
	*/
	function switch_view_mode(mode)
	{
	if (rcmail.env.threading != (mode == 'thread'))
	rcmail.set_list_options(null, undefined, undefined, mode == 'thread' ? 1 : 0);

	$('#maillistmode, #mailthreadmode').removeClass('selected');
	$('#mail'+mode+'mode').addClass('selected');
	}


	/** popup callbacks **/

	function searchmenu(show)
	{
	if (show && rcmail.env.search_mods) {
	var n, all,
	obj = popups['searchmenu'],
	list = $('input:checkbox[name="s_mods[]"]', obj),
	mbox = rcmail.env.mailbox,
	mods = rcmail.env.search_mods;

	if (rcmail.env.task == 'mail') {
	mods = mods[mbox] ? mods[mbox] : mods['*'];
	all = 'text';
	}
	else {
	all = '*';
	}

	if (mods[all])
	list.map(function() {
	this.checked = true;
	this.disabled = this.value != all;
	});
	else {
	list.prop('disabled', false).prop('checked', false);
	for (n in mods)
	$('#s_mod_' + n).prop('checked', true);
	}
	}
	}


	function spellmenu(show)
	{
	var link, li,
	lang = rcmail.spellcheck_lang(),
	menu = popups.spellmenu,
	ul = $('ul', menu);

	if (!ul.length) {
	ul = $('<ul class="toolbarmenu selectable">');

	for (i in rcmail.env.spell_langs) {
	li = $('<li>');
	link = $('<a href="#"></a>').text(rcmail.env.spell_langs[i])
	.addClass('active').data('lang', i)
	.click(function() {
	rcmail.spellcheck_lang_set($(this).data('lang'));
	});

	link.appendTo(li);
	li.appendTo(ul);
	}

	ul.appendTo(menu);
	}

	// select current language
	$('li', ul).each(function() {
	var el = $('a', this);
	if (el.data('lang') == lang)
	el.addClass('selected');
	else if (el.hasClass('selected'))
	el.removeClass('selected');
	});
	}


	/**
	*
	*/
	function show_listoptions()
	{
	var $dialog = $('#listoptions');

	// close the dialog
	if ($dialog.is(':visible')) {
	$dialog.dialog('close');
	return;
	}

	// set form values
	$('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
	$('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
	$('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
	$('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false);
	$('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true);

	// set checkboxes
	$('input[name="list_col[]"]').each(function() {
	$(this).prop('checked', $.inArray(this.value, rcmail.env.coltypes) != -1);
	});

	$dialog.dialog({
	modal: true,
	resizable: false,
	closeOnEscape: true,
	title: null,
	close: function() {
	$dialog.dialog('destroy').hide();
	},
	width: 650
	}).show();
	}


	/**
	*
	*/
	function save_listoptions()
	{
	$('#listoptions').dialog('close');

	var sort = $('input[name="sort_col"]:checked').val(),
	ord = $('input[name="sort_ord"]:checked').val(),
	thread = $('input[name="view"]:checked').val(),
	cols = $('input[name="list_col[]"]:checked')
	.map(function(){ return this.value; }).get();

	rcmail.set_list_options(cols, sort, ord, thread == 'thread' ? 1 : 0);
	}


	/**
	*
	*/
	function set_searchmod(elem)
	{
	var all, m, task = rcmail.env.task,
	mods = rcmail.env.search_mods,
	mbox = rcmail.env.mailbox;

	if (!mods)
	mods = {};

	if (task == 'mail') {
	if (!mods[mbox])
	mods[mbox] = rcube_clone_object(mods['*']);
	m = mods[mbox];
	all = 'text';
	}
	else { //addressbook
	m = mods;
	all = '*';
	}

	if (!elem.checked)
	delete(m[elem.value]);
	else
	m[elem.value] = 1;

	// mark all fields
	if (elem.value != all)
	return;

	$('input:checkbox[name="s_mods[]"]').map(function() {
	if (this == elem)
	return;

	this.checked = true;
	if (elem.checked) {
	this.disabled = true;
	delete m[this.value];
	}
	else {
	this.disabled = false;
	m[this.value] = 1;
	}
	});
	}


	function show_uploadform()
	{
	var $dialog = $('#upload-dialog');

	// close the dialog
	if ($dialog.is(':visible')) {
	$dialog.dialog('close');
	return;
	}

	// add icons to clone file input field
	if (rcmail.env.action == 'compose' && !$dialog.data('extended')) {
	$('<a>')
	.addClass('iconlink add')
	.attr('href', '#add')
	.html('Add')
	.appendTo($('input[type="file"]', $dialog).parent())
	.click(add_uploadfile);
	$dialog.data('extended', true);
	}

	$dialog.dialog({
	modal: true,
	resizable: false,
	closeOnEscape: true,
	title: $dialog.attr('title'),
	close: function() {
	try { $('#upload-dialog form').get(0).reset(); }
	catch(e){ } // ignore errors

	$dialog.dialog('destroy').hide();
	$('div.addline', $dialog).remove();
	},
	width: 480
	}).show();

	if (!document.all)
	$('input[type=file]', $dialog).first().click();
	}

	function add_uploadfile(e)
	{
	var div = $(this).parent();
	var clone = div.clone().addClass('addline').insertAfter(div);
	clone.children('.iconlink').click(add_uploadfile);
	clone.children('input').val('');

	if (!document.all)
	$('input[type=file]', clone).click();
	}


	/**
	*
	*/
	function show_header_row(which, updated)
	{
	var row = $('#compose-' + which);
	if (row.is(':visible'))
	return; // nothing to be done here

	if (compose_headers[which] && !updated)
	$('#_' + which).val(compose_headers[which]);

	row.show();
	$('#' + which + '-link').hide();
	layout_composeview();
	return false;
	}

	/**
	*
	*/
	function hide_header_row(which)
	{
	// copy and clear field value
	var field = $('#_' + which);
	compose_headers[which] = field.val();
	field.val('');

	$('#compose-' + which).hide();
	$('#' + which + '-link').show();
	layout_composeview();
	return false;
	}


	/**
	* Fieldsets-to-tabs converter
	*/
	function init_tabs(elem, current)
	{
	var content = $(elem),
	id = content.get(0).id,
	fs = content.children('fieldset');

	if (!fs.length)
	return;

	if (!id) {
	id = 'rcmtabcontainer';
	content.attr('id', id);
	}

	// first hide not selected tabs
	current = current \|\| 0;
	fs.each(function(idx) { if (idx != current) $(this).hide(); });

	// create tabs container
	var tabs = $('<div>').addClass('tabsbar').prependTo(content);

	// convert fildsets into tabs
	fs.each(function(idx) {
	var tab, a, elm = $(this), legend = elm.children('legend');

	// create a tab
	a = $('<a>').text(legend.text()).attr('href', '#');
	tab = $('<span>').attr({'id': 'tab'+idx, 'class': 'tablink'})
	.click(function() { show_tab(id, idx); return false })

	// remove legend
	legend.remove();
	// style fieldset
	elm.addClass('tab');
	// style selected tab
	if (idx == current)
	tab.addClass('selected');

	// add the tab to container
	tab.append(a).appendTo(tabs);
	});
	}

	function show_tab(id, index)
	{
	var fs = $('#'+id).children('fieldset');

	fs.each(function(idx) {
	// Show/hide fieldset (tab content)
	$(this)[index==idx ? 'show' : 'hide']();
	// Select/unselect tab
	$('#tab'+idx).toggleClass('selected', idx==index);
	});

	resize();
	}

	/**
	* Show about page as jquery UI dialog
	*/
	function show_about(elem)
	{
	var frame = $('<iframe>').attr('id', 'aboutframe')
	.attr('src', rcmail.url('settings/about'))
	.attr('frameborder', '0')
	.appendTo(document.body);

	var h = Math.floor($(window).height() * 0.75);
	var buttons = {};
	var supportln = $('#supportlink');
	if (supportln.length && (env.supporturl = supportln.attr('href')))
	buttons[supportln.html()] = function(e){ env.supporturl.indexOf('mailto:') < 0 ? window.open(env.supporturl) : location.href = env.supporturl };

	frame.dialog({
	modal: true,
	resizable: false,
	closeOnEscape: true,
	title: elem ? elem.title \|\| elem.innerHTML : null,
	close: function() {
	frame.dialog('destroy').remove();
	},
	buttons: buttons,
	width: 640,
	height: h
	}).width(640);
	}
	}


	/**
	* Roundcube Scroller class
	*/
	function rcube_scroller(list, top, bottom)
	{
	var ref = this;

	this.list = $(list);
	this.top = $(top);
	this.bottom = $(bottom);
	this.step_size = 6;
	this.step_time = 20;
	this.delay = 500;

	this.top
	.mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); })
	.mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });

	this.bottom
	.mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); })
	.mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });

	this.scroll = function(dir)
	{
	var ref = this, size = this.step_size;

	if (!rcmail.drag_active)
	return;

	if (dir == 'down')
	size *= -1;

	this.list.get(0).scrollTop += size;
	this.ts = window.setTimeout(function() { ref.scroll(dir); }, this.step_time);
	};
	};


	/**
	* Roundcube UI splitter class
	*
	* @constructor
	*/
	function rcube_splitter(p)
	{
	this.p = p;
	this.id = p.id;
	this.horizontal = (p.orientation == 'horizontal' \|\| p.orientation == 'h');
	this.halfsize = (p.size !== undefined ? p.size : 10) / 2;
	this.pos = p.start \|\| 0;
	this.min = p.min \|\| 20;
	this.offset = p.offset \|\| 0;
	this.relative = p.relative ? true : false;
	this.drag_active = false;
	this.render = p.render;
	this.callback = p.callback;

	var me = this;
	rcube_splitter._instances[this.id] = me;

	this.init = function()
	{
	this.p1 = $(this.p.p1);
	this.p2 = $(this.p.p2);

	// check if referenced elements exist, otherwise abort
	if (!this.p1.length \|\| !this.p2.length)
	return;

	// create and position the handle for this splitter
	this.p1pos = this.relative ? this.p1.position() : this.p1.offset();
	this.p2pos = this.relative ? this.p2.position() : this.p2.offset();
	this.handle = $('<div>')
	.attr('id', this.id)
	.attr('unselectable', 'on')
	.addClass('splitter ' + (this.horizontal ? 'splitter-h' : 'splitter-v'))
	.appendTo(this.p1.parent())
	.bind('mousedown', onDragStart);

	if (this.horizontal) {
	var top = this.p1pos.top + this.p1.outerHeight();
	this.handle.css({ left:'0px', top:top+'px' });
	}
	else {
	var left = this.p1pos.left + this.p1.outerWidth();
	this.handle.css({ left:left+'px', top:'0px' });
	}

	// listen to window resize on IE
	if (bw.ie)
	$(window).resize(onResize);

	// read saved position from cookie
	var cookie = rcmail.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) {
	this.p1.css('height', Math.floor(this.pos - this.p1pos.top - this.halfsize) + 'px');
	this.p2.css('top', Math.ceil(this.pos + this.halfsize + 2) + 'px');
	this.handle.css('top', Math.round(this.pos - this.halfsize + this.offset)+'px');
	if (bw.ie) {
	var new_height = parseInt(this.p2.parent().outerHeight(), 10) - parseInt(this.p2.css('top'), 10) - (bw.ie8 ? 2 : 0);
	this.p2.css('height', (new_height > 0 ? new_height : 0) + 'px');
	}
	}
	else {
	this.p1.css('width', Math.floor(this.pos - this.p1pos.left - this.halfsize) + 'px');
	this.p2.css('left', Math.ceil(this.pos + this.halfsize) + 'px');
	this.handle.css('left', Math.round(this.pos - this.halfsize + this.offset + 3)+'px');
	if (bw.ie) {
	var new_width = parseInt(this.p2.parent().outerWidth(), 10) - parseInt(this.p2.css('left'), 10) ;
	this.p2.css('width', (new_width > 0 ? new_width : 0) + 'px');
	}
	}

	this.p2.resize();
	this.p1.resize();

	// also resize iframe covers
	if (this.drag_active) {
	$('iframe').each(function(i, elem) {
	var pos = $(this).offset();
	$('#iframe-splitter-fix-'+i).css({ top: pos.top+'px', left: pos.left+'px', width:elem.offsetWidth+'px', height: elem.offsetHeight+'px' });
	});
	}

	if (typeof this.render == 'function')
	this.render(this);
	};

	/**
	* Handler for mousedown events
	*/
	function onDragStart(e)
	{
	// disable text selection while dragging the splitter
	if (bw.konq \|\| bw.chrome \|\| bw.safari)
	document.body.style.webkitUserSelect = 'none';

	me.p1pos = me.relative ? me.p1.position() : me.p1.offset();
	me.p2pos = me.relative ? me.p2.position() : me.p2.offset();
	me.drag_active = true;

	// start listening to mousemove events
	$(document).bind('mousemove.'+this.id, onDrag).bind('mouseup.'+this.id, onDragStop);

	// enable dragging above iframes
	$('iframe').each(function(i, elem) {
	$('<div>')
	.attr('id', 'iframe-splitter-fix-'+i)
	.addClass('iframe-splitter-fix')
	.css({ background: '#fff',
	width: elem.offsetWidth+'px', height: elem.offsetHeight+'px',
	position: 'absolute', opacity: '0.001', zIndex: 1000
	})
	.css($(this).offset())
	.appendTo('body');
	});
	};

	/**
	* Handler for mousemove events
	*/
	function onDrag(e)
	{
	if (!me.drag_active)
	return false;

	var pos = rcube_event.get_mouse_pos(e);

	if (me.relative) {
	var parent = me.p1.parent().offset();
	pos.x -= parent.left;
	pos.y -= parent.top;
	}

	if (me.horizontal) {
	if (((pos.y - me.halfsize) > me.p1pos.top) && ((pos.y + me.halfsize) < (me.p2pos.top + me.p2.outerHeight()))) {
	me.pos = Math.max(me.min, pos.y - me.offset);
	me.resize();
	}
	}
	else {
	if (((pos.x - me.halfsize) > me.p1pos.left) && ((pos.x + me.halfsize) < (me.p2pos.left + me.p2.outerWidth()))) {
	me.pos = Math.max(me.min, pos.x - me.offset);
	me.resize();
	}
	}

	me.p1pos = me.relative ? me.p1.position() : me.p1.offset();
	me.p2pos = me.relative ? me.p2.position() : me.p2.offset();
	return false;
	};

	/**
	* Handler for mouseup events
	*/
	function onDragStop(e)
	{
	// resume the ability to highlight text
	if (bw.konq \|\| bw.chrome \|\| bw.safari)
	document.body.style.webkitUserSelect = 'auto';

	// cancel the listening for drag events
	$(document).unbind('.'+me.id);
	me.drag_active = false;

	// remove temp divs
	$('div.iframe-splitter-fix').remove();

	me.set_cookie();

	if (typeof me.callback == 'function')
	me.callback(me);

	return bw.safari ? true : rcube_event.cancel(e);
	};

	/**
	* Handler for window resize events
	*/
	function onResize(e)
	{
	if (me.horizontal) {
	var new_height = parseInt(me.p2.parent().outerHeight(), 10) - parseInt(me.p2[0].style.top, 10) - (bw.ie8 ? 2 : 0);
	me.p2.css('height', (new_height > 0 ? new_height : 0) +'px');
	}
	else {
	var new_width = parseInt(me.p2.parent().outerWidth(), 10) - parseInt(me.p2[0].style.left, 10);
	me.p2.css('width', (new_width > 0 ? new_width : 0) + 'px');
	}
	};

	/**
	* Saves splitter position in cookie
	*/
	this.set_cookie = function()
	{
	var exp = new Date();
	exp.setYear(exp.getFullYear() + 1);
	rcmail.set_cookie(this.id, this.pos, exp);
	};

	} // end class rcube_splitter


	// static getter for splitter instances
	rcube_splitter._instances = {};

	rcube_splitter.get_instance = function(id)
	{
	return rcube_splitter._instances[id];
	};

File Metadata

Mime Type: text/x-diff
Expires: Mon, Feb 2, 10:21 AM (1 d, 19 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 426880
Default Alt Text: (928 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions