No OneTemporary
Actions

Size

211 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
	index 998779509..a2ec29ca3 100644
	--- a/program/include/rcmail_output_html.php
	+++ b/program/include/rcmail_output_html.php
	@@ -1,1776 +1,1776 @@
	<?php

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


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

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

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

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

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

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

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

	if (!empty($_REQUEST['_extwin']))
	$this->set_env('extwin', 1);
	if ($this->framed \|\| !empty($_REQUEST['_framed']))
	$this->set_env('framed', 1);

	// add common javascripts
	$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 environment variable
	*
	* @param string Property name
	* @param mixed Property value
	* @param boolean True if this property should be added to client environment
	*/
	public function set_env($name, $value, $addtojs = true)
	{
	$this->env[$name] = $value;
	if ($addtojs \|\| isset($this->js_env[$name])) {
	$this->js_env[$name] = $value;
	}
	}

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

	return $title;
	}

	/**
	* Set skin
	*/
	public function set_skin($skin)
	{
	$valid = false;
	$path = RCUBE_INSTALL_PATH . 'skins/';

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

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

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

	return $valid;
	}

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

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

	/**
	* Check if a specific template exists
	*
	* @param string Template name
	* @return boolean True if template exists
	*/
	public function template_exists($name)
	{
	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 name/path to resolve (starting with /)
	* @param string Reference to the base path of the matching skin
	* @param string Additional path to search in
	* @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)
	{
	$skin_paths = $this->skin_paths;
	if ($add_path)
	array_unshift($skin_paths, $add_path);

	foreach ($skin_paths as $skin_path) {
	$path = realpath($skin_path . $file);
	if (is_file($path)) {
	return $skin_path . $file;
	}
	}

	return false;
	}

	/**
	* Register a GUI object to the client script
	*
	* @param string Object name
	* @param string Object ID
	* @return void
	*/
	public function add_gui_object($obj, $id)
	{
	$this->add_script(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('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)
	{
	$env = $all ? null : array_intersect_key($this->env, array('extwin'=>1, 'framed'=>1));

	parent::reset();

	// let some env variables survive
	$this->env = $this->js_env = $env;
	$this->js_labels = array();
	$this->js_commands = array();
	$this->script_files = array();
	$this->scripts = array();
	$this->header = '';
	$this->footer = '';
	$this->body = '';
	}

	/**
	* Redirect to a certain url
	*
	* @param mixed $p Either a string with the action or url parameters as key-value pairs
	* @param int $delay Delay in seconds
	*/
	public function redirect($p = array(), $delay = 1)
	{
	if ($this->env['extwin'])
	$p['extwin'] = 1;
	$location = $this->app->url($p);
	header('Location: ' . $location);
	exit;
	}

	/**
	* Send the request output to the client.
	* This will either parse a skin tempalte or send an AJAX response
	*
	* @param string Template name
	* @param boolean True if script should terminate (default)
	*/
	public function send($templ = null, $exit = true)
	{
	if ($templ != 'iframe') {
	// prevent from endless loops
	if ($exit != 'recur' && $this->app->plugins->is_processing('render_page')) {
	rcube::raise_error(array('code' => 505, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => 'Recursion alert: ignoring output->send()'), true, false);
	return;
	}
	$this->parse($templ, false);
	}
	else {
	$this->framed = 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 = '')
	{
	// unlock interface after iframe load
	$unlock = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['_unlock']);
	if ($this->framed) {
	array_unshift($this->js_commands, array('iframe_loaded', $unlock));
	}
	else if ($unlock) {
	array_unshift($this->js_commands, array('hide_message', $unlock));
	}

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

	// write all env variables to client
	if ($commands = $this->get_js_commands()) {
	$js = $this->framed ? "if (window.parent) {\n" : '';
	$js .= $commands . ($this->framed ? ' }' : '');
	$this->add_script($js, 'head_top');
	}

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

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

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

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

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

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

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

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

	// fallback to deprecated template names
	if (!is_readable($path) && $this->deprecated_templates[$realname]) {
	$path = "$skin_path/templates/" . $this->deprecated_templates[$realname] . ".html";

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

	if (is_readable($path)) {
	$this->config->set('skin_path', $skin_path);
	$this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin)
	$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' => 501,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => 'Error loading template for '.$realname
	), true, $write);
	return false;
	}

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

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

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

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

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

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

	if ($exit) {
	exit;
	}
	}

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

	return $out;
	}

	/**
	* Make URLs starting with a slash point to skin directory
	*
	* @param string Input string
	* @param boolean True if URL should be resolved using the current skin path stack
	* @return string
	*/
	public function abs_url($str, $search_path = false)
	{
	if ($str[0] == '/') {
	if ($search_path && ($file_url = $this->get_skin_file($str, $skin_path)))
	return $file_url;

	return $this->base_path . $str;
	}
	else
	return $str;
	}

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

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

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


	/*** Template parsing methods ***/

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

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

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

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

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

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

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

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

	/**
	* Public wrapper to dipp into template parsing.
	*
	* @param string $input
	* @return string
	* @uses rcmail_output_html::parse_xml()
	* @since 0.1-rc1
	*/
	public function just_parse($input)
	{
	$input = $this->parse_conditions($input);
	$input = $this->parse_xml($input);

	return $input;
	}

	/**
	* Parse for conditional tags
	*
	* @param string $input
	* @return string
	*/
	protected function parse_conditions($input)
	{
	$matches = preg_split('/<roundcube:(if\|elseif\|else\|endif)\s+([^>]+)>\n?/is', $input, 2, PREG_SPLIT_DELIM_CAPTURE);
	if ($matches && count($matches) == 4) {
	if (preg_match('/^(else\|endif)$/i', $matches[1])) {
	return $matches[0] . $this->parse_conditions($matches[3]);
	}
	$attrib = html::parse_attrib_string($matches[2]);
	if (isset($attrib['condition'])) {
	$condmet = $this->check_condition($attrib['condition']);
	$submatches = preg_split('/<roundcube:(elseif\|else\|endif)\s+([^>]+)>\n?/is', $matches[3], 2, PREG_SPLIT_DELIM_CAPTURE);
	if ($condmet) {
	$result = $submatches[0];
	$result.= ($submatches[1] != 'endif' ? preg_replace('/.*<roundcube:endif\s+[^>]+>\n?/Uis', '', $submatches[3], 1) : $submatches[3]);
	}
	else {
	$result = "<roundcube:$submatches[1] $submatches[2]>" . $submatches[3];
	}
	return $matches[0] . $this->parse_conditions($result);
	}
	rcube::raise_error(array(
	'code' => 500,
	'type' => 'php',
	'line' => __LINE__,
	'file' => __FILE__,
	'message' => "Unable to parse conditional tag " . $matches[2]
	), true, false);
	}
	return $input;
	}

	/**
	* Determines if a given condition is met
	*
	* @todo Extend this to allow real conditions, not just "set"
	* @param string Condition statement
	* @return boolean True if condition is met, False if not
	*/
	protected function check_condition($condition)
	{
	return $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 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']",
	"\$app->config->get('\\1',rcube_utils::get_boolean('\\3'))",
	"\$env['\\1']",
	"rcube_utils::get_input_value('\\1', rcube_utils::INPUT_GPC)",
	"\$_COOKIE['\\1']",
	"\$browser->{'\\1'}",
	$this->template_name,
	),
	$expression
	);

	$fn = create_function('$app,$browser,$env', "return ($expression);");
	if (!$fn) {
	rcube::raise_error(array(
	'code' => 505,
	'type' => 'php',
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Expression parse error on: ($expression)"), true, false);

	return null;
	}

	return $fn($this->app, $this->browser, $this->env);
	}

	/**
	* Search for special tags in input and replace them
	* with the appropriate content
	*
	* @param string Input string to parse
	* @return string Altered input string
	* @todo Use DOM-parser to traverse template HTML
	* @todo Maybe a cache.
	*/
	protected function parse_xml($input)
	{
	return preg_replace_callback('/<roundcube:([-_a-z]+)\s+((?:[^>]\|\\\\>)+)(?<!\\\\)>/Ui', array($this, 'xml_command'), $input);
	}

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

	// empty output if required condition is not met
	if (!empty($attrib['condition']) && !$this->check_condition($attrib['condition'])) {
	return '';
	}

	// execute command
	switch ($command) {
	// return a button
	case 'button':
	if ($attrib['name'] \|\| $attrib['command']) {
	return $this->button($attrib);
	}
	break;

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

	// show a label
	case 'label':
	if ($attrib['expression'])
	$attrib['name'] = $this->eval_expression($attrib['expression']);

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

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

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

	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;

	// include a file
	case 'include':
	$old_base_path = $this->base_path;
	if (!empty($attrib['skin_path'])) $attrib['skinpath'] = $attrib['skin_path'];
	if ($path = $this->get_skin_file($attrib['file'], $skin_path, $attrib['skinpath'])) {
	$this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin)
	$path = realpath($path);
	}

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

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

	// define a container block
	case 'container':
	if ($attrib['name'] && $attrib['id']) {
	$this->command('gui_container', $attrib['name'], $attrib['id']);
	// let plugins insert some content here
	$hook = $this->app->plugins->exec_hook("template_container", $attrib);
	return $hook['content'];
	}
	break;

	// return code for a specific application object
	case 'object':
	$object = strtolower($attrib['name']);
	$content = '';

	// we are calling a class/method
	if (($handler = $this->object_handlers[$object]) && is_array($handler)) {
	if ((is_object($handler[0]) && method_exists($handler[0], $handler[1])) \|\|
	(is_string($handler[0]) && class_exists($handler[0])))
	$content = call_user_func($handler, $attrib);
	}
	// execute object handler function
	else if (function_exists($handler)) {
	$content = call_user_func($handler, $attrib);
	}
	else if ($object == 'doctype') {
	$content = html::doctype($attrib['value']);
	}
	else if ($object == 'logo') {
	$attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));
	if ($logo = $this->config->get('skin_logo'))
	$attrib['src'] = $logo;
	$content = html::img($attrib);
	}
	else if ($object == 'productname') {
	$name = $this->config->get('product_name', 'Roundcube Webmail');
	$content = html::quote($name);
	}
	else if ($object == 'version') {
	$ver = (string)RCMAIL_VERSION;
	if (is_file(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());
	}
	else if ($object == 'pagetitle') {
	if ($this->config->get('devel_mode') && !empty($_SESSION['username']))
	$title = $_SESSION['username'].' :: ';
	else if ($prod_name = $this->config->get('product_name'))
	$title = $prod_name . ' :: ';
	else
	$title = '';
	$title .= $this->get_pagetitle();
	$content = html::quote($title);
	}

	// exec plugin hooks for this template object
	$hook = $this->app->plugins->exec_hook("template_object_$object", $attrib + array('content' => $content));
	return $hook['content'];

	// return code for a specified eval expression
	case 'exp':
	return html::quote($this->eval_expression($attrib['expression']));

	// return variable
	case 'var':
	$var = explode(':', $attrib['name']);
	$name = $var[1];
	$value = '';

	switch ($var[0]) {
	case 'env':
	$value = $this->env[$name];
	break;
	case 'config':
	$value = $this->config->get($name);
	if (is_array($value) && $value[$_SESSION['storage_host']]) {
	$value = $value[$_SESSION['storage_host']];
	}
	break;
	case 'request':
	$value = rcube_utils::get_input_value($name, rcube_utils::INPUT_GPC);
	break;
	case 'session':
	$value = $_SESSION[$name];
	break;
	case 'cookie':
	$value = htmlspecialchars($_COOKIE[$name]);
	break;
	case 'browser':
	$value = $this->browser->{$name};
	break;
	}

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

	return html::quote($value);

	case 'form':
	return $this->form_tag($attrib);
	}
	return '';
	}

	/**
	* Include a specific file and return it's contents
	*
	* @param string File path
	* @return string Contents of the processed file
	*/
	protected function include_php($file)
	{
	ob_start();
	include $file;
	$out = ob_get_contents();
	ob_end_clean();

	return $out;
	}

	/**
	* Create and register a button
	*
	* @param array Named button attributes
	* @return string HTML button
	* @todo Remove all inline JS calls and use jQuery instead.
	* @todo Remove all sprintf()'s - they are pretty, but also slow.
	*/
	public function button($attrib)
	{
	static $s_button_count = 100;

	// these commands can be called directly via url
	$a_static_commands = array('compose', 'list', 'preferences', 'folders', 'identities');

	if (!($attrib['command'] \|\| $attrib['name'])) {
	return '';
	}

	// try to find out the button type
	if ($attrib['type']) {
	$attrib['type'] = strtolower($attrib['type']);
	}
	else {
	$attrib['type'] = ($attrib['image'] \|\| $attrib['imagepas'] \|\| $attrib['imageact']) ? 'image' : 'link';
	}

	$command = $attrib['command'];

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

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

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

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

	// add empty alt attribute for XHTML compatibility
	if (!isset($attrib['alt'])) {
	$attrib['alt'] = '';
	}

	// register button in the system
	if ($attrib['command']) {
	$this->add_script(sprintf(
	"%s.register_button('%s', '%s', '%s', '%s', '%s', '%s');",
	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('href', 'onclick', 'title', 'id', 'class', 'style', 'tabindex', 'target');
	if ($attrib['innerclass'])
	$btn_content = html::span($attrib['innerclass'], $btn_content);
	}
	else if ($attrib['type'] == 'input') {
	$attrib['type'] = 'button';

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

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

	// generate html code for button
	if ($btn_content) {
	$attrib_str = html::attrib_string($attrib, $link_attrib);
	$out = sprintf('<a%s>%s</a>', $attrib_str, $btn_content);
	}

	if ($attrib['wrapper']) {
	$out = html::tag($attrib['wrapper'], null, $out);
	}

	return $out;
	}

	/**
	* Link an external script file
	*
	* @param string File URL
	* @param string Target position [head\|foot]
	*/
	public function include_script($file, $position='head')
	{
	static $sa_files = array();

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

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

	$sa_files[] = $file;

	if (!is_array($this->script_files[$position])) {
	$this->script_files[$position] = array();
	}

	$this->script_files[$position][] = $file;
	}

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

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

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

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

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

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

	// replace specialchars in content
	$page_title = html::quote($this->pagetitle);
	$page_header = '';
	$page_footer = '';

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

	// definition of the code to be placed in the document header and footer
	if (is_array($this->script_files['head'])) {
	foreach ($this->script_files['head'] as $file) {
	$page_header .= html::script($file);
	}
	}

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

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

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

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

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

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

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

	// add page hader
	if ($hpos) {
	$output = substr_replace($output, $page_header, $hpos, 0);
	}
	else {
	$output = $page_header . $output;
	}

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

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

	$output = $this->parse_with_globals($this->fix_paths($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) : 'program/resources/blank.gif';

	// register as 'contentframe' object
	if ($is_contentframe \|\| $attrib['contentframe']) {
	$this->set_env('contentframe', $attrib['contentframe'] ? $attrib['contentframe'] : $attrib['name']);
	$this->set_env('blankpage', $attrib['src']);
	}

	return html::iframe($attrib);
	}


	/* *********** common functions delivering gui objects ************ */

	/**
	* Create a form tag with the necessary hidden fields
	*
	* @param array Named tag parameters
	* @return string HTML code for the form
	*/
	public function form_tag($attrib, $content = null)
	{
	if ($this->framed \|\| !empty($_REQUEST['_framed'])) {
	$hiddenfield = new html_hiddenfield(array('name' => '_framed', 'value' => '1'));
	$hidden = $hiddenfield->show();
	}
	if ($this->env['extwin']) {
	$hiddenfield = new html_hiddenfield(array('name' => '_extwin', 'value' => '1'));
	$hidden = $hiddenfield->show();
	}

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

	return html::tag('form',
	$attrib + array('action' => $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 Named tag parameters including 'action' and 'task' values which will be put into hidden fields
	* @param string Form content
	* @return string HTML code for the form
	*/
	public function request_form($attrib, $content = '')
	{
	$hidden = new html_hiddenfield();
	if ($attrib['task']) {
	$hidden->add(array('name' => '_task', 'value' => $attrib['task']));
	}
	if ($attrib['action']) {
	$hidden->add(array('name' => '_action', 'value' => $attrib['action']));
	}

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

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

	/**
	* GUI object 'username'
	* Showing IMAP username of the current session
	*
	* @param array Named tag parameters (currently not used)
	* @return string HTML code for the gui object
	*/
	public function current_username($attrib)
	{
	static $username;

	// alread fetched
	if (!empty($username)) {
	return $username;
	}

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

	return rcube_utils::idn_to_utf8($username);
	}

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

	$_SESSION['temp'] = true;

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

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

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

	$input_task = new html_hiddenfield(array('name' => '_task', 'value' => 'login'));
	$input_action = new html_hiddenfield(array('name' => '_action', 'value' => 'login'));
	$input_tzone = new html_hiddenfield(array('name' => '_timezone', 'id' => 'rcmlogintz', 'value' => '_default_'));
	$input_url = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => $url));
	- $input_user = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser')
	+ $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')
	+ $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);
	}

	$form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
	$this->add_gui_object('loginform', $form_name);

	// create HTML table with two cols
	$table = new html_table(array('cols' => 2));

	$table->add('title', html::label('rcmloginuser', html::quote($this->app->gettext('username'))));
	$table->add('input', $input_user->show(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC)));

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

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

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

	if ($hide_host) {
	$out .= $input_host->show();
	}

	// surround html output with a form tag
	if (empty($attrib['form'])) {
	$out = $this->form_tag(array('name' => $form_name, 'method' => 'post'), $out);
	}

	// include script for timezone detection
	$this->include_script('jstz.min.js');

	return $out;
	}

	/**
	* GUI object 'preloader'
	* Loads javascript code for images preloading
	*
	* @param array Named parameters
	* @return void
	*/
	protected function preloader($attrib)
	{
	$images = preg_split('/[\s\t\n,]+/', $attrib['images'], -1, PREG_SPLIT_NO_EMPTY);
	$images = array_map(array($this, 'abs_url'), $images);

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

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

	/**
	* GUI object 'searchform'
	* Returns code for search function
	*
	* @param array Named parameters
	* @return string HTML code for the gui object
	*/
	protected function search_form($attrib)
	{
	// add some labels to client
	$this->add_label('searching');

	$attrib['name'] = '_q';

	if (empty($attrib['id'])) {
	$attrib['id'] = 'rcmqsearchbox';
	}
	if ($attrib['type'] == 'search' && !$this->browser->khtml) {
	unset($attrib['type'], $attrib['results']);
	}

	$input_q = new html_inputfield($attrib);
	$out = $input_q->show();

	$this->add_gui_object('qsearchbox', $attrib['id']);

	// add form tag around text field
	if (empty($attrib['form'])) {
	$out = $this->form_tag(array(
	'name' => "rcmqsearchform",
	'onsubmit' => self::JS_OBJECT_NAME . ".command('search'); return false",
	'style' => "display:inline"),
	$out);
	}

	return $out;
	}

	/**
	* Builder for GUI object 'message'
	*
	* @param array Named tag parameters
	* @return string HTML code for the gui object
	*/
	protected function message_container($attrib)
	{
	if (isset($attrib['id']) === false) {
	$attrib['id'] = 'rcmMessageContainer';
	}

	$this->add_gui_object('message', $attrib['id']);

	return html::div($attrib, '');
	}

	/**
	* GUI object 'charsetselector'
	*
	* @param array Named parameters for the select tag
	* @return string HTML code for the gui object
	*/
	public function charset_selector($attrib)
	{
	// pass the following attributes to the form class
	$field_attrib = array('name' => '_charset');
	foreach ($attrib as $attr => $value) {
	if (in_array($attr, array('id', 'name', 'class', 'style', 'size', 'tabindex'))) {
	$field_attrib[$attr] = $value;
	}
	}

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

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

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

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

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

	/**
	* Include content from config/about.<LANG>.html if available
	*/
	protected function about_content($attrib)
	{
	$content = '';
	$filenames = array(
	'about.' . $_SESSION['language'] . '.html',
	'about.' . substr($_SESSION['language'], 0, 2) . '.html',
	'about.html',
	);
	foreach ($filenames as $file) {
	$fn = 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;
	}

	}
	diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php
	index 3e6e47a56..a36711281 100644
	--- a/program/lib/Roundcube/html.php
	+++ b/program/lib/Roundcube/html.php
	@@ -1,894 +1,894 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2011, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Helper class to create valid XHTML code \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/


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

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


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

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

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

	/**
	* Generic method to create a HTML tag
	*
	* @param string $tagname Tag name
	* @param array $attrib Tag attributes as key/value pairs
	* @param string $content Optinal Tag content (creates a container tag)
	* @param array $allowed_attrib List with allowed attributes, omit to allow all
	* @return string The XHTML tag
	*/
	public static function tag($tagname, $attrib = array(), $content = null, $allowed_attrib = null)
	{
	if (is_string($attrib))
	$attrib = array('class' => $attrib);

	$inline_tags = array('a','span','img');
	$suffix = $attrib['nl'] \|\| ($content && $attrib['nl'] !== false && !in_array($tagname, $inline_tags)) ? "\n" : '';

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

	/**
	*
	*/
	public static function doctype($type)
	{
	$doctypes = array(
	'html5' => '<!DOCTYPE html>',
	'xhtml' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
	'xhtml-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
	'xhtml-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
	);

	if ($doctypes[$type]) {
	self::$doctype = preg_replace('/-\w+$/', '', $type);
	return $doctypes[$type];
	}

	return '';
	}

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

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

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

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

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

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

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

	/**
	* Derrived method to create <script> tags
	*
	* @param mixed $attr Hash array with tag attributes or string with script source (src)
	* @param string $cont Javascript code to be placed as tag content
	* @return string HTML code
	* @see html::tag()
	*/
	public static function script($attr, $cont = null)
	{
	if (is_string($attr)) {
	$attr = array('src' => $attr);
	}
	if ($cont) {
	if (self::$doctype == 'xhtml')
	$cont = "\n/* <![CDATA[ /\n" . $cont . "\n/ ]]> */\n";
	else
	$cont = "\n" . $cont . "\n";
	}

	return self::tag('script', $attr + array('type' => 'text/javascript', 'nl' => true),
	$cont, array_merge(self::$common_attrib, array('src','type','charset')));
	}

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

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

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

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

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

	// attributes with no value
	if (in_array($key, array('checked', 'multiple', 'disabled', 'selected', 'autofocus'))) {
	if ($value) {
	$attrib_arr[] = $key . '="' . $key . '"';
	}
	}
	else {
	$attrib_arr[] = $key . '="' . self::quote($value) . '"';
	}
	}

	return count($attrib_arr) ? ' '.implode(' ', $attrib_arr) : '';
	}

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

	preg_match_all($regexp, stripslashes($str), $regs, PREG_SET_ORDER);

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

	return $attrib;
	}

	/**
	* Replacing specials characters in html attribute value
	*
	* @param string $str Input string
	*
	* @return string The quoted string
	*/
	public static function quote($str)
	{
	static $flags;

	if (!$flags) {
	$flags = ENT_COMPAT;
	if (defined('ENT_SUBSTITUTE')) {
	$flags \|= ENT_SUBSTITUTE;
	}
	}

	return @htmlspecialchars($str, $flags, RCUBE_CHARSET);
	}
	}


	/**
	* Class to create an HTML input field
	*
	* @package Framework
	* @subpackage View
	*/
	class html_inputfield extends html
	{
	protected $tagname = 'input';
	protected $type = 'text';
	protected $allowed = array(
	- 'type','name','value','size','tabindex','autocapitalize',
	+ 'type','name','value','size','tabindex','autocapitalize','required',
	'autocomplete','checked','onchange','onclick','disabled','readonly',
	'spellcheck','results','maxlength','src','multiple','accept',
	'placeholder','autofocus',
	);

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

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

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

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

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

	/**
	* Class to create an hidden HTML input field
	*
	* @package Framework
	* @subpackage View
	*/
	class html_hiddenfield extends html
	{
	protected $tagname = 'input';
	protected $type = 'hidden';
	protected $fields_arr = array();
	protected $allowed = array('type','name','value','onchange','disabled','readonly');

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

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

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

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

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

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

	return parent::show();
	}
	}

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

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

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

	return parent::show();
	}
	}

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

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

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

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

	if (!empty($value) && empty($this->attrib['is_escaped'])) {
	$value = self::quote($value);
	}

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

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

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

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

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

	$option_content = $option['text'];
	if (empty($this->attrib['is_escaped'])) {
	$option_content = self::quote($option_content);
	}

	$this->content .= self::tag('option', $attr, $option_content);
	}

	return parent::show();
	}
	}


	/**
	* Class to build an HTML table
	*
	* @package Framework
	* @subpackage View
	*/
	class html_table extends html
	{
	protected $tagname = 'table';
	protected $allowed = array('id','class','style','width','summary',
	'cellpadding','cellspacing','border');

	private $header = array();
	private $rows = array();
	private $rowindex = 0;
	private $colindex = 0;

	/**
	* Constructor
	*
	* @param array $attrib Named tag attributes
	*/
	public function __construct($attrib = array())
	{
	$default_attrib = self::$doctype == 'xhtml' ? array('summary' => '', 'border' => 0) : array();
	$this->attrib = array_merge($attrib, $default_attrib);

	if (!empty($attrib['tagname']) && $attrib['tagname'] != 'table') {
	$this->tagname = $attrib['tagname'];
	$this->allowed = self::$common_attrib;
	}
	}

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

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

	$this->rows[$this->rowindex]->cells[$this->colindex] = $cell;
	$this->colindex += max(1, intval($attr['colspan']));

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

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

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

	/**
	* Remove a column from a table
	* Useful for plugins making alterations
	*
	* @param string $class
	*/
	public function remove_column($class)
	{
	// Remove the header
	foreach ($this->header as $index=>$header){
	if ($header->attrib['class'] == $class){
	unset($this->header[$index]);
	break;
	}
	}

	// Remove cells from rows
	foreach ($this->rows as $i=>$row){
	foreach ($row->cells as $j=>$cell){
	if ($cell->attrib['class'] == $class){
	unset($this->rows[$i]->cells[$j]);
	break;
	}
	}
	}
	}

	/**
	* Jump to next row
	*
	* @param array $attr Row attributes
	*/
	public function add_row($attr = array())
	{
	$this->rowindex++;
	$this->colindex = 0;
	$this->rows[$this->rowindex] = new stdClass;
	$this->rows[$this->rowindex]->attrib = $attr;
	$this->rows[$this->rowindex]->cells = array();
	}

	/**
	* Set row attributes
	*
	* @param array $attr Row attributes
	* @param int $index Optional row index (default current row index)
	*/
	public function set_row_attribs($attr = array(), $index = null)
	{
	if (is_string($attr)) {
	$attr = array('class' => $attr);
	}

	if ($index === null) {
	$index = $this->rowindex;
	}

	// make sure row object exists (#1489094)
	if (!$this->rows[$index]) {
	$this->rows[$index] = new stdClass;
	}

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

	/**
	* Get row attributes
	*
	* @param int $index Row index
	*
	* @return array Row attributes
	*/
	public function get_row_attribs($index = null)
	{
	if ($index === null) {
	$index = $this->rowindex;
	}

	return $this->rows[$index] ? $this->rows[$index]->attrib : null;
	}

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

	$thead = $tbody = "";

	// include <thead>
	if (!empty($this->header)) {
	$rowcontent = '';
	foreach ($this->header as $c => $col) {
	$rowcontent .= self::tag($this->_col_tagname(), $col->attrib, $col->content);
	}
	$thead = $this->tagname == 'table' ? self::tag('thead', null, self::tag('tr', null, $rowcontent, parent::$common_attrib)) :
	self::tag($this->_row_tagname(), array('class' => 'thead'), $rowcontent, parent::$common_attrib);
	}

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

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

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

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

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

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

	/**
	* Remove table body (all rows)
	*/
	public function remove_body()
	{
	$this->rows = array();
	$this->rowindex = 0;
	}

	/**
	* Getter for the corresponding tag name for table row elements
	*/
	private function _row_tagname()
	{
	static $row_tagnames = array('table' => 'tr', 'ul' => 'li', '*' => 'div');
	return $row_tagnames[$this->tagname] ?: $row_tagnames['*'];
	}

	/**
	* Getter for the corresponding tag name for table cell elements
	*/
	private function _col_tagname()
	{
	static $col_tagnames = array('table' => 'td', '*' => 'span');
	return $col_tagnames[$this->tagname] ?: $col_tagnames['*'];
	}

	}
	diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
	index dbc9b3ce2..f6ea79ec6 100644
	--- a/program/steps/settings/func.inc
	+++ b/program/steps/settings/func.inc
	@@ -1,1255 +1,1255 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/settings/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Provide functionality for user's settings & preferences \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	if (!$OUTPUT->ajax_call) {
	$OUTPUT->set_pagetitle(rcube_label('preferences'));
	}

	// similar function as /steps/settings/identities.inc::rcmail_identity_frame()
	function rcmail_preferences_frame($attrib)
	{
	global $OUTPUT;

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

	return $OUTPUT->frame($attrib, true);
	}


	function rcmail_sections_list($attrib)
	{
	global $RCMAIL;

	// add id to message list table if not specified
	if (!strlen($attrib['id'])) {
	$attrib['id'] = 'rcmsectionslist';
	}

	list($list, $cols) = rcmail_user_prefs();

	// create XHTML table
	$out = rcube_table_output($attrib, $list, $cols, 'id');

	// set client env
	$RCMAIL->output->add_gui_object('sectionslist', $attrib['id']);
	$RCMAIL->output->include_script('list.js');

	return $out;
	}


	function rcmail_identities_list($attrib)
	{
	global $OUTPUT, $RCMAIL;

	// add id to message list table if not specified
	if (!strlen($attrib['id'])) {
	$attrib['id'] = 'rcmIdentitiesList';
	}

	// get identities list and define 'mail' column
	$list = $RCMAIL->user->list_identities();
	foreach ($list as $idx => $row) {
	$list[$idx]['mail'] = trim($row['name'] . ' <' . rcube_idn_to_utf8($row['email']) .'>');
	}

	// get all identites from DB and define list of cols to be displayed
	$plugin = $RCMAIL->plugins->exec_hook('identities_list', array(
	'list' => $list,
	'cols' => array('mail')
	));

	// @TODO: use <UL> instead of <TABLE> for identities list
	// create XHTML table
	$out = rcube_table_output($attrib, $plugin['list'], $plugin['cols'], 'identity_id');

	// set client env
	$OUTPUT->add_gui_object('identitieslist', $attrib['id']);

	return $out;
	}


	// similar function as in /steps/addressbook/edit.inc
	function get_form_tags($attrib, $action, $id = null, $hidden = null)
	{
	global $EDIT_FORM, $RCMAIL;

	$form_start = $form_end = '';

	if (empty($EDIT_FORM)) {
	$request_key = $action . (isset($id) ? '.'.$id : '');
	$form_start = $RCMAIL->output->request_form(array(
	'name' => 'form',
	'method' => 'post',
	'task' => $RCMAIL->task,
	'action' => $action,
	'request' => $request_key,
	'noclose' => true
	) + $attrib);

	if (is_array($hidden)) {
	$hiddenfields = new html_hiddenfield($hidden);
	$form_start .= $hiddenfields->show();
	}

	$form_end = !strlen($attrib['form']) ? '</form>' : '';

	$EDIT_FORM = !empty($attrib['form']) ? $attrib['form'] : 'form';
	$RCMAIL->output->add_gui_object('editform', $EDIT_FORM);
	}

	return array($form_start, $form_end);
	}


	function rcmail_user_prefs($current = null)
	{
	global $RCMAIL;

	$sections['general'] = array('id' => 'general', 'section' => rcube_label('uisettings'));
	$sections['mailbox'] = array('id' => 'mailbox', 'section' => rcube_label('mailboxview'));
	$sections['mailview'] = array('id' => 'mailview','section' => rcube_label('messagesdisplaying'));
	$sections['compose'] = array('id' => 'compose', 'section' => rcube_label('messagescomposition'));
	$sections['addressbook'] = array('id' => 'addressbook','section' => rcube_label('addressbook'));
	$sections['folders'] = array('id' => 'folders', 'section' => rcube_label('specialfolders'));
	$sections['server'] = array('id' => 'server', 'section' => rcube_label('serversettings'));

	// hook + define list cols
	$plugin = $RCMAIL->plugins->exec_hook('preferences_sections_list',
	array('list' => $sections, 'cols' => array('section')));

	$sections = $plugin['list'];
	$config = $RCMAIL->config->all();
	$no_override = array_flip((array)$RCMAIL->config->get('dont_override'));

	foreach ($sections as $idx => $sect) {
	if ($current && $sect['id'] != $current) {
	continue;
	}

	$blocks = array();

	switch ($sect['id']) {

	// general
	case 'general':
	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'skin' => array('name' => Q(rcube_label('skin'))),
	'browser' => array('name' => Q(rcube_label('browseroptions'))),
	);

	// language selection
	if (!isset($no_override['language'])) {
	if (!$current) {
	continue 2;
	}

	$a_lang = $RCMAIL->list_languages();
	asort($a_lang);

	$field_id = 'rcmfd_lang';
	$select = new html_select(array('name' => '_language', 'id' => $field_id));
	$select->add(array_values($a_lang), array_keys($a_lang));

	$blocks['main']['options']['language'] = array(
	'title' => html::label($field_id, Q(rcube_label('language'))),
	'content' => $select->show($RCMAIL->user->language),
	);
	}

	// timezone selection
	if (!isset($no_override['timezone'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_timezone';
	$select = new html_select(array('name' => '_timezone', 'id' => $field_id));
	$select->add(rcube_label('autodetect'), 'auto');

	$zones = array();
	foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
	try {
	$tz = new DateTimeZone($tzs);
	$date = new DateTime('2012-12-21', $tz);
	$offset = $date->format('Z') + 45000;
	$sortkey = sprintf('%06d.%s', $offset, $tzs);
	$zones[$sortkey] = array($tzs, $date->format('P'));
	}
	catch (Exception $e) {}
	}

	ksort($zones);

	foreach ($zones as $zone) {
	list($tzs, $offset) = $zone;
	$select->add('(GMT ' . $offset . ') ' . strtr($tzs, '_', ' '), $tzs);
	}

	$blocks['main']['options']['timezone'] = array(
	'title' => html::label($field_id, Q(rcube_label('timezone'))),
	'content' => $select->show((string)$config['timezone']),
	);
	}

	// date/time formatting
	if (!isset($no_override['time_format'])) {
	if (!$current) {
	continue 2;
	}

	$reftime = mktime(7,30,0);
	$defaults = array('G:i', 'H:i', 'g:i a', 'h:i A');
	$formats = (array)$RCMAIL->config->get('time_formats', $defaults);
	$field_id = 'rcmfd_time_format';
	$select = new html_select(array('name' => '_time_format', 'id' => $field_id));

	foreach ($formats as $choice) {
	$select->add(date($choice, $reftime), $choice);
	}

	$blocks['main']['options']['time_format'] = array(
	'title' => html::label($field_id, Q(rcube_label('timeformat'))),
	'content' => $select->show($RCMAIL->config->get('time_format')),
	);
	}

	if (!isset($no_override['date_format'])) {
	if (!$current) {
	continue 2;
	}

	$refdate = mktime(12,30,0,7,24);
	$defaults = array('Y-m-d','d-m-Y','Y/m/d','m/d/Y','d/m/Y','d.m.Y','j.n.Y');
	$formats = (array)$RCMAIL->config->get('date_formats', $defaults);
	$field_id = 'rcmfd_date_format';
	$select = new html_select(array('name' => '_date_format', 'id' => $field_id));

	foreach ($formats as $choice) {
	$select->add(date($choice, $refdate), $choice);
	}

	$blocks['main']['options']['date_format'] = array(
	'title' => html::label($field_id, Q(rcube_label('dateformat'))),
	'content' => $select->show($config['date_format']),
	);
	}

	// Show checkbox for toggling 'pretty dates'
	if (!isset($no_override['prettydate'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_prettydate';
	$input = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['prettydate'] = array(
	'title' => html::label($field_id, Q(rcube_label('prettydate'))),
	'content' => $input->show($config['prettydate']?1:0),
	);
	}

	if (!isset($no_override['refresh_interval'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_refresh_interval';
	$select = new html_select(array('name' => '_refresh_interval', 'id' => $field_id));

	$select->add(rcube_label('never'), 0);
	foreach (array(1, 3, 5, 10, 15, 30, 60) as $min) {
	if (!$config['min_refresh_interval'] \|\| $config['min_refresh_interval'] <= $min * 60) {
	$label = rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min)));
	$select->add($label, $min);
	}
	}

	$blocks['main']['options']['refresh_interval'] = array(
	'title' => html::label($field_id, Q(rcube_label('refreshinterval'))),
	'content' => $select->show($config['refresh_interval']/60),
	);
	}

	// show drop-down for available skins
	if (!isset($no_override['skin'])) {
	if (!$current) {
	continue 2;
	}

	$skins = rcmail_get_skins();

	if (count($skins) > 1) {
	$field_id = 'rcmfd_skin';
	$input = new html_radiobutton(array('name'=>'_skin'));

	foreach ($skins as $skin) {
	$thumbnail = "./skins/$skin/thumbnail.png";
	if (!is_file($thumbnail))
	$thumbnail = './program/resources/blank.gif';

	$skinname = ucfirst($skin);
	$author_link = $license_link = '';
	$meta = @json_decode(@file_get_contents("./skins/$skin/meta.json"), true);

	if (is_array($meta) && $meta['name']) {
	$skinname = $meta['name'];
	$author_link = $meta['url'] ? html::a(array('href' => $meta['url'], 'target' => '_blank'), Q($meta['author'])) : Q($meta['author']);
	$license_link = $meta['license-url'] ? html::a(array('href' => $meta['license-url'], 'target' => '_blank'), Q($meta['license'])) : Q($meta['license']);
	}

	$blocks['skin']['options'][$skin]['content'] = html::label(array('class' => 'skinselection'),
	html::span('skinitem', $input->show($config['skin'], array('value' => $skin, 'id' => $field_id.$skin))) .
	html::span('skinitem', html::img(array('src' => $thumbnail, 'class' => 'skinthumbnail', 'alt' => $skin, 'width' => 64, 'height' => 64))) .
	html::span('skinitem', html::span('skinname', Q($skinname)) . html::br() .
	html::span('skinauthor', $author_link ? 'by ' . $author_link : '') . html::br() .
	html::span('skinlicense', $license_link ? rcube_label('license').': ' . $license_link : ''))
	);
	}
	}
	}

	// standard_windows option decides if new windows should be
	// opened as popups or standard windows (which can be handled by browsers as tabs)
	if (!isset($no_override['standard_windows'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_standard_windows';
	$checkbox = new html_checkbox(array('name' => '_standard_windows', 'id' => $field_id, 'value' => 1));

	$blocks['browser']['options']['standard_windows'] = array(
	'title' => html::label($field_id, Q(rcube_label('standardwindows'))),
	'content' => $checkbox->show($config['standard_windows']?1:0),
	);
	}

	if ($current) {
	$product_name = $RCMAIL->config->get('product_name', 'Roundcube Webmail');
	$RCMAIL->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');",
	JS_OBJECT_NAME, JQ($product_name)), 'foot');
	}

	$blocks['browser']['options']['mailtoprotohandler'] = array(
	'content' => html::a(array(
	'href' => '#',
	'id' => 'mailtoprotohandler'), Q(rcube_label('mailtoprotohandler'))),
	);

	break;

	// Mailbox view (mail screen)
	case 'mailbox':
	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'new_message' => array('name' => Q(rcube_label('newmessage'))),
	);

	// show config parameter for preview pane
	if (!isset($no_override['preview_pane'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_preview';
	$input = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1,
	'onchange' => "$('#rcmfd_preview_pane_mark_read').prop('disabled', !this.checked)"));

	$blocks['main']['options']['preview_pane'] = array(
	'title' => html::label($field_id, Q(rcube_label('previewpane'))),
	'content' => $input->show($config['preview_pane']?1:0),
	);
	}

	// show config parameter for preview pane auto mark as read delay
	if (!isset($no_override['preview_pane_mark_read'])) {
	if (!$current) {
	continue 2;
	}

	// apply default if config option is not set at all
	$config['preview_pane_mark_read'] = $RCMAIL->config->get('preview_pane_mark_read', 0);

	$field_id = 'rcmfd_preview_pane_mark_read';
	$select = new html_select(array('name' => '_preview_pane_mark_read', 'id' => $field_id,
	'disabled' => $config['preview_pane']?0:1));

	$select->add(rcube_label('never'), '-1');
	$select->add(rcube_label('immediately'), 0);

	foreach (array(5, 10, 20, 30) as $sec) {
	$label = rcube_label(array('name' => 'afternseconds', 'vars' => array('n' => $sec)));
	$select->add($label, $sec);
	}

	$blocks['main']['options']['preview_pane_mark_read'] = array(
	'title' => html::label($field_id, Q(rcube_label('previewpanemarkread'))),
	'content' => $select->show(intval($config['preview_pane_mark_read'])),
	);
	}

	if (!isset($no_override['mdn_requests'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_mdn_requests';
	$select = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
	$select->add(rcube_label('askuser'), 0);
	$select->add(rcube_label('autosend'), 1);
	$select->add(rcube_label('autosendknown'), 3);
	$select->add(rcube_label('autosendknownignore'), 4);
	$select->add(rcube_label('ignore'), 2);

	$blocks['main']['options']['mdn_requests'] = array(
	'title' => html::label($field_id, Q(rcube_label('mdnrequests'))),
	'content' => $select->show($config['mdn_requests']),
	);
	}

	if (!isset($no_override['autoexpand_threads'])) {
	if (!$current) {
	continue 2;
	}

	$storage = $RCMAIL->get_storage();
	$supported = $storage->get_capability('THREAD');

	if ($supported) {
	$field_id = 'rcmfd_autoexpand_threads';
	$select = new html_select(array('name' => '_autoexpand_threads', 'id' => $field_id));
	$select->add(rcube_label('never'), 0);
	$select->add(rcube_label('do_expand'), 1);
	$select->add(rcube_label('expand_only_unread'), 2);

	$blocks['main']['options']['autoexpand_threads'] = array(
	'title' => html::label($field_id, Q(rcube_label('autoexpand_threads'))),
	'content' => $select->show($config['autoexpand_threads']),
	);
	}
	}

	// show page size selection
	if (!isset($no_override['mail_pagesize'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_mail_pagesize';
	$input = new html_inputfield(array('name' => '_mail_pagesize', 'id' => $field_id, 'size' => 5));
	$size = intval($config['mail_pagesize'] ? $config['mail_pagesize'] : $config['pagesize']);

	$blocks['main']['options']['pagesize'] = array(
	'title' => html::label($field_id, Q(rcube_label('pagesize'))),
	'content' => $input->show($size ? $size : 50),
	);
	}

	if (!isset($no_override['check_all_folders'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_check_all_folders';
	$input = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));

	$blocks['new_message']['options']['check_all_folders'] = array(
	'title' => html::label($field_id, Q(rcube_label('checkallfolders'))),
	'content' => $input->show($config['check_all_folders']?1:0),
	);
	}
	break;

	// Message viewing
	case 'mailview':
	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	);

	// show checkbox to open message view in new window
	if (!isset($no_override['message_extwin'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_message_extwin';
	$input = new html_checkbox(array('name' => '_message_extwin', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['message_extwin'] = array(
	'title' => html::label($field_id, Q(rcube_label('showinextwin'))),
	'content' => $input->show($config['message_extwin']?1:0),
	);
	}

	// show checkbox to show email instead of name
	if (!isset($no_override['message_show_email'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_message_show_email';
	$input = new html_checkbox(array('name' => '_message_show_email', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['message_show_email'] = array(
	'title' => html::label($field_id, Q(rcube_label('showemail'))),
	'content' => $input->show($config['message_show_email']?1:0),
	);
	}

	// show checkbox for HTML/plaintext messages
	if (!isset($no_override['prefer_html'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_htmlmsg';
	$input = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
	'onchange' => "$('#rcmfd_show_images').prop('disabled', !this.checked).val(0)"));

	$blocks['main']['options']['prefer_html'] = array(
	'title' => html::label($field_id, Q(rcube_label('preferhtml'))),
	'content' => $input->show($config['prefer_html']?1:0),
	);
	}

	if (!isset($no_override['default_charset'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_default_charset';

	$blocks['main']['options']['default_charset'] = array(
	'title' => html::label($field_id, Q(rcube_label('defaultcharset'))),
	'content' => $RCMAIL->output->charset_selector(array(
	- 'name' => '_default_charset', 'selected' => $config['default_charset']
	+ 'id' => $field_id, 'name' => '_default_charset', 'selected' => $config['default_charset']
	)));
	}

	if (!isset($no_override['show_images'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_show_images';
	$input = new html_select(array('name' => '_show_images', 'id' => $field_id,
	'disabled' => !$config['prefer_html']));

	$input->add(rcube_label('never'), 0);
	$input->add(rcube_label('fromknownsenders'), 1);
	$input->add(rcube_label('always'), 2);

	$blocks['main']['options']['show_images'] = array(
	'title' => html::label($field_id, Q(rcube_label('showremoteimages'))),
	'content' => $input->show($config['prefer_html'] ? $config['show_images'] : 0),
	);
	}

	if (!isset($no_override['inline_images'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_inline_images';
	$input = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['inline_images'] = array(
	'title' => html::label($field_id, Q(rcube_label('showinlineimages'))),
	'content' => $input->show($config['inline_images']?1:0),
	);
	}

	// "display after delete" checkbox
	if (!isset($no_override['display_next'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_displaynext';
	$input = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['display_next'] = array(
	'title' => html::label($field_id, Q(rcube_label('displaynext'))),
	'content' => $input->show($config['display_next']?1:0),
	);
	}
	break;

	// Mail composition
	case 'compose':
	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'sig' => array('name' => Q(rcube_label('signatureoptions'))),
	'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))),
	);

	// show checkbox to compose messages in a new window
	if (!isset($no_override['compose_extwin'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfdcompose_extwin';
	$input = new html_checkbox(array('name' => '_compose_extwin', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['compose_extwin'] = array(
	'title' => html::label($field_id, Q(rcube_label('composeextwin'))),
	'content' => $input->show($config['compose_extwin']?1:0),
	);
	}

	if (!isset($no_override['htmleditor'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_htmleditor';
	$select = new html_select(array('name' => '_htmleditor', 'id' => $field_id));

	$select->add(rcube_label('never'), 0);
	$select->add(rcube_label('always'), 1);
	$select->add(rcube_label('htmlonreply'), 2);
	$select->add(rcube_label('htmlonreplyandforward'), 3);

	$blocks['main']['options']['htmleditor'] = array(
	'title' => html::label($field_id, Q(rcube_label('htmleditor'))),
	'content' => $select->show(intval($config['htmleditor'])),
	);
	}

	if (!isset($no_override['draft_autosave'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_autosave';
	$select = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));

	$select->add(rcube_label('never'), 0);
	foreach (array(1, 3, 5, 10) as $i => $min) {
	$label = rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min)));
	$select->add($label, $min*60);
	}

	$blocks['main']['options']['draft_autosave'] = array(
	'title' => html::label($field_id, Q(rcube_label('autosavedraft'))),
	'content' => $select->show($config['draft_autosave']),
	);
	}

	if (!isset($no_override['mime_param_folding'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_param_folding';
	$select = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));

	$select->add(rcube_label('2231folding'), 0);
	$select->add(rcube_label('miscfolding'), 1);
	$select->add(rcube_label('2047folding'), 2);

	$blocks['main']['options']['mime_param_folding'] = array(
	'advanced' => true,
	'title' => html::label($field_id, Q(rcube_label('mimeparamfolding'))),
	'content' => $select->show($config['mime_param_folding']),
	);
	}

	if (!isset($no_override['force_7bit'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_force_7bit';
	$input = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['force_7bit'] = array(
	'advanced' => true,
	'title' => html::label($field_id, Q(rcube_label('force7bit'))),
	'content' => $input->show($config['force_7bit']?1:0),
	);
	}

	if (!isset($no_override['mdn_default'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_mdn_default';
	$input = new html_checkbox(array('name' => '_mdn_default', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['mdn_default'] = array(
	'title' => html::label($field_id, Q(rcube_label('reqmdn'))),
	'content' => $input->show($config['mdn_default']?1:0),
	);
	}

	if (!isset($no_override['dsn_default'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_dsn_default';
	$input = new html_checkbox(array('name' => '_dsn_default', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['dsn_default'] = array(
	'title' => html::label($field_id, Q(rcube_label('reqdsn'))),
	'content' => $input->show($config['dsn_default']?1:0),
	);
	}

	if (!isset($no_override['reply_same_folder'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_reply_same_folder';
	$input = new html_checkbox(array('name' => '_reply_same_folder', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['reply_same_folder'] = array(
	'title' => html::label($field_id, Q(rcube_label('replysamefolder'))),
	'content' => $input->show($config['reply_same_folder']?1:0),
	);
	}

	if (!isset($no_override['reply_mode'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_reply_mode';
	$select = new html_select(array('name' => '_reply_mode', 'id' => $field_id));

	$select->add(rcube_label('replyempty'), -1);
	$select->add(rcube_label('replybottomposting'), 0);
	$select->add(rcube_label('replytopposting'), 1);

	$blocks['main']['options']['reply_mode'] = array(
	'title' => html::label($field_id, Q(rcube_label('whenreplying'))),
	'content' => $select->show(intval($config['reply_mode'])),
	);
	}

	if (!isset($no_override['spellcheck_before_send']) && $config['enable_spellcheck']) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_spellcheck_before_send';
	$input = new html_checkbox(array('name' => '_spellcheck_before_send', 'id' => $field_id, 'value' => 1));

	$blocks['spellcheck']['options']['spellcheck_before_send'] = array(
	'title' => html::label($field_id, Q(rcube_label('spellcheckbeforesend'))),
	'content' => $input->show($config['spellcheck_before_send']?1:0),
	);
	}

	if ($config['enable_spellcheck']) {
	if (!$current) {
	continue 2;
	}

	foreach (array('syms', 'nums', 'caps') as $key) {
	$key = 'spellcheck_ignore_'.$key;
	if (!isset($no_override[$key])) {
	$input = new html_checkbox(array('name' => '_'.$key, 'id' => 'rcmfd_'.$key, 'value' => 1));

	$blocks['spellcheck']['options'][$key] = array(
	'title' => html::label($field_id, Q(rcube_label(str_replace('_', '', $key)))),
	'content' => $input->show($config[$key]?1:0),
	);
	}
	}
	}

	if (!isset($no_override['show_sig'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_show_sig';
	$select = new html_select(array('name' => '_show_sig', 'id' => $field_id));

	$select->add(rcube_label('never'), 0);
	$select->add(rcube_label('always'), 1);
	$select->add(rcube_label('newmessageonly'), 2);
	$select->add(rcube_label('replyandforwardonly'), 3);

	$blocks['sig']['options']['show_sig'] = array(
	'title' => html::label($field_id, Q(rcube_label('autoaddsignature'))),
	'content' => $select->show($RCMAIL->config->get('show_sig', 1)),
	);
	}

	if (!isset($no_override['strip_existing_sig'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_strip_existing_sig';
	$input = new html_checkbox(array('name' => '_strip_existing_sig', 'id' => $field_id, 'value' => 1));

	$blocks['sig']['options']['strip_existing_sig'] = array(
	'title' => html::label($field_id, Q(rcube_label('replyremovesignature'))),
	'content' => $input->show($config['strip_existing_sig']?1:0),
	);
	}

	if (!isset($no_override['forward_attachment'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_forward_attachment';
	$select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id));

	$select->add(rcube_label('inline'), 0);
	$select->add(rcube_label('asattachment'), 1);

	$blocks['main']['options']['forward_attachment'] = array(
	'title' => html::label($field_id, Q(rcube_label('forwardmode'))),
	'content' => $select->show(intval($config['forward_attachment'])),
	);
	}

	if (!isset($no_override['default_font'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_default_font';
	$fonts = rcube_fontdefs();
	$selected = $config['default_font'];

	$select = '<select name="_default_font" id="'.$field_id.'">';
	$select .= '<option value=""' . (!$selected ? ' selected="selected"' : '') . '>---</option>';
	foreach ($fonts as $fname => $font) {
	$select .= '<option value="'.$fname.'"'
	. ($fname == $selected ? ' selected="selected"' : '')
	. ' style=\'font-family: ' . $font . '\'>'
	. Q($fname) . '</option>';
	}
	$select .= '</select>';

	$blocks['main']['options']['default_font'] = array(
	'title' => html::label($field_id, Q(rcube_label('defaultfont'))),
	'content' => $select
	);
	}
	break;

	// Addressbook config
	case 'addressbook':
	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	);

	if (!isset($no_override['default_addressbook'])
	&& (!$current \|\| ($books = $RCMAIL->get_address_sources(true, true)))
	) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_default_addressbook';
	$select = new html_select(array('name' => '_default_addressbook', 'id' => $field_id));

	foreach ($books as $book) {
	$select->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
	}

	$blocks['main']['options']['default_addressbook'] = array(
	'title' => html::label($field_id, Q(rcube_label('defaultabook'))),
	'content' => $select->show($config['default_addressbook']),
	);
	}

	// show addressbook listing mode selection
	if (!isset($no_override['addressbook_name_listing'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_addressbook_name_listing';
	$select = new html_select(array('name' => '_addressbook_name_listing', 'id' => $field_id));

	$select->add(rcube_label('name'), 0);
	$select->add(rcube_label('firstname') . ' ' . rcube_label('surname'), 1);
	$select->add(rcube_label('surname') . ' ' . rcube_label('firstname'), 2);
	$select->add(rcube_label('surname') . ', ' . rcube_label('firstname'), 3);

	$blocks['main']['options']['list_name_listing'] = array(
	'title' => html::label($field_id, Q(rcube_label('listnamedisplay'))),
	'content' => $select->show($config['addressbook_name_listing']),
	);
	}

	// show addressbook sort column
	if (!isset($no_override['addressbook_sort_col'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_addressbook_sort_col';
	$select = new html_select(array('name' => '_addressbook_sort_col', 'id' => $field_id));

	$select->add(rcube_label('name'), 'name');
	$select->add(rcube_label('firstname'), 'firstname');
	$select->add(rcube_label('surname'), 'surname');

	$blocks['main']['options']['sort_col'] = array(
	'title' => html::label($field_id, Q(rcube_label('listsorting'))),
	'content' => $select->show($config['addressbook_sort_col']),
	);
	}

	// show addressbook page size selection
	if (!isset($no_override['addressbook_pagesize'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_addressbook_pagesize';
	$input = new html_inputfield(array('name' => '_addressbook_pagesize', 'id' => $field_id, 'size' => 5));
	$size = intval($config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize']);

	$blocks['main']['options']['pagesize'] = array(
	'title' => html::label($field_id, Q(rcube_label('pagesize'))),
	'content' => $input->show($size ? $size : 50),
	);
	}

	if (!isset($no_override['autocomplete_single'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_autocomplete_single';
	$checkbox = new html_checkbox(array('name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['autocomplete_single'] = array(
	'title' => html::label($field_id, Q(rcube_label('autocompletesingle'))),
	'content' => $checkbox->show($config['autocomplete_single']?1:0),
	);
	}
	break;

	// Special IMAP folders
	case 'folders':
	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	);

	if (!isset($no_override['show_real_foldernames'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'show_real_foldernames';
	$input = new html_checkbox(array('name' => '_show_real_foldernames', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['show_real_foldernames'] = array(
	'title' => html::label($field_id, Q(rcube_label('show_real_foldernames'))),
	'content' => $input->show($config['show_real_foldernames']?1:0),
	);
	}

	// Configure special folders
	if (!isset($no_override['default_folders']) && $current) {
	$select = rcmail_mailbox_select(array(
	'noselection' => '---',
	'realnames' => true,
	'maxlength' => 30,
	'folder_filter' => 'mail',
	'folder_rights' => 'w',
	// #1486114, #1488279
	'onchange' => "if ($(this).val() == 'INBOX') $(this).val('')",
	));
	}

	if (!isset($no_override['drafts_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['drafts_mbox'] = array(
	'title' => Q(rcube_label('drafts')),
	'content' => $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox")),
	);
	}

	if (!isset($no_override['sent_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['sent_mbox'] = array(
	'title' => Q(rcube_label('sent')),
	'content' => $select->show($config['sent_mbox'], array('name' => "_sent_mbox")),
	);
	}

	if (!isset($no_override['junk_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['junk_mbox'] = array(
	'title' => Q(rcube_label('junk')),
	'content' => $select->show($config['junk_mbox'], array('name' => "_junk_mbox")),
	);
	}

	if (!isset($no_override['trash_mbox'])) {
	if (!$current) {
	continue 2;
	}

	$blocks['main']['options']['trash_mbox'] = array(
	'title' => Q(rcube_label('trash')),
	'content' => $select->show($config['trash_mbox'], array('name' => "_trash_mbox")),
	);
	}
	break;

	// Server settings
	case 'server':
	$blocks = array(
	'main' => array('name' => Q(rcube_label('mainoptions'))),
	'maintenance' => array('name' => Q(rcube_label('maintenance'))),
	);

	if (!isset($no_override['read_when_deleted'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_read_deleted';
	$input = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['read_when_deleted'] = array(
	'title' => html::label($field_id, Q(rcube_label('readwhendeleted'))),
	'content' => $input->show($config['read_when_deleted']?1:0),
	);
	}

	if (!isset($no_override['flag_for_deletion'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_flag_for_deletion';
	$input = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['flag_for_deletion'] = array(
	'title' => html::label($field_id, Q(rcube_label('flagfordeletion'))),
	'content' => $input->show($config['flag_for_deletion']?1:0),
	);
	}

	// don't show deleted messages
	if (!isset($no_override['skip_deleted'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_skip_deleted';
	$input = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['skip_deleted'] = array(
	'title' => html::label($field_id, Q(rcube_label('skipdeleted'))),
	'content' => $input->show($config['skip_deleted']?1:0),
	);
	}

	if (!isset($no_override['delete_always'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_delete_always';
	$input = new html_checkbox(array('name' => '_delete_always', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['delete_always'] = array(
	'title' => html::label($field_id, Q(rcube_label('deletealways'))),
	'content' => $input->show($config['delete_always']?1:0),
	);
	}

	if (!isset($no_override['delete_junk'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_delete_junk';
	$input = new html_checkbox(array('name' => '_delete_junk', 'id' => $field_id, 'value' => 1));

	$blocks['main']['options']['delete_junk'] = array(
	'title' => html::label($field_id, Q(rcube_label('deletejunk'))),
	'content' => $input->show($config['delete_junk']?1:0),
	);
	}

	// Trash purging on logout
	if (!isset($no_override['logout_purge'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_logout_purge';
	$input = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));

	$blocks['maintenance']['options']['logout_purge'] = array(
	'title' => html::label($field_id, Q(rcube_label('logoutclear'))),
	'content' => $input->show($config['logout_purge']?1:0),
	);
	}

	// INBOX compacting on logout
	if (!isset($no_override['logout_expunge'])) {
	if (!$current) {
	continue 2;
	}

	$field_id = 'rcmfd_logout_expunge';
	$input = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));

	$blocks['maintenance']['options']['logout_expunge'] = array(
	'title' => html::label($field_id, Q(rcube_label('logoutcompact'))),
	'content' => $input->show($config['logout_expunge']?1:0),
	);
	}
	}

	$found = false;
	$data = $RCMAIL->plugins->exec_hook('preferences_list',
	array('section' => $sect['id'], 'blocks' => $blocks, 'current' => $current));

	// create output
	foreach ($data['blocks'] as $block) {
	if (!empty($block['content']) \|\| !empty($block['options'])) {
	$found = true;
	break;
	}
	}

	if (!$found)
	unset($sections[$idx]);
	else
	$sections[$idx]['blocks'] = $data['blocks'];
	}

	return array($sections, $plugin['cols']);
	}


	function rcmail_get_skins()
	{
	$path = RCUBE_INSTALL_PATH . 'skins';
	$skins = array();
	$dir = opendir($path);

	if (!$dir) {
	return false;
	}

	while (($file = readdir($dir)) !== false) {
	$filename = $path.'/'.$file;
	if (!preg_match('/^\./', $file) && is_dir($filename) && is_readable($filename)) {
	$skins[] = $file;
	}
	}

	closedir($dir);

	return $skins;
	}


	function rcmail_folder_options($mailbox)
	{
	global $RCMAIL;

	$options = $RCMAIL->get_storage()->folder_info($mailbox);
	$options['protected'] = $options['is_root'] \|\| ($options['special'] && $RCMAIL->config->get('protect_default_folders'));

	return $options;
	}

	/**
	* Updates (or creates) folder row in the subscriptions table
	*
	* @param string $name Folder name
	* @param string $oldname Old folder name (for update)
	* @param bool $subscribe Checks subscription checkbox
	* @param string $class CSS class name for folder row
	*/
	function rcmail_update_folder_row($name, $oldname=null, $subscribe=false, $class_name=null)
	{
	global $RCMAIL, $OUTPUT;

	$default_folders = (array) $RCMAIL->config->get('default_folders');
	$protect_folders = $RCMAIL->config->get('protect_default_folders');

	$storage = $RCMAIL->get_storage();
	$delimiter = $storage->get_hierarchy_delimiter();
	$name_utf8 = rcube_charset_convert($name, 'UTF7-IMAP');
	$protected = $protect_folders && in_array($name, $default_folders);

	$foldersplit = explode($delimiter, $storage->mod_folder($name));
	$level = count($foldersplit) - 1;
	$display_name = str_repeat('    ', $level)
	. Q($protected ? rcmail_localize_foldername($name) : rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP'));

	if ($oldname === null)
	$OUTPUT->command('add_folder_row', $name_utf8, $display_name, $protected, $subscribe,
	false, $class_name);
	else
	$OUTPUT->command('replace_folder_row', rcube_charset_convert($oldname, 'UTF7-IMAP'),
	$name_utf8, $display_name, $protected, $class_name);
	}


	// register UI objects
	$OUTPUT->add_handlers(array(
	'prefsframe' => 'rcmail_preferences_frame',
	'sectionslist' => 'rcmail_sections_list',
	'identitieslist' => 'rcmail_identities_list',
	));

	// register action aliases
	$RCMAIL->register_action_map(array(
	'folders' => 'folders.inc',
	'rename-folder' => 'folders.inc',
	'delete-folder' => 'folders.inc',
	'subscribe' => 'folders.inc',
	'unsubscribe' => 'folders.inc',
	'purge' => 'folders.inc',
	'folder-size' => 'folders.inc',
	'add-identity' => 'edit_identity.inc',
	));
	diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
	index c8b3b26f6..5a934d89b 100644
	--- a/skins/larry/includes/header.html
	+++ b/skins/larry/includes/header.html
	@@ -1,37 +1,37 @@
	<div id="header">
	<div id="topline">
	<div class="topleft">
	<roundcube:container name="topline-left" id="topline-left" />
	<roundcube:button name="about" type="link" label="about" class="about-link" onclick="UI.show_about(this);return false" condition="!env:extwin" />
	<roundcube:if condition="config:support_url" />
	<a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link" id="supportlink"><roundcube:label name="support" /></a>
	<roundcube:endif />
	</div>
	<roundcube:container name="topline-center" id="topline-center" />
	<div class="topright">
	<roundcube:container name="topline-right" id="topline-right" />
	<roundcube:if condition="!env:extwin && !env:framed" />
	<span class="username"><roundcube:object name="username" /></span>
	<roundcube:button command="logout" label="logout" class="button-logout" />
	<roundcube:elseif condition="env:extwin" />
	<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
	<roundcube:endif />
	</div>
	</div>

	<roundcube:if condition="!env:extwin && !env:framed" />
	<div id="topnav">
	<div id="taskbar" class="topright">
	<roundcube:button command="mail" label="mail" class="button-mail" classSel="button-mail button-selected" innerClass="button-inner" />
	<roundcube:button command="addressbook" label="addressbook" class="button-addressbook" classSel="button-addressbook button-selected" innerClass="button-inner" />
	<roundcube:container name="taskbar" id="taskbar" />
	<roundcube:button command="settings" label="settings" class="button-settings" classSel="button-settings button-selected" innerClass="button-inner" />
	<roundcube:button command="logout" label="logout" class="button-logout" classSel="button-logout" innerClass="button-inner" />
	<span class="minmodetoggle"></span>
	</div>
	- <roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
	+ <roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
	</div>
	<roundcube:endif />

	<br style="clear:both" />
	</div>
	diff --git a/skins/larry/styles.css b/skins/larry/styles.css
	index ec4f3047c..288b010ed 100644
	--- a/skins/larry/styles.css
	+++ b/skins/larry/styles.css
	@@ -1,2386 +1,2390 @@
	/**
	* Roundcube webmail styles for skin "Larry"
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	* Screendesign by FLINT / Büro für Gestaltung, bueroflint.com
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*/

	body {
	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
	font-size: 11px;
	color: #333;
	background: url(images/linen.jpg) repeat #d1d5d8;
	margin: 0;
	}

	body.noscroll {
	/* also avoids bounce effect in Chrome and Safari */
	overflow: hidden;
	}

	a {
	color: #0069a6;
	}

	a:visited {
	color: #0186ba;
	}

	img {
	border: 0;
	}

	input[type="text"],
	input[type="password"],
	textarea {
	margin: 0; /* Safari by default adds a margin */
	padding: 4px;
	border: 1px solid #b2b2b2;
	border-radius: 4px;
	box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
	-moz-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
	-webkit-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
	-o-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
	}

	input[type="text"]:focus,
	input[type="password"]:focus,
	+input[type="text"]:required,
	+input[type="password"]:required,
	input.button:focus,
	textarea:focus {
	border-color: #4787b1;
	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
	outline: none;
	}

	input.placeholder,
	textarea.placeholder {
	color: #aaa;
	}

	.bold {
	font-weight: bold;
	}

	/* fixes vertical alignment of checkboxes and labels */
	label input,
	label span {
	vertical-align: middle;
	}

	/* buttons */

	input.button {
	display: inline-block;
	margin: 0 2px;
	padding: 2px 5px;
	color: #525252;
	text-shadow: 0px 1px 1px #fff;
	border: 1px solid #c0c0c0;
	border-radius: 4px;
	background: #f7f7f7;
	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-o-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-webkit-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-moz-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	text-decoration: none;
	outline: none;
	}

	.formbuttons input.button {
	color: #ddd;
	font-size: 110%;
	text-shadow: 0px 1px 1px #333;
	padding: 4px 12px;
	border-color: #465864;
	border-radius: 5px;
	background: #7a7b7d;
	background: -moz-linear-gradient(top, #7b7b7b 0%, #606060 100%); /* FF3.6+ */
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b7b7b), color-stop(100%,#606060)); /* Chrome,Safari4+ */
	background: -o-linear-gradient(top, #7b7b7b 0%, #606060 100%); /* Opera 11.10+ */
	background: -ms-linear-gradient(top, #7b7b7b 0%, #606060 100%); /* IE10+ */
	background: linear-gradient(top, #7b7b7b 0%, #606060 100%); /* W3C */
	box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
	-o-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
	-webkit-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
	-moz-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
	}

	.formbuttons input.button:hover,
	.formbuttons input.button:focus,
	input.button.mainaction:hover,
	input.button.mainaction:focus {
	color: #f2f2f2;
	border-color: #465864;
	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
	}

	.formbuttons input.button:active {
	color: #fff;
	background: -moz-linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5c5c5c), color-stop(100%,#7b7b7b));
	background: -o-linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
	background: -ms-linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
	background: linear-gradient(top, #5c5c5c 0%, #7b7b7b 100%);
	}

	input.button.mainaction {
	color: #ededed;
	text-shadow: 0px 1px 1px #333;
	border-color: #1f262c;
	background: #505050;
	background: -moz-linear-gradient(top, #505050 0%, #2a2e31 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#505050), color-stop(100%,#2a2e31));
	background: -o-linear-gradient(top, #505050 0%, #2a2e31 100%);
	background: -ms-linear-gradient(top, #505050 0%, #2a2e31 100%);
	background: linear-gradient(top, #505050 0%, #2a2e31 100%);
	box-shadow: inset 0 1px 0 0 #777;
	-moz-box-shadow: inset 0 1px 0 0 #777;
	-webkit-box-shadow: inset 0 1px 0 0 #777;
	-o-box-shadow: inset 0 1px 0 0 #777;
	}

	input.button.mainaction:active {
	color: #fff;
	background: #515151;
	background: -moz-linear-gradient(top, #2a2e31 0%, #505050 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#2a2e31), color-stop(100%,#505050));
	background: -o-linear-gradient(top, #2a2e31 0%, #505050 100%);
	background: -ms-linear-gradient(top, #2a2e31 0%, #505050 100%);
	background: linear-gradient(top, #2a2e31 0%, #505050 100%);
	}

	input.button[disabled],
	input.button[disabled]:hover,
	input.button.mainaction[disabled] {
	color: #aaa !important;
	}

	input.mainaction {
	font-weight: bold;
	}

	/ link buttons /

	a.button,
	.buttongroup {
	display: inline-block;
	margin: 0 2px;
	padding: 2px 5px;
	color: #525252;
	text-shadow: 0px 1px 1px #fff;
	border: 1px solid #c6c6c6;
	border-radius: 4px;
	background: #f7f7f7;
	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
	box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-o-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-webkit-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	-moz-box-shadow: 0 1px 1px 0 rgba(140, 140, 140, 0.3);
	text-decoration: none;
	}

	.buttongroup {
	padding: 0;
	white-space: nowrap;
	}

	a.button:focus,
	input.button:focus {
	border-color: #4fadd5;
	box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	-moz-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	-webkit-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	-o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
	outline: none;
	}

	label.disabled,
	a.button.disabled {
	color: #999;
	}

	a.button.disabled,
	input.button.disabled,
	input.button[disabled],
	a.button.disabled:hover,
	input.button.disabled:hover,
	input.button[disabled]:hover {
	border-color: #c6c6c6;
	box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
	-o-box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
	-webkit-box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
	-moz-box-shadow: 0 1px 1px 0 rgba(160, 160, 160, 0.4);
	}

	a.button.disabled span.inner {
	opacity: 0.4;
	filter: alpha(opacity=40);
	}

	.buttongroup a.button {
	margin: 0;
	border-width: 0 1px 0 0;
	border-radius: 0;
	background: none;
	box-shadow: none;
	-o-box-shadow: none;
	-webkit-box-shadow: none;
	-moz-box-shadow: none;
	}

	.buttongroup a.button.first,
	.buttongroup a.button:first-child {
	border-radius: 4px 0 0 4px;
	border-left: 0;
	}

	.buttongroup a.button.last,
	.buttongroup a.button:last-child {
	border-radius: 0 4px 4px 0;
	border-right: 0;
	}

	a.button.pressed,
	a.button:active,
	input.button:active {
	background: #e6e6e6;
	background: -moz-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e6e6e6), color-stop(100%,#f9f9f9));
	background: -o-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	background: -ms-linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	background: linear-gradient(top, #e6e6e6 0%, #f9f9f9 100%);
	}

	.pagenav.dark a.button {
	font-weight: bold;
	border-color: #e6e6e6;
	background: #d8d8d8;
	background: -moz-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d8d8d8), color-stop(100%,#bababa));
	background: -o-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
	background: -ms-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
	background: linear-gradient(top, #d8d8d8 0%, #bababa 100%);
	box-shadow: 0 1px 1px 0 #999;
	-o-box-shadow: 0 1px 1px 0 #999;
	-webkit-box-shadow: 0 1px 1px 0 #999;
	-moz-box-shadow: 0 1px 1px 0 #999;
	}

	.pagenav.dark a.button.pressed {
	background: #bababa;
	background: -moz-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#bababa), color-stop(100%,#d8d8d8));
	background: -o-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
	background: -ms-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
	background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
	}

	.buttongroup a.button.selected,
	.buttongroup a.button.selected:hover {
	background: #8a8a8a;
	background: -moz-linear-gradient(top, #909090 0%, #858585 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#909090), color-stop(100%,#858585));
	background: -o-linear-gradient(top, #909090 0%, #858585 100%);
	background: -ms-linear-gradient(top, #909090 0%, #858585 100%);
	background: linear-gradient(top, #909090 0%, #858585 100%);
	-webkit-box-shadow: inset 0 1px 2px 0 #555;
	-moz-box-shadow: inset 0 1px 2px 0 #555;
	box-shadow: inset 0 1px 2px 0 #555;
	border-right-color: #555;
	border-left-color: #555;
	}

	.pagenav a.button {
	padding: 1px 3px;
	height: 16px;
	vertical-align: middle;
	margin-bottom: 1px;
	}

	.pagenav .buttongroup a.button,
	.pagenav .buttongroup a.button:hover {
	padding: 1px 5px;
	margin-bottom: 0;
	}

	.pagenav a.button span.inner {
	display: inline-block;
	width: 16px;
	height: 13px;
	text-indent: 1000px;
	overflow: hidden;
	background: url(images/buttons.png) -6px -211px no-repeat;
	}

	.pagenav a.prevpage span.inner {
	background-position: -7px -226px;
	}

	.pagenav a.nextpage span.inner {
	background-position: -28px -226px;
	}

	.pagenav a.lastpage span.inner {
	background-position: -28px -211px;
	}

	.pagenav a.pageup span.inner {
	background-position: -7px -241px;
	}

	.pagenav a.pagedown span.inner {
	background-position: -29px -241px;
	}

	.pagenav a.reply span.inner {
	background-position: -7px -256px;
	}

	.pagenav a.forward span.inner {
	background-position: -29px -256px;
	}

	.pagenav a.replyall span.inner {
	background-position: -7px -271px;
	}

	.pagenav a.extwin span.inner {
	background-position: -29px -271px;
	}

	.pagenav a.changeformat.html span.inner {
	background-position: -7px -1859px;
	}
	.pagenav a.changeformat.html.selected span.inner {
	background-position: -29px -1859px;
	}

	.pagenav a.changeformat.text span.inner {
	background-position: -7px -1874px;
	}
	.pagenav a.changeformat.text.selected span.inner {
	background-position: -29px -1874px;
	}

	.pagenav .countdisplay {
	display: inline-block;
	padding: 3px 1em 0 1em;
	text-shadow: 0px 1px 1px #fff;
	min-width: 16em;
	}

	.pagenavbuttons {
	position: relative;
	top: -2px;
	}

	a.iconbutton {
	display: inline-block;
	width: 24px;
	height: 18px;
	text-decoration: none;
	text-indent: -5000px;
	background: url(images/buttons.png) -1000px 0 no-repeat;
	}

	a.iconbutton.disabled {
	opacity: 0.4;
	filter: alpha(opacity=40);
	cursor: default;
	}

	a.iconbutton.searchoptions {
	background-position: -2px -317px;
	}

	a.iconbutton.reset {
	background-position: -25px -317px;
	}

	a.iconbutton.cancel {
	background-position: -7px -377px;
	}

	a.iconlink {
	display: inline-block;
	color: #888;
	text-decoration: none;
	white-space: nowrap;
	padding: 2px 8px 2px 20px;
	background: url(images/buttons.png) -1000px 0 no-repeat;
	}

	a.iconlink:hover {
	text-decoration: underline;
	}

	a.iconlink.delete {
	background-position: -7px -337px;
	}

	a.iconlink.add {
	background-position: -7px -357px;
	}

	a.iconlink.remove {
	background-position: -7px -378px;
	}

	a.iconlink.cancel {
	background-position: -7px -397px;
	}

	a.iconlink.edit {
	background-position: -7px -417px;
	}

	a.iconlink.upload {
	background-position: -6px -437px;
	}


	/* message bar */

	#message div.loading,
	#message div.warning,
	#message div.error,
	#message div.notice,
	#message div.confirmation,
	#message-objects div.notice {
	color: #555;
	font-weight: bold;
	padding: 6px 30px 6px 25px;
	display: inline-block;
	white-space: nowrap;
	background: url(images/messages.png) 0 5px no-repeat;
	cursor: default;
	}

	#message div.warning {
	color: #960;
	background-position: 0 -86px;
	}

	#message div.error {
	color: #cf2734;
	background-position: 0 -55px;
	}

	#message div.confirmation {
	color: #093;
	background-position: 0 -25px;
	}

	#message div.loading {
	background: url(images/ajaxloader.gif) 2px 6px no-repeat;
	}

	#message div a,
	#message div span {
	padding-right: 0.5em;
	text-decoration: none;
	}

	#message div a:hover {
	text-decoration: underline;
	cursor: pointer;
	}

	#message.statusbar {
	position: absolute;
	bottom: 0;
	left: 0;
	right: 0;
	height: 27px;
	padding-left: 8px;
	border-top: 1px solid #ddd;
	border-radius: 0 0 4px 4px;
	background: #eaeaea;
	background: -moz-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eaeaea), color-stop(100%,#c8c8c8));
	background: -o-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
	background: -ms-linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
	background: linear-gradient(top, #eaeaea 0%, #c8c8c8 100%);
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.ui-dialog.error .ui-dialog-title,
	.ui-dialog.warning .ui-dialog-title,
	.ui-dialog.confirmation .ui-dialog-title {
	padding-left: 25px;
	background: url(images/messages.png) 0 5px no-repeat;
	text-shadow: 0 1px 1px #fff;
	}

	.ui-dialog.warning .ui-dialog-title {
	color: #960;
	background-position: 0 -90px;
	}

	.ui-dialog.error .ui-dialog-title {
	color: #cf2734;
	background-position: 0 -60px;
	}

	.ui-dialog.confirmation .ui-dialog-title {
	color: #093;
	background-position: 0 -30px;
	}

	.ui-dialog.popupmessage .ui-dialog-titlebar {
	padding: 8px 1em 4px 1em;
	background: #e3e3e3;
	background: -moz-linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e3e3e3), color-stop(100%,#cfcfcf));
	background: -o-linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
	background: -ms-linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
	background: linear-gradient(top, #e3e3e3 0%, #cfcfcf 100%);
	}

	.ui-dialog.popupmessage .ui-widget-content {
	font-size: 12px;
	background: #eee;
	background: -moz-linear-gradient(top, #eee 0%, #dcdcdc 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eee), color-stop(100%,#dcdcdc));
	background: -o-linear-gradient(top, #eee 0%, #dcdcdc 100%);
	background: -ms-linear-gradient(top, #eee 0%, #dcdcdc 100%);
	background: linear-gradient(top, #eee 0%, #dcdcdc 100%);
	}


	/* basic page layout */

	#header {
	overflow-x: hidden; /* Chrome bug #1488851 */
	}

	#topline {
	height: 18px;
	background: url(images/linen_header.jpg) repeat #666;
	border-bottom: 1px solid #4f4f4f;
	padding: 2px 0 2px 10px;
	color: #aaa;
	text-align: center;
	}

	#topnav {
	position: relative;
	height: 46px;
	margin-bottom: 10px;
	padding: 0 0 0 10px;
	background: #111;
	background: -moz-linear-gradient(top, #404040 0%, #060606 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#404040), color-stop(100%,#060606));
	background: -o-linear-gradient(top, #404040 0%, #060606 100%);
	background: -ms-linear-gradient(top, #404040 0%, #060606 100%);
	background: linear-gradient(top, #404040 0%, #060606 100%);
	}

	#topline a,
	#topnav a {
	color: #eee;
	text-decoration: none;
	}

	#topline a:hover {
	text-decoration: underline;
	}

	#toplogo {
	padding-top: 2px;
	cursor: pointer;
	+ border: none;
	}

	.topleft {
	float: left;
	}

	.topright {
	float: right;
	}

	.closelink {
	display: inline-block;
	padding: 2px 10px 2px 20px;
	}

	#topline span.username {
	padding-right: 1em;
	}

	#topline .topleft a {
	display: inline-block;
	padding: 2px 0.8em 0 0;
	color: #aaa;
	}

	#topline a.button-logout {
	display: inline-block;
	padding: 2px 10px 2px 20px;
	background: url(images/buttons.png) -6px -193px no-repeat;
	color: #fff;
	}

	#taskbar .button-logout {
	display: none;
	}

	#taskbar a.button-logout span.button-inner {
	background-position: -2px -1791px;
	}

	#taskbar a.button-logout:hover span.button-inner {
	background-position: -2px -1829px;
	}


	/* minimal version of the page header */

	.minimal #topline {
	position: fixed;
	top: -18px;
	background: #444;
	z-index: 5000;
	width: 100%;
	height: 22px;
	-moz-box-sizing: border-box;
	box-sizing: border-box;
	}

	.minimal #topline:hover {
	top: 0px;
	opacity: 0.94;
	filter: alpha(opacity=94);
	-webkit-transition: top 0.3s ease-in-out;
	-moz-transition: top 0.3s ease-in-out;
	-o-transition: top 0.3s ease-in-out;
	transition: top 0.3s ease-in-out;
	}

	.extwin #topline,
	.extwin #topline:hover {
	position: static;
	top: 0px;
	height: 18px;
	width: auto;
	-moz-box-sizing: content-box;
	box-sizing: content-box;
	opacity: 0.999;
	}

	.minimal #topline a.button-logout {
	display: none;
	}

	.minimal #topline span.username {
	display: inline-block;
	padding-top: 2px;
	}

	.minimal #topnav {
	position: relative;
	top: 4px;
	height: 42px;
	}

	.minimal #taskbar a {
	position: relative;
	padding: 10px 10px 0 6px;
	height: 32px;
	}

	.minimal #taskbar .button-logout {
	display: inline-block;
	}

	.minimal #taskbar .button-inner {
	top: -4px;
	padding: 0;
	height: 24px !important;
	width: 27px;
	text-indent: -5000px;
	}

	#taskbar .tooltip {
	display: none;
	}

	.minimal #taskbar .tooltip {
	position: absolute;
	top: -500px;
	right: 2px;
	display: inline-block;
	padding: 2px 8px 3px 8px;
	background: #444;
	background: -moz-linear-gradient(top, #444 0%, #333 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#444), color-stop(100%,#333));
	background: -o-linear-gradient(top, #444 0%, #333 100%);
	background: -ms-linear-gradient(top, #444 0%, #333 100%);
	background: linear-gradient(top, #444 0%, #333 100%);
	color: #eee;
	font-weight: bold;
	white-space: nowrap;
	border: 1px solid #777;
	box-shadow: 0 1px 5px 0 #333;
	-moz-box-shadow: 0 1px 5px 0 #333;
	-webkit-box-shadow: 0 1px 5px 0 #333;
	-o-box-shadow: 0 1px 5px 0 #333;
	z-index: 200;
	white-space: nowrap;
	text-shadow: 0px 1px 1px #000;
	}

	.minimal #taskbar .tooltip:after {
	content: "";
	position: absolute;
	top: -4px;
	right: 15px;
	border-style: solid;
	border-width: 0 4px 4px;
	border-color: #888 transparent;
	/* reduce the damage in FF3.0 */
	display: block;
	width: 0;
	z-index: 251;
	}

	.ie8 .minimal #taskbar .tooltip:after {
	top: -6px;
	}

	.minimal #taskbar a:hover .tooltip {
	display: block;
	top: 39px;
	}


	/* taskbar */

	#taskbar {
	position: relative;
	padding-right: 18px;
	}

	#taskbar a {
	display: inline-block;
	height: 34px;
	padding: 12px 10px 0 6px;
	}

	#taskbar a span.button-inner {
	display: inline-block;
	font-size: 110%;
	font-weight: normal;
	text-shadow: 0px 1px 1px black;
	padding: 5px 0 0 34px;
	height: 19px;
	background: url(images/buttons.png) -1000px 0 no-repeat;
	}

	#taskbar a.button-selected {
	color: #3cf;
	background-color: #2c2c2c;
	}

	#taskbar a.button-mail span.button-inner {
	background-position: 0 2px;
	}

	#taskbar a.button-mail:hover span.button-inner,
	#taskbar a.button-mail.button-selected span.button-inner {
	background-position: 0 -22px;
	}

	#taskbar a.button-addressbook span.button-inner {
	background-position: 0 -48px;
	}

	#taskbar a.button-addressbook:hover span.button-inner,
	#taskbar a.button-addressbook.button-selected span.button-inner {
	background-position: 0 -72px;
	}

	#taskbar a.button-settings span.button-inner {
	background-position: 0 -96px;
	}

	#taskbar a.button-settings:hover span.button-inner,
	#taskbar a.button-settings.button-selected span.button-inner {
	background-position: 0 -120px;
	}

	#taskbar a.button-calendar span.button-inner {
	background-position: 0 -144px;
	}

	#taskbar a.button-calendar:hover span.button-inner,
	#taskbar a.button-calendar.button-selected span.button-inner {
	background-position: 0 -168px;
	}

	#taskbar .minmodetoggle {
	position: absolute;
	top: 0;
	right: 0;
	display: block;
	width: 19px;
	height: 46px;
	cursor: pointer;
	background: url(images/buttons.png) -35px -1778px no-repeat;
	}

	.minimal #taskbar .minmodetoggle {
	height: 42px;
	background-position: -35px -1820px;
	}

	#mainscreen {
	position: absolute;
	top: 88px;
	left: 10px;
	right: 10px;
	bottom: 20px;
	}

	.minimal #mainscreen {
	top: 62px;
	}

	.minimal #mainscreen.offset {
	top: 102px;
	}

	.extwin #mainscreen {
	top: 40px;
	}

	#mainscreen.offset {
	top: 132px;
	}

	#mainscreen .offset {
	top: 42px;
	}

	.uibox {
	border: 1px solid #a3a3a3;
	border-radius: 4px;
	overflow: hidden;
	box-shadow: 0 0 2px #999;
	-o-box-shadow: 0 0 2px #999;
	-webkit-box-shadow: 0 0 2px #999;
	-moz-box-shadow: 0 0 2px #999;
	background: #fff;
	}

	.minwidth {
	position: absolute;
	top: 0;
	left: 0;
	bottom: 0;
	width: 100%;
	min-width: 1024px;
	}

	.scroller {
	overflow: auto;
	}

	.readtext {
	width: 42em;
	padding: 12px;
	font-size: 12px;
	}

	.readtext > h1,
	.readtext > h2,
	.readtext > h3 {
	margin-top: 0;
	}

	.watermark {
	background-image: url(images/watermark.jpg);
	background-position: center;
	background-repeat: no-repeat;
	}

	/* lists */

	.listbox {
	background: #d9ecf4;
	overflow: hidden;
	}

	.listbox .scroller {
	position: absolute;
	top: 0;
	left: 0;
	width: 100%;
	bottom: 0;
	overflow-x: hidden;
	overflow-y: auto;
	}

	.listbox .scroller.withfooter {
	bottom: 42px;
	}

	.listbox .boxtitle + .scroller {
	top: 34px;
	}

	.boxtitle,
	.uibox .listing thead td {
	font-size: 12px;
	font-weight: bold;
	padding: 10px 8px 3px 8px;
	height: 20px; /* doesn't affect table-cells in FF */
	margin: 0;
	text-shadow: 0px 1px 1px #fff;
	border-bottom: 1px solid #bbd3da;
	white-space: nowrap;
	}

	.uibox .listing thead td {
	padding-bottom: 8px;
	height: auto;
	}

	.uibox .boxtitle,
	.uibox .listing thead td {
	background: #b0ccd7;
	color: #004458;
	border-radius: 4px 4px 0 0;
	}

	.listbox .listitem,
	.listbox .tablink,
	.listing tbody td,
	.listing li {
	display: block;
	border-top: 1px solid #fff;
	border-bottom: 1px solid #bbd3da;
	cursor: default;
	font-weight: normal;
	}

	.listbox .listitem a,
	.listbox .tablink a,
	.listing tbody td,
	.listing li a {
	display: block;
	color: #376572;
	text-shadow: 0px 1px 1px #fff;
	text-decoration: none;
	cursor: default;
	padding: 6px 8px 2px 8px;
	height: 17px; /* doesn't affect table-cells in FF */
	white-space: nowrap;
	}

	.listing tbody td {
	display: table-cell;
	padding-bottom: 5px;
	height: auto;
	min-height: 14px;
	}

	.webkit .listing tbody td {
	height: 14px;
	}

	.listbox .listitem.selected,
	.listbox .tablink.selected,
	.listbox .listitem.selected > a,
	.listbox .tablink.selected > a,
	.listing tbody tr.unfocused td,
	.listing tbody tr.selected td,
	.listing li.selected,
	.listing li.selected > a {
	color: #004458;
	font-weight: bold;
	background-color: #c7e3ef;
	}

	ul.listing {
	display: block;
	list-style: none;
	margin: 0;
	padding: 0;
	}

	ul.listing li {
	background-color: #d9ecf4;
	}

	ul.listing li ul {
	border-top: 1px solid #bbd3da;
	}

	ul.listing li.droptarget,
	table.listing tr.droptarget td {
	background-color: #e8e798;
	}

	.listbox table.listing {
	background-color: #d9ecf4;
	}

	table.listing,
	table.layout {
	border: 0;
	width: 100%;
	border-spacing: 0;
	}

	table.layout td {
	vertical-align: top;
	}

	ul.treelist li {
	position: relative;
	}

	ul.treelist li div.treetoggle {
	position: absolute;
	top: 13px;
	left: 19px;
	width: 13px;
	height: 13px;
	background: url(images/listicons.png) -3px -144px no-repeat;
	cursor: pointer;
	}

	ul.treelist li div.treetoggle.expanded {
	background-position: -3px -168px;
	}

	ul.treelist li.selected > div.collapsed {
	background-position: -23px -144px;
	}

	ul.treelist li.selected > div.expanded {
	background-position: -23px -168px;
	}

	.listbox .boxfooter {
	position: absolute;
	bottom: 0;
	left: 0;
	width: 100%;
	height: 42px;
	border-top: 1px solid #ccdde4;
	background: #d9ecf4;
	-webkit-box-shadow: inset 0 1px 0 0 #fff;
	-moz-box-shadow: inset 0 1px 0 0 #fff;
	box-shadow: inset 0 1px 0 0 #fff;
	white-space: nowrap;
	overflow: hidden;
	}

	.uibox .boxfooter {
	border-radius: 0 0 4px 4px;
	}

	.boxfooter .listbutton {
	display: inline-block;
	text-decoration: none;
	width: 48px;
	border-right: 1px solid #fff;
	background: #c7e3ef;
	padding: 3px 0;
	margin-top: 1px;
	}

	.uibox .boxfooter .listbutton:first-child {
	border-radius: 0 0 0 4px;
	}

	.boxfooter .listbutton .inner {
	display: inline-block;
	width: 48px;
	height: 35px;
	text-indent: -5000px;
	background: url(images/buttons.png) -1000px 0 no-repeat;
	}

	.boxfooter .listbutton.add .inner {
	background-position: 10px -1301px;
	}

	.boxfooter .listbutton.delete .inner {
	background-position: 10px -1342px;
	}

	.boxfooter .listbutton.groupactions .inner {
	background-position: 5px -1382px;
	}

	.boxfooter .listbutton.addto .inner {
	background-position: 5px -1422px;
	}

	.boxfooter .listbutton.addcc .inner {
	background-position: 5px -1462px;
	}

	.boxfooter .listbutton.addbcc {
	width: 54px;
	}

	.boxfooter .listbutton.addbcc .inner {
	width: 54px;
	background-position: 2px -1502px;
	}

	.boxfooter .listbutton.removegroup .inner {
	background-position: 5px -1540px;
	}

	.boxfooter .listbutton.disabled .inner {
	opacity: 0.4;
	filter: alpha(opacity=40);
	}

	.boxfooter .countdisplay {
	display: inline-block;
	position: relative;
	top: 10px;
	color: #69929e;
	padding: 3px 6px;
	}

	.boxpagenav {
	position: absolute;
	top: 10px;
	right: 6px;
	width: auto;
	}

	.boxpagenav a.icon {
	display: inline-block;
	padding: 1px 3px;
	height: 13px;
	width: 14px;
	text-indent: 1000px;
	vertical-align: bottom;
	overflow: hidden;
	background: url(images/buttons.png) -4px -286px no-repeat;
	}

	.boxpagenav a.icon.prevpage {
	background-position: -4px -301px;
	}

	.boxpagenav a.icon.nextpage {
	background-position: -28px -301px;
	}

	.boxpagenav a.icon.lastpage {
	background-position: -28px -286px;
	}

	.boxpagenav a.icon.disabled {
	opacity: 0.4;
	filter: alpha(opacity=40);
	}

	.centerbox {
	width: 40em;
	margin: 16px auto;
	}

	.errorbox {
	width: 40em;
	padding: 20px;
	}

	.errorbox h3 {
	font-size: 16px;
	margin-top: 0;
	}


	/* Records table */

	table.records-table {
	display: table;
	width: 100%;
	table-layout: fixed;
	border-collapse: collapse;
	border-spacing: 0;
	border: 1px solid #bbd3da;
	}

	.boxlistcontent .records-table {
	border: 0;
	}

	.records-table thead td {
	color: #69939e;
	font-size: 11px;
	font-weight: bold;
	background: #d6eaf3;
	background: -moz-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
	background: -webkit-gradient(linear, left top, right top, color-stop(0,#e3f2f6), color-stop(8%,#d6eaf3), color-stop(100%,#d6eaf3));
	background: -o-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
	background: -ms-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px ,#d6eaf3 100%);
	background: linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
	border-left: 1px solid #bbd3da;
	padding: 8px 7px;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.records-table.sortheader thead td {
	padding: 0;
	}

	.records-table thead td a,
	.records-table thead td span {
	display: block;
	padding: 7px 7px;
	color: #69939e;
	text-decoration: none;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.records-table tbody td {
	padding: 2px 7px;
	border-bottom: 1px solid #ddd;
	border-left: 1px dotted #bbd3da;
	white-space: nowrap;
	cursor: default;
	overflow: hidden;
	text-overflow: ellipsis;
	background-color: #fff;
	}

	.records-table thead tr td:first-child,
	.records-table tbody tr td:first-child {
	border-left: 0;
	}

	.records-table tr.selected td {
	color: #fff !important;
	background: #019bc6;
	background: -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
	background: -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	background: -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
	background: linear-gradient(top, #019bc6 0%, #017cb4 100%);
	}

	.records-table tr.selected td a,
	.records-table tr.selected td span {
	color: #fff !important;
	}

	.records-table tr.unfocused td {
	color: #fff !important;
	background: #4db0d2 !important;
	}

	.records-table tr.unfocused td a,
	.records-table tr.unfocused td span {
	color: #fff !important;
	}

	.records-table tr.deleted td,
	.records-table tr.deleted td a {
	color: #ccc !important;
	}


	/* iFrames */

	#aboutframe {
	width: 97%;
	height: 100%;
	border: 0;
	padding: 0;
	}

	body.iframe {
	background: #fff;
	margin: 38px 0 10px 0;
	}

	body.iframe.error {
	background: #ededed;
	}

	body.iframe.floatingbuttons {
	margin-bottom: 40px;
	}

	body.iframe.fullheight {
	margin: 0;
	}

	.contentbox .boxtitle,
	body.iframe .boxtitle {
	color: #777;
	background: #eee;
	background: -moz-linear-gradient(top, #eee 0%, #dfdfdf 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eee), color-stop(100%,#dfdfdf));
	background: -o-linear-gradient(top, #eee 0%, #dfdfdf 100%);
	background: -ms-linear-gradient(top, #eee 0%, #dfdfdf 100%);
	background: linear-gradient(top, #eee 0%, #dfdfdf 100%);
	border-bottom: 1px solid #ccc;
	}

	body.iframe .boxtitle {
	position: fixed;
	top: 0;
	left: 0;
	width: 100%;
	z-index: 100;
	}

	body.iframe .footerleft.floating,
	#composeview-bottom .formbuttons.floating {
	position: fixed;
	left: 0;
	bottom: 0;
	width: 100%;
	z-index: 110;
	background: #fff;
	padding-top: 8px;
	padding-bottom: 12px;
	}

	body.iframe .footerleft.floating:before,
	#composeview-bottom .formbuttons.floating:before {
	content: " ";
	position: absolute;
	top: -6px;
	left: 0;
	width: 100%;
	height: 6px;
	background: url(images/overflowshadow.png) top center no-repeat;
	}

	.boxcontent {
	padding: 10px;
	}

	.contentbox .scroller {
	position: absolute;
	top: 34px;
	left: 0;
	right: 0;
	bottom: 28px;
	overflow: auto;
	}

	.iframebox {
	position: absolute;
	top: 0;
	left: 0;
	right: 0;
	bottom: 28px;
	}

	.footerleft {
	padding: 0 12px 4px 12px;
	}

	.propform fieldset {
	margin-bottom: 20px;
	border: 0;
	padding: 0;
	}

	.propform fieldset legend {
	display: block;
	font-size: 14px;
	font-weight: bold;
	padding-bottom: 10px;
	margin-bottom: 0;
	}

	.propform fieldset fieldset legend {
	color: #666;
	font-size: 12px;
	}

	fieldset.floating {
	float: left;
	margin-right: 10px;
	margin-bottom: 10px;
	}

	table.propform {
	width: 100%;
	border-spacing: 0;
	border-collapse: collapse;
	}

	ul.proplist li,
	table.propform td {
	width: 80%;
	padding: 4px 10px;
	background: #eee;
	border-bottom: 2px solid #fff;
	}

	table.propform td.title {
	width: 20%;
	color: #333;
	padding-right: 20px;
	white-space: nowrap;
	}

	table.propform .mceLayout td {
	padding: 0;
	border-bottom: 0;
	}

	ul.proplist {
	list-style: none;
	margin: 0;
	padding: 0;
	}

	ul.proplist li {
	width: auto;
	}

	#pluginbody {
	position: absolute;
	top: 0;
	left: 0;
	right: 0;
	bottom: 0;
	}


	/* Login form */

	#login-form {
	position: relative;
	width: 580px;
	margin: 20ex auto 2ex auto;
	}

	#login-form .box-inner {
	width: 430px;
	background: url(images/linen_login.jpg) top left no-repeat #5c5c5c;
	margin: 0 50px;
	padding: 10px 24px 24px 24px;
	border: 1px solid #333;
	border-radius: 5px;
	box-shadow: inset 0 0 1px #ccc;
	-o-box-shadow: inset 0 0 1px #ccc;
	-webkit-box-shadow: inset 0 0 1px #ccc;
	-moz-box-shadow: inset 0 0 1px #ccc;
	}

	#login-form .box-bottom {
	background: url(images/login_shadow.png) top center no-repeat;
	margin-top: -3px;
	padding-top: 10px;
	}

	#login-form .noscriptwarning {
	margin: 0 auto;
	width: 430px;
	color: #cf2734;
	font-size: 110%;
	font-weight: bold;
	}

	#login-form td.input {
	width: 80%;
	padding: 8px;
	}

	#login-form input[type="text"],
	#login-form input[type="password"] {
	width: 100%;
	border-color: #666;
	}

	#login-form input.button {
	color: #444;
	text-shadow: 0px 1px 1px #fff;
	border-color: #f9f9f9;
	background: #f9f9f9;
	background: -moz-linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e2e2e2));
	background: -o-linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
	background: -ms-linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
	background: linear-gradient(top, #f9f9f9 0%, #e2e2e2 100%);
	box-shadow: inset 0 1px 0 0 #fff;
	-moz-box-shadow: inset 0 1px 0 0 #fff;
	-webkit-box-shadow: inset 0 1px 0 0 #fff;
	-o-box-shadow: inset 0 1px 0 0 #fff;
	}

	#login-form input.button:hover,
	#login-form input.button:focus {
	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9), inset 0 1px 0 0 #fff;
	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9), inset 0 1px 0 0 #fff;
	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9), inset 0 1px 0 0 #fff;
	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9), inset 0 1px 0 0 #fff;
	}

	#login-form input.button:active {
	color: #333;
	background: -moz-linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dcdcdc), color-stop(100%,#f9f9f9));
	background: -o-linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
	background: -ms-linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
	background: linear-gradient(top, #dcdcdc 0%, #f9f9f9 100%);
	}

	#login-form form table {
	width: 98%;
	}

	#login-form td.title {
	width: 20%;
	white-space: nowrap;
	color: #cecece;
	text-shadow: 0px 1px 1px black;
	text-align: right;
	padding-right: 1em;
	}

	#login-form p.formbuttons {
	margin-top: 2em;
	text-align: center;
	}

	#login-form #logo {
	margin-bottom: 20px;
	+ border: none;
	}

	#login-form #message {
	min-height: 40px;
	padding: 5px 25px;
	text-align: center;
	}

	#login-form #message div {
	display: inline-block;
	padding-right: 0;
	}

	#bottomline {
	font-size: 90%;
	text-align: center;
	margin-top: 2em;
	}



	/* quicksearch /

	.searchbox {
	position: relative;
	}

	#quicksearchbar {
	position: absolute;
	right: 1px;
	top: 2px;
	width: 240px;
	}

	.searchbox input,
	#quicksearchbar input {
	width: 176px;
	margin: 0;
	padding: 3px 30px 3px 34px;
	height: 18px;
	background: #f1f1f1;
	border-color: #ababab;
	font-weight: bold;
	font-size: 11px;
	}

	.searchbox #searchmenulink,
	#quicksearchbar #searchmenulink {
	position: absolute;
	top: 5px;
	left: 6px;
	}

	.searchbox #searchreset,
	#quicksearchbar #searchreset {
	position: absolute;
	top: 4px;
	right: 1px;
	}


	/* toolbar */

	.toolbar .spacer {
	display: inline-block;
	width: 24px;
	height: 40px;
	padding: 0;
	}

	.toolbar a.button {
	text-align: center;
	font-size: 10px;
	color: #555;
	min-width: 50px;
	max-width: 75px;
	height: 13px;
	overflow: hidden;
	text-overflow: ellipsis;
	white-space: nowrap;
	padding: 28px 2px 0 2px;
	text-shadow: 0px 1px 1px #eee;
	box-shadow: none;
	-moz-box-shadow: none;
	-webkit-box-shadow: none;
	-o-box-shadow: none;
	background: url(images/buttons.png) -100px 0 no-repeat transparent;
	border: 0;
	}

	.toolbar a.button.disabled {
	opacity: 0.4;
	filter: alpha(opacity=40);
	}

	.dropbutton {
	display: inline-block;
	position: relative;
	}

	.dropbutton .dropbuttontip {
	display: block;
	position: absolute;
	right: 0;
	top: 0;
	height: 42px;
	width: 18px;
	background: url(images/buttons.png) 0 -1255px no-repeat;
	cursor: pointer;
	}

	.dropbutton .dropbuttontip:hover {
	background-position: -26px -1255px;
	}

	.dropbutton a.button.disabled + .dropbuttontip {
	opacity: 0.5;
	filter: alpha(opacity=50);
	}

	.dropbutton a.button.disabled + .dropbuttontip:hover {
	background-position: 0 -1255px;
	}

	.dropbutton a.button {
	margin-left: 0;
	padding-left: 0;
	margin-right: 0;
	padding-right: 0;
	}

	.toolbar a.button.back {
	background-position: 0 -1216px;
	}

	.toolbar a.button.checkmail {
	background-position: center -1176px;
	}

	.toolbar a.button.compose {
	background-position: center -530px;
	}

	.toolbar a.button.reply {
	background-position: center -570px;
	}

	.toolbar a.button.reply-all {
	min-width: 64px;
	background-position: left -610px;
	}

	.toolbar a.button.forward {
	min-width: 64px;
	background-position: left -650px;
	}

	.toolbar a.button.delete {
	background-position: center -690px;
	}

	.toolbar a.button.archive {
	background-position: center -730px;
	}

	.toolbar a.button.junk {
	background-position: center -770px;
	}

	.toolbar a.button.print {
	background-position: center -810px;
	}

	.toolbar a.button.markmessage {
	background-position: center -1094px;
	}

	.toolbar a.button.more {
	background-position: center -850px;
	}

	.toolbar a.button.attach {
	background-position: center -890px;
	}

	.toolbar a.button.spellcheck {
	min-width: 64px;
	background-position: left -930px;
	}

	.toolbar a.button.spellcheck.selected {
	background-position: left -1620px;
	color: #1978a1;
	}

	.toolbar a.button.insertsig {
	background-position: center -1135px;
	}

	.toolbar a.button.search {
	background-position: center -970px;
	}

	.toolbar a.button.import {
	background-position: center -1012px;
	}

	.toolbar a.button.export {
	min-width: 74px;
	background-position: center -1054px;
	}

	.toolbar a.button.send {
	background-position: center -1660px;
	}

	.toolbar a.button.savedraft {
	background-position: center -1700px;
	}

	.toolbar a.button.close {
	background-position: 0 -1745px;
	}

	.toolbar a.button.download {
	background-position: center -1906px;
	}

	a.menuselector {
	display: inline-block;
	border: 1px solid #ababab;
	border-radius: 4px;
	background: #f8f8f8;
	background: -moz-linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#dddddd));
	background: -o-linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
	background: -ms-linear-gradient(top, #f9f9f9 0%, #dddddd 100%);
	background: linear-gradient(top, #f8f8f8 0%, #dddddd 100%);
	text-decoration: none;
	color: #333;
	cursor: pointer;
	white-space: nowrap;
	}

	a.menuselector .handle {
	display: inline-block;
	padding: 0 32px 0 6px;
	height: 20px;
	line-height: 19px;
	text-shadow: 0px 1px 1px #fff;
	background: url(images/selector.png) right center no-repeat;
	border-radius: 4px;
	}

	a.menuselector:active {
	background: #dddddd;
	background: -moz-linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dddddd), color-stop(100%,#f8f8f8));
	background: -o-linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
	background: -ms-linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
	background: linear-gradient(top, #dddddd 0%, #f8f8f8 100%);
	text-decoration: none;
	}

	select.decorated {
	position: relative;
	z-index: 10;
	opacity: 0;
	height: 22px;
	cursor: pointer;
	filter: alpha(opacity=0);
	-khtml-appearance: none;
	-webkit-appearance: none;
	border: 0;
	}

	html.opera select.decorated {
	opacity: 1;
	}

	select.decorated option {
	color: #fff;
	background: #444;
	border: 0;
	border-top: 1px solid #5a5a5a;
	border-bottom: 1px solid #333;
	text-shadow: 0px 1px 1px #333;
	padding: 4px 6px;
	outline: none;
	cursor: default;
	}


	/* quota indicator */

	#quotadisplay {
	left: 6px;
	font-size: 12px;
	font-weight: bold;
	text-shadow: 0px 1px 1px #fff;
	padding-left: 30px;
	height: 18px;
	background: url(images/quota.png) -100px 0 no-repeat;
	}

	/* popup menus */

	.popupmenu,
	#rcmKSearchpane {
	display: none;
	position: absolute;
	top: 32px;
	left: 90px;
	width: auto;
	background: #444;
	border: 1px solid #999;
	z-index: 240;
	border-radius: 4px;
	box-shadow: 0 2px 6px 0 #333;
	-moz-box-shadow: 0 2px 6px 0 #333;
	-webkit-box-shadow: 0 2px 6px 0 #333;
	-o-box-shadow: 0 2px 6px 0 #333;
	}

	.popupmenu.dropdown {
	border-radius: 0 0 4px 4px;
	border-top: 0;
	}

	ul.toolbarmenu,
	#rcmKSearchpane ul {
	margin: 0;
	padding: 0;
	list-style: none;
	}

	.googie_list td,
	ul.toolbarmenu li,
	#rcmKSearchpane ul li {
	color: #fff;
	white-space: nowrap;
	min-width: 130px;
	margin: 0;
	border-top: 1px solid #5a5a5a;
	border-bottom: 1px solid #333;
	}

	.googie_list tr:first-child td,
	ul.toolbarmenu li:first-child,
	select.decorated option:first-child {
	border-top: 0;
	}

	.googie_list tr:last-child td,
	ul.toolbarmenu li:last-child,
	select.decorated option:last-child {
	border-bottom: 0;
	}

	.googie_list td span,
	ul.toolbarmenu li a {
	display: block;
	color: #666;
	text-shadow: 0px 1px 1px #333;
	text-decoration: none;
	min-height: 14px;
	padding: 6px 10px 6px 10px;
	}

	.googie_list td span {
	padding: 3px 10px;
	}

	.googie_list td span,
	ul.toolbarmenu li a.active {
	color: #fff;
	cursor: default;
	}

	.googie_list td.googie_list_onhover,
	ul.toolbarmenu li a.active:hover,
	#rcmKSearchpane ul li.selected,
	select.decorated option:hover,
	select.decorated option[selected='selected'] {
	background-color: #00aad6;
	background: -moz-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00aad6), color-stop(100%,#008fc9));
	background: -o-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	background: -ms-linear-gradient(top, #00aad6 0%, #008fc9 100%);
	background: linear-gradient(top, #00aad6 0%, #008fc9 100%);
	}

	ul.toolbarmenu.iconized li a,
	ul.toolbarmenu.selectable li a {
	padding-left: 30px;
	}

	ul.toolbarmenu.selectable li a.selected {
	background: url(images/messages.png) 4px -27px no-repeat;
	}

	ul.toolbarmenu li label {
	display: block;
	color: #fff;
	padding: 4px 8px;
	text-shadow: 0px 1px 1px #333;
	}

	ul.toolbarmenu li a.icon {
	color: #eee;
	padding: 2px 6px;
	}

	ul.toolbarmenu li span.icon {
	display: block;
	min-height: 14px;
	padding: 4px 4px 1px 24px;
	height: 17px;
	background-image: url(images/listicons.png);
	background-position: -100px 0;
	background-repeat: no-repeat;
	opacity: 0.2;
	filter: alpha(opacity=20);
	}

	ul.toolbarmenu li a.active span.icon {
	opacity: 0.99;
	filter: alpha(opacity=100);
	}

	ul.toolbarmenu li span.read {
	background-position: 0 -1220px;
	}

	ul.toolbarmenu li span.unread {
	background-position: 0 -1196px;
	}

	ul.toolbarmenu li span.flagged {
	background-position: 0 -1244px;
	}

	ul.toolbarmenu li span.unflagged {
	background-position: 0 -1268px;
	}

	ul.toolbarmenu li span.mail {
	background-position: 0 -1293px;
	}

	ul.toolbarmenu li span.list {
	background-position: 0 -1317px;
	}

	ul.toolbarmenu li span.invert {
	background-position: 0 -1340px;
	}

	ul.toolbarmenu li span.cross {
	background-position: 0 -1365px;
	}

	ul.toolbarmenu li span.print {
	background-position: 0 -1436px;
	}

	ul.toolbarmenu li span.download {
	background-position: 0 -1412px;
	}

	ul.toolbarmenu li span.edit {
	background-position: 0 -1388px;
	}

	ul.toolbarmenu li span.viewsource {
	background-position: 0 -1460px;
	}

	ul.toolbarmenu li span.extwin {
	background-position: 0 -1484px;
	}

	ul.toolbarmenu li span.conversation {
	background-position: 0 -1532px;
	}

	#rcmKSearchpane {
	border-radius: 0 0 4px 4px;
	border-top: 0;
	}

	#rcmKSearchpane ul li {
	text-shadow: 0px 1px 1px #333;
	text-decoration: none;
	min-height: 14px;
	padding: 6px 10px 6px 10px;
	border: 0;
	cursor: default;
	}

	.popupdialog {
	display: none;
	padding: 10px;
	}

	.popupdialog .formbuttons {
	margin: 20px 0 4px 0;
	}

	.ui-dialog .prompt input {
	display: block;
	margin: 8px 0;
	}

	.hint {
	margin: 4px 0;
	color: #999;
	text-shadow: 0px 1px 1px #fff;
	}

	.splitter {
	user-select: none;
	-moz-user-select: none;
	-khtml-user-select: none;
	position: absolute;
	background: url(images/splitter.png) center no-repeat;
	}

	.splitter-h {
	height: 10px;
	width: 100%;
	cursor: n-resize;
	cursor: row-resize;
	background-position: center 0;
	}

	.splitter-v {
	width: 10px;
	height: 100%;
	cursor: e-resize;
	cursor: col-resize;
	background-position: 0 center;
	}

	#rcmdraglayer {
	min-width: 260px;
	width: auto !important;
	width: 260px;
	padding: 6px 8px;
	background: #444;
	border: 1px solid #555;
	border-radius: 4px;
	box-shadow: 0 2px 6px 0 #333;
	-moz-box-shadow: 0 2px 6px 0 #333;
	-webkit-box-shadow: 0 2px 6px 0 #333;
	-o-box-shadow: 0 2px 6px 0 #333;
	z-index: 250;
	color: #ccc;
	white-space: nowrap;
	opacity: 0.92;
	filter: alpha(opacity=92);
	text-shadow: 0px 1px 1px #333;
	}

	#rcmdraglayer:after {
	content: "";
	position: absolute;
	top: 6px;
	left: -6px;
	border-style: solid;
	border-width: 6px 6px 6px 0;
	border-color: transparent #444;
	/* reduce the damage in FF3.0 */
	display: block;
	width: 0;
	z-index: 251;
	}

	.draglayercopy:before {
	position: absolute;
	bottom: -6px;
	left: -6px;
	content: " ";
	width: 16px;
	height: 16px;
	background: url(images/buttons.png) -7px -358px no-repeat;
	z-index: 255;
	}


	/* attachment list */

	.attachmentslist {
	list-style: none;
	margin: 0;
	padding: 0;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.attachmentslist li {
	display: block;
	position: relative;
	background: url(images/filetypes.png) 0 0 no-repeat;
	margin-bottom: 1px;
	}

	.attachmentslist li.pdf {
	background-position: 0 -26px;
	}

	.attachmentslist li.doc,
	.attachmentslist li.docx,
	.attachmentslist li.msword {
	background-position: 0 -52px;
	}

	.attachmentslist li.odt {
	background-position: 0 -78px;
	}

	.attachmentslist li.xls,
	.attachmentslist li.xlsx,
	.attachmentslist li.msexcel {
	background-position: 0 -104px;
	}

	.attachmentslist li.ods {
	background-position: 0 -130px;
	}

	.attachmentslist li.zip,
	.attachmentslist li.gz {
	background-position: 0 -156px;
	}

	.attachmentslist li.rar {
	background-position: 0 -182px;
	}

	.attachmentslist li.image {
	background-position: 0 -208px;
	}

	.attachmentslist li.jpg,
	.attachmentslist li.jpeg {
	background-position: 0 -234px;
	}

	.attachmentslist li.png {
	background-position: 0 -260px;
	}

	.attachmentslist li.m4p {
	background-position: 0 -286px;
	}

	.attachmentslist li.mp3,
	.attachmentslist li.audio {
	background-position: 0 -312px;
	}

	.attachmentslist li.video {
	background-position: 0 -338px;
	}

	.attachmentslist li.txt,
	.attachmentslist li.text {
	background-position: 0 -416px;
	}

	.attachmentslist li.ics,
	.attachmentslist li.calendar {
	background-position: 0 -364px;
	}

	.attachmentslist li.vcard {
	background-position: 0 -390px;
	}

	.attachmentslist li.sig,
	.attachmentslist li.pgp-signature,
	.attachmentslist li.pkcs7-signature {
	background-position: 0 -442px;
	}

	.attachmentslist li.html {
	background-position: 0 -468px;
	}

	.attachmentslist li.eml,
	.attachmentslist li.rfc822 {
	background-position: 0 -494px;
	}

	.attachmentslist li a,
	#compose-attachments ul li {
	display: block;
	color: #333;
	font-weight: bold;
	padding: 8px 15px 3px 30px;
	text-shadow: 0px 1px 1px #fff;
	text-decoration: none;
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.attachmentslist li a.drop {
	background: url(images/buttons.png) no-repeat scroll center -1570px;
	width: 14px;
	height: 20px;
	cursor: pointer;
	position: absolute;
	right: 0;
	top: 0;
	padding: 0;
	}

	#compose-attachments ul li {
	padding-right: 28px;
	}

	.attachmentslist li a:hover {
	text-decoration: underline;
	}

	.attachmentslist li.uploading {
	background: url(images/ajaxloader.gif) 2px 6px no-repeat;
	}

	.attachmentslist li a.delete,
	.attachmentslist li a.cancelupload {
	position: absolute;
	top: 6px;
	right: 0;
	width: 24px;
	height: 18px;
	padding: 0;
	text-decoration: none;
	text-indent: -5000px;
	background: url(images/buttons.png) -7px -337px no-repeat;
	}

	.attachmentslist li a.cancelupload {
	background-position: -7px -377px;
	}


	/* fieldset tabs */

	.tabsbar {
	margin-bottom: 12px;
	padding-top: 15px;
	height: 27px;
	white-space: nowrap;
	}

	.ui-dialog-content .tabsbar {
	margin-bottom: 0;
	}

	.tabsbar .tablink {
	padding: 15px 1px 15px 0;
	background: #f8f8f8;
	background: -moz-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(50%,#d3d3d3), color-stop(100%,#f8f8f8));
	background: -webkit-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: -o-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: -ms-linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	background: linear-gradient(top, #f8f8f8 0%, #d3d3d3 50%, #f8f8f8 100%);
	}

	.tabsbar .tablink:last-child {
	background: none;
	}

	.tabsbar .tablink:last-child a {
	border-right: 0;
	}

	.tabsbar .tablink a {
	padding: 15px;
	color: #999;
	font-size: 12px;
	font-weight: bold;
	text-decoration: none;
	background: #fff;
	border-right: 1px solid #fafafa;
	}

	.tabsbar .tablink.selected a {
	color: #004458;
	background: #f6f6f6;
	background: -moz-linear-gradient(top, #fff 40%, #efefef 100%);
	background: -webkit-gradient(linear, left top, left bottom, color-stop(40%,#fff), color-stop(100%,#efefef));
	background: -o-linear-gradient(top, #fff 40%, #efefef 100%);
	background: -ms-linear-gradient(top, #fff 40%, #efefef 100%);
	background: linear-gradient(top, #fff 40%, #efefef 100%);
	}

	fieldset.tab {
	border: 0;
	padding: 0;
	margin-left: 0;
	}
	diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html
	index 6e56ee2fd..13e919ad3 100644
	--- a/skins/larry/templates/login.html
	+++ b/skins/larry/templates/login.html
	@@ -1,54 +1,54 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<meta name="Robots" content="noindex,nofollow" />
	<roundcube:include file="/includes/links.html" />
	</head>
	<body>

	<div id="login-form">
	<div class="box-inner">
	-<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" />
	+<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" />

	<roundcube:form name="form" method="post">
	<roundcube:object name="loginform" form="form" size="40" />

	<p class="formbuttons"><input type="submit" class="button mainaction" value="<roundcube:label name='login' />" /></p>

	</form>
	</div>

	<div class="box-bottom">
	<roundcube:object name="message" id="message" />
	<noscript>
	<p class="noscriptwarning"><roundcube:label name="noscriptwarning" /></p>
	</noscript>
	</div>

	<div id="bottomline">
	<roundcube:var name="config:product_name"> <roundcube:object name="version" condition="config:display_version" />
	<roundcube:if condition="config:support_url" />
	●  <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a>
	<roundcube:endif />
	<roundcube:container name="loginfooter" id="bottomline" />
	</div>
	</div>

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

	<roundcube:object name="preloader" images="
	/images/ajaxloader.gif
	/images/buttons.png
	/images/addcontact.png
	/images/filetypes.png
	/images/listicons.png
	/images/messages.png
	/images/quota.png
	/images/selector.png
	/images/splitter.png
	/images/watermark.jpg
	" />

	</body>
	</html>
	diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
	index 6015054d3..7ef12bfdb 100644
	--- a/skins/larry/templates/mail.html
	+++ b/skins/larry/templates/mail.html
	@@ -1,241 +1,241 @@
	<roundcube:object name="doctype" value="html5" />
	<html>
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	<style type="text/css">
	<roundcube:if condition="config:preview_pane == true" />
	#mailview-top { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-48 : 276" />px; }
	#mailview-bottom { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+6 : 330" />px; height: auto; }
	#mailpreviewframe { display: block; }
	<roundcube:endif />
	</style>
	</head>
	<body>

	<div class="minwidth">
	<roundcube:include file="/includes/header.html" />

	<div id="mainscreen">

	<!-- toolbar -->
	<div id="messagetoolbar" class="toolbar">
	<roundcube:button command="checkmail" type="link" class="button checkmail disabled" classAct="button checkmail" classSel="button checkmail pressed" label="refresh" title="checkmail" />
	<roundcube:include file="/includes/mailtoolbar.html" />
	</div>

	<div id="mailview-left">

	<!-- folders list -->
	<div id="folderlist-header"></div>
	<div id="mailboxcontainer" class="uibox listbox">
	<div id="folderlist-content" class="scroller withfooter">
	<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing" folder_filter="mail" unreadwrap="%s" />
	</div>
	<div id="folderlist-footer" class="boxfooter">
	<roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="listbutton groupactions" onclick="UI.show_popup('mailboxmenu');return false" innerClass="inner" content="⚙" />
	<roundcube:if condition="env:quota" />
	<roundcube:object name="quotaDisplay" id="quotadisplay" class="countdisplay" display="text" />
	<roundcube:endif />
	</div>
	</div>

	</div>

	<div id="mailview-right">

	<div id="messagesearchtools">

	<!-- search filter -->
	<div id="searchfilter">
	<roundcube:object name="searchfilter" class="searchfilter decorated" />
	</div>

	<!-- search box -->
	<div id="quicksearchbar" class="searchbox">
	<roundcube:object name="searchform" id="quicksearchbox" />
	<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
	<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
	</div>

	</div>

	<roundcube:if condition="config:preview_pane == true" />
	<div id="mailview-top" class="uibox">
	<roundcube:else />
	<div id="mailview-top" class="uibox fullheight">
	<roundcube:endif />

	<!-- messagelist -->
	<div id="messagelistcontainer" class="boxlistcontent">
	<roundcube:object name="messages"
	id="messagelist"
	class="records-table messagelist sortheader fixedheader"
	optionsmenuIcon="true" />
	</div>

	<!-- list footer -->
	<div id="messagelistfooter">
	<div id="listcontrols">
	<roundcube:if condition="env:threads" />
	<a href="#list" class="iconbutton listmode" id="maillistmode" title="<roundcube:label name='list' />">List</a>
	<a href="#threads" class="iconbutton threadmode" id="mailthreadmode" title="<roundcube:label name='threads' />">Threads</a>
	<roundcube:else />
	<a href="#list" class="iconbutton listmode selected" title="<roundcube:label name='list' />" onclick="return false">List</a>
	<a href="#threads" class="iconbutton threadmode disabled" title="<roundcube:label name='threads' />" onclick="return false">Threads</a>
	<roundcube:endif />
	</div>

	<div id="listselectors">
	<a href="#select" id="listselectmenulink" class="menuselector" onclick="UI.show_popup('listselectmenu');return false"><span class="handle"><roundcube:label name="select" /></span></a>
	<roundcube:if condition="env:threads" />
	<a href="#threads" id="threadselectmenulink" class="menuselector" onclick="UI.show_popup('threadselectmenu');return false"><span class="handle"><roundcube:label name="threads" /></span></a>
	<roundcube:endif />
	</div>

	<div id="countcontrols" class="pagenav dark">
	<roundcube:object name="messageCountDisplay" class="countdisplay" />
	<span class="pagenavbuttons">
	<roundcube:button command="firstpage" type="link" class="button firstpage disabled" classAct="button firstpage" classSel="button firstpage pressed" innerClass="inner" title="firstpage" content="\|&lt;" />
	<roundcube:button command="previouspage" type="link" class="button prevpage disabled" classAct="button prevpage" classSel="button prevpage pressed" innerClass="inner" title="previouspage" content="&lt;" />
	<roundcube:button command="nextpage" type="link" class="button nextpage disabled" classAct="button nextpage" classSel="button nextpage pressed" innerClass="inner" title="nextpage" content="&gt;" />
	<roundcube:button command="lastpage" type="link" class="button lastpage disabled" classAct="button lastpage" classSel="button lastpage pressed" innerClass="inner" title="lastpage" content="&gt;\|" />
	</span>
	</div>

	<roundcube:container name="listcontrols" id="listcontrols" />

	<a href="#preview" id="mailpreviewtoggle" title="<roundcube:label name='previewpane' />"></a>
	</div>

	</div><!-- end mailview-top -->

	<div id="mailview-bottom" class="uibox">

	<div id="mailpreviewframe">
	<roundcube:object name="messagecontentframe" id="messagecontframe" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
	</div>

	<roundcube:object name="message" id="message" class="statusbar" />

	</div><!-- end mailview-bottom -->

	</div><!-- end mailview-right -->

	</div><!-- end mainscreen -->

	-<div><!-- end minwidth -->
	+</div><!-- end minwidth -->

	<div id="searchmenu" class="popupmenu">
	<ul class="toolbarmenu">
	<li><label><input type="checkbox" name="s_mods[]" value="subject" id="s_mod_subject" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="subject" /></span></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="from" id="s_mod_from" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="from" /></span></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="to" id="s_mod_to" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="to" /></span></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="cc" id="s_mod_cc" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="cc" /></span></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="bcc" id="s_mod_bcc" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="bcc" /></span></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="body" id="s_mod_body" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="body" /></span></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="text" id="s_mod_text" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="msgtext" /></span></label></li>
	</ul>
	</div>

	<div id="dragmessagemenu" class="popupmenu">
	<ul class="toolbarmenu">
	<li><roundcube:button command="move" onclick="return rcmail.drag_menu_action('move')" label="move" classAct="active" /></li>
	<li><roundcube:button command="copy" onclick="return rcmail.drag_menu_action('copy')" label="copy" classAct="active" /></li>
	</ul>
	</div>

	<div id="mailboxmenu" class="popupmenu">
	<ul class="toolbarmenu" id="mailboxoptionsmenu">
	<li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
	<li><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
	<li><roundcube:button name="messageimport" type="link" class="active" label="importmessages" onclick="UI.show_uploadform()" /></li>
	<li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
	<roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
	</ul>
	</div>

	<div id="listselectmenu" class="popupmenu dropdown">
	<ul class="toolbarmenu iconized">
	<li><roundcube:button command="select-all" type="link" label="all" class="icon" classAct="icon active" innerclass="icon mail" /></li>
	<li><roundcube:button command="select-all" type="link" prop="page" label="currpage" class="icon" classAct="icon active" innerclass="icon list" /></li>
	<li><roundcube:button command="select-all" type="link" prop="unread" label="unread" class="icon" classAct="icon active" innerclass="icon unread" /></li>
	<li><roundcube:button command="select-all" type="link" prop="flagged" label="flagged" class="icon" classAct="icon active" innerclass="icon flagged" /></li>
	<li><roundcube:button command="select-all" type="link" prop="invert" label="invert" class="icon" classAct="icon active" innerclass="icon invert" /></li>
	<li><roundcube:button command="select-none" type="link" label="none" class="icon" classAct="icon active" innerclass="icon cross" /></li>
	</ul>
	</div>

	<div id="threadselectmenu" class="popupmenu dropdown">
	<ul class="toolbarmenu">
	<li><roundcube:button command="expand-all" type="link" label="expand-all" class="icon" classAct="icon active" innerclass="icon conversation" /></li>
	<li><roundcube:button command="expand-unread" type="link" label="expand-unread" class="icon" classAct="icon active" innerclass="icon conversation" /></li>
	<li><roundcube:button command="collapse-all" type="link" label="collapse-all" class="icon" classAct="icon active" innerclass="icon conversation" /></li>
	</ul>
	</div>

	<div id="listoptions" class="propform popupdialog">
	<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" />
	<fieldset class="floating">
	<legend><roundcube:label name="listcolumns" /></legend>
	<ul class="proplist">
	<li><label class="disabled"><input type="checkbox" name="list_col[]" value="threads" checked="checked" disabled="disabled" /> <span><roundcube:label name="threads" /></span></label></li>
	<li><label class="disabled"><input type="checkbox" name="list_col[]" value="subject" checked="checked" disabled="disabled" /> <span><roundcube:label name="subject" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="fromto" /> <span><roundcube:label name="fromto" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="from" /> <span><roundcube:label name="from" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="to" /> <span><roundcube:label name="to" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="replyto" /> <span><roundcube:label name="replyto" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="cc" /> <span><roundcube:label name="cc" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="date" /> <span><roundcube:label name="date" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="size" /> <span><roundcube:label name="size" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="status" /> <span><roundcube:label name="readstatus" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="attachment" /> <span><roundcube:label name="attachment" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="flag" /> <span><roundcube:label name="flag" /></span></label></li>
	<li><label><input type="checkbox" name="list_col[]" value="priority" /> <span><roundcube:label name="priority" /></span></label></li>
	</ul>
	</fieldset>
	<roundcube:endif />
	<roundcube:if condition="!in_array('message_sort_col', (array)config:dont_override)" />
	<fieldset class="floating">
	<legend><roundcube:label name="listsorting" /></legend>
	<ul class="proplist">
	<li><label><input type="radio" name="sort_col" value="" /> <span><roundcube:label name="nonesort" /></span></label></li>
	<li><label><input type="radio" name="sort_col" value="arrival" /> <span><roundcube:label name="arrival" /></span></label></li>
	<li><label><input type="radio" name="sort_col" value="date" /> <span><roundcube:label name="sentdate" /></span></label></li>
	<li><label><input type="radio" name="sort_col" value="subject" /> <span><roundcube:label name="subject" /></span></label></li>
	<li><label><input type="radio" name="sort_col" value="fromto" /> <span><roundcube:label name="fromto" /></span></label></li>
	<li><label><input type="radio" name="sort_col" value="from" /> <span><roundcube:label name="from" /></span></label></li>
	<li><label><input type="radio" name="sort_col" value="to" /> <span><roundcube:label name="to" /></span></label></li>
	<li><label><input type="radio" name="sort_col" value="cc" /> <span><roundcube:label name="cc" /></span></label></li>
	<li><label><input type="radio" name="sort_col" value="size" /> <span><roundcube:label name="size" /></span></label></li>
	</ul>
	</fieldset>
	<roundcube:endif />
	<roundcube:if condition="!in_array('message_sort_order', (array)config:dont_override)" />
	<fieldset class="floating">
	<legend><roundcube:label name="listorder" /></legend>
	<ul class="proplist">
	<li><label><input type="radio" name="sort_ord" value="ASC" /> <span><roundcube:label name="asc" /></span></label></li>
	<li><label><input type="radio" name="sort_ord" value="DESC" /> <span><roundcube:label name="desc" /></span></label></li>
	</ul>
	</fieldset>
	<roundcube:endif />
	<br style="clear:both" />
	<div class="formbuttons">
	<roundcube:button command="menu-save" id="listmenusave" type="input" class="button mainaction" label="save" />
	<roundcube:button command="menu-open" id="listmenucancel" type="input" class="button" label="cancel" />
	</div>
	</div>

	<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='importmessages' />">
	<roundcube:object name="messageimportform" id="uploadform" attachmentFieldSize="40" buttons="no" />
	<div class="formbuttons">
	<roundcube:button command="import-messages" type="input" class="button mainaction" label="upload" />
	<roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />
	</div>
	</div>

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

	</body>
	</html>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Jan 31, 8:28 AM (9 h, 35 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 426202
Default Alt Text: (211 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions