diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index 2b8c32802..a747c7d04 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -1,1266 +1,1288 @@
 <?php
 
 // ---------------------------------------------------------------------
 // WARNING: Do not edit this file! Copy configuration to config.inc.php.
 // ---------------------------------------------------------------------
 
 /*
  +-----------------------------------------------------------------------+
  | Default settings for all configuration options                        |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 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.                     |
  +-----------------------------------------------------------------------+
 */
 
 $config = array();
 
 // ----------------------------------
 // SQL DATABASE
 // ----------------------------------
 
 // Database connection string (DSN) for read+write operations
 // Format (compatible with PEAR MDB2): db_provider://user:password@host/database
 // Currently supported db_providers: mysql, pgsql, sqlite, mssql, sqlsrv, oracle
 // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
 // Note: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646'
 //       or (Windows): 'sqlite:///C:/full/path/to/sqlite.db'
 // Note: Various drivers support various additional arguments for connection,
 //       for Mysql: key, cipher, cert, capath, ca, verify_server_cert,
 //       for Postgres: application_name, sslmode, sslcert, sslkey, sslrootcert, sslcrl, sslcompression, service.
 //       e.g. 'mysql://roundcube:@localhost/roundcubemail?verify_server_cert=false'
 $config['db_dsnw'] = 'mysql://roundcube:@localhost/roundcubemail';
 
 // Database DSN for read-only operations (if empty write database will be used)
 // useful for database replication
 $config['db_dsnr'] = '';
 
 // Disable the use of already established dsnw connections for subsequent reads
 $config['db_dsnw_noread'] = false;
 
 // use persistent db-connections
 // beware this will not "always" work as expected
 // see: http://www.php.net/manual/en/features.persistent-connections.php
 $config['db_persistent'] = false;
 
 // you can define specific table (and sequence) names prefix
 $config['db_prefix'] = '';
 
 // Mapping of table names and connections to use for ALL operations.
 // This can be used in a setup with replicated databases and a DB master
 // where read/write access to cache tables should not go to master.
 $config['db_table_dsn'] = array(
 //    'cache' => 'r',
 //    'cache_index' => 'r',
 //    'cache_thread' => 'r',
 //    'cache_messages' => 'r',
 );
 
 // It is possible to specify database variable values e.g. some limits here.
 // Use them if your server is not MySQL or for better performance.
 // For example Roundcube uses max_allowed_packet value (in bytes)
 // which limits query size for database cache operations.
 $config['db_max_allowed_packet'] = null;
 
 
 // ----------------------------------
 // LOGGING/DEBUGGING
 // ----------------------------------
 
 // log driver:  'syslog', 'stdout' or 'file'.
 $config['log_driver'] = 'file';
 
 // date format for log entries
 // (read http://php.net/manual/en/function.date.php for all format characters)  
 $config['log_date_format'] = 'd-M-Y H:i:s O';
 
 // length of the session ID to prepend each log line with
 // set to 0 to avoid session IDs being logged.
 $config['log_session_id'] = 8;
 
 // Default extension used for log file name
 $config['log_file_ext'] = '.log';
 
 // Syslog ident string to use, if using the 'syslog' log driver.
 $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
 $config['syslog_facility'] = LOG_USER;
 
 // Activate this option if logs should be written to per-user directories.
 // Data will only be logged if a directory <log_dir>/<username>/ exists and is writable.
 $config['per_user_logging'] = false;
 
 // Log sent messages to <log_dir>/sendmail.log or to syslog
 $config['smtp_log'] = true;
 
 // Log successful/failed logins to <log_dir>/userlogins.log or to syslog
 $config['log_logins'] = false;
 
 // Log session debug information/authentication errors to <log_dir>/session.log or to syslog
 $config['session_debug'] = false;
 
 // Log SQL queries to <log_dir>/sql.log or to syslog
 $config['sql_debug'] = false;
 
 // Log IMAP conversation to <log_dir>/imap.log or to syslog
 $config['imap_debug'] = false;
 
 // Log LDAP conversation to <log_dir>/ldap.log or to syslog
 $config['ldap_debug'] = false;
 
 // Log SMTP conversation to <log_dir>/smtp.log or to syslog
 $config['smtp_debug'] = false;
 
 // Log Memcache conversation to <log_dir>/memcache.log or to syslog
 $config['memcache_debug'] = false;
 
 // Log APC conversation to <log_dir>/apc.log or to syslog
 $config['apc_debug'] = false;
 
 // Log Redis conversation to <log_dir>/redis.log or to syslog
 $config['redis_debug'] = false;
 
 
 // ----------------------------------
 // IMAP
 // ----------------------------------
 
 // The IMAP 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
 // WARNING: After hostname change update of mail_host column in users table is
 //          required to match old user data records with the new host.
 $config['default_host'] = 'localhost';
 
 // TCP port used for IMAP connections
 $config['default_port'] = 143;
 
 // IMAP authentication method (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or null).
 // Use 'IMAP' to authenticate with IMAP LOGIN command.
 // By default the most secure method (from supported) will be selected.
 $config['imap_auth_type'] = null;
 
 // IMAP socket context options
 // See http://php.net/manual/en/context.ssl.php
 // The example below enables server certificate validation
 //$config['imap_conn_options'] = array(
 //  'ssl'         => array(
 //     'verify_peer'  => true,
 //     'verify_depth' => 3,
 //     'cafile'       => '/etc/openssl/certs/ca.crt',
 //   ),
 // );
 // Note: These can be also specified as an array of options indexed by hostname
 $config['imap_conn_options'] = null;
 
 // IMAP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
 $config['imap_timeout'] = 0;
 
 // Optional IMAP authentication identifier to be used as authorization proxy
 $config['imap_auth_cid'] = null;
 
 // Optional IMAP authentication password to be used for imap_auth_cid
 $config['imap_auth_pw'] = null;
 
 // If you know your imap's folder delimiter, you can specify it here.
 // Otherwise it will be determined automatically
 $config['imap_delimiter'] = null;
 
 // If you know your imap's folder vendor, you can specify it here.
 // Otherwise it will be determined automatically. Use lower-case
 // identifiers, e.g. 'dovecot', 'cyrus', 'gimap', 'hmail', 'uw-imap'.
 $config['imap_vendor'] = 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.
 // Note: Folders need to be ended with directory separator, e.g. "INBOX."
 //       (special directory "~" is an exception to this rule)
 // Note: These can be used also to overwrite server's namespaces
 // Note: Set these to FALSE to disable access to specified namespace
 $config['imap_ns_personal'] = null;
 $config['imap_ns_other']    = null;
 $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.
 $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. https://github.com/roundcube/roundcubemail/issues/2474
 // Enable this option to force LSUB command usage instead.
 // Deprecated: Use imap_disabled_caps = array('LIST-EXTENDED')
 $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
 $config['imap_force_ns'] = false;
 
 // Some servers return hidden folders (name starting witha dot)
 // from user home directory. IMAP RFC does not forbid that.
 // Enable this option to hide them and disable possibility to create such.
 $config['imap_skip_hidden_folders'] = false;
 
 // Some servers do not support folders with both folders and messages inside
 // If your server supports that use true, if it does not, use false.
 // By default it will be determined automatically (once per user session).
 $config['imap_dual_use_folders'] = null;
 
 // List of disabled imap extensions.
 // Use if your IMAP server has broken implementation of some feature
 // and you can't remove it from CAPABILITY string on server-side.
 // For example UW-IMAP server has broken ESEARCH.
 // Note: Because the list is cached, re-login is required after change.
 $config['imap_disabled_caps'] = array();
 
 // Log IMAP session identifiers after each IMAP login.
 // This is used to relate IMAP session with Roundcube user sessions
 $config['imap_log_session'] = false;
 
 // Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache' or 'memcached'.
 $config['imap_cache'] = null;
 
 // Enables messages cache. Only 'db' cache is supported.
 // This requires an IMAP server that supports QRESYNC and CONDSTORE
 // extensions (RFC7162). See synchronize() in program/lib/Roundcube/rcube_imap_cache.php
 // for further info, or if you experience syncing problems.
 $config['messages_cache'] = false;
 
 // Lifetime of IMAP indexes cache. Possible units: s, m, h, d, w
 $config['imap_cache_ttl'] = '10d';
 
 // Lifetime of messages cache. Possible units: s, m, h, d, w
 $config['messages_cache_ttl'] = '10d';
 
 // Maximum cached message size in kilobytes.
 // Note: On MySQL this should be less than (max_allowed_packet - 30%)
 $config['messages_cache_threshold'] = 50;
 
 
 // ----------------------------------
 // SMTP
 // ----------------------------------
 
 // SMTP server host (for sending mails).
 // Enter hostname with prefix tls:// to use STARTTLS, or use
 // prefix ssl:// to use the deprecated SSL over SMTP (aka SMTPS)
 // 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
 $config['smtp_server'] = 'localhost';
 
 // SMTP port (default is 587)
 $config['smtp_port'] = 587;
 
 // SMTP username (if required) if you use %u as the username Roundcube
 // will use the current username for login
 $config['smtp_user'] = '%u';
 
 // SMTP password (if required) if you use %p as the password Roundcube
 // will use the current user's password for login
 $config['smtp_pass'] = '%p';
 
 // SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
 // best server supported one)
 $config['smtp_auth_type'] = null;
 
 // Optional SMTP authentication identifier to be used as authorization proxy
 $config['smtp_auth_cid'] = null;
 
 // Optional SMTP authentication password to be used for smtp_auth_cid
 $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.
 $config['smtp_helo_host'] = '';
 
 // SMTP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
 // Note: There's a known issue where using ssl connection with
 // timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
 $config['smtp_timeout'] = 0;
 
 // SMTP socket context options
 // See http://php.net/manual/en/context.ssl.php
 // The example below enables server certificate validation, and
 // requires 'smtp_timeout' to be non zero.
 // $config['smtp_conn_options'] = array(
 //   'ssl'         => array(
 //     'verify_peer'  => true,
 //     'verify_depth' => 3,
 //     'cafile'       => '/etc/openssl/certs/ca.crt',
 //   ),
 // );
 // Note: These can be also specified as an array of options indexed by hostname
 $config['smtp_conn_options'] = null;
 
 
 // ----------------------------------
 // LDAP
 // ----------------------------------
 
 // Type of LDAP cache. Supported values: 'db', 'apc' and 'memcache' or 'memcached'.
 $config['ldap_cache'] = 'db';
 
 // Lifetime of LDAP cache. Possible units: s, m, h, d, w
 $config['ldap_cache_ttl'] = '10m';
 
 
 // ----------------------------------
 // CACHE(S)
 // ----------------------------------
 
 // Use these hosts for accessing memcached
 // Define any number of hosts in the form of hostname:port or unix:///path/to/socket.file
 // Example: array('localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock');
 $config['memcache_hosts'] = null;
 
 // Controls the use of a persistent connections to memcache servers
 // See http://php.net/manual/en/memcache.addserver.php
 $config['memcache_pconnect'] = true;
 
 // Value in seconds which will be used for connecting to the daemon
 // See http://php.net/manual/en/memcache.addserver.php
 $config['memcache_timeout'] = 1;
 
 // Controls how often a failed server will be retried (value in seconds).
 // Setting this parameter to -1 disables automatic retry.
 // See http://php.net/manual/en/memcache.addserver.php
 $config['memcache_retry_interval'] = 15;
 
 // Use these hosts for accessing Redis.
 // Currently only one host is supported. Cluster support may come in a future release.
 // You can pass 4 fields, host, port (optional), database (optional) and password (optional).
 // Unset fields will be set to the default values host=127.0.0.1, port=6379.
 // Examples:
 //     array('localhost:6379');
 //     array('192.168.1.1:6379:1:secret');
 //     array('unix:///var/run/redis/redis-server.sock:1:secret');
 $config['redis_hosts'] = null;
 
 // Maximum size of an object in memcache (in bytes). Default: 2MB
 $config['memcache_max_allowed_packet'] = '2M';
 
 // Maximum size of an object in APC cache (in bytes). Default: 2MB
 $config['apc_max_allowed_packet'] = '2M';
 
 // Maximum size of an object in Redis cache (in bytes). Default: 2MB
 $config['redis_max_allowed_packet'] = '2M';
 
 
 // ----------------------------------
 // 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!
 $config['enable_installer'] = false;
 
 // don't allow these settings to be overridden by the user
 $config['dont_override'] = array();
 
 // List of disabled UI elements/actions
 $config['disabled_actions'] = array();
 
 // define which settings should be listed under the 'advanced' block
 // which is hidden by default
 $config['advanced_prefs'] = array();
 
 // provide an URL where a user can get support for this Roundcube installation
 // PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
 $config['support_url'] = '';
 
 // replace Roundcube logo with this image
 // specify an URL relative to the document root of this Roundcube installation
 // an array can be used to specify different logos for specific template files
-// '*' for default logo
-// ':favicon' for favicon
-// ':print' for logo on all print templates (e.g. messageprint, contactprint)
-// ':small' for small screen logo in Elastic
-// different logos can be specified for different skins by prefixing the skin name to the array key
-// config applied in order: <skin>:<template>, <skin>:*, <template>, *
-// for example array("*" => "/images/roundcube_logo.png", "messageprint" => "/images/roundcube_logo_print.png", "elastic:*" => "/images/logo.png")
+// the array key specifies the template(s) the logo should be applied to while the
+// value should be the relative URL of the image.
+//
+// the array key is made up of (up to) 3 parts:
+// the skin name (optional)
+// the template name (or * for all templates)
+// the logo type (optional) the type attribute is used for logos used on multiple templates
+//   the available types include '[favicon]' for favicon, '[print]' for logo on all print
+//   templates (e.g. messageprint, contactprint) and '[small]' for small screen logo in supported skins
+//
+// config applied in order: <skin>:<template>, <skin>:<template>, <skin>:*, <template>, *
+/*
+ * example config for skin_logo
+ *
+   array(
+     // show the image /images/logo_login_small.png for the Login screen in the Elastic skin on small screens
+     "elastic:login[small]" => "/images/logo_login_small.png",
+     // show the image /images/logo_login.png for the Login screen in the Elastic skin
+     "elastic:login" => "/images/logo_login.png",
+     // show the image /images/logo_small.png in the Elastic skin
+     "elastic[small]" => "/images/logo_small.png",
+     // show the image /images/larry.png in the Larry skin
+     "larry:*" => "/images/larry.png",
+     // show the image /images/logo_login.png on the login template in all skins
+     "login" => "/images/logo_login.png",
+     // show the image /images/logo_print.png for all print type logos in all skins
+     "[print]" => "/images/logo_print.png",
+   );
+*/
 $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
 $config['auto_create_user'] = true;
 
 // Enables possibility to log in using email address from user identities
 $config['user_aliases'] = false;
 
 // use this folder to store log files
 // must be writeable for the user who runs PHP process (Apache user if mod_php is being used)
 // This is used by the 'file' log driver.
 $config['log_dir'] = RCUBE_INSTALL_PATH . 'logs/';
 
 // use this folder to store temp files
 // must be writeable for the user who runs PHP process (Apache user if mod_php is being used)
 $config['temp_dir'] = RCUBE_INSTALL_PATH . 'temp/';
 
 // expire files in temp_dir after 48 hours
 // possible units: s, m, h, d, w
 $config['temp_dir_ttl'] = '48h';
 
 // Enforce connections over https
 // With this option enabled, all non-secure connections will be redirected.
 // It can be also a port number, hostname or hostname:port if they are
 // different than default HTTP_HOST:443
 $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.
 $config['use_https'] = false;
 
 // Allow browser-autocompletion on login form.
 // 0 - disabled, 1 - username and host only, 2 - username, host, password
 $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);
 $config['login_lc'] = 2;
 
 // Maximum length (in bytes) of logon username and password.
 $config['login_username_maxlen'] = 1024;
 $config['login_password_maxlen'] = 1024;
 
 // Logon username filter. Regular expression for use with preg_match().
 // Example: '/^[a-z0-9_@.-]+$/'
 $config['login_username_filter'] = null;
 
 // Brute-force attacks prevention.
 // The value specifies maximum number of failed logon attempts per minute.
 $config['login_rate_limit'] = 3;
 
 // Includes should be interpreted as PHP files
 $config['skin_include_php'] = false;
 
 // display product name and software version on login screen
 // 0 - hide product name and version number, 1 - show product name only, 2 - show product name and version number
 $config['display_product_info'] = 1;
 
 // Session lifetime in minutes
 $config['session_lifetime'] = 10;
 
 // Session domain: .example.org
 $config['session_domain'] = '';
 
 // Session name. Default: 'roundcube_sessid'
 $config['session_name'] = null;
 
 // Session authentication cookie name. Default: 'roundcube_sessauth'
 $config['session_auth_name'] = null;
 
 // Session path. Defaults to PHP session.cookie_path setting.
 $config['session_path'] = null;
 
 // Backend to use for session storage. Can either be 'db' (default), 'redis', 'memcache', or 'php'
 //
 // If set to 'memcache' or 'memcached', a list of servers need to be specified in 'memcache_hosts'
 // Make sure the Memcache extension (https://pecl.php.net/package/memcache) version >= 2.0.0
 // or the Memcached extension (https://pecl.php.net/package/memcached) version >= 2.0.0 is installed.
 //
 // If set to 'redis', a server needs to be specified in 'redis_hosts'
 // Make sure the Redis extension (https://pecl.php.net/package/redis) version >= 2.0.0 is installed.
 //
 // Setting this value to 'php' will use the default session save handler configured in PHP
 $config['session_storage'] = 'db';
 
 // List of trusted proxies
 // X_FORWARDED_* and X_REAL_IP headers are only accepted from these IPs
 $config['proxy_whitelist'] = array();
 
 // List of trusted host names
 // Attackers can modify Host header of the HTTP request causing $_SERVER['SERVER_NAME']
 // or $_SERVER['HTTP_HOST'] variables pointing to a different host, that could be used
 // to collect user names and passwords. Some server configurations prevent that, but not all.
 // An empty list accepts any host name. The list can contain host names
 // or PCRE patterns (without // delimiters, that will be added automatically).
 $config['trusted_host_patterns'] = array();
 
 // check client IP in session authorization
 $config['ip_check'] = false;
 
 // X-Frame-Options HTTP header value sent to prevent from Clickjacking.
 // Possible values: sameorigin|deny|allow-from <uri>.
 // Set to false in order to disable sending the header.
 $config['x_frame_options'] = 'sameorigin';
 
 // This key is used for encrypting purposes, like storing of imap password
 // in the session. For historical reasons it's called DES_key, but it's used
 // with any configured cipher_method (see below).
 $config['des_key'] = 'rcmail-!24ByteDESkey*Str';
 
 // Encryption algorithm. You can use any method supported by OpenSSL.
 // Default is set for backward compatibility to DES-EDE3-CBC,
 // but you can choose e.g. AES-256-CBC which we consider a better choice.
 $config['cipher_method'] = 'DES-EDE3-CBC';
 
 // 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
 $config['username_domain'] = '';
 
 // Force domain configured in username_domain to be used for login.
 // Any domain in username will be replaced by username_domain.
 $config['username_domain_forced'] = false;
 
 // 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
 $config['mail_domain'] = '';
 
 // Password character set, to change the password for user
 // authentication or for password change operations
 $config['password_charset'] = 'UTF-8';
 
 // How many seconds must pass between emails sent by a user
 $config['sendmail_delay'] = 0;
 
 // Message size limit. Note that SMTP server(s) may use a different value.
 // This limit is verified when user attaches files to a composed message.
 // Size in bytes (possible unit suffix: K, M, G)
 $config['max_message_size'] = '100M';
 
 // Maximum number of recipients per message (including To, Cc, Bcc).
 // Default: 0 (no limit)
 $config['max_recipients'] = 0;
 
 // Maximum number of recipients per message exluding Bcc header.
 // This is a soft limit, which means we only display a warning to the user.
 // Default: 5
 $config['max_disclosed_recipients'] = 5;
 
 // Maximum allowed number of members of an address group. Default: 0 (no limit)
 // If 'max_recipients' is set this value should be less or equal
 $config['max_group_members'] = 0;
 
 // Name your service. This is displayed on the login screen and in the window title
 $config['product_name'] = 'Roundcube Webmail';
 
 // Add this user-agent to message headers when sending
 $config['useragent'] = 'Roundcube Webmail/'.RCUBE_VERSION;
 
 // try to load host-specific configuration
 // see https://github.com/roundcube/roundcubemail/wiki/Configuration:-Multi-Domain-Setup
 // for more details
 $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
 $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
 $config['generic_message_footer_html'] = '';
 
 // add a received header to outgoing mails containing the creators IP and hostname
 $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.
 $config['http_received_header_encrypt'] = false;
 
 // number of chars allowed for line when wrapping text.
 // text wrapping is done when composing/sending messages
 $config['line_length'] = 72;
 
 // send plaintext messages as format=flowed
 $config['send_format_flowed'] = true;
 
 // According to RFC2298, return receipt envelope sender address must be empty.
 // If this option is true, Roundcube will use user's identity as envelope sender for MDN responses.
 $config['mdn_use_from'] = false;
 
 // 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
 // 4 - one identity with possibility to edit only signature
 $config['identities_level'] = 0;
 
 // Maximum size of uploaded image in kilobytes
 // Images (in html signatures) are stored in database as data URIs
 $config['identity_image_size'] = 64;
 
 // 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'
 $config['client_mimetypes'] = null;  # null == default
 
 // Path to a local mime magic database file for PHPs finfo extension.
 // Set to null if the default path should be used.
 $config['mime_magic'] = null;
 
 // Absolute path to a local mime.types mapping table file.
 // This is used to derive mime-types from the filename extension or vice versa.
 // Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system,
 // download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
 $config['mime_types'] = null;
 
 // path to imagemagick identify binary (if not set we'll use Imagick or GD extensions)
 $config['im_identify_path'] = null;
 
 // path to imagemagick convert binary (if not set we'll use Imagick or GD extensions)
 $config['im_convert_path'] = null;
 
 // Size of thumbnails from image attachments displayed below the message content.
 // Note: whether images are displayed at all depends on the 'inline_images' option.
 // Set to 0 to display images in full size.
 $config['image_thumbnail_size'] = 240;
 
 // maximum size of uploaded contact photos in pixel
 $config['contact_photo_size'] = 160;
 
 // Enable DNS checking for e-mail address validation
 $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
 $config['no_save_sent_messages'] = false;
 
 // Improve system security by using special URL with security token.
 // This can be set to a number defining token length. Default: 16.
 // Warning: This requires http server configuration. Sample:
 //    RewriteRule ^/roundcubemail/[a-zA-Z0-9]{16}/(.*) /roundcubemail/$1 [PT]
 //    Alias /roundcubemail /var/www/roundcubemail/
 // Note: Use assets_path to not prevent the browser from caching assets
 $config['use_secure_urls'] = false;
 
 // Allows to define separate server/path for image/js/css files
 // Warning: If the domain is different cross-domain access to some
 // resources need to be allowed
 // Sample:
 //    <FilesMatch ".(eot|ttf|woff)">
 //    Header set Access-Control-Allow-Origin "*"
 //    </FilesMatch>
 $config['assets_path'] = '';
 
 // While assets_path is for the browser, assets_dir informs
 // PHP code about the location of asset files in filesystem
 $config['assets_dir'] = '';
 
 
 // ----------------------------------
 // PLUGINS
 // ----------------------------------
 
 // List of active plugins (in plugins/ directory)
 $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'
 $config['message_sort_col'] = '';
 
 // default messages sort order
 $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
 $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
 $config['language'] = null;
 
 // use this format for date display (date or strftime format)
 $config['date_format'] = 'Y-m-d';
 
 // give this choice of date formats to the user to select from
 // Note: do not use ambiguous formats like m/d/Y
 $config['date_formats'] = array('Y-m-d', 'Y/m/d', 'Y.m.d', 'd-m-Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
 
 // use this format for time display (date or strftime format)
 $config['time_format'] = 'H:i';
 
 // give this choice of time formats to the user to select from
 $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)
 $config['date_short'] = 'D H:i';
 
 // use this format for detailed date/time formatting (derived from date_format and time_format)
 $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)
 $config['drafts_mbox'] = 'Drafts';
 
 // store spam messages in this mailbox
 // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
 $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)
 $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)
 $config['trash_mbox'] = 'Trash';
 
 // automatically create the above listed default folders on user login
 $config['create_default_folders'] = false;
 
 // protect the default folders from renames, deletes, and subscription changes
 $config['protect_default_folders'] = true;
 
 // Disable localization of the default folder names listed above
 $config['show_real_foldernames'] = false;
 
 // if in your system 0 quota means no limit set this option to true 
 $config['quota_zero_as_unlimited'] = false;
 
 // Make use of the built-in spell checker. It is based on GoogieSpell.
 $config['enable_spellcheck'] = true;
 
 // Enables spellchecker exceptions dictionary.
 // Setting it to 'shared' will make the dictionary shared by all users.
 $config['spellcheck_dictionary'] = false;
 
 // Set the spell checking engine. Possible values:
 // - 'googie'  - the default (also used for connecting to Nox Spell Server, see 'spellcheck_uri' setting)
 // - 'pspell'  - requires the PHP Pspell module and aspell installed
 // - 'enchant' - requires the PHP Enchant module
 // - 'atd'     - install your own After the Deadline server or check with the people at http://www.afterthedeadline.com before using their API
 // Since Google shut down their public spell checking service, the default settings
 // connect to http://spell.roundcube.net which is a hosted service provided by Roundcube.
 // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
 $config['spellcheck_engine'] = 'googie';
 
 // For locally installed Nox Spell Server or After the Deadline services,
 // please specify the URI to call it.
 // Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 or
 // the After the Deadline package from http://www.afterthedeadline.com.
 // Leave empty to use the public API of service.afterthedeadline.com
 $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.
 $config['spellcheck_languages'] = NULL;
 
 // Makes that words with all letters capitalized will be ignored (e.g. GOOGLE)
 $config['spellcheck_ignore_caps'] = false;
 
 // Makes that words with numbers will be ignored (e.g. g00gle)
 $config['spellcheck_ignore_nums'] = false;
 
 // Makes that words with symbols will be ignored (e.g. g@@gle)
 $config['spellcheck_ignore_syms'] = false;
 
 // Number of lines at the end of a message considered to contain the signature.
 // Increase this value if signatures are not properly detected and colored
 $config['sig_max_lines'] = 15;
 
 // don't let users set pagesize to more than this value if set
 $config['max_pagesize'] = 200;
 
 // Minimal value of user's 'refresh_interval' setting (in seconds)
 $config['min_refresh_interval'] = 60;
 
 // 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.
 $config['undo_timeout'] = 0;
 
 // A static list of canned responses which are immutable for the user
 $config['compose_responses_static'] = array(
 //  array('name' => 'Canned Response 1', 'text' => 'Static Response One'),
 //  array('name' => 'Canned Response 2', 'text' => 'Static Response Two'),
 );
 
 // List of HKP key servers for PGP public key lookups in Enigma/Mailvelope
 // Default: array("keys.fedoraproject.org", "keybase.io")
 $config['keyservers'] = array();
 
 // ----------------------------------
 // ADDRESSBOOK SETTINGS
 // ----------------------------------
 
 // This indicates which type of address book to use. Possible choises:
 // 'sql' - built-in sql addressbook enabled (default),
 // ''    - built-in sql addressbook disabled.
 //         Still LDAP or plugin-added addressbooks will be available.
 //         BC Note: The value can actually be anything except 'sql', it does not matter.
 $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_
 $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
  *
 $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
   'network_timeout' => 10,    // The timeout (in seconds) for connect + bind arrempts. This is only supported in PHP >= 5.3.0 with OpenLDAP 2.x
   'user_specific' => false,   // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
   // When 'user_specific' is enabled following variables can be used in base_dn/bind_dn config:
   // %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' => '',
   // Base DN and filter used for resolving the user's domain root DN which feeds the %dc variables
   // Leave empty to skip this lookup and derive the root DN from the username domain
   'domain_base_dn' => '',
   'domain_filter'  => '',
   // Optional map of replacement strings => attributes used when binding for an individual address book
   'search_bind_attrib' => array(),  // e.g. array('%udc' => 'ou')
   // 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
   //   1. for every attribute one can specify the number of values (limit) allowed.
   //      default is 1, a wildcard * means unlimited
   //   2. another possible parameter is separator character for composite fields
   //   3. it's possible to define field format for write operations, e.g. for date fields
   //      example: 'birthday:date[YmdHis\\Z]'
   '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',
     'phone:workfax' => 'facsimileTelephoneNumber',
     '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',
     'photo'        => 'jpegPhoto',
     // these currently don't work:
     // 'manager'       => 'manager',
     // 'assistant'     => 'secretary',
   ),
   // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country'
   'sub_fields' => array(),
   // Generate values for the following LDAP attributes automatically when creating a new record
   'autovalues' => array(
   // 'uid'  => 'md5(microtime())',               // You may specify PHP code snippets which are then eval'ed 
   // 'mail' => '{givenname}.{sn}@mydomain.com',  // or composite strings with placeholders for existing attributes
   ),
   '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)
   'vlv_search'     => false,        // Use Virtual List View functions for autocompletion searches (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
   'config_root_dn' => 'cn=config',  // Root DN to search config entries (e.g. vlv indexes)
   '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'      => false,        // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups
   'dereference'    => 0,            // Sets the LDAP_OPT_DEREF option. One of: LDAP_DEREF_NEVER, LDAP_DEREF_SEARCHING, LDAP_DEREF_FINDING, LDAP_DEREF_ALWAYS
                                     // Used where addressbook contains aliases to objects elsewhere in the LDAP tree.
 
   // 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'),   // Object classes to be assigned to new groups
     'member_attr'       => 'member',   // Name of the default member attribute, e.g. uniqueMember
     'name_attr'         => 'cn',       // Attribute to be used as group name
     'email_attr'        => 'mail',     // Group email address attribute (e.g. for mailing lists)
     'member_filter'     => '(objectclass=*)',  // Optional filter to use when querying for group members
     'vlv'               => false,      // Use VLV controls to list groups
     'class_member_attr' => array(      // Mapping of group object class to member attribute used in these objects
       'groupofnames'       => 'member',
       'groupofuniquenames' => 'uniquemember'
     ),
   ),
   // this configuration replaces the regular groups listing in the directory tree with
   // a hard-coded list of groups, each listing entries with the configured base DN and filter.
   // if the 'groups' option from above is set, it'll be shown as the first entry with the name 'Groups'
   'group_filters' => array(
     'departments' => array(
       'name'    => 'Company Departments',
       'scope'   => 'list',
       'base_dn' => 'ou=Groups,dc=mydomain,dc=com',
       'filter'  => '(|(objectclass=groupofuniquenames)(objectclass=groupofurls))',
       'name_attr' => 'cn',
     ),
     'customers' => array(
       'name'    => 'Customers',
       'scope'   => 'sub',
       'base_dn' => 'ou=Customers,dc=mydomain,dc=com',
       'filter'  => '(objectClass=inetOrgPerson)',
       'name_attr' => 'sn',
     ),
   ),
 );
 */
 
 // An ordered array of the ids of the addressbooks that should be searched
 // when populating address autocomplete fields server-side. ex: array('sql','Verisign');
 $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
 $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.
 $config['autocomplete_threads'] = 0;
 
 // Max. numer of entries in autocomplete popup. Default: 15.
 $config['autocomplete_max'] = 15;
 
 // show address fields in this order
 // available placeholders: {street}, {locality}, {zipcode}, {country}, {region}
 $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
 $config['addressbook_search_mode'] = 0;
 
 // List of fields used on contacts list and for autocompletion searches
 // Warning: These are field names not LDAP attributes (see 'fieldmap' setting)!
 $config['contactlist_fields'] = array('name', 'firstname', 'surname', 'email');
 
 // Template of contact entry on the autocompletion list.
 // You can use contact fields as: name, email, organization, department, etc.
 // See program/steps/addressbook/func.inc for a list
 $config['contact_search_name'] = '{name} <{email}>';
 
 // ----------------------------------
 // USER PREFERENCES
 // ----------------------------------
 
 // Use this charset as fallback for message decoding
 $config['default_charset'] = 'ISO-8859-1';
 
 // skin name: folder from skins/
 $config['skin'] = 'elastic';
 
 // limit skins available/shown in the settings section
 $config['skins_allowed'] = array();
 
 // Enables using standard browser windows (that can be handled as tabs)
 // instead of popup windows
 $config['standard_windows'] = false;
 
 // show up to X items in messages list view
 $config['mail_pagesize'] = 50;
 
 // show up to X items in contacts list view
 $config['addressbook_pagesize'] = 50;
 
 // sort contacts by this col (preferably either one of name, firstname, surname)
 $config['addressbook_sort_col'] = 'surname';
 
 // The way how contact names are displayed in the list.
 // 0: prefix firstname middlename surname suffix (only if display name is not set)
 // 1: firstname middlename surname
 // 2: surname firstname middlename
 // 3: surname, firstname middlename
 $config['addressbook_name_listing'] = 0;
 
 // use this timezone to display date/time
 // valid timezone identifiers are listed here: php.net/manual/en/timezones.php
 // 'auto' will use the browser's timezone settings
 $config['timezone'] = 'auto';
 
 // prefer displaying HTML messages
 $config['prefer_html'] = true;
 
 // display remote resources (inline images, styles)
 // 0 - Never, always ask
 // 1 - Ask if sender is not in address book
 // 2 - Always allow
 $config['show_images'] = 0;
 
 // open messages in new window
 $config['message_extwin'] = false;
 
 // open message compose form in new window
 $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
 //  4 - always, except when replying to plain text message
 $config['htmleditor'] = 0;
 
 // save copies of compose messages in the browser's local storage
 // for recovery in case of browser crashes and session timeout.
 $config['compose_save_localstorage'] = true;
 
 // show pretty dates as standard
 $config['prettydate'] = true;
 
 // save compose message every 300 seconds (5min)
 $config['draft_autosave'] = 300;
 
 // Interface layout. Default: 'widescreen'.
 //  'widescreen' - three columns
 //  'desktop'    - two columns, preview on bottom
 //  'list'       - two columns, no preview
 $config['layout'] = 'widescreen';
 
 // Mark as read when viewing a message (delay in seconds)
 // Set to -1 if messages should not be marked as read
 $config['mail_read_time'] = 0;
 
 // Clear Trash on logout
 $config['logout_purge'] = false;
 
 // Compact INBOX on logout
 $config['logout_expunge'] = false;
 
 // Display attached images below the message body 
 $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
 $config['mime_param_folding'] = 1;
 
 // Set true if deleted messages should not be displayed
 // This will make the application run slower
 $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
 $config['read_when_deleted'] = true;
 
 // Set to true to never delete messages immediately
 // Use 'Purge' to remove messages marked as deleted
 $config['flag_for_deletion'] = false;
 
 // Default interval for auto-refresh requests (in seconds)
 // These are requests for system state updates e.g. checking for new messages, etc.
 // Setting it to 0 disables the feature.
 $config['refresh_interval'] = 60;
 
 // If true all folders will be checked for recent messages
 $config['check_all_folders'] = false;
 
 // If true, after message/contact delete/move, the next message/contact will be displayed
 $config['display_next'] = true;
 
 // Default messages listing mode. One of 'threads' or 'list'.
 $config['default_list_mode'] = 'list';
 
 // 0 - Do not expand threads
 // 1 - Expand all threads automatically
 // 2 - Expand only threads with unread messages
 $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)
 // 2  - place cursor above original message (top posting), but do not indent the quote
 $config['reply_mode'] = 0;
 
 // When replying strip original signature from message
 $config['strip_existing_sig'] = true;
 
 // Show signature:
 // 0 - Never
 // 1 - Always
 // 2 - New messages only
 // 3 - Forwards and Replies only
 $config['show_sig'] = 1;
 
 // By default the signature is placed depending on cursor position (reply_mode).
 // Sometimes it might be convenient to start the reply on top but keep
 // the signature below the quoted text (sig_below = true).
 $config['sig_below'] = false;
 
 // Enables adding of standard separator to the signature
 $config['sig_separator'] = true;
 
 // Use MIME encoding (quoted-printable) for 8bit characters in message body
 $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 $config['*_mbox'] options
 $config['search_mods'] = null;  // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1));
 
 // Defaults of the addressbook search field configuration.
 $config['addressbook_search_mods'] = null;  // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1);
 
 // Directly delete messages in Junk instead of moving to Trash
 $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
 $config['mdn_requests'] = 0;
 
 // Return receipt checkbox default state
 $config['mdn_default'] = 0;
 
 // Delivery Status Notification checkbox default state
 // Note: This can be used only if smtp_server is non-empty
 $config['dsn_default'] = 0;
 
 // Place replies in the folder of the message being replied to
 $config['reply_same_folder'] = false;
 
 // Sets default mode of Forward feature to "forward as attachment"
 $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.
 $config['default_addressbook'] = null;
 
 // Enables spell checking before sending a message.
 $config['spellcheck_before_send'] = false;
 
 // Skip alternative email addresses in autocompletion (show one address per contact)
 $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
 $config['default_font'] = 'Verdana';
 
 // Default font size for composed HTML message.
 // Supported sizes: 8pt, 10pt, 12pt, 14pt, 18pt, 24pt, 36pt
 $config['default_font_size'] = '10pt';
 
 // Enables display of email address with name instead of a name (and address in title)
 $config['message_show_email'] = false;
 
 // Default behavior of Reply-All button:
 // 0 - Reply-All always
 // 1 - Reply-List if mailing list is detected
 $config['reply_all_mode'] = 0;
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index a2c6f682f..05b18f8c1 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -1,2493 +1,2508 @@
 <?php
 
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
  |                                                                       |
  | Copyright (C) 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    Webmail
  * @subpackage View
  */
 class rcmail_output_html extends rcmail_output
 {
     public $type = 'html';
 
     protected $message;
     protected $template_name;
     protected $objects      = array();
     protected $js_env       = array();
     protected $js_labels    = array();
     protected $js_commands  = array();
     protected $skin_paths   = array();
     protected $skin_name    = '';
     protected $scripts_path = '';
     protected $script_files = array();
     protected $css_files    = array();
     protected $scripts      = array();
     protected $meta_tags    = array();
     protected $link_tags    = array('shortcut icon' => '');
     protected $header       = '';
     protected $footer       = '';
     protected $body         = '';
     protected $base_path    = '';
     protected $assets_path;
     protected $assets_dir   = RCUBE_INSTALL_PATH;
     protected $devel_mode   = false;
     protected $default_template = "<html>\n<head><title></title></head>\n<body></body>\n</html>";
 
     // deprecated names of templates used before 0.5
     protected $deprecated_templates = array(
         'contact'      => 'showcontact',
         'contactadd'   => 'addcontact',
         'contactedit'  => 'editcontact',
         'identityedit' => 'editidentity',
         'messageprint' => 'printmessage',
     );
 
     // deprecated names of template objects used before 1.4
     protected $deprecated_template_objects = array(
         'addressframe'        => 'contentframe',
         'messagecontentframe' => 'contentframe',
         'prefsframe'          => 'contentframe',
         'folderframe'         => 'contentframe',
         'identityframe'       => 'contentframe',
         'responseframe'       => 'contentframe',
         'keyframe'            => 'contentframe',
         'filterframe'         => 'contentframe',
     );
 
     /**
      * Constructor
      */
     public function __construct($task = null, $framed = false)
     {
         parent::__construct();
 
         $this->devel_mode = $this->config->get('devel_mode');
 
         $this->set_env('task', $task);
         $this->set_env('standard_windows', (bool) $this->config->get('standard_windows'));
         $this->set_env('locale', $_SESSION['language']);
         $this->set_env('devel_mode', $this->devel_mode);
 
         // Version number e.g. 1.4.2 will be 10402
         $version = explode('.', preg_replace('/[^0-9.].*/', '', RCMAIL_VERSION));
         $this->set_env('rcversion', $version[0] * 10000 + $version[1] * 100 + $version[2]);
 
         // 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', filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN));
 
         // Easy way to change skin via GET argument, for developers
         if ($this->devel_mode && !empty($_GET['skin']) && preg_match('/^[a-z0-9-_]+$/i', $_GET['skin'])) {
             if ($this->check_skin($_GET['skin'])) {
                 $this->set_skin($_GET['skin']);
                 $this->app->user->save_prefs(array('skin' => $_GET['skin']));
             }
         }
 
         // load and setup the skin
         $this->set_skin($this->config->get('skin'));
         $this->set_assets_path($this->config->get('assets_path'), $this->config->get('assets_dir'));
 
         if (!empty($_REQUEST['_extwin']))
             $this->set_env('extwin', 1);
         if ($this->framed || $framed)
             $this->set_env('framed', 1);
 
         $lic = <<<EOF
 /*
         @licstart  The following is the entire license notice for the 
         JavaScript code in this page.
 
         Copyright (C) The Roundcube Dev Team
 
         The JavaScript code in this page is free software: you can redistribute
         it and/or modify it under the terms of the GNU General Public License
         as published by the Free Software Foundation, either version 3 of
         the License, or (at your option) any later version.
 
         The code is distributed WITHOUT ANY WARRANTY; without even the implied
         warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
         See the GNU GPL for more details.
 
         @licend  The above is the entire license notice
         for the JavaScript code in this page.
 */
 EOF;
         // add common javascripts
         $this->add_script($lic, 'head_top');
         $this->add_script('var '.self::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(self::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 blankpage (watermark) url
         $blankpage = $this->config->get('blankpage_url', '/watermark.html');
         $this->set_env('blankpage', $blankpage);
     }
 
     /**
      * Set environment variable
      *
      * @param string  $name    Property name
      * @param mixed   $value   Property value
      * @param boolean $addtojs 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;
         }
     }
 
     /**
      * Parse and set assets path
      *
      * @param string $path   Assets path URL (relative or absolute)
      * @param string $fs_dif Assets path in filesystem
      */
     public function set_assets_path($path, $fs_dir = null)
     {
         if (empty($path)) {
             return;
         }
 
         $path = rtrim($path, '/') . '/';
 
         // handle relative assets path
         if (!preg_match('|^https?://|', $path) && $path[0] != '/') {
             // save the path to search for asset files later
             $this->assets_dir = $path;
 
             $base = preg_replace('/[?#&].*$/', '', $_SERVER['REQUEST_URI']);
             $base = rtrim($base, '/');
 
             // remove url token if exists
             if ($len = intval($this->config->get('use_secure_urls'))) {
                 $_base  = explode('/', $base);
                 $last   = count($_base) - 1;
                 $length = $len > 1 ? $len : 16; // as in rcube::get_secure_url_token()
 
                 // we can't use real token here because it
                 // does not exists in unauthenticated state,
                 // hope this will not produce false-positive matches
                 if ($last > -1 && preg_match('/^[a-f0-9]{' . $length . '}$/', $_base[$last])) {
                     $path = '../' . $path;
                 }
             }
         }
 
         // set filesystem path for assets
         if ($fs_dir) {
             if ($fs_dir[0] != '/') {
                 $fs_dir = realpath(RCUBE_INSTALL_PATH . $fs_dir);
             }
             // ensure the path ends with a slash
             $this->assets_dir = rtrim($fs_dir, '/') . '/';
         }
 
         $this->assets_path = $path;
         $this->set_env('assets_path', $path);
     }
 
     /**
      * Getter for the current page title
      *
      * @param bool $full Prepend title with product/user name
      *
      * @return string The page title
      */
     protected function get_pagetitle($full = true)
     {
         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']);
         }
 
         if ($full) {
             if ($this->devel_mode && !empty($_SESSION['username'])) {
                 $title = $_SESSION['username'] . ' :: ' . $title;
             }
             else if ($prod_name = $this->config->get('product_name')) {
                 $title = $prod_name . ' :: ' . $title;
             }
         }
 
         return $title;
     }
 
     /**
      * Getter for the current skin path property
      */
     public function get_skin_path()
     {
         return $this->skin_paths[0];
     }
 
     /**
      * Set skin
      *
      * @param string $skin Skin name
      */
     public function set_skin($skin)
     {
         if (!$this->check_skin($skin)) {
             $skin = rcube_config::DEFAULT_SKIN;
         }
 
         $skin_path = 'skins/' . $skin;
 
         $this->config->set('skin_path', $skin_path);
         $this->base_path = $skin_path;
 
         // register skin path(s)
         $this->skin_paths = array();
         $this->skins      = array();
         $this->load_skin($skin_path);
 
         $this->skin_name = $skin;
         $this->set_env('skin', $skin);
     }
 
     /**
      * Check skin validity/existence
      *
      * @param string $skin Skin name
      *
      * @return bool True if the skin exist and is readable, False otherwise
      */
     public function check_skin($skin)
     {
         // Sanity check to prevent from path traversal vulnerability (#1490620)
         if (strpos($skin, '/') !== false || strpos($skin, "\\") !== false) {
             rcube::raise_error(array(
                     'file'    => __FILE__,
                     'line'    => __LINE__,
                     'message' => 'Invalid skin name'
                 ), true, false);
 
             return false;
         }
 
         $path = RCUBE_INSTALL_PATH . 'skins/';
 
         return !empty($skin) && is_dir($path . $skin) && is_readable($path . $skin);
     }
 
     /**
      * 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 dependencies
         $meta = @file_get_contents(RCUBE_INSTALL_PATH . $skin_path . '/meta.json');
         $meta = @json_decode($meta, true);
 
         $meta['path']  = $skin_path;
         $path_elements = explode('/', $skin_path);
         $skin_id       = end($path_elements);
 
         if (!$meta['name']) {
             $meta['name'] = $skin_id;
         }
 
         $this->skins[$skin_id] = $meta;
 
         // Keep skin config for ajax requests (#6613)
         $_SESSION['skin_config'] = array();
 
         if ($meta['extends']) {
             $path = RCUBE_INSTALL_PATH . 'skins/';
             if (is_dir($path . $meta['extends']) && is_readable($path . $meta['extends'])) {
                 $_SESSION['skin_config'] = $this->load_skin('skins/' . $meta['extends']);
             }
         }
 
         if (!empty($meta['config'])) {
             foreach ($meta['config'] as $key => $value) {
                 $this->config->set($key, $value, true);
                 $_SESSION['skin_config'][$key] = $value;
             }
 
             $value = array_merge((array) $this->config->get('dont_override'), array_keys($meta['config']));
             $this->config->set('dont_override', $value, true);
         }
 
         if (!empty($meta['localization'])) {
             $locdir = $meta['localization'] === true ? 'localization' : $meta['localization'];
             if ($texts = $this->app->read_localization(RCUBE_INSTALL_PATH . $skin_path . '/' . $locdir)) {
                 $this->app->load_language($_SESSION['language'], $texts);
             }
         }
 
         // Use array_merge() here to allow for global default and extended skins
         $this->meta_tags = array_merge($this->meta_tags, (array) $meta['meta']);
         $this->link_tags = array_merge($this->link_tags, (array) $meta['links']);
 
         return $_SESSION['skin_config'];
     }
 
     /**
      * Check if a specific template exists
      *
      * @param string $name Template name
      *
      * @return boolean True if template exists
      */
     public function template_exists($name)
     {
         foreach ($this->skin_paths as $skin_path) {
             $filename = RCUBE_INSTALL_PATH . $skin_path . '/templates/' . $name . '.html';
             if ((is_file($filename) && is_readable($filename))
                 || ($this->deprecated_templates[$name] && $this->template_exists($this->deprecated_templates[$name]))
             ) {
                 return true;
             }
         }
 
         return false;
     }
 
     /**
      * Find the given file in the current skin path stack
      *
      * @param string $file       File name/path to resolve (starting with /)
      * @param string &$skin_path Reference to the base path of the matching skin
      * @param string $add_path   Additional path to search in
      * @param bool   $minified   Fallback to a minified version of the file
      *
      * @return mixed Relative path to the requested file or False if not found
      */
     public function get_skin_file($file, &$skin_path = null, $add_path = null, $minified = false)
     {
         $skin_paths = $this->skin_paths;
 
         if ($add_path) {
             array_unshift($skin_paths, $add_path);
             $skin_paths = array_unique($skin_paths);
         }
 
         if ($skin_path = $this->find_file_path($file, $skin_paths)) {
             return $skin_path . $file;
         }
 
         if ($minified && preg_match('/(?<!\.min)\.(js|css)$/', $file)) {
             $file = preg_replace('/\.(js|css)$/', '.min.\\1', $file);
 
             if ($skin_path = $this->find_file_path($file, $skin_paths)) {
                 return $skin_path . $file;
             }
         }
 
         return false;
     }
 
     /**
      * Find path of the asset file
      */
     protected function find_file_path($file, $skin_paths)
     {
         foreach ($skin_paths as $skin_path) {
             if ($this->assets_dir != RCUBE_INSTALL_PATH) {
                 if (realpath($this->assets_dir . $skin_path . $file)) {
                     return $skin_path;
                 }
             }
 
             if (realpath(RCUBE_INSTALL_PATH . $skin_path . $file)) {
                 return $skin_path;
             }
         }
     }
 
     /**
      * Register a GUI object to the client script
      *
      * @param string $obj Object name
      * @param string $id  Object ID
      */
     public function add_gui_object($obj, $id)
     {
         $this->add_script(self::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(array('rcube','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
      *
      * @param bool $all Reset all env variables (including internal)
      */
     public function reset($all = false)
     {
         $framed = $this->framed;
         $task   = $this->env['task'];
         $env    = $all ? null : array_intersect_key($this->env, array('extwin'=>1, 'framed'=>1));
 
         // keep jQuery-UI files
         $css_files = $script_files = array();
 
         foreach ($this->css_files as $file) {
             if (strpos($file, 'plugins/jqueryui') === 0) {
                 $css_files[] = $file;
             }
         }
 
         foreach ($this->script_files as $position => $files) {
             foreach ($files as $file) {
                 if (strpos($file, 'plugins/jqueryui') === 0) {
                     $script_files[$position][] = $file;
                 }
             }
         }
 
         parent::reset();
 
         // let some env variables survive
         $this->env          = $this->js_env = $env;
         $this->framed       = $framed || $this->env['framed'];
         $this->js_labels    = array();
         $this->js_commands  = array();
         $this->scripts      = array();
         $this->header       = '';
         $this->footer       = '';
         $this->body         = '';
         $this->css_files    = array();
         $this->script_files = array();
 
         // load defaults
         if (!$all) {
             $this->__construct();
         }
 
         // Note: we merge jQuery-UI scripts after jQuery...
         $this->css_files    = array_merge($this->css_files, $css_files);
         $this->script_files = array_merge_recursive($this->script_files, $script_files);
 
         $this->set_env('orig_task', $task);
     }
 
     /**
      * 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
      * @param bool  $secure Redirect to secure location (see rcmail::url())
      */
     public function redirect($p = array(), $delay = 1, $secure = false)
     {
         if ($this->env['extwin'])
             $p['extwin'] = 1;
         $location = $this->app->url($p, false, false, $secure);
         header('Location: ' . $location);
         exit;
     }
 
     /**
      * Send the request output to the client.
      * This will either parse a skin template.
      *
      * @param string  $templ Template name
      * @param boolean $exit  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 = true;
             $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 = '')
     {
         if (!empty($this->script_files)) {
             $this->set_env('request_token', $this->app->get_request_token());
         }
 
         // Fix assets path on blankpage
         if ($this->js_env['blankpage']) {
             $this->js_env['blankpage'] = $this->asset_url($this->abs_url($this->js_env['blankpage'], true));
         }
 
         $commands = $this->get_js_commands($framed);
 
         // if all js commands go to parent window we can ignore all
         // script files and skip rcube_webmail initialization (#1489792)
         // but not on error pages where skins may need jQuery, etc.
         if ($framed && empty($this->js_env['server_error'])) {
             $this->scripts      = array();
             $this->script_files = array();
             $this->header       = '';
             $this->footer       = '';
         }
 
         // write all javascript commands
         if (!empty($commands)) {
             $this->add_script($commands, 'head_top');
         }
 
         $this->page_headers();
 
         // call super method
         $this->_write($template);
     }
 
     /**
      * Send common page headers
      * For now it only (re)sets X-Frame-Options when needed
      */
     public function page_headers()
     {
         if (headers_sent()) {
             return;
         }
 
         // allow (legal) iframe content to be loaded
         $framed = $this->framed || $this->env['framed'];
         if ($framed && ($xopt = $this->app->config->get('x_frame_options', 'sameorigin'))) {
             if (strtolower($xopt) === 'deny') {
                 header('X-Frame-Options: sameorigin', true);
             }
         }
     }
 
     /**
      * Parse a specific skin template and deliver to stdout (or return)
      *
      * @param string  $name  Template name
      * @param boolean $exit  Exit script
      * @param boolean $write 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;
         $plugin_skin_paths = array();
 
         $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
             foreach ($this->skin_paths as $skin_path) {
                 $plugin_skin_paths[] = $this->app->plugins->url . $plugin . '/' . $skin_path;
             }
 
             // prepend 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) {
             // when requesting a plugin template ignore global skin path(s)
             if ($plugin && strpos($skin_path, $this->app->plugins->url) !== 0) {
                 continue;
             }
 
             $path = RCUBE_INSTALL_PATH . "$skin_path/templates/$name.html";
 
             // fallback to deprecated template names
             if (!is_readable($path) && ($dname = $this->deprecated_templates[$realname])) {
                 $path = RCUBE_INSTALL_PATH . "$skin_path/templates/$dname.html";
 
                 if (is_readable($path)) {
                     rcube::raise_error(array(
                             'code' => 502, 'file' => __FILE__, 'line' => __LINE__,
                             'message' => "Using deprecated template '$dname' in $skin_path/templates. Please rename to '$realname'"
                         ), true, false);
                 }
             }
 
             if (is_readable($path)) {
                 $this->config->set('skin_path', $skin_path);
                 // set base_path to core skin directory (not plugin's skin)
                 $this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path);
                 $skin_dir        = preg_replace('!^plugins/!', '', $skin_path);
                 break;
             }
             else {
                 $path = false;
             }
         }
 
         // read template file
         if (!$path || ($templ = @file_get_contents($path)) === false) {
             rcube::raise_error(array(
                 'code' => 404,
                 'type' => 'php',
                 'line' => __LINE__,
                 'file' => __FILE__,
                 'message' => 'Error loading template for '.$realname
                 ), true, $write);
 
             $this->skin_paths = array_slice($this->skin_paths, count($plugin_skin_paths));
             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, 'write' => $write));
 
         // save some memory
         $output = $hook['content'];
         unset($hook['content']);
 
         // remove plugin skin paths from current context
         $this->skin_paths = array_slice($this->skin_paths, count($plugin_skin_paths));
 
         if (!$write) {
             return $this->postrender($output);
         }
 
         $this->write(trim($output));
 
         if ($exit) {
             exit;
         }
     }
 
     /**
      * Return executable javascript code for all registered commands
      */
     protected function get_js_commands(&$framed = null)
     {
         $out             = '';
         $parent_commands = 0;
         $top_commands    = array();
 
         // these should be always on top,
         // e.g. hide_message() below depends on env.framed
         if (!$this->framed && !empty($this->js_env)) {
             $top_commands[] = array('set_env', $this->js_env);
         }
         if (!empty($this->js_labels)) {
             $top_commands[] = array('add_label', $this->js_labels);
         }
 
         // unlock interface after iframe load
         $unlock = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['_unlock']);
         if ($this->framed) {
             $top_commands[] = array('iframe_loaded', $unlock);
         }
         else if ($unlock) {
             $top_commands[] = array('hide_message', $unlock);
         }
 
         $commands = array_merge($top_commands, $this->js_commands);
 
         foreach ($commands as $i => $args) {
             $method = array_shift($args);
             $parent = $this->framed || preg_match('/^parent\./', $method);
 
             foreach ($args as $i => $arg) {
                 $args[$i] = self::json_serialize($arg, $this->devel_mode);
             }
 
             if ($parent) {
                 $parent_commands++;
                 $method        = preg_replace('/^parent\./', '', $method);
                 $parent_prefix = 'if (window.parent && parent.' . self::JS_OBJECT_NAME . ') parent.';
                 $method        = $parent_prefix . self::JS_OBJECT_NAME . '.' . $method;
             }
             else {
                 $method = self::JS_OBJECT_NAME . '.' . $method;
             }
 
             $out .= sprintf("%s(%s);\n", $method, implode(',', $args));
         }
 
         $framed = $parent_prefix && $parent_commands == count($commands);
 
         // make the output more compact if all commands go to parent window
         if ($framed) {
             $out = "if (window.parent && parent." . self::JS_OBJECT_NAME . ") {\n"
                 . str_replace($parent_prefix, "\tparent.", $out)
                 . "}\n";
         }
 
         return $out;
     }
 
     /**
      * Make URLs starting with a slash point to skin directory
      *
      * @param string $str         Input string
      * @param bool   $search_path True if URL should be resolved using the current skin path stack
      *
      * @return string URL
      */
     public function abs_url($str, $search_path = false)
     {
         if ($str[0] == '/') {
             if ($search_path && ($file_url = $this->get_skin_file($str))) {
                 return $file_url;
             }
 
             return $this->base_path . $str;
         }
 
         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 RCUBE_INSTALL_PATH . 'program/steps/utils/error.inc';
         exit;
     }
 
     /**
      * Modify path by adding URL prefix if configured
      *
      * @param string $path    Asset path
      * @param bool   $abs_url Pass to self::abs_url() first
      *
      * @return string Asset path
      */
     public function asset_url($path, $abs_url = false)
     {
         // iframe content can't be in a different domain
         // @TODO: check if assests are on a different domain
 
         if ($abs_url) {
             $path = $this->abs_url($path, true);
         }
 
         if (!$this->assets_path || in_array($path[0], array('?', '/', '.')) || strpos($path, '://')) {
             return $path;
         }
 
         return $this->assets_path . $path;
     }
 
 
     /*****  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 function 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 cache busters)
      */
     protected function fix_paths($output)
     {
         return preg_replace_callback(
             '!(src|href|background|data-src-[a-z]+)=(["\']?)([a-z0-9/_.-]+)(["\'\s>])!i',
             array($this, 'file_callback'), $output);
     }
 
     /**
      * Callback function for preg_replace_callback in fix_paths()
      *
      * @return string Parsed string
      */
     protected function file_callback($matches)
     {
         $file = $matches[3];
         $file = preg_replace('!^/this/!', '/', $file);
 
         // correct absolute paths
         if ($file[0] == '/') {
             $this->get_skin_file($file, $skin_path, $this->base_path);
             $file = ($skin_path ?: $this->base_path) . $file;
         }
 
         // add file modification timestamp
         if (preg_match('/\.(js|css|less|ico|png|svg|jpeg)$/', $file)) {
             $file = $this->file_mod($file);
         }
 
         return $matches[1] . '=' . $matches[2] . $file . $matches[4];
     }
 
     /**
      * Correct paths of asset files according to assets_path
      */
     protected function fix_assets_paths($output)
     {
         return preg_replace_callback(
             '!(src|href|background)=(["\']?)([a-z0-9/_.?=-]+)(["\'\s>])!i',
             array($this, 'assets_callback'), $output);
     }
 
     /**
      * Callback function for preg_replace_callback in fix_assets_paths()
      *
      * @return string Parsed string
      */
     protected function assets_callback($matches)
     {
         $file = $this->asset_url($matches[3]);
 
         return $matches[1] . '=' . $matches[2] . $file . $matches[4];
     }
 
     /**
      * Modify file by adding mtime indicator
      */
     protected function file_mod($file)
     {
         $fs  = false;
         $ext = substr($file, strrpos($file, '.') + 1);
 
         // use minified file if exists (not in development mode)
         if (!$this->devel_mode && !preg_match('/\.min\.' . $ext . '$/', $file)) {
             $minified_file = substr($file, 0, strlen($ext) * -1) . 'min.' . $ext;
             if ($fs = @filemtime($this->assets_dir . $minified_file)) {
                 return $minified_file . '?s=' . $fs;
             }
         }
 
         if ($fs = @filemtime($this->assets_dir . $file)) {
             $file .= '?s=' . $fs;
         }
 
         return $file;
     }
 
     /**
      * Public wrapper to dipp into template parsing.
      *
      * @param string $input Template content
      *
      * @return string
      * @uses   rcmail_output_html::parse_xml()
      * @since  0.1-rc1
      */
     public function just_parse($input)
     {
         $input = $this->parse_conditions($input);
         $input = $this->parse_xml($input);
         $input = $this->postrender($input);
 
         return $input;
     }
 
     /**
      * Parse for conditional tags
      */
     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];
                     if ($submatches[1] != 'endif') {
                         $result .= preg_replace('/.*<roundcube:endif\s+[^>]+>\n?/Uis', '', $submatches[3], 1);
                     }
                     else {
                         $result .= $submatches[3];
                     }
                 }
                 else {
                     $result = "<roundcube:$submatches[1] $submatches[2]>" . $submatches[3];
                 }
 
                 return $matches[0] . $this->parse_conditions($result);
             }
 
             rcube::raise_error(array(
                     'code' => 500, 'line' => __LINE__, 'file' => __FILE__,
                     'message' => "Unable to parse conditional tag " . $matches[2]
                 ), true, false);
         }
 
         return $input;
     }
 
     /**
      * Determines if a given condition is met
      *
      * @param string $condition Condition statement
      *
      * @return boolean True if condition is met, False if not
      * @todo Extend this to allow real conditions, not just "set"
      */
     protected function check_condition($condition)
     {
         return $this->eval_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;
     }
 
     /**
      * Parse & evaluate a given expression and return its result.
      *
      * @param string $expression Expression statement
      *
      * @return mixed Expression result
      */
     protected function eval_expression($expression)
     {
         $expression = 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',rcube_utils::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
         );
 
         // Note: We used create_function() before but it's deprecated in PHP 7.2
         //       and really it was just a wrapper on eval().
         return eval("return ($expression);");
     }
 
     /**
      * Parse variable strings
      *
      * @param string $type Variable type (env, config etc)
      * @param string $name Variable name
      *
      * @return mixed Variable value
      */
     protected function parse_variable($type, $name)
     {
         $value = '';
 
         switch ($type) {
             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], ENT_COMPAT | ENT_HTML401, RCUBE_CHARSET);
                 break;
             case 'browser':
                 $value = $this->browser->{$name};
                 break;
         }
 
         return $value;
     }
 
     /**
      * Search for special tags in input and replace them
      * with the appropriate content
      *
      * @param string $input 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 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 '';
         }
 
         // localize title and summary attributes
         if ($command != 'button' && !empty($attrib['title']) && $this->app->text_exists($attrib['title'])) {
             $attrib['title'] = $this->app->gettext($attrib['title']);
         }
         if ($command != 'button' && !empty($attrib['summary']) && $this->app->text_exists($attrib['summary'])) {
             $attrib['summary'] = $this->app->gettext($attrib['summary']);
         }
 
         // 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'] = $this->eval_expression($attrib['expression']);
 
                 if ($attrib['name'] || $attrib['command']) {
                     $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']) : (rcube_utils::get_boolean((string)$attrib['html']) ? 'no' : '');
 
                     // 'noshow' can be used in skins to define new labels
                     if ($attrib['noshow']) {
                         return '';
                     }
 
                     switch ($quoting) {
                         case 'no':
                         case 'raw':
                             break;
                         case 'javascript':
                         case 'js':
                             $label = rcube::JQ($label);
                             break;
                         default:
                             $label = html::quote($label);
                             break;
                     }
 
                     return $label;
                 }
                 break;
 
             case 'add_label':
                 $this->add_label($attrib['name']);
                 break;
 
             // include a file
             case 'include':
                 if ($attrib['condition'] && !$this->check_condition($attrib['condition'])) {
                     break;
                 }
 
                 if ($attrib['file'][0] != '/') {
                     $attrib['file'] = '/templates/' . $attrib['file'];
                 }
 
                 $old_base_path    = $this->base_path;
                 $include          = '';
 
                 if (!empty($attrib['skin_path'])) {
                     $attrib['skinpath'] = $attrib['skin_path'];
                 }
 
                 if ($path = $this->get_skin_file($attrib['file'], $skin_path, $attrib['skinpath'])) {
                     // set base_path to core skin directory (not plugin's skin)
                     $this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path);
                     $path = realpath(RCUBE_INSTALL_PATH . $path);
                 }
 
                 if (is_readable($path)) {
                     $allow_php = $this->config->get('skin_include_php');
                     $include   = $allow_php ? $this->include_php($path) : file_get_contents($path);
                     $include   = $this->parse_conditions($include);
                     $include   = $this->parse_xml($include);
                     $include   = $this->fix_paths($include);
                 }
 
                 $this->base_path = $old_base_path;
 
                 return $include;
 
             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 = '';
 
                 // correct deprecated object names
                 if ($this->deprecated_template_objects[$object]) {
                     $object = $this->deprecated_template_objects[$object];
                 }
 
                 $handler = $this->object_handlers[$object];
 
                 // execute object handler function
                 if (is_callable($handler)) {
                     $this->prepare_object_attribs($attrib);
 
                     // We assume that objects with src attribute are internal (in most
                     // cases this is a watermark frame). We need this to make sure assets_path
                     // is added to the internal assets paths
                     $external = empty($attrib['src']);
                     $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 (!empty($attrib['type']) && ($template_logo = $this->get_template_logo(':' . $attrib['type'], true)) !== null) {
+                    if (!empty($attrib['type']) && ($template_logo = $this->get_template_logo(null, $attrib['type'], true)) !== null) {
                         $attrib['src'] = $template_logo;
                     }
                     else if (($template_logo = $this->get_template_logo()) !== null) {
                         $attrib['src'] = $template_logo;
                     }
 
                     // process alternative logos (eg for Elastic small screen)
                     foreach ($attrib as $key => $value) {
                         if (preg_match('/data-src-(.*)/', $key, $matches)) {
-                            if (($template_logo = $this->get_template_logo(':' . $matches[1], true)) !== null) {
+                            if (($template_logo = $this->get_template_logo(null, $matches[1], true)) !== null) {
                                 $attrib[$key] = $template_logo;
                             }
 
                             $attrib[$key] = !empty($attrib[$key]) ? $this->abs_url($attrib[$key]) : null;
                         }
                     }
 
                     if ($attrib['src']) {
                         $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(RCUBE_INSTALL_PATH . '.svn/entries')) {
                         if (preg_match('/Revision:\s(\d+)/', @shell_exec('svn info'), $regs))
                           $ver .= ' [SVN r'.$regs[1].']';
                     }
                     else if (is_file(RCUBE_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(false));
                 }
                 else if ($object == 'pagetitle') {
                     // Deprecated, <title> will be added automatically
                     $content = html::quote($this->get_pagetitle());
                 }
                 else if ($object == 'contentframe') {
                     if (empty($attrib['id'])) {
                         $attrib['id'] = 'rcm' . $this->env['task'] . 'frame';
                     }
 
                     // parse variables
                     if (preg_match('/^(config|env):([a-z0-9_]+)$/i', $attrib['src'], $matches)) {
                         $attrib['src'] = $this->parse_variable($matches[1], $matches[2]);
                     }
 
                     $content = $this->frame($attrib, true);
                 }
                 else if ($object == 'meta' || $object == 'links') {
                     if ($object == 'meta') {
                         $source = 'meta_tags';
                         $tag    = 'meta';
                         $key    = 'name';
                         $param  = 'content';
                     }
                     else if ($object == 'links') {
                         $source = 'link_tags';
                         $tag    = 'link';
                         $key    = 'rel';
                         $param  = 'href';
                     }
 
                     foreach ($this->$source as $name => $vars) {
                         // $vars can be in many forms:
                         // - string
                         // - array('key' => 'val')
                         // - array(string, string)
                         // - array(array(), string)
                         // - array(array('key' => 'val'), array('key' => 'val'))
                         // normalise this for processing by checking for string array keys
                         $vars = is_array($vars) ? (count(array_filter(array_keys($vars), 'is_string')) > 0 ? array($vars) : $vars) : array($vars);
 
                         foreach ($vars as $args) {
                             // skip unset headers e.g. when extending a skin and removing a header defined in the parent
                             if ($args === false) {
                                 continue;
                             }
 
                             $args = is_array($args) ? $args : array($param => $args);
 
                             // special handling for favicon
                             if ($object == 'links' && $name == 'shortcut icon' && empty($args[$param])) {
-                                if ($href = $this->get_template_logo(':favicon', true)) {
+                                if ($href = $this->get_template_logo(null, 'favicon', true)) {
                                     $args[$param] = $href;
                                 }
                                 else if ($href = $this->config->get('favicon', '/images/favicon.ico')) {
                                     $args[$param] = $href;
                                 }
                             }
 
                             $content .= html::tag($tag, array($key => $name, 'nl' => true) + $args);
                         }
                     }
                 }
 
                 // exec plugin hooks for this template object
                 $hook = $this->app->plugins->exec_hook("template_object_$object", $attrib + array('content' => $content));
 
                 if (strlen($hook['content']) && !empty($external)) {
                     $object_id                 = uniqid('TEMPLOBJECT:', true);
                     $this->objects[$object_id] = $hook['content'];
                     $hook['content']           = $object_id;
                 }
 
                 return $hook['content'];
 
             // return <link> element
             case 'link':
                 if ($attrib['condition'] && !$this->check_condition($attrib['condition'])) {
                     break;
                 }
 
                 unset($attrib['condition']);
 
                 return html::tag('link', $attrib);
 
 
             // return code for a specified eval expression
             case 'exp':
                 return html::quote($this->eval_expression($attrib['expression']));
 
             // return variable
             case 'var':
                 $var = explode(':', $attrib['name']);
                 $value = $this->parse_variable($var[0], $var[1]);
 
                 if (is_array($value)) {
                     $value = implode(', ', $value);
                 }
 
                 return html::quote($value);
 
             case 'form':
                 return $this->form_tag($attrib);
         }
         return '';
     }
 
     /**
      * Prepares template object attributes
      *
      * @param array &$attribs Attributes
      */
     protected function prepare_object_attribs(&$attribs)
     {
         // Localize data-label-* attributes
         array_walk($attribs, function(&$value, $key, $rcube) {
             if (strpos($key, 'data-label-') === 0) {
                 $value = $rcube->gettext($value);
             }
         }, $this->app);
     }
 
     /**
      * Include a specific file and return it's contents
      *
      * @param string $file 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;
     }
 
     /**
      * Put objects' content back into template output
      */
     protected function postrender($output)
     {
         // insert objects' contents
         foreach ($this->objects as $key => $val) {
             $output = str_replace($key, $val, $output, $count);
             if ($count) {
                 $this->objects[$key] = null;
             }
         }
 
         // make sure all <form> tags have a valid request token
         $output = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $output);
 
         return $output;
     }
 
     /**
      * Create and register a button
      *
      * @param array $attrib 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;
         static $disabled_actions = null;
 
         // these commands can be called directly via url
         $a_static_commands = array('compose', 'list', 'preferences', 'folders', 'identities');
 
         if (!($attrib['command'] || $attrib['name'] || $attrib['href'])) {
             return '';
         }
 
         // try to find out the button type
         if ($attrib['type']) {
             $attrib['type'] = strtolower($attrib['type']);
             if (strpos($attrib['type'], '-menuitem')) {
                 $attrib['type'] = substr($attrib['type'], 0, -9);
                 $menuitem = true;
             }
         }
         else {
             $attrib['type'] = ($attrib['image'] || $attrib['imagepas'] || $attrib['imageact']) ? 'image' : 'button';
         }
 
         $command = $attrib['command'];
         $action = $command ?: $attrib['name'];
 
         if ($attrib['task']) {
             $command = $attrib['task'] . '.' . $command;
             $element = $attrib['task'] . '.' . $action;
         }
         else {
             $element = ($this->env['task'] ? $this->env['task'] . '.' : '') . $action;
         }
 
         if ($disabled_actions === null) {
             $disabled_actions = (array) $this->config->get('disabled_actions');
         }
 
         // remove buttons for disabled actions
         if (in_array($element, $disabled_actions) || in_array($action, $disabled_actions)) {
             return '';
         }
 
         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 accessibility attributes
         if (!$attrib['role']) {
             $attrib['role'] = 'button';
         }
         if (!empty($attrib['class']) && !empty($attrib['classact']) || !empty($attrib['imagepas']) && !empty($attrib['imageact'])) {
             if (array_key_exists('tabindex', $attrib))
                 $attrib['data-tabindex'] = $attrib['tabindex'];
             $attrib['tabindex'] = '-1';  // disable button by default
             $attrib['aria-disabled'] = 'true';
         }
 
         // 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');",
                 self::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("return %s.command('switch-task','%s',this,event)", self::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' || $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)",
                 self::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_merge(html::$common_attrib, array('href', 'onclick', 'tabindex', 'target', 'rel'));
             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'));
         }
         else {
             if ($attrib['label']) {
                 $attrib['value'] = $attrib['label'];
             }
             if ($attrib['command']) {
                 $attrib['disabled'] = 'disabled';
             }
 
             $content = isset($attrib['content']) ? $attrib['content'] : $attrib['label'];
             $out = html::tag('button', $attrib, $content, 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);
         }
 
         if ($attrib['wrapper']) {
             $out = html::tag($attrib['wrapper'], null, $out);
         }
 
         if ($menuitem) {
             $class = $attrib['menuitem-class'] ? ' class="' . $attrib['menuitem-class'] . '"' : '';
             $out   = '<li role="menuitem"' . $class . '>' . $out . '</li>';
         }
 
         return $out;
     }
 
     /**
      * Link an external script file
      *
      * @param string $file     File URL
      * @param string $position Target position [head|head_bottom|foot]
      */
     public function include_script($file, $position = 'head', $add_path = true)
     {
         if ($add_path && !preg_match('|^https?://|i', $file) && $file[0] != '/') {
             $file = $this->file_mod($this->scripts_path . $file);
         }
 
         if (!is_array($this->script_files[$position])) {
             $this->script_files[$position] = array();
         }
 
         if (!in_array($file, $this->script_files[$position])) {
             $this->script_files[$position][] = $file;
         }
     }
 
     /**
      * Add inline javascript code
      *
      * @param string $script   JS code snippet
      * @param string $position Target position [head|head_top|foot|docready]
      */
     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 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 $output HTML output
      */
     protected function _write($output = '')
     {
         $output = trim($output);
 
         if (empty($output)) {
             $output   = html::doctype('html5') . "\n" . $this->default_template;
             $is_empty = true;
         }
 
         $merge_script_files = function($output, $script) {
             return $output . html::script($script);
         };
 
         $merge_scripts = function($output, $script) {
             return $output . html::script(array(), $script);
         };
 
         // put docready commands into page footer
         if (!empty($this->scripts['docready'])) {
             $this->add_script('$(function(){ ' . $this->scripts['docready'] . "\n});", 'foot');
         }
 
         $page_header = '';
         $page_footer = '';
         $meta        = '';
 
         // declare page language
         if (!empty($_SESSION['language'])) {
             $lang   = substr($_SESSION['language'], 0, 2);
             $output = preg_replace('/<html/', '<html lang="' . html::quote($lang) . '"', $output, 1);
 
             if (!headers_sent()) {
                 header('Content-Language: ' . $lang);
             }
         }
 
         // include meta tag with charset
         if (!empty($this->charset)) {
             if (!headers_sent()) {
                 header('Content-Type: text/html; charset=' . $this->charset);
             }
 
             $meta .= html::tag('meta', array(
                     'http-equiv' => 'content-type',
                     'content'    => "text/html; charset={$this->charset}",
                     'nl'         => true
             ));
         }
 
         // include page title (after charset specification)
         $meta .= '<title>' . html::quote($this->get_pagetitle()) . "</title>\n";
 
         $output = preg_replace('/(<head[^>]*>)\n*/i', "\\1\n{$meta}", $output, 1, $count);
         if (!$count) {
             $page_header .= $meta;
         }
 
         // include scripts into header/footer
         $page_header .= array_reduce((array) $this->script_files['head'], $merge_script_files);
         $page_header .= array_reduce(array($this->scripts['head_top'] . $this->scripts['head']), $merge_scripts);
         $page_header .= $this->header . "\n";
         $page_header .= array_reduce((array) $this->script_files['head_bottom'], $merge_script_files);
 
         $page_footer .= array_reduce((array) $this->script_files['foot'], $merge_script_files);
         $page_footer .= $this->footer . "\n";
         $page_footer .= array_reduce((array) $this->scripts['foot'], $merge_scripts);
 
         // 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$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>'))) {
             // for Elastic: put footer content before "footer scripts"
             while (($npos = strripos($output, "\n", -strlen($output) + $fpos - 1))
                 && $npos != $fpos
                 && ($chunk = substr($output, $npos, $fpos - $npos)) !== ''
                 && (trim($chunk) === '' || preg_match('/\s*<script[^>]+><\/script>\s*/', $chunk))
             ) {
                 $fpos = $npos;
             }
 
             $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) && !$is_empty
             && (($pos = stripos($output, '<script ')) || ($pos = stripos($output, '</head>')))
         ) {
             $css = '';
             foreach ($this->css_files as $file) {
                 $is_less = substr_compare($file, '.less', -5, 5, true) === 0;
                 $css    .= html::tag('link', array(
                         'rel'  => $is_less ? 'stylesheet/less' : 'stylesheet',
                         'type' => 'text/css',
                         'href' => $file,
                         'nl'   => true,
                 ));
             }
             $output = substr_replace($output, $css, $pos, 0);
         }
 
         $output = $this->parse_with_globals($this->fix_paths($output));
 
         if ($this->assets_path) {
             $output = $this->fix_assets_paths($output);
         }
 
         $output = $this->postrender($output);
 
         // 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 != RCUBE_CHARSET) {
                 echo rcube_charset::convert($hook['content'], RCUBE_CHARSET, $this->charset);
             }
             else {
                 echo $hook['content'];
             }
         }
     }
 
     /**
      * Returns iframe object, registers some related env variables
      *
      * @param array   $attrib          HTML attributes
      * @param boolean $is_contentframe Register this iframe as the 'contentframe' gui object
      *
      * @return string IFRAME element
      */
     public function frame($attrib, $is_contentframe = false)
     {
         static $idcount = 0;
 
         if (!$attrib['id']) {
             $attrib['id'] = 'rcmframe' . ++$idcount;
         }
 
         $attrib['name'] = $attrib['id'];
         $attrib['src']  = $attrib['src'] ? $this->abs_url($attrib['src'], true) : 'about:blank';
 
         // register as 'contentframe' object
         if ($is_contentframe || $attrib['contentframe']) {
             $this->set_env('contentframe', $attrib['contentframe'] ? $attrib['contentframe'] : $attrib['name']);
         }
 
         return html::iframe($attrib);
     }
 
 
     /*  ************* common functions delivering gui objects **************  */
 
     /**
      * Create a form tag with the necessary hidden fields
      *
      * @param array  $attrib  Named tag parameters
      * @param string $content HTML content of the form
      *
      * @return string HTML code for the form
      */
     public function form_tag($attrib, $content = null)
     {
         if ($this->env['extwin']) {
             $hiddenfield = new html_hiddenfield(array('name' => '_extwin', 'value' => '1'));
             $hidden = $hiddenfield->show();
         }
         else if ($this->framed || $this->env['framed']) {
             $hiddenfield = new html_hiddenfield(array('name' => '_framed', 'value' => '1'));
             $hidden = $hiddenfield->show();
         }
 
         if (!$content) {
             $attrib['noclose'] = true;
         }
 
         return html::tag('form',
             $attrib + array('action' => $this->app->comm_path, 'method' => "get"),
             $hidden . $content,
             array('id','class','style','name','method','action','enctype','onsubmit')
         );
     }
 
     /**
      * Build a form tag with a unique request token
      *
      * @param array  $attrib  Named tag parameters including 'action' and 'task' values
      *                        which will be put into hidden fields
      * @param string $content 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']));
         }
 
         // we already have a <form> tag
         if ($attrib['form']) {
             if ($this->framed || $this->env['framed']) {
                 $hidden->add(array('name' => '_framed', 'value' => '1'));
             }
 
             return $hidden->show() . $content;
         }
 
         unset($attrib['task'], $attrib['request']);
         $attrib['action'] = './';
 
         return $this->form_tag($attrib, $hidden->show() . $content);
     }
 
     /**
      * GUI object 'username'
      * Showing IMAP username of the current session
      *
      * @param array $attrib 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 $attrib 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';
 
         $form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
 
         // 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_url    = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => $url));
         $input_user   = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser', 'required' => 'required')
             + $attrib + $user_attrib);
         $input_pass   = new html_passwordfield(array('name' => '_pass', 'id' => 'rcmloginpwd', 'required' => 'required')
             + $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 = key($default_host)) !== null) {
             $hide_host = true;
             $input_host = new html_hiddenfield(array(
                 'name' => '_host', 'id' => 'rcmloginhost', 'value' => is_numeric($host) ? $default_host[$host] : $host) + $attrib);
         }
         else if (empty($default_host)) {
             $input_host = new html_inputfield(array('name' => '_host', 'id' => 'rcmloginhost')
                 + $attrib + $host_attrib);
         }
 
         $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_url->show();
         $out .= $table->show();
 
         if ($hide_host) {
             $out .= $input_host->show();
         }
 
         if (rcube_utils::get_boolean($attrib['submit'])) {
             $button_attr = array('type' => 'submit', 'id' => 'rcmloginsubmit', 'class' => 'button mainaction submit');
             $out .= html::p('formbuttons', html::tag('button', $button_attr, $this->app->gettext('login')));
         }
 
         // surround html output with a form tag
         if (empty($attrib['form'])) {
             $out = $this->form_tag(array('name' => $form_name, 'method' => 'post'), $out);
         }
 
         // include script for timezone detection
         $this->include_script('jstz.min.js');
 
         return $out;
     }
 
     /**
      * GUI object 'preloader'
      * Loads javascript code for images preloading
      *
      * @param array $attrib 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);
         $images = array_map(array($this, 'asset_url'), $images);
 
         if (empty($images) || $_REQUEST['_task'] == 'logout') {
             return;
         }
 
         $this->add_script('var images = ' . self::json_serialize($images, $this->devel_mode) .';
             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 $attrib Named parameters
      *
      * @return string HTML code for the gui object
      */
     public function search_form($attrib)
     {
         // add some labels to client
         $this->add_label('searching');
 
         $attrib['name']  = '_q';
         $attrib['class'] = trim($attrib['class'] . ' no-bs');
 
         if (empty($attrib['id'])) {
             $attrib['id'] = 'rcmqsearchbox';
         }
         if ($attrib['type'] == 'search' && !$this->browser->khtml) {
             unset($attrib['type'], $attrib['results']);
         }
         if (empty($attrib['placeholder'])) {
             $attrib['placeholder'] = $this->app->gettext('searchplaceholder');
         }
 
         $label   = html::label(array('for' => $attrib['id'], 'class' => 'voice'), rcube::Q($this->app->gettext('arialabelsearchterms')));
         $input_q = new html_inputfield($attrib);
         $out     = $label . $input_q->show();
 
         // Support for multiple searchforms on the same page
         if ($attrib['gui-object'] !== false && $attrib['gui-object'] !== 'false') {
             $this->add_gui_object($attrib['gui-object'] ?: 'qsearchbox', $attrib['id']);
         }
 
         // add form tag around text field
         if (empty($attrib['form']) && empty($attrib['no-form'])) {
             $out = $this->form_tag(array(
                     'name'     => $attrib['form-name'] ?: 'rcmqsearchform',
                     'onsubmit' => sprintf("%s.command('%s'); return false", self::JS_OBJECT_NAME, $attrib['command'] ?: 'search'),
                     // 'style'    => "display:inline"
                 ), $out);
         }
 
         if (!empty($attrib['wrapper'])) {
             $header = html::tag($attrib['ariatag'] ?: 'h2', array(
                     'id'    => 'aria-label-' . $attrib['label'],
                     'class' => 'voice'
                 ), rcube::Q($this->app->gettext('arialabel' . $attrib['label'], $attrib['label-domain'])));
 
             if ($attrib['options']) {
                 $options_button = $this->button(array(
                         'type'       => 'link',
                         'href'       => '#search-filter',
                         'class'      => 'button options',
                         'label'      => 'options',
                         'title'      => 'options',
                         'tabindex'   => '0',
                         'innerclass' => 'inner',
                         'data-target' => $attrib['options']
                 ));
             }
 
             $search_button = $this->button(array(
                     'type'       => 'link',
                     'href'       => '#search',
                     'class'      => 'button search',
                     'label'      => $attrib['buttontitle'],
                     'title'      => $attrib['buttontitle'],
                     'tabindex'   => '0',
                     'innerclass' => 'inner',
             ));
 
             $reset_button = $this->button(array(
                     'type'       => 'link',
                     'command'    => $attrib['reset-command'] ?: 'reset-search',
                     'class'      => 'button reset',
                     'label'      => 'resetsearch',
                     'title'      => 'resetsearch',
                     'tabindex'   => '0',
                     'innerclass' => 'inner',
             ));
 
             $out = html::div(array(
                     'role'            => 'search',
                     'aria-labelledby' => $attrib['label'] ? 'aria-label-' . $attrib['label'] : null,
                     'class'           => $attrib['wrapper'],
                 ), "$header$out\n$reset_button\n$options_button\n$search_button");
         }
 
         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 $attrib 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').')',
             'KOI8-R'       => 'KOI8-R ('.$this->app->gettext('cyrillic').')',
         );
 
         if ($post = rcube_utils::get_input_value('_charset', rcube_utils::INPUT_POST)) {
             $set = $post;
         }
         else if (!empty($attrib['selected'])) {
             $set = $attrib['selected'];
         }
         else {
             $set = $this->get_charset();
         }
 
         $set = strtoupper($set);
         if (!isset($charsets[$set]) && preg_match('/^[A-Z0-9-]+$/', $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 = RCUBE_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;
     }
 
     /**
      * Get logo URL for current template based on skin_logo config option
      *
      * @param string  $name     Name of the logo to check for
      *                          default is current template
+     * @param string  $type     Type of the logo to check for (e.g. 'print' or 'small')
+     *                          default is null (no special type)
      * @param boolean $strict   True if logo should only be returned for specific template
      *
      * @return string image URL
      */
-    protected function get_template_logo($name = null, $strict = false)
+    protected function get_template_logo($name = null, $type = null, $strict = false)
     {
         $template_logo = null;
 
         // Use current template if none provided
         if (!$name) {
             $name = $this->template_name;
         }
 
         $template_names = array(
+            $this->skin_name . ':' . $name . '[' . $type . ']',
             $this->skin_name . ':' . $name,
+            $this->skin_name . ':*[' . $type . ']',
             $this->skin_name . ':*',
+            $this->skin_name . '[' . $type . ']',
+            '*:' . $name . '[' . $type . ']',
+            '*:' . $name,
+            $name . '[' . $type . ']',
             $name,
+            '*[' . $type . ']',
             '*',
+            '[' . $type . ']',
         );
 
-        // If strict matching then remove wildcard options
+        // If no type is specified then remove those options from the list
+        if (empty($type)) {
+            $template_names = preg_grep("/\\[\]$/", $template_names, PREG_GREP_INVERT);
+        }
+
+        // If strict matching then remove wild card options
         if ($strict) {
             $template_names = preg_grep("/\*$/", $template_names, PREG_GREP_INVERT);
         }
 
         if ($logo = $this->config->get('skin_logo')) {
             if (is_array($logo)) {
                 foreach ($template_names as $key) {
                     if (isset($logo[$key])) {
                         $template_logo = $logo[$key];
                         break;
                     }
                 }
             }
             else {
                 $template_logo = $logo;
             }
         }
 
         return $template_logo;
     }
 }