githubFork/roundcubemail.git

			@@ -5,7 +5,7 @@
			\| program/steps/mail/func.inc \|
			\| \|
			\| This file is part of the Roundcube Webmail client \|
			\| Copyright (C) 2005-2012, The Roundcube Dev Team \|
			\| Copyright (C) 2005-2014, The Roundcube Dev Team \|
			\| \|
			\| Licensed under the GNU General Public License version 3 or \|
			\| any later version with exceptions for skins & plugins. \|
			@@ -16,44 +16,45 @@
			\| \|
			+-----------------------------------------------------------------------+
			\| Author: Thomas Bruederli <roundcube@gmail.com> \|
			\| Author: Aleksander Machniak <alec@alec.pl> \|
			+-----------------------------------------------------------------------+
			*/

			// setup some global vars used by mail steps
			$SENT_MBOX = $RCMAIL->config->get('sent_mbox');
			$DRAFTS_MBOX = $RCMAIL->config->get('drafts_mbox');
			$SEARCH_MODS_DEFAULT = array(
			'*' => array('subject'=>1, 'from'=>1),
			$SENT_MBOX => array('subject'=>1, 'to'=>1),
			$DRAFTS_MBOX => array('subject'=>1, 'to'=>1)
			);

			// always instantiate storage object (but not connect to server yet)
			$RCMAIL->storage_init();

			// set imap properties and session vars
			if (strlen(trim($mbox = get_input_value('_mbox', RCUBE_INPUT_GPC, true))))
			$RCMAIL->storage->set_folder(($_SESSION['mbox'] = $mbox));
			else if ($RCMAIL->storage)
			$_SESSION['mbox'] = $RCMAIL->storage->get_folder();
			if (strlen(trim($mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)))) {
			$RCMAIL->storage->set_folder(($_SESSION['mbox'] = $mbox));
			}
			else if ($RCMAIL->storage) {
			$_SESSION['mbox'] = $RCMAIL->storage->get_folder();
			}

			if (!empty($_GET['_page']))
			$RCMAIL->storage->set_page(($_SESSION['page'] = intval($_GET['_page'])));
			if (!empty($_GET['_page'])) {
			$RCMAIL->storage->set_page(($_SESSION['page'] = intval($_GET['_page'])));
			}

			$a_threading = $RCMAIL->config->get('message_threading', array());
			$message_sort_col = $RCMAIL->config->get('message_sort_col');
			$message_sort_order = $RCMAIL->config->get('message_sort_order');

			// set default sort col/order to session
			if (!isset($_SESSION['sort_col']))
			$_SESSION['sort_col'] = !empty($CONFIG['message_sort_col']) ? $CONFIG['message_sort_col'] : '';
			if (!isset($_SESSION['sort_order']))
			$_SESSION['sort_order'] = strtoupper($CONFIG['message_sort_order']) == 'ASC' ? 'ASC' : 'DESC';
			if (!isset($_SESSION['sort_col'])) {
			$_SESSION['sort_col'] = $message_sort_col ? $message_sort_col : '';
			}
			if (!isset($_SESSION['sort_order'])) {
			$_SESSION['sort_order'] = strtoupper($message_sort_order) == 'ASC' ? 'ASC' : 'DESC';
			}

			// set threads mode
			$a_threading = $RCMAIL->config->get('message_threading', array());
			if (isset($_GET['_threads'])) {
			if ($_GET['_threads'])
			$a_threading[$_SESSION['mbox']] = true;
			else
			unset($a_threading[$_SESSION['mbox']]);
			$RCMAIL->user->save_prefs(array('message_threading' => $a_threading));
			if ($_GET['_threads'])
			$a_threading[$_SESSION['mbox']] = true;
			else
			unset($a_threading[$_SESSION['mbox']]);

			$RCMAIL->user->save_prefs(array('message_threading' => $a_threading));
			}
			$RCMAIL->storage->set_threading($a_threading[$_SESSION['mbox']]);

			@@ -61,87 +62,111 @@
			if (!empty($_REQUEST['_search']) && isset($_SESSION['search'])
			&& $_SESSION['search_request'] == $_REQUEST['_search']
			) {
			$RCMAIL->storage->set_search_set($_SESSION['search']);
			$OUTPUT->set_env('search_request', $_REQUEST['_search']);
			$OUTPUT->set_env('search_text', $_SESSION['last_text_search']);
			$RCMAIL->storage->set_search_set($_SESSION['search']);

			$OUTPUT->set_env('search_request', $_REQUEST['_search']);
			$OUTPUT->set_env('search_text', $_SESSION['last_text_search']);
			}

			// remove mbox part from _uid
			if (($_uid = rcube_utils::get_input_value('_uid', RCUBE_INPUT_GPC)) && !is_array($_uid) && preg_match('/^\d+-.+/', $_uid)) {
			list($_uid, $mbox) = explode('-', $_uid, 2);
			if (isset($_GET['_uid'])) $_GET['_uid'] = $_uid;
			if (isset($_POST['_uid'])) $_POST['_uid'] = $_uid;
			$_REQUEST['_uid'] = $_uid;
			unset($_uid);

			// override mbox
			if (!empty($mbox)) {
			$_GET['_mbox'] = $mbox;
			$_POST['_mbox'] = $mbox;
			$RCMAIL->storage->set_folder(($_SESSION['mbox'] = $mbox));
			}
			}


			// set main env variables, labels and page title
			if (empty($RCMAIL->action) \|\| $RCMAIL->action == 'list') {
			// connect to storage server and trigger error on failure
			$RCMAIL->storage_connect();
			// connect to storage server and trigger error on failure
			$RCMAIL->storage_connect();

			$mbox_name = $RCMAIL->storage->get_folder();
			$mbox_name = $RCMAIL->storage->get_folder();

			if (empty($RCMAIL->action)) {
			// initialize searching result if search_filter is used
			if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') {
			$search_request = md5($mbox_name.$_SESSION['search_filter']);
			if (empty($RCMAIL->action)) {
			// initialize searching result if search_filter is used
			if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') {
			$RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCUBE_CHARSET, rcmail_sort_column());

			$RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, rcmail_sort_column());
			$_SESSION['search'] = $RCMAIL->storage->get_search_set();
			$_SESSION['search_request'] = $search_request;
			$OUTPUT->set_env('search_request', $search_request);
			$search_request = md5($mbox_name.$_SESSION['search_filter']);
			$_SESSION['search'] = $RCMAIL->storage->get_search_set();
			$_SESSION['search_request'] = $search_request;

			$OUTPUT->set_env('search_request', $search_request);
			}

			$OUTPUT->set_env('search_mods', rcmail_search_mods());

			if (!empty($_SESSION['search_scope']))
			$OUTPUT->set_env('search_scope', $_SESSION['search_scope']);
			}

			$search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);
			$OUTPUT->set_env('search_mods', $search_mods);
			}
			$threading = (bool) $RCMAIL->storage->get_threading();
			$delimiter = $RCMAIL->storage->get_hierarchy_delimiter();

			$threading = (bool) $RCMAIL->storage->get_threading();
			$delimiter = $RCMAIL->storage->get_hierarchy_delimiter();
			// set current mailbox and some other vars in client environment
			$OUTPUT->set_env('mailbox', $mbox_name);
			$OUTPUT->set_env('pagesize', $RCMAIL->storage->get_pagesize());
			$OUTPUT->set_env('delimiter', $delimiter);
			$OUTPUT->set_env('threading', $threading);
			$OUTPUT->set_env('threads', $threading \|\| $RCMAIL->storage->get_capability('THREAD'));
			$OUTPUT->set_env('reply_all_mode', (int) $RCMAIL->config->get('reply_all_mode'));
			$OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0));

			// set current mailbox and some other vars in client environment
			$OUTPUT->set_env('mailbox', $mbox_name);
			$OUTPUT->set_env('pagesize', $RCMAIL->storage->get_pagesize());
			$OUTPUT->set_env('delimiter', $delimiter);
			$OUTPUT->set_env('threading', $threading);
			$OUTPUT->set_env('threads', $threading \|\| $RCMAIL->storage->get_capability('THREAD'));
			$OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0));
			if ($RCMAIL->storage->get_capability('QUOTA')) {
			$OUTPUT->set_env('quota', true);
			}
			if ($RCMAIL->storage->get_capability('QUOTA')) {
			$OUTPUT->set_env('quota', true);
			}

			foreach (array('delete_junk','flag_for_deletion','read_when_deleted','skip_deleted','display_next','message_extwin','compose_extwin','forward_attachment') as $prop) {
			if ($CONFIG[$prop])
			$OUTPUT->set_env($prop, true);
			}
			// set special folders
			foreach (array('drafts', 'trash', 'junk') as $mbox) {
			if ($folder = $RCMAIL->config->get($mbox . '_mbox')) {
			$OUTPUT->set_env($mbox . '_mailbox', $folder);
			}
			}

			if ($CONFIG['trash_mbox'])
			$OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
			if ($CONFIG['drafts_mbox'])
			$OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
			if ($CONFIG['junk_mbox'])
			$OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']);
			// set configuration
			$RCMAIL->set_env_config(array('delete_junk', 'flag_for_deletion', 'read_when_deleted',
			'skip_deleted', 'display_next', 'message_extwin', 'compose_extwin', 'forward_attachment'));

			if (!empty($_SESSION['browser_caps']))
			$OUTPUT->set_env('browser_capabilities', $_SESSION['browser_caps']);
			if (!empty($_SESSION['browser_caps'])) {
			$OUTPUT->set_env('browser_capabilities', $_SESSION['browser_caps']);
			}

			if (!$OUTPUT->ajax_call)
			$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
			'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
			'copy', 'move', 'quota', 'replyall', 'replylist', 'importwait');
			if (!$OUTPUT->ajax_call) {
			$OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
			'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
			'copy', 'move', 'quota', 'replyall', 'replylist');
			}

			$pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true);
			$pagetitle = str_replace($delimiter, " \xC2\xBB ", $pagetitle);
			$pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true);
			$pagetitle = str_replace($delimiter, " \xC2\xBB ", $pagetitle);

			$OUTPUT->set_pagetitle($pagetitle);
			$OUTPUT->set_pagetitle($pagetitle);
			}

			// register UI objects
			$OUTPUT->add_handlers(array(
			'mailboxlist' => 'rcmail_mailbox_list',
			'messages' => 'rcmail_message_list',
			'messagecountdisplay' => 'rcmail_messagecount_display',
			'quotadisplay' => 'rcmail_quota_display',
			'mailboxname' => 'rcmail_mailbox_name_display',
			'messageheaders' => 'rcmail_message_headers',
			'messagefullheaders' => 'rcmail_message_full_headers',
			'messagebody' => 'rcmail_message_body',
			'messagecontentframe' => 'rcmail_messagecontent_frame',
			'messageimportform' => 'rcmail_message_import_form',
			'searchfilter' => 'rcmail_search_filter',
			'searchform' => array($OUTPUT, 'search_form'),
			'mailboxlist' => array($RCMAIL, 'folder_list'),
			'quotadisplay' => array($RCMAIL, 'quota_display'),
			'messages' => 'rcmail_message_list',
			'messagecountdisplay' => 'rcmail_messagecount_display',
			'mailboxname' => 'rcmail_mailbox_name_display',
			'messageheaders' => 'rcmail_message_headers',
			'messagefullheaders' => 'rcmail_message_full_headers',
			'messagebody' => 'rcmail_message_body',
			'messagecontentframe' => 'rcmail_messagecontent_frame',
			'messageimportform' => 'rcmail_message_import_form',
			'searchfilter' => 'rcmail_search_filter',
			'searchform' => array($OUTPUT, 'search_form'),
			));

			// register action aliases
			@@ -161,6 +186,27 @@
			));


			/**
			* Returns default search mods
			*/
			function rcmail_search_mods()
			{
			global $RCMAIL;

			$mods = $RCMAIL->config->get('search_mods');

			if (empty($mods)) {
			$mods = array('*' => array('subject' => 1, 'from' => 1));

			foreach (array('sent', 'drafts') as $mbox) {
			if ($mbox = $RCMAIL->config->get($mbox . '_mbox')) {
			$mods[$mbox] = array('subject' => 1, 'to' => 1);
			}
			}
			}

			return $mods;
			}

			/**
			* Returns 'to' if current folder is configured Sent or Drafts
			@@ -170,18 +216,20 @@
			*/
			function rcmail_message_list_smart_column_name()
			{
			global $RCMAIL;
			global $RCMAIL;

			$delim = $RCMAIL->storage->get_hierarchy_delimiter();
			$mbox = $RCMAIL->storage->get_folder();
			$sent_mbox = $RCMAIL->config->get('sent_mbox');
			$drafts_mbox = $RCMAIL->config->get('drafts_mbox');
			$delim = $RCMAIL->storage->get_hierarchy_delimiter();
			$mbox = $RCMAIL->storage->get_folder();
			$sent_mbox = $RCMAIL->config->get('sent_mbox');
			$drafts_mbox = $RCMAIL->config->get('drafts_mbox');

			if (strpos($mbox.$delim, $sent_mbox.$delim) === 0 \|\| strpos($mbox.$delim, $drafts_mbox.$delim) === 0) {
			return 'to';
			}
			if ((strpos($mbox.$delim, $sent_mbox.$delim) === 0 \|\| strpos($mbox.$delim, $drafts_mbox.$delim) === 0)
			&& strtoupper($mbox) != 'INBOX'
			) {
			return 'to';
			}

			return 'from';
			return 'from';
			}

			/**
			@@ -193,21 +241,21 @@
			*/
			function rcmail_sort_column()
			{
			global $RCMAIL;
			global $RCMAIL;

			if (isset($_SESSION['sort_col'])) {
			$column = $_SESSION['sort_col'];
			}
			else {
			$column = $RCMAIL->config->get('message_sort_col');
			}
			if (isset($_SESSION['sort_col'])) {
			$column = $_SESSION['sort_col'];
			}
			else {
			$column = $RCMAIL->config->get('message_sort_col');
			}

			// get name of smart From/To column in folder context
			if ($column == 'fromto') {
			$column = rcmail_message_list_smart_column_name();
			}
			// get name of smart From/To column in folder context
			if ($column == 'fromto') {
			$column = rcmail_message_list_smart_column_name();
			}

			return $column;
			return $column;
			}

			/**
			@@ -217,13 +265,13 @@
			*/
			function rcmail_sort_order()
			{
			global $RCMAIL;
			global $RCMAIL;

			if (isset($_SESSION['sort_order'])) {
			return $_SESSION['sort_order'];
			}
			if (isset($_SESSION['sort_order'])) {
			return $_SESSION['sort_order'];
			}

			return $RCMAIL->config->get('message_sort_order');
			return $RCMAIL->config->get('message_sort_order');
			}

			/**
			@@ -231,389 +279,426 @@
			*/
			function rcmail_message_list($attrib)
			{
			global $CONFIG, $OUTPUT;
			global $RCMAIL, $OUTPUT;

			// add some labels to client
			$OUTPUT->add_label('from', 'to');
			// add some labels to client
			$OUTPUT->add_label('from', 'to');

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

			// define list of cols to be displayed based on parameter or config
			if (empty($attrib['columns'])) {
			$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
			$OUTPUT->set_env('col_movable', !in_array('list_cols', (array)$CONFIG['dont_override']));
			}
			else {
			$a_show_cols = preg_split('/[\s,;]+/', strip_quotes($attrib['columns']));
			$attrib['columns'] = $a_show_cols;
			}
			// define list of cols to be displayed based on parameter or config
			if (empty($attrib['columns'])) {
			$list_cols = $RCMAIL->config->get('list_cols');
			$a_show_cols = !empty($list_cols) && is_array($list_cols) ? $list_cols : array('subject');

			// save some variables for use in ajax list
			$_SESSION['list_attrib'] = $attrib;
			// make sure 'threads' and 'subject' columns are present
			if (!in_array('subject', $a_show_cols))
			array_unshift($a_show_cols, 'subject');
			if (!in_array('threads', $a_show_cols))
			array_unshift($a_show_cols, 'threads');
			$OUTPUT->set_env('col_movable', !in_array('list_cols', (array)$RCMAIL->config->get('dont_override')));
			}
			else {
			$a_show_cols = preg_split('/[\s,;]+/', str_replace(array("'", '"'), '', $attrib['columns']));
			$attrib['columns'] = $a_show_cols;
			}

			$_SESSION['skin_path'] = $CONFIG['skin_path'];
			// save some variables for use in ajax list
			$_SESSION['list_attrib'] = $attrib;

			// set client env
			$OUTPUT->add_gui_object('messagelist', $attrib['id']);
			$OUTPUT->set_env('autoexpand_threads', intval($CONFIG['autoexpand_threads']));
			$OUTPUT->set_env('sort_col', $_SESSION['sort_col']);
			$OUTPUT->set_env('sort_order', $_SESSION['sort_order']);
			$OUTPUT->set_env('messages', array());
			$OUTPUT->set_env('coltypes', $a_show_cols);
			// make sure 'threads' and 'subject' columns are present
			if (!in_array('subject', $a_show_cols))
			array_unshift($a_show_cols, 'subject');
			if (!in_array('threads', $a_show_cols))
			array_unshift($a_show_cols, 'threads');

			$OUTPUT->include_script('list.js');
			$_SESSION['skin_path'] = $RCMAIL->config->get('skin_path');

			$table = new html_table($attrib);
			if (!$attrib['noheader']) {
			foreach (rcmail_message_list_head($attrib, $a_show_cols) as $cell)
			$table->add_header(array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
			}
			// set client env
			$OUTPUT->add_gui_object('messagelist', $attrib['id']);
			$OUTPUT->set_env('autoexpand_threads', intval($RCMAIL->config->get('autoexpand_threads')));
			$OUTPUT->set_env('sort_col', $_SESSION['sort_col']);
			$OUTPUT->set_env('sort_order', $_SESSION['sort_order']);
			$OUTPUT->set_env('messages', array());
			$OUTPUT->set_env('listcols', $a_show_cols);

			return $table->show();
			$OUTPUT->include_script('list.js');

			$table = new html_table($attrib);

			if (!$attrib['noheader']) {
			foreach (rcmail_message_list_head($attrib, $a_show_cols) as $cell)
			$table->add_header(array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
			}

			return $table->show();
			}


			/**
			* return javascript commands to add rows to the message list
			*/
			function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null)
			function rcmail_js_message_list($a_headers, $insert_top=false, $a_show_cols=null)
			{
			global $CONFIG, $RCMAIL, $OUTPUT;
			global $RCMAIL, $OUTPUT;

			if (empty($a_show_cols)) {
			if (!empty($_SESSION['list_attrib']['columns']))
			$a_show_cols = $_SESSION['list_attrib']['columns'];
			else
			$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
			}
			else {
			if (!is_array($a_show_cols))
			$a_show_cols = preg_split('/[\s,;]+/', strip_quotes($a_show_cols));
			$head_replace = true;
			}

			$mbox = $RCMAIL->storage->get_folder();

			// make sure 'threads' and 'subject' columns are present
			if (!in_array('subject', $a_show_cols))
			array_unshift($a_show_cols, 'subject');
			if (!in_array('threads', $a_show_cols))
			array_unshift($a_show_cols, 'threads');

			$_SESSION['list_attrib']['columns'] = $a_show_cols;

			// Make sure there are no duplicated columns (#1486999)
			$a_show_cols = array_unique($a_show_cols);

			// Plugins may set header's list_cols/list_flags and other rcube_message_header variables
			// and list columns
			$plugin = $RCMAIL->plugins->exec_hook('messages_list',
			array('messages' => $a_headers, 'cols' => $a_show_cols));

			$a_show_cols = $plugin['cols'];
			$a_headers = $plugin['messages'];

			$thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;

			// get name of smart From/To column in folder context
			if (array_search('fromto', $a_show_cols) !== false) {
			$smart_col = rcmail_message_list_smart_column_name();
			}

			$OUTPUT->command('set_message_coltypes', $a_show_cols, $thead, $smart_col);

			if (empty($a_headers))
			return;

			// remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here
			foreach (array('threads', 'attachment', 'flag', 'status', 'priority') as $col) {
			if (($key = array_search($col, $a_show_cols)) !== FALSE)
			unset($a_show_cols[$key]);
			}

			// loop through message headers
			foreach ($a_headers as $header) {
			if (empty($header))
			continue;

			$a_msg_cols = array();
			$a_msg_flags = array();

			// format each col; similar as in rcmail_message_list()
			foreach ($a_show_cols as $col) {
			$col_name = $col == 'fromto' ? $smart_col : $col;

			if (in_array($col_name, array('from', 'to', 'cc', 'replyto')))
			$cont = rcmail_address_string($header->$col_name, 3, false, null, $header->charset);
			else if ($col == 'subject') {
			$cont = trim(rcube_mime::decode_header($header->$col, $header->charset));
			if (!$cont) $cont = rcube_label('nosubject');
			$cont = Q($cont);
			}
			else if ($col == 'size')
			$cont = show_bytes($header->$col);
			else if ($col == 'date')
			$cont = format_date($header->date);
			else
			$cont = Q($header->$col);

			$a_msg_cols[$col] = $cont;
			if (empty($a_show_cols)) {
			if (!empty($_SESSION['list_attrib']['columns']))
			$a_show_cols = $_SESSION['list_attrib']['columns'];
			else {
			$list_cols = $RCMAIL->config->get('list_cols');
			$a_show_cols = !empty($list_cols) && is_array($list_cols) ? $list_cols : array('subject');
			}
			}
			else {
			if (!is_array($a_show_cols)) {
			$a_show_cols = preg_split('/[\s,;]+/', str_replace(array("'", '"'), '', $a_show_cols));
			}
			$head_replace = true;
			}

			$a_msg_flags = array_change_key_case(array_map('intval', (array) $header->flags));
			if ($header->depth)
			$a_msg_flags['depth'] = $header->depth;
			else if ($header->has_children)
			$roots[] = $header->uid;
			if ($header->parent_uid)
			$a_msg_flags['parent_uid'] = $header->parent_uid;
			if ($header->has_children)
			$a_msg_flags['has_children'] = $header->has_children;
			if ($header->unread_children)
			$a_msg_flags['unread_children'] = $header->unread_children;
			if ($header->others['list-post'])
			$a_msg_flags['ml'] = 1;
			if ($header->priority)
			$a_msg_flags['prio'] = (int) $header->priority;
			// add 'folder' column to list on multi-folder searches
			$search_set = $RCMAIL->storage->get_search_set();
			$multifolder = $search_set && $search_set[1]->multi;
			if ($multifolder && !in_array('folder', $a_show_cols)) {
			$a_show_cols[] = 'folder';
			$head_replace = true;
			}

			$a_msg_flags['ctype'] = Q($header->ctype);
			$a_msg_flags['mbox'] = $mbox;
			$mbox = $RCMAIL->storage->get_folder();

			// merge with plugin result (Deprecated, use $header->flags)
			if (!empty($header->list_flags) && is_array($header->list_flags))
			$a_msg_flags = array_merge($a_msg_flags, $header->list_flags);
			if (!empty($header->list_cols) && is_array($header->list_cols))
			$a_msg_cols = array_merge($a_msg_cols, $header->list_cols);
			// make sure 'threads' and 'subject' columns are present
			if (!in_array('subject', $a_show_cols))
			array_unshift($a_show_cols, 'subject');
			if (!in_array('threads', $a_show_cols))
			array_unshift($a_show_cols, 'threads');

			$OUTPUT->command('add_message_row',
			$header->uid,
			$a_msg_cols,
			$a_msg_flags,
			$insert_top);
			}
			// Make sure there are no duplicated columns (#1486999)
			$a_show_cols = array_unique($a_show_cols);

			if ($RCMAIL->storage->get_threading()) {
			$OUTPUT->command('init_threads', (array) $roots, $mbox);
			}
			// Plugins may set header's list_cols/list_flags and other rcube_message_header variables
			// and list columns
			$plugin = $RCMAIL->plugins->exec_hook('messages_list',
			array('messages' => $a_headers, 'cols' => $a_show_cols));

			$a_show_cols = $plugin['cols'];
			$a_headers = $plugin['messages'];

			$thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;

			// get name of smart From/To column in folder context
			if (array_search('fromto', $a_show_cols) !== false) {
			$smart_col = rcmail_message_list_smart_column_name();
			}

			$OUTPUT->command('set_message_coltypes', $a_show_cols, $thead, $smart_col);

			if ($multifolder && $_SESSION['search_scope'] == 'all') {
			$OUTPUT->command('select_folder', '');
			}

			$OUTPUT->set_env('multifolder_listing', $multifolder);

			if (empty($a_headers)) {
			return;
			}

			// remove 'threads', 'attachment', 'flag', 'status' columns, we don't need them here
			foreach (array('threads', 'attachment', 'flag', 'status', 'priority') as $col) {
			if (($key = array_search($col, $a_show_cols)) !== FALSE) {
			unset($a_show_cols[$key]);
			}
			}

			// loop through message headers
			foreach ($a_headers as $header) {
			if (empty($header))
			continue;

			// make message UIDs unique by appending the folder name
			if ($multifolder) {
			$header->uid .= '-'.$header->folder;
			$header->flags['skip_mbox_check'] = true;
			if ($header->parent_uid)
			$header->parent_uid .= '-'.$header->folder;
			}

			$a_msg_cols = array();
			$a_msg_flags = array();

			// format each col; similar as in rcmail_message_list()
			foreach ($a_show_cols as $col) {
			$col_name = $col == 'fromto' ? $smart_col : $col;

			if (in_array($col_name, array('from', 'to', 'cc', 'replyto')))
			$cont = rcmail_address_string($header->$col_name, 3, false, null, $header->charset);
			else if ($col == 'subject') {
			$cont = trim(rcube_mime::decode_header($header->$col, $header->charset));
			if (!$cont) $cont = $RCMAIL->gettext('nosubject');
			$cont = rcube::Q($cont);
			}
			else if ($col == 'size')
			$cont = show_bytes($header->$col);
			else if ($col == 'date')
			$cont = $RCMAIL->format_date($header->date);
			else if ($col == 'folder')
			$cont = rcube::Q(rcube_charset::convert($header->folder, 'UTF7-IMAP'));
			else
			$cont = rcube::Q($header->$col);

			$a_msg_cols[$col] = $cont;
			}

			$a_msg_flags = array_change_key_case(array_map('intval', (array) $header->flags));
			if ($header->depth)
			$a_msg_flags['depth'] = $header->depth;
			else if ($header->has_children)
			$roots[] = $header->uid;
			if ($header->parent_uid)
			$a_msg_flags['parent_uid'] = $header->parent_uid;
			if ($header->has_children)
			$a_msg_flags['has_children'] = $header->has_children;
			if ($header->unread_children)
			$a_msg_flags['unread_children'] = $header->unread_children;
			if ($header->others['list-post'])
			$a_msg_flags['ml'] = 1;
			if ($header->priority)
			$a_msg_flags['prio'] = (int) $header->priority;

			$a_msg_flags['ctype'] = rcube::Q($header->ctype);
			$a_msg_flags['mbox'] = $header->folder;

			// merge with plugin result (Deprecated, use $header->flags)
			if (!empty($header->list_flags) && is_array($header->list_flags))
			$a_msg_flags = array_merge($a_msg_flags, $header->list_flags);
			if (!empty($header->list_cols) && is_array($header->list_cols))
			$a_msg_cols = array_merge($a_msg_cols, $header->list_cols);

			$OUTPUT->command('add_message_row',
			$header->uid,
			$a_msg_cols,
			$a_msg_flags,
			$insert_top);
			}

			if ($RCMAIL->storage->get_threading()) {
			$OUTPUT->command('init_threads', (array) $roots, $mbox);
			}
			}


			/*
			* Creates <THEAD> for message list table
			*/
			function rcmail_message_list_head($attrib, $a_show_cols)
			{
			global $RCMAIL;
			global $RCMAIL;

			$skin_path = $_SESSION['skin_path'];
			$skin_path = $_SESSION['skin_path'];

			// check to see if we have some settings for sorting
			$sort_col = $_SESSION['sort_col'];
			$sort_order = $_SESSION['sort_order'];
			// check to see if we have some settings for sorting
			$sort_col = $_SESSION['sort_col'];
			$sort_order = $_SESSION['sort_order'];

			$dont_override = (array)$RCMAIL->config->get('dont_override');
			$disabled_sort = in_array('message_sort_col', $dont_override);
			$disabled_order = in_array('message_sort_order', $dont_override);
			$dont_override = (array) $RCMAIL->config->get('dont_override');
			$disabled_sort = in_array('message_sort_col', $dont_override);
			$disabled_order = in_array('message_sort_order', $dont_override);

			$RCMAIL->output->set_env('disabled_sort_col', $disabled_sort);
			$RCMAIL->output->set_env('disabled_sort_order', $disabled_order);
			$RCMAIL->output->set_env('disabled_sort_col', $disabled_sort);
			$RCMAIL->output->set_env('disabled_sort_order', $disabled_order);

			// define sortable columns
			if ($disabled_sort)
			$a_sort_cols = $sort_col && !$disabled_order ? array($sort_col) : array();
			else
			$a_sort_cols = array('subject', 'date', 'from', 'to', 'fromto', 'size', 'cc');

			if (!empty($attrib['optionsmenuicon'])) {
			$onclick = 'return ' . JS_OBJECT_NAME . ".command('menu-open', 'messagelistmenu')";
			if ($attrib['optionsmenuicon'] === true \|\| $attrib['optionsmenuicon'] == 'true')
			$list_menu = html::div(array('onclick' => $onclick, 'class' => 'listmenu',
			'id' => 'listmenulink', 'title' => rcube_label('listoptions')));
			// define sortable columns
			if ($disabled_sort)
			$a_sort_cols = $sort_col && !$disabled_order ? array($sort_col) : array();
			else
			$list_menu = html::a(array('href' => '#', 'onclick' => $onclick),
			html::img(array('src' => $skin_path . $attrib['optionsmenuicon'],
			'id' => 'listmenulink', 'title' => rcube_label('listoptions')))
			);
			}
			else
			$list_menu = '';
			$a_sort_cols = array('subject', 'date', 'from', 'to', 'fromto', 'size', 'cc');

			$cells = array();

			// get name of smart From/To column in folder context
			if (array_search('fromto', $a_show_cols) !== false) {
			$smart_col = rcmail_message_list_smart_column_name();
			}

			foreach ($a_show_cols as $col) {
			// get column name
			switch ($col) {
			case 'flag':
			$col_name = '<span class="flagged"> </span>';
			break;
			case 'attachment':
			case 'priority':
			case 'status':
			$col_name = '<span class="' . $col .'"> </span>';
			break;
			case 'threads':
			$col_name = $list_menu;
			break;
			case 'fromto':
			$col_name = Q(rcube_label($smart_col));
			break;
			default:
			$col_name = Q(rcube_label($col));
			if (!empty($attrib['optionsmenuicon'])) {
			$onclick = 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('menu-open', 'messagelistmenu')";
			if ($attrib['optionsmenuicon'] === true \|\| $attrib['optionsmenuicon'] == 'true')
			$list_menu = html::div(array('onclick' => $onclick, 'class' => 'listmenu',
			'id' => 'listmenulink', 'title' => $RCMAIL->gettext('listoptions')));
			else
			$list_menu = html::a(array('href' => '#', 'onclick' => $onclick),
			html::img(array('src' => $skin_path . $attrib['optionsmenuicon'],
			'id' => 'listmenulink', 'title' => $RCMAIL->gettext('listoptions'))));
			}
			else {
			$list_menu = '';
			}

			// make sort links
			if (in_array($col, $a_sort_cols))
			$col_name = html::a(array('href'=>"./#sort", 'onclick' => 'return '.JS_OBJECT_NAME.".command('sort','".$col."',this)", 'title' => rcube_label('sortby')), $col_name);
			else if ($col_name[0] != '<')
			$col_name = '<span class="' . $col .'">' . $col_name . '</span>';
			$cells = $coltypes = array();

			$sort_class = $col == $sort_col && !$disabled_order ? " sorted$sort_order" : '';
			$class_name = $col.$sort_class;
			// get name of smart From/To column in folder context
			if (array_search('fromto', $a_show_cols) !== false) {
			$smart_col = rcmail_message_list_smart_column_name();
			}

			// put it all together
			$cells[] = array('className' => $class_name, 'id' => "rcm$col", 'html' => $col_name);
			}
			foreach ($a_show_cols as $col) {
			$label = '';
			$sortable = false;

			return $cells;
			// get column name
			switch ($col) {
			case 'flag':
			$col_name = html::span('flagged', ' ');
			break;
			case 'attachment':
			case 'priority':
			case 'status':
			$col_name = html::span($col, ' ');
			break;
			case 'threads':
			$col_name = $list_menu;
			break;
			case 'fromto':
			$label = $RCMAIL->gettext($smart_col);
			$col_name = rcube::Q($label);
			break;
			default:
			$label = $RCMAIL->gettext($col);
			$col_name = rcube::Q($label);
			}

			// make sort links
			if (in_array($col, $a_sort_cols)) {
			$sortable = true;
			$col_name = html::a(array(
			'href' => "./#sort",
			'class' => 'sortcol',
			'rel' => $col,
			'title' => $RCMAIL->gettext('sortby')
			), $col_name);
			}
			else if ($col_name[0] != '<') {
			$col_name = '<span class="' . $col .'">' . $col_name . '</span>';
			}

			$sort_class = $col == $sort_col && !$disabled_order ? " sorted$sort_order" : '';
			$class_name = $col.$sort_class;

			// put it all together
			$cells[] = array('className' => $class_name, 'id' => "rcm$col", 'html' => $col_name);
			$coltypes[$col] = array('className' => $class_name, 'id' => "rcm$col", 'label' => $label, 'sortable' => $sortable);
			}

			$RCMAIL->output->set_env('coltypes', $coltypes);
			return $cells;
			}


			/**
			* return an HTML iframe for loading mail content
			*/
			function rcmail_messagecontent_frame($attrib)
			{
			global $OUTPUT, $RCMAIL;
			global $OUTPUT, $RCMAIL;

			if (empty($attrib['id']))
			$attrib['id'] = 'rcmailcontentwindow';
			if (empty($attrib['id']))
			$attrib['id'] = 'rcmailcontentwindow';

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

			if ($RCMAIL->config->get('preview_pane'))
			$OUTPUT->set_env('contentframe', $attrib['id']);
			$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');
			if ($RCMAIL->config->get('preview_pane')) {
			$OUTPUT->set_env('contentframe', $attrib['id']);
			}

			return $OUTPUT->frame($attrib, true);
			$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');

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


			function rcmail_messagecount_display($attrib)
			{
			global $RCMAIL;
			global $RCMAIL;

			if (!$attrib['id'])
			$attrib['id'] = 'rcmcountdisplay';
			if (!$attrib['id'])
			$attrib['id'] = 'rcmcountdisplay';

			$RCMAIL->output->add_gui_object('countdisplay', $attrib['id']);
			$RCMAIL->output->add_gui_object('countdisplay', $attrib['id']);

			$content = $RCMAIL->action != 'show' ? rcmail_get_messagecount_text() : rcube_label('loading');
			$content = $RCMAIL->action != 'show' ? rcmail_get_messagecount_text() : $RCMAIL->gettext('loading');

			return html::span($attrib, $content);
			return html::span($attrib, $content);
			}


			function rcmail_get_messagecount_text($count=NULL, $page=NULL)
			function rcmail_get_messagecount_text($count = null, $page = null)
			{
			global $RCMAIL;
			global $RCMAIL;

			if ($page === NULL) {
			$page = $RCMAIL->storage->get_page();
			}
			if ($page === null) {
			$page = $RCMAIL->storage->get_page();
			}

			$page_size = $RCMAIL->storage->get_pagesize();
			$start_msg = ($page-1) * $page_size + 1;
			$page_size = $RCMAIL->storage->get_pagesize();
			$start_msg = ($page-1) * $page_size + 1;

			if ($count!==NULL)
			$max = $count;
			else if ($RCMAIL->action)
			$max = $RCMAIL->storage->count(NULL, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
			if ($count !== null)
			$max = $count;
			else if ($RCMAIL->action)
			$max = $RCMAIL->storage->count(NULL, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');

			if ($max==0)
			$out = rcube_label('mailboxempty');
			else
			$out = rcube_label(array('name' => $RCMAIL->storage->get_threading() ? 'threadsfromto' : 'messagesfromto',
			if ($max == 0)
			$out = $RCMAIL->storage->get_search_set() ? $RCMAIL->gettext('nomessages') : $RCMAIL->gettext('mailboxempty');
			else
			$out = $RCMAIL->gettext(array('name' => $RCMAIL->storage->get_threading() ? 'threadsfromto' : 'messagesfromto',
			'vars' => array('from' => $start_msg,
			'to' => min($max, $start_msg + $page_size - 1),
			'count' => $max)));

			return Q($out);
			return rcube::Q($out);
			}


			function rcmail_mailbox_name_display($attrib)
			{
			global $RCMAIL;
			global $RCMAIL;

			if (!$attrib['id'])
			$attrib['id'] = 'rcmmailboxname';
			if (!$attrib['id'])
			$attrib['id'] = 'rcmmailboxname';

			$RCMAIL->output->add_gui_object('mailboxname', $attrib['id']);
			$RCMAIL->output->add_gui_object('mailboxname', $attrib['id']);

			return html::span($attrib, rcmail_get_mailbox_name_text());
			return html::span($attrib, rcmail_get_mailbox_name_text());
			}


			function rcmail_get_mailbox_name_text()
			{
			global $RCMAIL;
			return rcmail_localize_foldername($RCMAIL->storage->get_folder());
			global $RCMAIL;
			return $RCMAIL->localize_foldername($RCMAIL->storage->get_folder());
			}


			function rcmail_send_unread_count($mbox_name, $force=false, $count=null, $mark='')
			{
			global $RCMAIL;
			global $RCMAIL;

			$old_unseen = rcmail_get_unseen_count($mbox_name);
			$old_unseen = rcmail_get_unseen_count($mbox_name);

			if ($count === null)
			$unseen = $RCMAIL->storage->count($mbox_name, 'UNSEEN', $force);
			else
			$unseen = $count;
			if ($count === null)
			$unseen = $RCMAIL->storage->count($mbox_name, 'UNSEEN', $force);
			else
			$unseen = $count;

			if ($unseen != $old_unseen \|\| ($mbox_name == 'INBOX'))
			$RCMAIL->output->command('set_unread_count', $mbox_name, $unseen,
			($mbox_name == 'INBOX'), $unseen && $mark ? $mark : '');
			if ($unseen != $old_unseen \|\| ($mbox_name == 'INBOX'))
			$RCMAIL->output->command('set_unread_count', $mbox_name, $unseen,
			($mbox_name == 'INBOX'), $unseen && $mark ? $mark : '');

			rcmail_set_unseen_count($mbox_name, $unseen);
			rcmail_set_unseen_count($mbox_name, $unseen);

			return $unseen;
			return $unseen;
			}


			function rcmail_set_unseen_count($mbox_name, $count)
			{
			// @TODO: this data is doubled (session and cache tables) if caching is enabled
			// @TODO: this data is doubled (session and cache tables) if caching is enabled

			// Make sure we have an array here (#1487066)
			if (!is_array($_SESSION['unseen_count']))
			$_SESSION['unseen_count'] = array();
			// Make sure we have an array here (#1487066)
			if (!is_array($_SESSION['unseen_count'])) {
			$_SESSION['unseen_count'] = array();
			}

			$_SESSION['unseen_count'][$mbox_name] = $count;
			$_SESSION['unseen_count'][$mbox_name] = $count;
			}


			function rcmail_get_unseen_count($mbox_name)
			{
			if (is_array($_SESSION['unseen_count']) && array_key_exists($mbox_name, $_SESSION['unseen_count']))
			return $_SESSION['unseen_count'][$mbox_name];
			else
			return null;
			if (is_array($_SESSION['unseen_count']) && array_key_exists($mbox_name, $_SESSION['unseen_count'])) {
			return $_SESSION['unseen_count'][$mbox_name];
			}
			}


			/**
			* Sets message is_safe flag according to 'show_images' option value
			@@ -622,34 +707,33 @@
			*/
			function rcmail_check_safe(&$message)
			{
			global $RCMAIL;
			global $RCMAIL;

			if (!$message->is_safe
			&& ($show_images = $RCMAIL->config->get('show_images'))
			&& $message->has_html_part()
			) {
			switch ($show_images) {
			case 1: // known senders only
			// get default addressbook, like in addcontact.inc
			$CONTACTS = $RCMAIL->get_address_book(-1, true);
			if (!$message->is_safe
			&& ($show_images = $RCMAIL->config->get('show_images'))
			&& $message->has_html_part()
			) {
			switch ($show_images) {
			case 1: // known senders only
			// get default addressbook, like in addcontact.inc
			$CONTACTS = $RCMAIL->get_address_book(-1, true);

			if ($CONTACTS) {
			$result = $CONTACTS->search('email', $message->sender['mailto'], 1, false);
			if ($result->count) {
			if ($CONTACTS) {
			$result = $CONTACTS->search('email', $message->sender['mailto'], 1, false);
			if ($result->count) {
			$message->set_safe(true);
			}
			}

			$RCMAIL->plugins->exec_hook('message_check_safe', array('message' => $message));
			break;

			case 2: // always
			$message->set_safe(true);
			}
			break;
			}

			$RCMAIL->plugins->exec_hook('message_check_safe', array('message' => $message));
			break;

			case 2: // always
			$message->set_safe(true);
			break;
			}
			}
			}


			/**
			* Cleans up the given message HTML Body (for displaying)
			@@ -661,66 +745,67 @@
			*/
			function rcmail_wash_html($html, $p, $cid_replaces)
			{
			global $REMOTE_OBJECTS;
			global $REMOTE_OBJECTS;

			$p += array('safe' => false, 'inline_html' => true);
			$p += array('safe' => false, 'inline_html' => true);

			// charset was converted to UTF-8 in rcube_storage::get_message_part(),
			// change/add charset specification in HTML accordingly,
			// washtml cannot work without that
			$meta = '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />';
			// charset was converted to UTF-8 in rcube_storage::get_message_part(),
			// change/add charset specification in HTML accordingly,
			// washtml cannot work without that
			$meta = '<meta http-equiv="Content-Type" content="text/html; charset='.RCUBE_CHARSET.'" />';

			// remove old meta tag and add the new one, making sure
			// that it is placed in the head (#1488093)
			$html = preg_replace('/<meta[^>]+charset=[a-z0-9-_]+[^>]*>/Ui', '', $html);
			$html = preg_replace('/(<head[^>]*>)/Ui', '\\1'.$meta, $html, -1, $rcount);
			if (!$rcount) {
			$html = '<head>' . $meta . '</head>' . $html;
			}
			// remove old meta tag and add the new one, making sure
			// that it is placed in the head (#1488093)
			$html = preg_replace('/<meta[^>]+charset=[a-z0-9-_]+[^>]*>/Ui', '', $html);
			$html = preg_replace('/(<head[^>]*>)/Ui', '\\1'.$meta, $html, -1, $rcount);
			if (!$rcount) {
			$html = '<head>' . $meta . '</head>' . $html;
			}

			// clean HTML with washhtml by Frederic Motte
			$wash_opts = array(
			'show_washed' => false,
			'allow_remote' => $p['safe'],
			'blocked_src' => "./program/resources/blocked.gif",
			'charset' => RCMAIL_CHARSET,
			'cid_map' => $cid_replaces,
			'html_elements' => array('body'),
			);
			// clean HTML with washhtml by Frederic Motte
			$wash_opts = array(
			'show_washed' => false,
			'allow_remote' => $p['safe'],
			'blocked_src' => "./program/resources/blocked.gif",
			'charset' => RCUBE_CHARSET,
			'cid_map' => $cid_replaces,
			'html_elements' => array('body'),
			);

			if (!$p['inline_html']) {
			$wash_opts['html_elements'] = array('html','head','title','body');
			}
			if ($p['safe']) {
			$wash_opts['html_elements'][] = 'link';
			$wash_opts['html_attribs'] = array('rel','type');
			}
			if (!$p['inline_html']) {
			$wash_opts['html_elements'] = array('html','head','title','body');
			}
			if ($p['safe']) {
			$wash_opts['html_elements'][] = 'link';
			$wash_opts['html_attribs'] = array('rel','type');
			}

			// overwrite washer options with options from plugins
			if (isset($p['html_elements']))
			$wash_opts['html_elements'] = $p['html_elements'];
			if (isset($p['html_attribs']))
			$wash_opts['html_attribs'] = $p['html_attribs'];
			// overwrite washer options with options from plugins
			if (isset($p['html_elements']))
			$wash_opts['html_elements'] = $p['html_elements'];
			if (isset($p['html_attribs']))
			$wash_opts['html_attribs'] = $p['html_attribs'];

			// initialize HTML washer
			$washer = new rcube_washtml($wash_opts);
			// initialize HTML washer
			$washer = new rcube_washtml($wash_opts);

			if (!$p['skip_washer_form_callback'])
			$washer->add_callback('form', 'rcmail_washtml_callback');
			if (!$p['skip_washer_form_callback']) {
			$washer->add_callback('form', 'rcmail_washtml_callback');
			}

			// allow CSS styles, will be sanitized by rcmail_washtml_callback()
			if (!$p['skip_washer_style_callback'])
			$washer->add_callback('style', 'rcmail_washtml_callback');
			// allow CSS styles, will be sanitized by rcmail_washtml_callback()
			if (!$p['skip_washer_style_callback']) {
			$washer->add_callback('style', 'rcmail_washtml_callback');
			}

			// Remove non-UTF8 characters (#1487813)
			$html = rc_utf8_clean($html);
			// Remove non-UTF8 characters (#1487813)
			$html = rcube_charset::clean($html);

			$html = $washer->wash($html);
			$REMOTE_OBJECTS = $washer->extlinks;
			$html = $washer->wash($html);
			$REMOTE_OBJECTS = $washer->extlinks;

			return $html;
			return $html;
			}


			/**
			* Convert the given message part to proper HTML
			@@ -732,58 +817,58 @@
			*/
			function rcmail_print_body($part, $p = array())
			{
			global $RCMAIL;
			global $RCMAIL;

			// trigger plugin hook
			$data = $RCMAIL->plugins->exec_hook('message_part_before',
			array('type' => $part->ctype_secondary, 'body' => $part->body, 'id' => $part->mime_id)
			+ $p + array('safe' => false, 'plain' => false, 'inline_html' => true));
			// trigger plugin hook
			$data = $RCMAIL->plugins->exec_hook('message_part_before',
			array('type' => $part->ctype_secondary, 'body' => $part->body, 'id' => $part->mime_id)
			+ $p + array('safe' => false, 'plain' => false, 'inline_html' => true));

			// convert html to text/plain
			if ($data['plain'] && ($data['type'] == 'html' \|\| $data['type'] == 'enriched')) {
			if ($data['type'] == 'enriched') {
			$data['body'] = rcube_enriched::to_html($data['body']);
			// convert html to text/plain
			if ($data['plain'] && ($data['type'] == 'html' \|\| $data['type'] == 'enriched')) {
			if ($data['type'] == 'enriched') {
			$data['body'] = rcube_enriched::to_html($data['body']);
			}

			$txt = new rcube_html2text($data['body'], false, true);
			$body = $txt->get_text();
			$part->ctype_secondary = 'plain';
			}
			$txt = new rcube_html2text($data['body'], false, true);
			$body = $txt->get_text();
			$part->ctype_secondary = 'plain';
			}
			// text/html
			else if ($data['type'] == 'html') {
			$body = rcmail_wash_html($data['body'], $data, $part->replaces);
			$part->ctype_secondary = $data['type'];
			}
			// text/enriched
			else if ($data['type'] == 'enriched') {
			$body = rcube_enriched::to_html($data['body']);
			$body = rcmail_wash_html($body, $data, $part->replaces);
			$part->ctype_secondary = 'html';
			}
			else {
			// assert plaintext
			$body = $part->body;
			$part->ctype_secondary = $data['type'] = 'plain';
			}

			// free some memory (hopefully)
			unset($data['body']);

			// plaintext postprocessing
			if ($part->ctype_secondary == 'plain') {
			if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
			$body = rcube_mime::unfold_flowed($body);
			// text/html
			else if ($data['type'] == 'html') {
			$body = rcmail_wash_html($data['body'], $data, $part->replaces);
			$part->ctype_secondary = $data['type'];
			}
			// text/enriched
			else if ($data['type'] == 'enriched') {
			$body = rcube_enriched::to_html($data['body']);
			$body = rcmail_wash_html($body, $data, $part->replaces);
			$part->ctype_secondary = 'html';
			}
			else {
			// assert plaintext
			$body = $part->body;
			$part->ctype_secondary = $data['type'] = 'plain';
			}

			$body = rcmail_plain_body($body);
			}
			// free some memory (hopefully)
			unset($data['body']);

			// allow post-processing of the message body
			$data = $RCMAIL->plugins->exec_hook('message_part_after',
			array('type' => $part->ctype_secondary, 'body' => $body, 'id' => $part->mime_id) + $data);
			// plaintext postprocessing
			if ($part->ctype_secondary == 'plain') {
			if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
			$body = rcube_mime::unfold_flowed($body);
			}

			return $data['type'] == 'html' ? $data['body'] : html::tag('pre', array(), $data['body']);
			$body = rcmail_plain_body($body);
			}

			// allow post-processing of the message body
			$data = $RCMAIL->plugins->exec_hook('message_part_after',
			array('type' => $part->ctype_secondary, 'body' => $body, 'id' => $part->mime_id) + $data);

			return $data['type'] == 'html' ? $data['body'] : html::tag('pre', array(), $data['body']);
			}


			/**
			* Handle links and citation marks in plain text message
			@@ -794,232 +879,245 @@
			*/
			function rcmail_plain_body($body)
			{
			global $RCMAIL;
			global $RCMAIL;

			// make links and email-addresses clickable
			$attribs = array('link_attribs' => array('rel' => 'noreferrer', 'target' => '_blank'));
			$replacer = new rcmail_string_replacer($attribs);
			// make links and email-addresses clickable
			$attribs = array('link_attribs' => array('rel' => 'noreferrer', 'target' => '_blank'));
			$replacer = new rcmail_string_replacer($attribs);

			// search for patterns like links and e-mail addresses and replace with tokens
			$body = $replacer->replace($body);
			// search for patterns like links and e-mail addresses and replace with tokens
			$body = $replacer->replace($body);

			// split body into single lines
			$body = preg_split('/\r?\n/', $body);
			$quote_level = 0;
			$last = -1;
			// split body into single lines
			$body = preg_split('/\r?\n/', $body);
			$quote_level = 0;
			$last = -1;

			// find/mark quoted lines...
			for ($n=0, $cnt=count($body); $n < $cnt; $n++) {
			if ($body[$n][0] == '>' && preg_match('/^(>+ {0,1})+/', $body[$n], $regs)) {
			$q = substr_count($regs[0], '>');
			$body[$n] = substr($body[$n], strlen($regs[0]));
			// find/mark quoted lines...
			for ($n=0, $cnt=count($body); $n < $cnt; $n++) {
			if ($body[$n][0] == '>' && preg_match('/^(>+ {0,1})+/', $body[$n], $regs)) {
			$q = substr_count($regs[0], '>');
			$body[$n] = substr($body[$n], strlen($regs[0]));

			if ($q > $quote_level) {
			$body[$n] = $replacer->get_replacement($replacer->add(
			str_repeat('<blockquote>', $q - $quote_level))) . $body[$n];
			$last = $n;
			}
			else if ($q < $quote_level) {
			$body[$n] = $replacer->get_replacement($replacer->add(
			str_repeat('</blockquote>', $quote_level - $q))) . $body[$n];
			$last = $n;
			}
			}
			else {
			$q = 0;
			if ($quote_level > 0)
			$body[$n] = $replacer->get_replacement($replacer->add(
			str_repeat('</blockquote>', $quote_level))) . $body[$n];
			if ($q > $quote_level) {
			$body[$n] = $replacer->get_replacement($replacer->add(
			str_repeat('<blockquote>', $q - $quote_level))) . $body[$n];
			$last = $n;
			}
			else if ($q < $quote_level) {
			$body[$n] = $replacer->get_replacement($replacer->add(
			str_repeat('</blockquote>', $quote_level - $q))) . $body[$n];
			$last = $n;
			}
			}
			else {
			$q = 0;
			if ($quote_level > 0)
			$body[$n] = $replacer->get_replacement($replacer->add(
			str_repeat('</blockquote>', $quote_level))) . $body[$n];
			}

			$quote_level = $q;
			}

			$quote_level = $q;
			}
			$body = join("\n", $body);

			$body = join("\n", $body);
			// quote plain text (don't use rcube::Q() here, to display entities "as is")
			$table = get_html_translation_table(HTML_SPECIALCHARS);
			unset($table['?']);
			$body = strtr($body, $table);

			// quote plain text (don't use Q() here, to display entities "as is")
			$table = get_html_translation_table(HTML_SPECIALCHARS);
			unset($table['?']);
			$body = strtr($body, $table);
			// colorize signature (up to <sig_max_lines> lines)
			$len = strlen($body);
			$sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15);

			// colorize signature (up to <sig_max_lines> lines)
			$len = strlen($body);
			$sig_max_lines = $RCMAIL->config->get('sig_max_lines', 15);
			while (($sp = strrpos($body, "-- \n", $sp ? -$len+$sp-1 : 0)) !== false) {
			if ($sp == 0 \|\| $body[$sp-1] == "\n") {
			// do not touch blocks with more that X lines
			if (substr_count($body, "\n", $sp) < $sig_max_lines)
			$body = substr($body, 0, max(0, $sp))
			.'<span class="sig">'.substr($body, $sp).'</span>';
			break;
			while (($sp = strrpos($body, "-- \n", $sp ? -$len+$sp-1 : 0)) !== false) {
			if ($sp == 0 \|\| $body[$sp-1] == "\n") {
			// do not touch blocks with more that X lines
			if (substr_count($body, "\n", $sp) < $sig_max_lines) {
			$body = substr($body, 0, max(0, $sp))
			. '<span class="sig">'.substr($body, $sp).'</span>';
			}

			break;
			}
			}
			}

			// insert url/mailto links and citation tags
			$body = $replacer->resolve($body);
			// insert url/mailto links and citation tags
			$body = $replacer->resolve($body);

			return $body;
			return $body;
			}


			/**
			* Callback function for washtml cleaning class
			*/
			function rcmail_washtml_callback($tagname, $attrib, $content, $washtml)
			{
			switch ($tagname) {
			switch ($tagname) {
			case 'form':
			$out = html::div('form', $content);
			break;
			$out = html::div('form', $content);
			break;

			case 'style':
			// decode all escaped entities and reduce to ascii strings
			$stripped = preg_replace('/[^a-zA-Z\(:;]/', '', rcmail_xss_entity_decode($content));
			// decode all escaped entities and reduce to ascii strings
			$stripped = preg_replace('/[^a-zA-Z\(:;]/', '', rcube_utils::xss_entity_decode($content));

			// now check for evil strings like expression, behavior or url()
			if (!preg_match('/expression\|behavior\|javascript:\|import[^a]/i', $stripped)) {
			if (!$washtml->get_config('allow_remote') && stripos($stripped, 'url('))
			$washtml->extlinks = true;
			else
			$out = html::tag('style', array('type' => 'text/css'), $content);
			break;
			}
			// now check for evil strings like expression, behavior or url()
			if (!preg_match('/expression\|behavior\|javascript:\|import[^a]/i', $stripped)) {
			if (!$washtml->get_config('allow_remote') && stripos($stripped, 'url('))
			$washtml->extlinks = true;
			else
			$out = html::tag('style', array('type' => 'text/css'), $content);
			break;
			}

			default:
			$out = '';
			}
			$out = '';
			}

			return $out;
			return $out;
			}


			/**
			* return table with message headers
			*/
			function rcmail_message_headers($attrib, $headers=null)
			{
			global $MESSAGE, $PRINT_MODE, $RCMAIL;
			static $sa_attrib;
			global $MESSAGE, $PRINT_MODE, $RCMAIL;
			static $sa_attrib;

			// keep header table attrib
			if (is_array($attrib) && !$sa_attrib && !$attrib['valueof'])
			$sa_attrib = $attrib;
			else if (!is_array($attrib) && is_array($sa_attrib))
			$attrib = $sa_attrib;
			// keep header table attrib
			if (is_array($attrib) && !$sa_attrib && !$attrib['valueof'])
			$sa_attrib = $attrib;
			else if (!is_array($attrib) && is_array($sa_attrib))
			$attrib = $sa_attrib;

			if (!isset($MESSAGE))
			return FALSE;

			// get associative array of headers object
			if (!$headers) {
			$headers_obj = $MESSAGE->headers;
			$headers = get_object_vars($MESSAGE->headers);
			}
			else if (is_object($headers)) {
			$headers_obj = $headers;
			$headers = get_object_vars($headers_obj);
			}
			else {
			$headers_obj = rcube_message_header::from_array($headers);
			}

			// show these headers
			$standard_headers = array('subject', 'from', 'sender', 'to', 'cc', 'bcc', 'replyto',
			'mail-reply-to', 'mail-followup-to', 'date', 'priority');
			$exclude_headers = $attrib['exclude'] ? explode(',', $attrib['exclude']) : array();
			$output_headers = array();

			foreach ($standard_headers as $hkey) {
			$ishtml = false;

			if ($headers[$hkey])
			$value = $headers[$hkey];
			else if ($headers['others'][$hkey])
			$value = $headers['others'][$hkey];
			else if (!$attrib['valueof'])
			continue;

			if (in_array($hkey, $exclude_headers))
			continue;

			$header_title = rcube_label(preg_replace('/(^mail-\|-)/', '', $hkey));

			if ($hkey == 'date') {
			if ($PRINT_MODE)
			$header_value = format_date($value, $RCMAIL->config->get('date_long', 'x'));
			else
			$header_value = format_date($value);
			if (!isset($MESSAGE)) {
			return false;
			}
			else if ($hkey == 'priority') {
			if ($value) {
			$header_value = html::span('prio' . $value, rcmail_localized_priority($value));
			}
			else
			continue;
			}
			else if ($hkey == 'replyto') {
			if ($headers['replyto'] != $headers['from']) {
			$header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
			$ishtml = true;
			}
			else
			continue;
			}
			else if ($hkey == 'mail-reply-to') {
			if ($headers['mail-replyto'] != $headers['reply-to']
			&& $headers['reply-to'] != $headers['from']
			) {
			$header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
			$ishtml = true;
			}
			else
			continue;
			}
			else if ($hkey == 'sender') {
			if ($headers['sender'] != $headers['from']) {
			$header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
			$ishtml = true;
			}
			else
			continue;
			}
			else if ($hkey == 'mail-followup-to') {
			$header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
			$ishtml = true;
			}
			else if (in_array($hkey, array('from', 'to', 'cc', 'bcc'))) {
			$header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
			$ishtml = true;
			}
			else if ($hkey == 'subject' && empty($value))
			$header_value = rcube_label('nosubject');
			else
			$header_value = trim(rcube_mime::decode_header($value, $headers['charset']));

			$output_headers[$hkey] = array(
			'title' => $header_title,
			'value' => $header_value,
			'raw' => $value,
			'html' => $ishtml,
			);
			}
			// get associative array of headers object
			if (!$headers) {
			$headers_obj = $MESSAGE->headers;
			$headers = get_object_vars($MESSAGE->headers);
			}
			else if (is_object($headers)) {
			$headers_obj = $headers;
			$headers = get_object_vars($headers_obj);
			}
			else {
			$headers_obj = rcube_message_header::from_array($headers);
			}

			$plugin = $RCMAIL->plugins->exec_hook('message_headers_output',
			array('output' => $output_headers, 'headers' => $headers_obj, 'exclude' => $exclude_headers));
			// show these headers
			$standard_headers = array('subject', 'from', 'sender', 'to', 'cc', 'bcc', 'replyto',
			'mail-reply-to', 'mail-followup-to', 'date', 'priority');
			$exclude_headers = $attrib['exclude'] ? explode(',', $attrib['exclude']) : array();
			$output_headers = array();

			// single header value is requested
			if (!empty($attrib['valueof']))
			return Q($plugin['output'][$attrib['valueof']]['value'], ($attrib['valueof'] == 'subject' ? 'strict' : 'show'));
			foreach ($standard_headers as $hkey) {
			$ishtml = false;

			// compose html table
			$table = new html_table(array('cols' => 2));
			if ($headers[$hkey])
			$value = $headers[$hkey];
			else if ($headers['others'][$hkey])
			$value = $headers['others'][$hkey];
			else if (!$attrib['valueof'])
			continue;

			foreach ($plugin['output'] as $hkey => $row) {
			$table->add(array('class' => 'header-title'), Q($row['title']));
			$table->add(array('class' => 'header '.$hkey), $row['html'] ? $row['value'] : Q($row['value'], ($hkey == 'subject' ? 'strict' : 'show')));
			}
			if (in_array($hkey, $exclude_headers))
			continue;

			return $table->show($attrib);
			$header_title = $RCMAIL->gettext(preg_replace('/(^mail-\|-)/', '', $hkey));

			if ($hkey == 'date') {
			if ($PRINT_MODE)
			$header_value = $RCMAIL->format_date($value, $RCMAIL->config->get('date_long', 'x'));
			else
			$header_value = $RCMAIL->format_date($value);
			}
			else if ($hkey == 'priority') {
			if ($value) {
			$header_value = html::span('prio' . $value, rcmail_localized_priority($value));
			}
			else
			continue;
			}
			else if ($hkey == 'replyto') {
			if ($headers['replyto'] != $headers['from']) {
			$header_value = rcmail_address_string($value, $attrib['max'], true,
			$attrib['addicon'], $headers['charset'], $header_title);
			$ishtml = true;
			}
			else
			continue;
			}
			else if ($hkey == 'mail-reply-to') {
			if ($headers['mail-replyto'] != $headers['reply-to']
			&& $headers['reply-to'] != $headers['from']
			) {
			$header_value = rcmail_address_string($value, $attrib['max'], true,
			$attrib['addicon'], $headers['charset'], $header_title);
			$ishtml = true;
			}
			else
			continue;
			}
			else if ($hkey == 'sender') {
			if ($headers['sender'] != $headers['from']) {
			$header_value = rcmail_address_string($value, $attrib['max'], true,
			$attrib['addicon'], $headers['charset'], $header_title);
			$ishtml = true;
			}
			else
			continue;
			}
			else if ($hkey == 'mail-followup-to') {
			$header_value = rcmail_address_string($value, $attrib['max'], true,
			$attrib['addicon'], $headers['charset'], $header_title);
			$ishtml = true;
			}
			else if (in_array($hkey, array('from', 'to', 'cc', 'bcc'))) {
			$header_value = rcmail_address_string($value, $attrib['max'], true,
			$attrib['addicon'], $headers['charset'], $header_title);
			$ishtml = true;
			}
			else if ($hkey == 'subject' && empty($value))
			$header_value = $RCMAIL->gettext('nosubject');
			else
			$header_value = trim(rcube_mime::decode_header($value, $headers['charset']));

			$output_headers[$hkey] = array(
			'title' => $header_title,
			'value' => $header_value,
			'raw' => $value,
			'html' => $ishtml,
			);
			}

			$plugin = $RCMAIL->plugins->exec_hook('message_headers_output', array(
			'output' => $output_headers,
			'headers' => $headers_obj,
			'exclude' => $exclude_headers
			));

			// single header value is requested
			if (!empty($attrib['valueof'])) {
			return rcube::Q($plugin['output'][$attrib['valueof']]['value'], ($attrib['valueof'] == 'subject' ? 'strict' : 'show'));
			}

			// compose html table
			$table = new html_table(array('cols' => 2));

			foreach ($plugin['output'] as $hkey => $row) {
			$val = $row['html'] ? $row['value'] : rcube::Q($row['value'], ($hkey == 'subject' ? 'strict' : 'show'));

			$table->add(array('class' => 'header-title'), rcube::Q($row['title']));
			$table->add(array('class' => 'header '.$hkey), $val);
			}

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

			/**
			@@ -1027,18 +1125,21 @@
			*/
			function rcmail_localized_priority($value)
			{
			$labels_map = array(
			'1' => 'highest',
			'2' => 'high',
			'3' => 'normal',
			'4' => 'low',
			'5' => 'lowest',
			);
			global $RCMAIL;

			if ($value && $labels_map[$value])
			return rcube_label($labels_map[$value]);
			$labels_map = array(
			'1' => 'highest',
			'2' => 'high',
			'3' => 'normal',
			'4' => 'low',
			'5' => 'lowest',
			);

			return '';
			if ($value && $labels_map[$value]) {
			return $RCMAIL->gettext($labels_map[$value]);
			}

			return '';
			}

			/**
			@@ -1046,17 +1147,20 @@
			*/
			function rcmail_message_full_headers($attrib, $headers=NULL)
			{
			global $OUTPUT;
			global $OUTPUT, $RCMAIL;

			$html = html::div(array('id' => "all-headers", 'class' => "all", 'style' => 'display:none'), html::div(array('id' => 'headers-source'), ''));
			$html .= html::div(array('class' => "more-headers show-headers", 'onclick' => "return ".JS_OBJECT_NAME.".command('show-headers','',this)", 'title' => rcube_label('togglefullheaders')), '');
			$html = html::div(array('id' => "all-headers", 'class' => "all", 'style' => 'display:none'), html::div(array('id' => 'headers-source'), ''));
			$html .= html::div(array(
			'class' => "more-headers show-headers",
			'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('show-headers','',this)",
			'title' => $RCMAIL->gettext('togglefullheaders')
			), '');

			$OUTPUT->add_gui_object('all_headers_row', 'all-headers');
			$OUTPUT->add_gui_object('all_headers_box', 'headers-source');
			$OUTPUT->add_gui_object('all_headers_row', 'all-headers');
			$OUTPUT->add_gui_object('all_headers_box', 'headers-source');

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


			/**
			* Handler for the 'messagebody' GUI object
			@@ -1066,488 +1170,529 @@
			*/
			function rcmail_message_body($attrib)
			{
			global $CONFIG, $OUTPUT, $MESSAGE, $RCMAIL, $REMOTE_OBJECTS;
			global $OUTPUT, $MESSAGE, $RCMAIL, $REMOTE_OBJECTS;

			if (!is_array($MESSAGE->parts) && empty($MESSAGE->body))
			return '';

			if (!$attrib['id'])
			$attrib['id'] = 'rcmailMsgBody';

			$safe_mode = $MESSAGE->is_safe \|\| intval($_GET['_safe']);
			$out = '';

			$header_attrib = array();
			foreach ($attrib as $attr => $value)
			if (preg_match('/^headertable([a-z]+)$/i', $attr, $regs))
			$header_attrib[$regs[1]] = $value;

			if (!empty($MESSAGE->parts)) {
			foreach ($MESSAGE->parts as $part) {
			if ($part->type == 'headers') {
			$out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
			}
			else if ($part->type == 'content') {
			// unsupported (e.g. encrypted)
			if ($part->realtype) {
			if ($part->realtype == 'multipart/encrypted' \|\| $part->realtype == 'application/pkcs7-mime') {
			$out .= html::span('part-notice', rcube_label('encryptedmessage'));
			}
			continue;
			}
			else if (!$part->size) {
			continue;
			}
			// Check if we have enough memory to handle the message in it
			// #1487424: we need up to 10x more memory than the body
			else if (!rcmail_mem_check($part->size * 10)) {
			$out .= html::span('part-notice', rcube_label('messagetoobig'). ' '
			. html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part='.$part->mime_id
			.'&_mbox='. urlencode($RCMAIL->storage->get_folder()), rcube_label('download')));
			continue;
			}

			if (empty($part->ctype_parameters) \|\| empty($part->ctype_parameters['charset']))
			$part->ctype_parameters['charset'] = $MESSAGE->headers->charset;

			// fetch part if not available
			if (!isset($part->body))
			$part->body = $MESSAGE->get_part_content($part->mime_id);

			// extract headers from message/rfc822 parts
			if ($part->mimetype == 'message/rfc822') {
			$msgpart = rcube_mime::parse_message($part->body);
			if (!empty($msgpart->headers)) {
			$part = $msgpart;
			$out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
			}
			}

			// message is cached but not exists (#1485443), or other error
			if ($part->body === false) {
			rcmail_message_error($MESSAGE->uid);
			}

			$plugin = $RCMAIL->plugins->exec_hook('message_body_prefix', array(
			'part' => $part, 'prefix' => ''));

			$body = rcmail_print_body($part, array('safe' => $safe_mode, 'plain' => !$CONFIG['prefer_html']));

			if ($part->ctype_secondary == 'html') {
			$body = rcmail_html4inline($body, $attrib['id'], 'rcmBody', $attrs, $safe_mode);
			$div_attr = array('class' => 'message-htmlpart');
			$style = array();

			if (!empty($attrs)) {
			foreach ($attrs as $a_idx => $a_val)
			$style[] = $a_idx . ': ' . $a_val;
			if (!empty($style))
			$div_attr['style'] = implode('; ', $style);
			}

			$out .= html::div($div_attr, $plugin['prefix'] . $body);
			}
			else
			$out .= html::div('message-part', $plugin['prefix'] . $body);
			}
			if (!is_array($MESSAGE->parts) && empty($MESSAGE->body)) {
			return '';
			}
			}
			else {
			// Check if we have enough memory to handle the message in it
			// #1487424: we need up to 10x more memory than the body
			if (!rcmail_mem_check(strlen($MESSAGE->body) * 10)) {
			$out .= html::span('part-notice', rcube_label('messagetoobig'). ' '
			. html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part=0'
			.'&_mbox='. urlencode($RCMAIL->storage->get_folder()), rcube_label('download')));

			if (!$attrib['id'])
			$attrib['id'] = 'rcmailMsgBody';

			$safe_mode = $MESSAGE->is_safe \|\| intval($_GET['_safe']);
			$out = '';

			$header_attrib = array();
			foreach ($attrib as $attr => $value) {
			if (preg_match('/^headertable([a-z]+)$/i', $attr, $regs)) {
			$header_attrib[$regs[1]] = $value;
			}
			}

			if (!empty($MESSAGE->parts)) {
			foreach ($MESSAGE->parts as $part) {
			if ($part->type == 'headers') {
			$out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
			}
			else if ($part->type == 'content') {
			// unsupported (e.g. encrypted)
			if ($part->realtype) {
			if ($part->realtype == 'multipart/encrypted' \|\| $part->realtype == 'application/pkcs7-mime') {
			$out .= html::span('part-notice', $RCMAIL->gettext('encryptedmessage'));
			}
			continue;
			}
			else if (!$part->size) {
			continue;
			}

			// Check if we have enough memory to handle the message in it
			// #1487424: we need up to 10x more memory than the body
			else if (!rcube_utils::mem_check($part->size * 10)) {
			$out .= html::span('part-notice', $RCMAIL->gettext('messagetoobig'). ' '
			. html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part='.$part->mime_id
			.'&_mbox='. urlencode($RCMAIL->storage->get_folder()), $RCMAIL->gettext('download')));
			continue;
			}

			if (empty($part->ctype_parameters) \|\| empty($part->ctype_parameters['charset'])) {
			$part->ctype_parameters['charset'] = $MESSAGE->headers->charset;
			}

			// fetch part if not available
			if (!isset($part->body)) {
			$part->body = $MESSAGE->get_part_content($part->mime_id);
			}

			// extract headers from message/rfc822 parts
			if ($part->mimetype == 'message/rfc822') {
			$msgpart = rcube_mime::parse_message($part->body);
			if (!empty($msgpart->headers)) {
			$part = $msgpart;
			$out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
			}
			}

			// message is cached but not exists (#1485443), or other error
			if ($part->body === false) {
			rcmail_message_error($MESSAGE->uid);
			}

			$plugin = $RCMAIL->plugins->exec_hook('message_body_prefix',
			array('part' => $part, 'prefix' => ''));

			$body = rcmail_print_body($part, array('safe' => $safe_mode, 'plain' => !$RCMAIL->config->get('prefer_html')));

			if ($part->ctype_secondary == 'html') {
			$body = rcmail_html4inline($body, $attrib['id'], 'rcmBody', $attrs, $safe_mode);
			$div_attr = array('class' => 'message-htmlpart');
			$style = array();

			if (!empty($attrs)) {
			foreach ($attrs as $a_idx => $a_val)
			$style[] = $a_idx . ': ' . $a_val;
			if (!empty($style))
			$div_attr['style'] = implode('; ', $style);
			}

			$out .= html::div($div_attr, $plugin['prefix'] . $body);
			}
			else
			$out .= html::div('message-part', $plugin['prefix'] . $body);
			}
			}
			}
			else {
			$plugin = $RCMAIL->plugins->exec_hook('message_body_prefix', array(
			'part' => $MESSAGE, 'prefix' => ''));

			$out .= html::div('message-part', $plugin['prefix'] . html::tag('pre', array(),
			rcmail_plain_body(Q($MESSAGE->body, 'strict', false))));
			}
			}

			// list images after mail body
			if ($RCMAIL->config->get('inline_images', true) && !empty($MESSAGE->attachments)) {
			$thumbnail_size = $RCMAIL->config->get('image_thumbnail_size', 240);
			$client_mimetypes = (array)$RCMAIL->config->get('client_mimetypes');

			foreach ($MESSAGE->attachments as $attach_prop) {
			// skip inline images
			if ($attach_prop->content_id && $attach_prop->disposition == 'inline') {
			continue;
			}

			// Content-Type: image/*...
			if ($mimetype = rcmail_part_image_type($attach_prop)) {
			// display thumbnails
			if ($thumbnail_size) {
			$show_link = array(
			'href' => $MESSAGE->get_part_url($attach_prop->mime_id, false),
			'onclick' => sprintf(
			'return %s.command(\'load-attachment\',\'%s\',this)',
			JS_OBJECT_NAME,
			$attach_prop->mime_id)
			);
			$out .= html::p('image-attachment',
			html::a($show_link + array('class' => 'image-link', 'style' => sprintf('width:%dpx', $thumbnail_size)),
			html::img(array(
			'class' => 'image-thumbnail',
			'src' => $MESSAGE->get_part_url($attach_prop->mime_id, 'image') . '&_thumb=1',
			'title' => $attach_prop->filename,
			'alt' => $attach_prop->filename,
			'style' => sprintf('max-width:%dpx; max-height:%dpx', $thumbnail_size, $thumbnail_size),
			))
			) .
			html::span('image-filename', Q($attach_prop->filename)) .
			html::span('image-filesize', Q($RCMAIL->message_part_size($attach_prop))) .
			html::span('attachment-links',
			(in_array($mimetype, $client_mimetypes) ? html::a($show_link, rcube_label('showattachment')) . ' ' : '') .
			html::a($show_link['href'] . '&_download=1', rcube_label('download'))
			) .
			html::br(array('style' => 'clear:both'))
			);
			// Check if we have enough memory to handle the message in it
			// #1487424: we need up to 10x more memory than the body
			if (!rcube_utils::mem_check(strlen($MESSAGE->body) * 10)) {
			$out .= html::span('part-notice', $RCMAIL->gettext('messagetoobig'). ' '
			. html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part=0'
			.'&_mbox='. urlencode($RCMAIL->storage->get_folder()), $RCMAIL->gettext('download')));
			}
			else {
			$out .= html::tag('fieldset', 'image-attachment',
			html::tag('legend', 'image-filename', Q($attach_prop->filename)) .
			html::p(array('align' => "center"),
			html::img(array(
			'src' => $MESSAGE->get_part_url($attach_prop->mime_id, 'image'),
			'title' => $attach_prop->filename,
			'alt' => $attach_prop->filename,
			)))
			);
			$plugin = $RCMAIL->plugins->exec_hook('message_body_prefix',
			array('part' => $MESSAGE, 'prefix' => ''));

			$out .= html::div('message-part', $plugin['prefix'] . html::tag('pre', array(),
			rcmail_plain_body(rcube::Q($MESSAGE->body, 'strict', false))));
			}
			}
			}
			}

			// tell client that there are blocked remote objects
			if ($REMOTE_OBJECTS && !$safe_mode)
			$OUTPUT->set_env('blockedobjects', true);
			// list images after mail body
			if ($RCMAIL->config->get('inline_images', true) && !empty($MESSAGE->attachments)) {
			$thumbnail_size = $RCMAIL->config->get('image_thumbnail_size', 240);
			$client_mimetypes = (array)$RCMAIL->config->get('client_mimetypes');

			return html::div($attrib, $out);
			foreach ($MESSAGE->attachments as $attach_prop) {
			// skip inline images
			if ($attach_prop->content_id && $attach_prop->disposition == 'inline') {
			continue;
			}

			// Content-Type: image/*...
			if ($mimetype = rcmail_part_image_type($attach_prop)) {
			// display thumbnails
			if ($thumbnail_size) {
			$show_link = array(
			'href' => $MESSAGE->get_part_url($attach_prop->mime_id, false),
			'onclick' => sprintf(
			'return %s.command(\'load-attachment\',\'%s\',this)',
			rcmail_output::JS_OBJECT_NAME,
			$attach_prop->mime_id)
			);
			$out .= html::p('image-attachment',
			html::a($show_link + array('class' => 'image-link', 'style' => sprintf('width:%dpx', $thumbnail_size)),
			html::img(array(
			'class' => 'image-thumbnail',
			'src' => $MESSAGE->get_part_url($attach_prop->mime_id, 'image') . '&_thumb=1',
			'title' => $attach_prop->filename,
			'alt' => $attach_prop->filename,
			'style' => sprintf('max-width:%dpx; max-height:%dpx', $thumbnail_size, $thumbnail_size),
			))
			) .
			html::span('image-filename', rcube::Q($attach_prop->filename)) .
			html::span('image-filesize', rcube::Q($RCMAIL->message_part_size($attach_prop))) .
			html::span('attachment-links',
			(in_array($mimetype, $client_mimetypes) ? html::a($show_link, $RCMAIL->gettext('showattachment')) . ' ' : '') .
			html::a($show_link['href'] . '&_download=1', $RCMAIL->gettext('download'))
			) .
			html::br(array('style' => 'clear:both'))
			);
			}
			else {
			$out .= html::tag('fieldset', 'image-attachment',
			html::tag('legend', 'image-filename', rcube::Q($attach_prop->filename)) .
			html::p(array('align' => 'center'),
			html::img(array(
			'src' => $MESSAGE->get_part_url($attach_prop->mime_id, 'image'),
			'title' => $attach_prop->filename,
			'alt' => $attach_prop->filename,
			)))
			);
			}
			}
			}
			}

			// tell client that there are blocked remote objects
			if ($REMOTE_OBJECTS && !$safe_mode) {
			$OUTPUT->set_env('blockedobjects', true);
			}

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

			function rcmail_part_image_type($part)
			{
			$rcmail = rcmail::get_instance();
			$rcmail = rcmail::get_instance();

			// Skip TIFF images if browser doesn't support this format...
			$tiff_support = !empty($_SESSION['browser_caps']) && !empty($_SESSION['browser_caps']['tif']);
			// until we can convert them to JPEG
			$tiff_support = $tiff_support \|\| $rcmail->config->get('im_convert_path');
			// Skip TIFF images if browser doesn't support this format...
			$tiff_support = !empty($_SESSION['browser_caps']) && !empty($_SESSION['browser_caps']['tif']);
			// until we can convert them to JPEG
			$tiff_support = $tiff_support \|\| $rcmail->config->get('im_convert_path');

			// Content-type regexp
			$mime_regex = $tiff_support ? '/^image\//i' : '/^image\/(?!tif)/i';
			// Content-type regexp
			$mime_regex = $tiff_support ? '/^image\//i' : '/^image\/(?!tif)/i';

			// Content-Type: image/*...
			if (preg_match($mime_regex, $part->mimetype)) {
			return rcmail_fix_mimetype($part->mimetype);
			}
			// Content-Type: image/*...
			if (preg_match($mime_regex, $part->mimetype)) {
			return rcmail_fix_mimetype($part->mimetype);
			}

			// Many clients use application/octet-stream, we'll detect mimetype
			// by checking filename extension
			// Many clients use application/octet-stream, we'll detect mimetype
			// by checking filename extension

			// Supported image filename extensions to image type map
			$types = array(
			'jpg' => 'image/jpeg',
			'jpeg' => 'image/jpeg',
			'png' => 'image/png',
			'gif' => 'image/gif',
			'bmp' => 'image/bmp',
			);
			if ($tiff_support) {
			$types['tif'] = 'image/tiff';
			$types['tiff'] = 'image/tiff';
			}
			// Supported image filename extensions to image type map
			$types = array(
			'jpg' => 'image/jpeg',
			'jpeg' => 'image/jpeg',
			'png' => 'image/png',
			'gif' => 'image/gif',
			'bmp' => 'image/bmp',
			);
			if ($tiff_support) {
			$types['tif'] = 'image/tiff';
			$types['tiff'] = 'image/tiff';
			}

			if ($part->filename
			&& preg_match('/^application\/octet-stream$/i', $part->mimetype)
			&& preg_match('/\.([^.]+)$/i', $part->filename, $m)
			&& ($extension = strtolower($m[1]))
			&& isset($types[$extension])
			) {
			return $types[$extension];
			}
			if ($part->filename
			&& preg_match('/^application\/octet-stream$/i', $part->mimetype)
			&& preg_match('/\.([^.]+)$/i', $part->filename, $m)
			&& ($extension = strtolower($m[1]))
			&& isset($types[$extension])
			) {
			return $types[$extension];
			}
			}


			/**
			* modify a HTML message that it can be displayed inside a HTML page
			*/
			function rcmail_html4inline($body, $container_id, $body_id='', &$attributes=null, $allow_remote=false)
			{
			$last_style_pos = 0;
			$cont_id = $container_id.($body_id ? ' div.'.$body_id : '');
			$last_style_pos = 0;
			$cont_id = $container_id.($body_id ? ' div.'.$body_id : '');

			// find STYLE tags
			while (($pos = stripos($body, '<style', $last_style_pos)) && ($pos2 = stripos($body, '</style>', $pos)))
			{
			$pos = strpos($body, '>', $pos) + 1;
			$len = $pos2 - $pos;
			// find STYLE tags
			while (($pos = stripos($body, '<style', $last_style_pos)) && ($pos2 = stripos($body, '</style>', $pos))) {
			$pos = strpos($body, '>', $pos) + 1;
			$len = $pos2 - $pos;

			// replace all css definitions with #container [def]
			$styles = substr($body, $pos, $len);
			$styles = rcmail_mod_css_styles($styles, $cont_id, $allow_remote);
			// replace all css definitions with #container [def]
			$styles = substr($body, $pos, $len);
			$styles = rcube_utils::mod_css_styles($styles, $cont_id, $allow_remote);

			$body = substr_replace($body, $styles, $pos, $len);
			$last_style_pos = $pos2 + strlen($styles) - $len;
			}

			// modify HTML links to open a new window if clicked
			$GLOBALS['rcmail_html_container_id'] = $container_id;
			$body = preg_replace_callback('/<(a\|link\|area)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body);
			unset($GLOBALS['rcmail_html_container_id']);

			$body = preg_replace(array(
			// add comments arround html and other tags
			'/(<!DOCTYPE[^>]*>)/i',
			'/(<\?xml[^>]*>)/i',
			'/(<\/?html[^>]*>)/i',
			'/(<\/?head[^>]*>)/i',
			'/(<title[^>]>.<\/title>)/Ui',
			'/(<\/?meta[^>]*>)/i',
			// quote <? of php and xml files that are specified as text/html
			'/<\?/',
			'/\?>/',
			// replace <body> with <div>
			'/<body([^>]*)>/i',
			'/<\/body>/i',
			),
			array(
			'<!--\\1-->',
			'<!--\\1-->',
			'<!--\\1-->',
			'<!--\\1-->',
			'<!--\\1-->',
			'<!--\\1-->',
			'<?',
			'?>',
			'<div class="'.$body_id.'"\\1>',
			'</div>',
			),
			$body);

			$attributes = array();

			// Handle body attributes that doesn't play nicely with div elements
			$regexp = '/<div class="' . preg_quote($body_id, '/') . '"([^>]*)/';
			if (preg_match($regexp, $body, $m)) {
			$attrs = $m[0];
			// Get bgcolor, we'll set it as background-color of the message container
			if ($m[1] && preg_match('/bgcolor=["\']([a-z0-9#]+)["\']/', $attrs, $mb)) {
			$attributes['background-color'] = $mb[1];
			$attrs = preg_replace('/bgcolor=["\']([a-z0-9#]+)["\']/', '', $attrs);
			}
			// Get background, we'll set it as background-image of the message container
			if ($m[1] && preg_match('/background=["\']([^"\'>\s]+)["\']/', $attrs, $mb)) {
			$attributes['background-image'] = 'url('.$mb[1].')';
			$attrs = preg_replace('/background=["\']([^"\'>\s]+)["\']/', '', $attrs);
			}
			if (!empty($attributes)) {
			$body = preg_replace($regexp, rtrim($attrs), $body, 1);
			$body = substr_replace($body, $styles, $pos, $len);
			$last_style_pos = $pos2 + strlen($styles) - $len;
			}

			// handle body styles related to background image
			if ($attributes['background-image']) {
			// get body style
			if (preg_match('/#'.preg_quote($cont_id, '/').'\s+\{([^}]+)}/i', $body, $m)) {
			// get background related style
			if (preg_match_all('/(background-position\|background-repeat)\s:\s([^;]+);/i', $m[1], $ma, PREG_SET_ORDER)) {
			foreach ($ma as $style)
			$attributes[$style[1]] = $style[2];
			// modify HTML links to open a new window if clicked
			$GLOBALS['rcmail_html_container_id'] = $container_id;
			$body = preg_replace_callback('/<(a\|link\|area)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body);
			unset($GLOBALS['rcmail_html_container_id']);

			$body = preg_replace(array(
			// add comments arround html and other tags
			'/(<!DOCTYPE[^>]*>)/i',
			'/(<\?xml[^>]*>)/i',
			'/(<\/?html[^>]*>)/i',
			'/(<\/?head[^>]*>)/i',
			'/(<title[^>]>.<\/title>)/Ui',
			'/(<\/?meta[^>]*>)/i',
			// quote <? of php and xml files that are specified as text/html
			'/<\?/',
			'/\?>/',
			// replace <body> with <div>
			'/<body([^>]*)>/i',
			'/<\/body>/i',
			),
			array(
			'<!--\\1-->',
			'<!--\\1-->',
			'<!--\\1-->',
			'<!--\\1-->',
			'<!--\\1-->',
			'<!--\\1-->',
			'<?',
			'?>',
			'<div class="'.$body_id.'"\\1>',
			'</div>',
			),
			$body);

			$attributes = array();

			// Handle body attributes that doesn't play nicely with div elements
			$regexp = '/<div class="' . preg_quote($body_id, '/') . '"([^>]*)/';
			if (preg_match($regexp, $body, $m)) {
			$attrs = $m[0];

			// Get bgcolor, we'll set it as background-color of the message container
			if ($m[1] && preg_match('/bgcolor=["\']([a-z0-9#]+)["\']/i', $attrs, $mb)) {
			$attributes['background-color'] = $mb[1];
			$attrs = preg_replace('/bgcolor=["\'][a-z0-9#]+["\']/i', '', $attrs);
			}
			}

			// Get background, we'll set it as background-image of the message container
			if ($m[1] && preg_match('/background=["\']([^"\'>\s]+)["\']/', $attrs, $mb)) {
			$attributes['background-image'] = 'url('.$mb[1].')';
			$attrs = preg_replace('/background=["\']([^"\'>\s]+)["\']/', '', $attrs);
			}

			if (!empty($attributes)) {
			$body = preg_replace($regexp, rtrim($attrs), $body, 1);
			}

			// handle body styles related to background image
			if ($attributes['background-image']) {
			// get body style
			if (preg_match('/#'.preg_quote($cont_id, '/').'\s+\{([^}]+)}/i', $body, $m)) {
			// get background related style
			$regexp = '/(background-position\|background-repeat)\s:\s([^;]+);/i';
			if (preg_match_all($regexp, $m[1], $ma, PREG_SET_ORDER)) {
			foreach ($ma as $style) {
			$attributes[$style[1]] = $style[2];
			}
			}
			}
			}
			}
			}
			// make sure there's 'rcmBody' div, we need it for proper css modification
			// its name is hardcoded in rcmail_message_body() also
			else {
			$body = '<div class="' . $body_id . '">' . $body . '</div>';
			}
			// make sure there's 'rcmBody' div, we need it for proper css modification
			// its name is hardcoded in rcmail_message_body() also
			else {
			$body = '<div class="' . $body_id . '">' . $body . '</div>';
			}

			return $body;
			return $body;
			}


			/**
			* parse link (a, link, area) attributes and set correct target
			*/
			function rcmail_alter_html_link($matches)
			{
			global $RCMAIL;
			global $RCMAIL;

			// Support unicode/punycode in top-level domain part
			$EMAIL_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]@[^&@"\'.][^@&"\']\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}\|xn--[a-z0-9]{2,}))';
			$tag = strtolower($matches[1]);
			$attrib = html::parse_attrib_string($matches[2]);
			$end = '>';

			$tag = strtolower($matches[1]);
			$attrib = parse_attrib_string($matches[2]);
			$end = '>';
			// Remove non-printable characters in URL (#1487805)
			if ($attrib['href'])
			$attrib['href'] = preg_replace('/[\x00-\x1F]/', '', $attrib['href']);

			// Remove non-printable characters in URL (#1487805)
			if ($attrib['href'])
			$attrib['href'] = preg_replace('/[\x00-\x1F]/', '', $attrib['href']);
			if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
			$tempurl = 'tmp-' . md5($attrib['href']) . '.css';
			$_SESSION['modcssurls'][$tempurl] = $attrib['href'];
			$attrib['href'] = $RCMAIL->url(array('task' => 'utils', 'action' => 'modcss', 'u' => $tempurl, 'c' => $GLOBALS['rcmail_html_container_id']));
			$end = ' />';
			}
			else if (preg_match('/^mailto:(.+)/i', $attrib['href'], $mailto)) {
			list($mailto, $url) = explode('?', html_entity_decode($mailto[1], ENT_QUOTES, 'UTF-8'), 2);

			if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
			$tempurl = 'tmp-' . md5($attrib['href']) . '.css';
			$_SESSION['modcssurls'][$tempurl] = $attrib['href'];
			$attrib['href'] = $RCMAIL->url(array('task' => 'utils', 'action' => 'modcss', 'u' => $tempurl, 'c' => $GLOBALS['rcmail_html_container_id']));
			$end = ' />';
			}
			else if (preg_match('/^mailto:'.$EMAIL_PATTERN.'(\?[^"\'>]+)?/i', $attrib['href'], $mailto)) {
			$attrib['href'] = $mailto[0];
			$attrib['onclick'] = sprintf(
			"return %s.command('compose','%s',this)",
			JS_OBJECT_NAME,
			JQ($mailto[1].$mailto[3]));
			}
			else if (empty($attrib['href']) && !$attrib['name']) {
			$attrib['href'] = './#NOP';
			$attrib['onclick'] = 'return false';
			}
			else if (!empty($attrib['href']) && $attrib['href'][0] != '#') {
			$attrib['target'] = '_blank';
			}
			$url = urldecode($url);
			$mailto = urldecode($mailto);
			$addresses = rcube_mime::decode_address_list($mailto, null, true);
			$mailto = array();

			// Better security by adding rel="noreferrer" (#1484686)
			if (($tag == 'a' \|\| $tag == 'area') && $attrib['href'] && $attrib['href'][0] != '#') {
			$attrib['rel'] = 'noreferrer';
			}
			// do sanity checks on recipients
			foreach ($addresses as $idx => $addr) {
			if (rcube_utils::check_email($addr['mailto'], false)) {
			$addresses[$idx] = $addr['mailto'];
			$mailto[] = $addr['string'];
			}
			else {
			unset($addresses[$idx]);
			}
			}

			// allowed attributes for a\|link\|area tags
			$allow = array('href','name','target','onclick','id','class','style','title',
			'rel','type','media','alt','coords','nohref','hreflang','shape');
			if (!empty($addresses)) {
			$attrib['href'] = 'mailto:' . implode(',', $addresses);
			$attrib['onclick'] = sprintf(
			"return %s.command('compose','%s',this)",
			rcmail_output::JS_OBJECT_NAME,
			rcube::JQ(implode(',', $mailto) . ($url ? "?$url" : '')));
			}
			else {
			$attrib['href'] = '#NOP';
			$attrib['onclick'] = '';
			}
			}
			else if (empty($attrib['href']) && !$attrib['name']) {
			$attrib['href'] = './#NOP';
			$attrib['onclick'] = 'return false';
			}
			else if (!empty($attrib['href']) && $attrib['href'][0] != '#') {
			$attrib['target'] = '_blank';
			}

			return "<$tag" . html::attrib_string($attrib, $allow) . $end;
			// Better security by adding rel="noreferrer" (#1484686)
			if (($tag == 'a' \|\| $tag == 'area') && $attrib['href'] && $attrib['href'][0] != '#') {
			$attrib['rel'] = 'noreferrer';
			}

			// allowed attributes for a\|link\|area tags
			$allow = array('href','name','target','onclick','id','class','style','title',
			'rel','type','media','alt','coords','nohref','hreflang','shape');

			return "<$tag" . html::attrib_string($attrib, $allow) . $end;
			}


			/**
			* decode address string and re-format it as HTML links
			*/
			function rcmail_address_string($input, $max=null, $linked=false, $addicon=null, $default_charset=null, $title=null)
			{
			global $RCMAIL, $PRINT_MODE, $CONFIG;
			global $RCMAIL, $PRINT_MODE;

			$a_parts = rcube_mime::decode_address_list($input, null, true, $default_charset);
			$a_parts = rcube_mime::decode_address_list($input, null, true, $default_charset);

			if (!sizeof($a_parts))
			return $input;

			$c = count($a_parts);
			$j = 0;
			$out = '';
			$allvalues = array();
			$show_email = $RCMAIL->config->get('message_show_email');

			if ($addicon && !isset($_SESSION['writeable_abook'])) {
			$_SESSION['writeable_abook'] = $RCMAIL->get_address_sources(true) ? true : false;
			}

			foreach ($a_parts as $part) {
			$j++;
			$name = $part['name'];
			$mailto = $part['mailto'];
			$string = $part['string'];
			$valid = check_email($mailto, false);

			// phishing email prevention (#1488981), e.g. "valid@email.addr <phishing@email.addr>"
			if (!$show_email && $valid && $name && $name != $mailto && strpos($name, '@')) {
			$name = '';
			if (!sizeof($a_parts)) {
			return $input;
			}

			// IDNA ASCII to Unicode
			if ($name == $mailto)
			$name = rcube_idn_to_utf8($name);
			if ($string == $mailto)
			$string = rcube_idn_to_utf8($string);
			$mailto = rcube_idn_to_utf8($mailto);
			$c = count($a_parts);
			$j = 0;
			$out = '';
			$allvalues = array();
			$show_email = $RCMAIL->config->get('message_show_email');

			if ($PRINT_MODE) {
			$out .= ($out ? ', ' : '') . sprintf('%s <%s>', Q($name), $mailto);
			// for printing we display all addresses
			continue;
			if ($addicon && !isset($_SESSION['writeable_abook'])) {
			$_SESSION['writeable_abook'] = $RCMAIL->get_address_sources(true) ? true : false;
			}
			else if ($valid) {
			if ($linked) {
			$attrs = array(
			'href' => 'mailto:' . $mailto,
			'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($mailto)),
			'class' => "rcmContactAddress",
			);

			if ($show_email && $name && $mailto) {
			$content = Q($name ? sprintf('%s <%s>', $name, $mailto) : $mailto);
			foreach ($a_parts as $part) {
			$j++;

			$name = $part['name'];
			$mailto = $part['mailto'];
			$string = $part['string'];
			$valid = rcube_utils::check_email($mailto, false);

			// phishing email prevention (#1488981), e.g. "valid@email.addr <phishing@email.addr>"
			if (!$show_email && $valid && $name && $name != $mailto && strpos($name, '@')) {
			$name = '';
			}

			// IDNA ASCII to Unicode
			if ($name == $mailto)
			$name = rcube_utils::idn_to_utf8($name);
			if ($string == $mailto)
			$string = rcube_utils::idn_to_utf8($string);
			$mailto = rcube_utils::idn_to_utf8($mailto);

			if ($PRINT_MODE) {
			$address = sprintf('%s <%s>', rcube::Q($name), rcube::Q($mailto));
			}
			else if ($valid) {
			if ($linked) {
			$attrs = array(
			'href' => 'mailto:' . $mailto,
			'class' => 'rcmContactAddress',
			'onclick' => sprintf("return %s.command('compose','%s',this)",
			rcmail_output::JS_OBJECT_NAME, rcube::JQ(format_email_recipient($mailto, $name))),
			);

			if ($show_email && $name && $mailto) {
			$content = rcube::Q($name ? sprintf('%s <%s>', $name, $mailto) : $mailto);
			}
			else {
			$content = rcube::Q($name ? $name : $mailto);
			$attrs['title'] = $mailto;
			}

			$address = html::a($attrs, $content);
			}
			else {
			$address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
			rcube::Q($name ? $name : $mailto));
			}

			if ($addicon && $_SESSION['writeable_abook']) {
			$address .= html::a(array(
			'href' => "#add",
			'title' => $RCMAIL->gettext('addtoaddressbook'),
			'class' => 'rcmaddcontact',
			'onclick' => sprintf("return %s.command('add-contact','%s',this)",
			rcmail_output::JS_OBJECT_NAME, rcube::JQ($string)),
			),
			html::img(array(
			'src' => $RCMAIL->config->get('skin_path') . $addicon,
			'alt' => "Add contact",
			)));
			}
			}
			else {
			$content = Q($name ? $name : $mailto);
			$attrs['title'] = $mailto;
			$address = '';
			if ($name)
			$address .= rcube::Q($name);
			if ($mailto)
			$address = trim($address . ' ' . rcube::Q($name ? sprintf('<%s>', $mailto) : $mailto));
			}

			$address = html::a($attrs, $content);
			}
			else {
			$address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
			Q($name ? $name : $mailto));
			}
			$address = html::span('adr', $address);
			$allvalues[] = $address;

			if ($addicon && $_SESSION['writeable_abook']) {
			$address .= html::a(array(
			'href' => "#add",
			'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, JQ($string)),
			'title' => rcube_label('addtoaddressbook'),
			'class' => 'rcmaddcontact',
			),
			html::img(array(
			'src' => $CONFIG['skin_path'] . $addicon,
			'alt' => "Add contact",
			)));
			}
			}
			else {
			$address = '';
			if ($name)
			$address .= Q($name);
			if ($mailto)
			$address = trim($address . ' ' . Q($name ? sprintf('<%s>', $mailto) : $mailto));
			if (!$moreadrs)
			$out .= ($out ? ', ' : '') . $address;

			if ($max && $j == $max && $c > $j) {
			if ($linked) {
			$moreadrs = $c - $j;
			}
			else {
			$out .= '...';
			break;
			}
			}
			}

			$address = html::span('adr', $address);
			$allvalues[] = $address;

			if (!$moreadrs)
			$out .= ($out ? ', ' : '') . $address;

			if ($max && $j == $max && $c > $j) {
			if ($linked) {
			$moreadrs = $c - $j;
			}
			else {
			$out .= '...';
			break;
			}
			if ($moreadrs) {
			if ($PRINT_MODE) {
			$out .= ' ' . html::a(array(
			'href' => '#more',
			'class' => 'morelink',
			'onclick' => '$(this).hide().next().show()',
			),
			rcube::Q($RCMAIL->gettext(array('name' => 'andnmore', 'vars' => array('nr' => $moreadrs)))))
			. html::span(array('style' => 'display:none'), join(', ', $allvalues));
			}
			else {
			$out .= ' ' . html::a(array(
			'href' => '#more',
			'class' => 'morelink',
			'onclick' => sprintf("return %s.show_popup_dialog('%s','%s')",
			rcmail_output::JS_OBJECT_NAME,
			rcube::JQ(join(', ', $allvalues)),
			rcube::JQ($title))
			),
			rcube::Q($RCMAIL->gettext(array('name' => 'andnmore', 'vars' => array('nr' => $moreadrs)))));
			}
			}
			}

			if ($moreadrs) {
			$out .= ' ' . html::a(array(
			'href' => '#more',
			'class' => 'morelink',
			'onclick' => sprintf("return %s.show_popup_dialog('%s','%s')",
			JS_OBJECT_NAME,
			JQ(join(', ', $allvalues)),
			JQ($title))
			),
			Q(rcube_label(array('name' => 'andnmore', 'vars' => array('nr' => $moreadrs)))));
			}

			return $out;
			return $out;
			}


			/**
			* Wrap text to a given number of characters per line
			@@ -1561,73 +1706,82 @@
			*/
			function rcmail_wrap_and_quote($text, $length = 72)
			{
			// Rebuild the message body with a maximum of $max chars, while keeping quoted message.
			$max = max(75, $length + 8);
			$lines = preg_split('/\r?\n/', trim($text));
			$out = '';
			// Rebuild the message body with a maximum of $max chars, while keeping quoted message.
			$max = max(75, $length + 8);
			$lines = preg_split('/\r?\n/', trim($text));
			$out = '';

			foreach ($lines as $line) {
			// don't wrap already quoted lines
			if ($line[0] == '>')
			$line = '>' . rtrim($line);
			else if (mb_strlen($line) > $max) {
			$newline = '';
			foreach (explode("\n", rc_wordwrap($line, $length - 2)) as $l) {
			if (strlen($l))
			$newline .= '> ' . $l . "\n";
			else
			$newline .= ">\n";
			}
			$line = rtrim($newline);
			foreach ($lines as $line) {
			// don't wrap already quoted lines
			if ($line[0] == '>') {
			$line = '>' . rtrim($line);
			}
			else if (mb_strlen($line) > $max) {
			$newline = '';

			foreach (explode("\n", rcube_mime::wordwrap($line, $length - 2)) as $l) {
			if (strlen($l))
			$newline .= '> ' . $l . "\n";
			else
			$newline .= ">\n";
			}

			$line = rtrim($newline);
			}
			else {
			$line = '> ' . $line;
			}

			// Append the line
			$out .= $line . "\n";
			}
			else
			$line = '> ' . $line;

			// Append the line
			$out .= $line . "\n";
			}

			return rtrim($out, "\n");
			return rtrim($out, "\n");
			}


			function rcmail_draftinfo_encode($p)
			{
			$parts = array();
			foreach ($p as $key => $val)
			$parts[] = $key . '=' . ($key == 'folder' ? base64_encode($val) : $val);
			$parts = array();
			foreach ($p as $key => $val) {
			$encode = $key == 'folder' \|\| strpos($val, ';') !== false;
			$parts[] = $key . '=' . ($encode ? 'B::' . base64_encode($val) : $val);
			}

			return join('; ', $parts);
			return join('; ', $parts);
			}


			function rcmail_draftinfo_decode($str)
			{
			$info = array();
			foreach (preg_split('/;\s+/', $str) as $part) {
			list($key, $val) = explode('=', $part, 2);
			if ($key == 'folder')
			$val = base64_decode($val);
			$info[$key] = $val;
			}
			$info = array();

			return $info;
			foreach (preg_split('/;\s+/', $str) as $part) {
			list($key, $val) = explode('=', $part, 2);
			if (strpos($val, 'B::') === 0) {
			$val = base64_decode(substr($val, 3));
			}
			else if ($key == 'folder') {
			$val = base64_decode($val);
			}

			$info[$key] = $val;
			}

			return $info;
			}


			/**
			* clear message composing settings
			*/
			function rcmail_compose_cleanup($id)
			{
			if (!isset($_SESSION['compose_data_'.$id]))
			return;
			if (!isset($_SESSION['compose_data_'.$id])) {
			return;
			}

			$rcmail = rcmail::get_instance();
			$rcmail->plugins->exec_hook('attachments_cleanup', array('group' => $id));
			$rcmail->session->remove('compose_data_'.$id);
			$rcmail = rcmail::get_instance();
			$rcmail->plugins->exec_hook('attachments_cleanup', array('group' => $id));
			$rcmail->session->remove('compose_data_'.$id);
			}


			/**
			* Send the MDN response
			@@ -1639,76 +1793,78 @@
			*/
			function rcmail_send_mdn($message, &$smtp_error)
			{
			global $RCMAIL;
			global $RCMAIL;

			if (!is_object($message) \|\| !is_a($message, 'rcube_message'))
			$message = new rcube_message($message);

			if ($message->headers->mdn_to && empty($message->headers->flags['MDNSENT']) &&
			($RCMAIL->storage->check_permflag('MDNSENT') \|\| $RCMAIL->storage->check_permflag('*')))
			{
			$identity = rcmail_identity_select($message);
			$sender = format_email_recipient($identity['email'], $identity['name']);
			$recipient = array_shift(rcube_mime::decode_address_list(
			$message->headers->mdn_to, 1, true, $message->headers->charset));
			$mailto = $recipient['mailto'];

			$compose = new Mail_mime("\r\n");

			$compose->setParam('text_encoding', 'quoted-printable');
			$compose->setParam('html_encoding', 'quoted-printable');
			$compose->setParam('head_encoding', 'quoted-printable');
			$compose->setParam('head_charset', RCMAIL_CHARSET);
			$compose->setParam('html_charset', RCMAIL_CHARSET);
			$compose->setParam('text_charset', RCMAIL_CHARSET);

			// compose headers array
			$headers = array(
			'Date' => rcmail_user_date(),
			'From' => $sender,
			'To' => $message->headers->mdn_to,
			'Subject' => rcube_label('receiptread') . ': ' . $message->subject,
			'Message-ID' => rcmail_gen_message_id(),
			'X-Sender' => $identity['email'],
			'References' => trim($message->headers->references . ' ' . $message->headers->messageID),
			);

			if ($agent = $RCMAIL->config->get('useragent'))
			$headers['User-Agent'] = $agent;

			if ($RCMAIL->config->get('mdn_use_from'))
			$options['mdn_use_from'] = true;

			$body = rcube_label("yourmessage") . "\r\n\r\n" .
			"\t" . rcube_label("to") . ': ' . rcube_mime::decode_mime_string($message->headers->to, $message->headers->charset) . "\r\n" .
			"\t" . rcube_label("subject") . ': ' . $message->subject . "\r\n" .
			"\t" . rcube_label("sent") . ': ' . format_date($message->headers->date, $RCMAIL->config->get('date_long')) . "\r\n" .
			"\r\n" . rcube_label("receiptnote") . "\r\n";

			$ua = $RCMAIL->config->get('useragent', "Roundcube Webmail (Version ".RCMAIL_VERSION.")");
			$report = "Reporting-UA: $ua\r\n";

			if ($message->headers->to)
			$report .= "Original-Recipient: {$message->headers->to}\r\n";

			$report .= "Final-Recipient: rfc822; {$identity['email']}\r\n" .
			"Original-Message-ID: {$message->headers->messageID}\r\n" .
			"Disposition: manual-action/MDN-sent-manually; displayed\r\n";

			$compose->headers($headers);
			$compose->setContentType('multipart/report', array('report-type'=> 'disposition-notification'));
			$compose->setTXTBody(rc_wordwrap($body, 75, "\r\n"));
			$compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline');

			$sent = rcmail_deliver_message($compose, $identity['email'], $mailto, $smtp_error, $body_file, $options);

			if ($sent) {
			$RCMAIL->storage->set_flag($message->uid, 'MDNSENT');
			return true;
			if (!is_object($message) \|\| !is_a($message, 'rcube_message')) {
			$message = new rcube_message($message);
			}
			}

			return false;
			if ($message->headers->mdn_to && empty($message->headers->flags['MDNSENT']) &&
			($RCMAIL->storage->check_permflag('MDNSENT') \|\| $RCMAIL->storage->check_permflag('*'))
			) {
			$identity = rcmail_identity_select($message);
			$sender = format_email_recipient($identity['email'], $identity['name']);
			$recipient = array_shift(rcube_mime::decode_address_list(
			$message->headers->mdn_to, 1, true, $message->headers->charset));
			$mailto = $recipient['mailto'];

			$compose = new Mail_mime("\r\n");

			$compose->setParam('text_encoding', 'quoted-printable');
			$compose->setParam('html_encoding', 'quoted-printable');
			$compose->setParam('head_encoding', 'quoted-printable');
			$compose->setParam('head_charset', RCUBE_CHARSET);
			$compose->setParam('html_charset', RCUBE_CHARSET);
			$compose->setParam('text_charset', RCUBE_CHARSET);

			// compose headers array
			$headers = array(
			'Date' => $RCMAIL->user_date(),
			'From' => $sender,
			'To' => $message->headers->mdn_to,
			'Subject' => $RCMAIL->gettext('receiptread') . ': ' . $message->subject,
			'Message-ID' => $RCMAIL->gen_message_id(),
			'X-Sender' => $identity['email'],
			'References' => trim($message->headers->references . ' ' . $message->headers->messageID),
			);

			$report = "Final-Recipient: rfc822; {$identity['email']}\r\n"
			. "Original-Message-ID: {$message->headers->messageID}\r\n"
			. "Disposition: manual-action/MDN-sent-manually; displayed\r\n";

			if ($message->headers->to) {
			$report .= "Original-Recipient: {$message->headers->to}\r\n";
			}

			if ($agent = $RCMAIL->config->get('useragent')) {
			$headers['User-Agent'] = $agent;
			$report .= "Reporting-UA: $agent\r\n";
			}

			$body = $RCMAIL->gettext("yourmessage") . "\r\n\r\n" .
			"\t" . $RCMAIL->gettext("to") . ': ' . rcube_mime::decode_mime_string($message->headers->to, $message->headers->charset) . "\r\n" .
			"\t" . $RCMAIL->gettext("subject") . ': ' . $message->subject . "\r\n" .
			"\t" . $RCMAIL->gettext("sent") . ': ' . $RCMAIL->format_date($message->headers->date, $RCMAIL->config->get('date_long')) . "\r\n" .
			"\r\n" . $RCMAIL->gettext("receiptnote");

			$compose->headers($headers);
			$compose->setContentType('multipart/report', array('report-type'=> 'disposition-notification'));
			$compose->setTXTBody(rcube_mime::wordwrap($body, 75, "\r\n"));
			$compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline');

			if ($RCMAIL->config->get('mdn_use_from')) {
			$options['mdn_use_from'] = true;
			}

			$sent = $RCMAIL->deliver_message($compose, $identity['email'], $mailto, $smtp_error, $body_file, $options);

			if ($sent) {
			$RCMAIL->storage->set_flag($message->uid, 'MDNSENT');
			return true;
			}
			}

			return false;
			}

			/**
			@@ -1728,7 +1884,7 @@
			$a_to = rcube_mime::decode_address_list($MESSAGE->headers->to, null, true, $MESSAGE->headers->charset);
			foreach ($a_to as $addr) {
			if (!empty($addr['mailto'])) {
			$a_recipients[] = format_email($addr['mailto']);
			$a_recipients[] = strtolower($addr['mailto']);
			$a_names[] = $addr['name'];
			}
			}
			@@ -1737,35 +1893,41 @@
			$a_cc = rcube_mime::decode_address_list($MESSAGE->headers->cc, null, true, $MESSAGE->headers->charset);
			foreach ($a_cc as $addr) {
			if (!empty($addr['mailto'])) {
			$a_recipients[] = format_email($addr['mailto']);
			$a_recipients[] = strtolower($addr['mailto']);
			$a_names[] = $addr['name'];
			}
			}
			}
			}

			$from_idx = null;
			$found_idx = null;
			$default_identity = 0; // default identity is always first on the list
			// decode From: address
			$from = rcube_mime::decode_address_list($MESSAGE->headers->from, null, true, $MESSAGE->headers->charset);
			$from = array_shift($from);
			$from['mailto'] = strtolower($from['mailto']);

			$from_idx = null;
			$found_idx = array('to' => null, 'from' => null);
			$check_from = in_array($compose_mode, array('draft', 'edit', 'reply'));

			// Select identity
			foreach ($identities as $idx => $ident) {
			// use From header
			if (in_array($compose_mode, array('draft', 'edit'))) {
			if ($MESSAGE->headers->from == $ident['ident']) {
			// use From: header when in edit/draft or reply-to-self
			if ($check_from && $from['mailto'] == strtolower($ident['email_ascii'])) {
			// remember first matching identity address
			if ($found_idx['from'] === null) {
			$found_idx['from'] = $idx;
			}
			// match identity name
			if ($from['name'] && $ident['name'] && $from['name'] == $ident['name']) {
			$from_idx = $idx;
			break;
			}
			}
			// reply to yourself
			else if ($compose_mode == 'reply' && $MESSAGE->headers->from == $ident['ident']) {
			$from_idx = $idx;
			break;
			}
			// use replied message recipients
			else if (($found = array_search($ident['email_ascii'], $a_recipients)) !== false) {
			if ($found_idx === null) {
			$found_idx = $idx;
			// use replied/forwarded message recipients
			else if (($found = array_search(strtolower($ident['email_ascii']), $a_recipients)) !== false) {
			// remember first matching identity address
			if ($found_idx['to'] === null) {
			$found_idx['to'] = $idx;
			}
			// match identity name
			if ($a_names[$found] && $ident['name'] && $a_names[$found] == $ident['name']) {
			@@ -1775,16 +1937,27 @@
			}
			}

			// If matching by name+address doesn't found any matches, get first found address (identity)
			// If matching by name+address didn't find any matches,
			// get first found identity (address) if any
			if ($from_idx === null) {
			$from_idx = $found_idx;
			$from_idx = $found_idx['from'] !== null ? $found_idx['from'] : $found_idx['to'];
			}

			// Try Return-Path
			if ($from_idx === null && ($return_path = $MESSAGE->headers->others['return-path'])) {
			$return_path = array_map('strtolower', (array) $return_path);

			foreach ($identities as $idx => $ident) {
			foreach ((array)$return_path as $path) {
			if (stripos($path, $ident['email_ascii']) !== false) {
			// Return-Path header contains an email address, but on some mailing list
			// it can be e.g. <pear-dev-return-55250-local=domain.tld@lists.php.net>
			// where local@domain.tld is the address we're looking for (#1489241)
			$ident1 = strtolower($ident['email_ascii']);
			$ident2 = str_replace('@', '=', $ident1);
			$ident1 = '<' . $ident1 . '>';
			$ident2 = '-' . $ident2 . '@';

			foreach ($return_path as $path) {
			if ($path == $ident1 \|\| stripos($path, $ident2)) {
			$from_idx = $idx;
			break 2;
			}
			@@ -1792,56 +1965,47 @@
			}
			}

			// Fallback using Delivered-To
			if ($from_idx === null && ($delivered_to = $MESSAGE->headers->others['delivered-to'])) {
			foreach ($identities as $idx => $ident) {
			if (in_array($ident['email_ascii'], (array)$delivered_to)) {
			$from_idx = $idx;
			break;
			}
			}
			}
			// See identity_select plugin for example usage of this hook
			$plugin = rcmail::get_instance()->plugins->exec_hook('identity_select',
			array('message' => $MESSAGE, 'identities' => $identities, 'selected' => $from_idx));

			// Fallback using Envelope-To
			if ($from_idx === null && ($envelope_to = $MESSAGE->headers->others['envelope-to'])) {
			foreach ($identities as $idx => $ident) {
			if (in_array($ident['email_ascii'], (array)$envelope_to)) {
			$from_idx = $idx;
			break;
			}
			}
			}
			$selected = $plugin['selected'];

			return $identities[$from_idx !== null ? $from_idx : $default_identity];
			// default identity is always first on the list
			return $identities[$selected !== null ? $selected : 0];
			}

			// Fixes some content-type names
			function rcmail_fix_mimetype($name)
			{
			// Some versions of Outlook create garbage Content-Type:
			// application/pdf.A520491B_3BF7_494D_8855_7FAC2C6C0608
			if (preg_match('/^application\/pdf.+/', $name))
			$name = 'application/pdf';
			// treat image/pjpeg (image/pjpg, image/jpg) as image/jpeg (#1489097)
			else if (preg_match('/^image\/p?jpe?g$/', $name))
			$name = 'image/jpeg';
			// Some versions of Outlook create garbage Content-Type:
			// application/pdf.A520491B_3BF7_494D_8855_7FAC2C6C0608
			if (preg_match('/^application\/pdf.+/', $name)) {
			$name = 'application/pdf';
			}
			// treat image/pjpeg (image/pjpg, image/jpg) as image/jpeg (#1489097)
			else if (preg_match('/^image\/p?jpe?g$/', $name)) {
			$name = 'image/jpeg';
			}

			return $name;
			return $name;
			}

			// return attachment filename, handle empty filename case
			function rcmail_attachment_name($attachment, $display = false)
			{
			global $RCMAIL;

			$filename = $attachment->filename;

			if ($filename === null \|\| $filename === '') {
			if ($attachment->mimetype == 'text/html') {
			$filename = rcube_label('htmlmessage');
			$filename = $RCMAIL->gettext('htmlmessage');
			}
			else {
			$ext = (array) rcube_mime::get_mime_extensions($attachment->mimetype);
			$ext = array_shift($ext);
			$filename = rcube_label('messagepart') . ' ' . $attachment->mime_id;
			$filename = $RCMAIL->gettext('messagepart') . ' ' . $attachment->mime_id;
			if ($ext) {
			$filename .= '.' . $ext;
			}
			@@ -1853,7 +2017,7 @@
			// Display smart names for some known mimetypes
			if ($display) {
			if (preg_match('/application\/(pgp\|pkcs7)-signature/i', $attachment->mimetype)) {
			$filename = rcube_label('digitalsig');
			$filename = $RCMAIL->gettext('digitalsig');
			}
			}

			@@ -1862,93 +2026,156 @@

			function rcmail_search_filter($attrib)
			{
			global $OUTPUT, $CONFIG;
			global $RCMAIL;

			if (!strlen($attrib['id']))
			$attrib['id'] = 'rcmlistfilter';
			if (!strlen($attrib['id']))
			$attrib['id'] = 'rcmlistfilter';

			$attrib['onchange'] = JS_OBJECT_NAME.'.filter_mailbox(this.value)';
			$attrib['onchange'] = rcmail_output::JS_OBJECT_NAME.'.filter_mailbox(this.value)';

			// Content-Type values of messages with attachments
			// the same as in app.js:add_message_row()
			$ctypes = array('application/', 'multipart/m', 'multipart/signed', 'multipart/report');
			// Content-Type values of messages with attachments
			// the same as in app.js:add_message_row()
			$ctypes = array('application/', 'multipart/m', 'multipart/signed', 'multipart/report');

			// Build search string of "with attachment" filter
			$attachment = str_repeat(' OR', count($ctypes)-1);
			foreach ($ctypes as $type) {
			$attachment .= ' HEADER Content-Type ' . rcube_imap_generic::escape($type);
			}
			// Build search string of "with attachment" filter
			$attachment = trim(str_repeat(' OR', count($ctypes)-1));
			foreach ($ctypes as $type) {
			$attachment .= ' HEADER Content-Type ' . rcube_imap_generic::escape($type);
			}

			$select_filter = new html_select($attrib);
			$select_filter->add(rcube_label('all'), 'ALL');
			$select_filter->add(rcube_label('unread'), 'UNSEEN');
			$select_filter->add(rcube_label('flagged'), 'FLAGGED');
			$select_filter->add(rcube_label('unanswered'), 'UNANSWERED');
			if (!$CONFIG['skip_deleted']) {
			$select_filter->add(rcube_label('deleted'), 'DELETED');
			$select_filter->add(rcube_label('undeleted'), 'UNDELETED');
			}
			$select_filter->add(rcube_label('withattachment'), $attachment);
			$select_filter->add(rcube_label('priority').': '.rcube_label('highest'), 'HEADER X-PRIORITY 1');
			$select_filter->add(rcube_label('priority').': '.rcube_label('high'), 'HEADER X-PRIORITY 2');
			$select_filter->add(rcube_label('priority').': '.rcube_label('normal'), 'NOT HEADER X-PRIORITY 1 NOT HEADER X-PRIORITY 2 NOT HEADER X-PRIORITY 4 NOT HEADER X-PRIORITY 5');
			$select_filter->add(rcube_label('priority').': '.rcube_label('low'), 'HEADER X-PRIORITY 4');
			$select_filter->add(rcube_label('priority').': '.rcube_label('lowest'), 'HEADER X-PRIORITY 5');
			$select_filter = new html_select($attrib);
			$select_filter->add($RCMAIL->gettext('all'), 'ALL');
			$select_filter->add($RCMAIL->gettext('unread'), 'UNSEEN');
			$select_filter->add($RCMAIL->gettext('flagged'), 'FLAGGED');
			$select_filter->add($RCMAIL->gettext('unanswered'), 'UNANSWERED');
			if (!$RCMAIL->config->get('skip_deleted')) {
			$select_filter->add($RCMAIL->gettext('deleted'), 'DELETED');
			$select_filter->add($RCMAIL->gettext('undeleted'), 'UNDELETED');
			}
			$select_filter->add($RCMAIL->gettext('withattachment'), $attachment);
			$select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('highest'), 'HEADER X-PRIORITY 1');
			$select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('high'), 'HEADER X-PRIORITY 2');
			$select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('normal'), 'NOT HEADER X-PRIORITY 1 NOT HEADER X-PRIORITY 2 NOT HEADER X-PRIORITY 4 NOT HEADER X-PRIORITY 5');
			$select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('low'), 'HEADER X-PRIORITY 4');
			$select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('lowest'), 'HEADER X-PRIORITY 5');

			$out = $select_filter->show($_SESSION['search_filter']);
			$out = $select_filter->show($_SESSION['search_filter']);

			$OUTPUT->add_gui_object('search_filter', $attrib['id']);
			$RCMAIL->output->add_gui_object('search_filter', $attrib['id']);

			return $out;
			return $out;
			}

			function rcmail_message_error($uid=null)
			{
			global $RCMAIL;
			global $RCMAIL;

			// Set env variables for messageerror.html template
			if ($RCMAIL->action == 'show') {
			$mbox_name = $RCMAIL->storage->get_folder();
			$RCMAIL->output->set_env('mailbox', $mbox_name);
			$RCMAIL->output->set_env('uid', null);
			}
			// display error message
			$RCMAIL->output->show_message('messageopenerror', 'error');
			// ... display message error page
			$RCMAIL->output->send('messageerror');
			// Set env variables for messageerror.html template
			if ($RCMAIL->action == 'show') {
			$mbox_name = $RCMAIL->storage->get_folder();

			$RCMAIL->output->set_env('mailbox', $mbox_name);
			$RCMAIL->output->set_env('uid', null);
			}

			// display error message
			$RCMAIL->output->show_message('messageopenerror', 'error');
			// ... display message error page
			$RCMAIL->output->send('messageerror');
			}

			function rcmail_message_import_form($attrib = array())
			{
			global $OUTPUT;
			global $RCMAIL;

			// set defaults
			$attrib += array('id' => 'rcmImportform', 'buttons' => 'yes');
			// set defaults
			$attrib += array('id' => 'rcmImportform', 'buttons' => 'yes');

			// Get filesize, enable upload progress bar
			$max_filesize = rcube_upload_init();
			// Get filesize, enable upload progress bar
			$max_filesize = $RCMAIL->upload_init();

			$button = new html_inputfield(array('type' => 'button'));
			$fileinput = new html_inputfield(array(
			'type' => 'file',
			'name' => '_file[]',
			'size' => $attrib['attachmentfieldsize'],
			'multiple' => 'multiple',
			'accept' => ".eml, .mbox, message/rfc822, text/*",
			));
			$button = new html_inputfield(array('type' => 'button'));
			$fileinput = new html_inputfield(array(
			'type' => 'file',
			'name' => '_file[]',
			'multiple' => 'multiple',
			'accept' => ".eml, .mbox, message/rfc822, text/*",
			));

			$out = html::div($attrib,
			$OUTPUT->form_tag(array('id' => $attrib['id'].'Frm', 'method' => 'post', 'enctype' => 'multipart/form-data'),
			html::tag('input', array('type' => 'hidden', 'name' => '_unlock', 'value' => '')) .
			html::div(null, $fileinput->show()) .
			html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
			(get_boolean($attrib['buttons']) ? html::div('buttons',
			$button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
			$button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('import-messages', this.form)"))
			) : '')
			)
			);
			$content = html::tag('input', array('type' => 'hidden', 'name' => '_unlock', 'value' => ''))
			. html::div(null, $fileinput->show())
			. html::div('hint', $RCMAIL->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))));

			$OUTPUT->add_gui_object('importform', $attrib['id'].'Frm');
			return $out;
			if (rcube_utils::get_boolean($attrib['buttons'])) {
			$content .= html::div('buttons',
			$button->show($RCMAIL->gettext('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()"))
			. ' ' .
			$button->show($RCMAIL->gettext('upload'), array(
			'class' => 'button mainaction',
			'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('import-messages', this.form)"
			)));
			}

			$out = $RCMAIL->output->form_tag(array(
			'id' => $attrib['id'].'Frm',
			'method' => 'post',
			'enctype' => 'multipart/form-data'
			),
			$content);

			$RCMAIL->output->add_gui_object('importform', $attrib['id'].'Frm');
			$RCMAIL->output->add_label('selectimportfile','importwait');

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

			/**
			* Add groups from the given address source to the address book widget
			*/
			function rcmail_compose_contact_groups($abook, $source_id, $search = null, $search_mode = 0)
			{
			global $RCMAIL, $OUTPUT;

			$jsresult = array();
			foreach ($abook->list_groups($search, $search_mode) as $group) {
			$abook->reset();
			$abook->set_group($group['ID']);
			$group_prop = $abook->get_group($group['ID']);

			// group (distribution list) with email address(es)
			if ($group_prop['email']) {
			foreach ((array)$group_prop['email'] as $email) {
			$row_id = 'G'.$group['ID'];
			$jsresult[$row_id] = format_email_recipient($email, $group['name']);
			$OUTPUT->command('add_contact_row', $row_id, array(
			'contactgroup' => html::span(array('title' => $email), rcube::Q($group['name']))), 'group');
			}
			}
			// make virtual groups clickable to list their members
			else if ($group_prop['virtual']) {
			$row_id = 'G'.$group['ID'];
			$OUTPUT->command('add_contact_row', $row_id, array(
			'contactgroup' => html::a(array(
			'href' => '#list',
			'rel' => $group['ID'],
			'title' => $RCMAIL->gettext('listgroup'),
			'onclick' => sprintf("return %s.command('pushgroup',{'source':'%s','id':'%s'},this,event)",
			rcmail_output::JS_OBJECT_NAME, $source_id, $group['ID']),
			), rcube::Q($group['name']) . ' ' . html::span('action', '»'))),
			'group',
			array('ID' => $group['ID'], 'name' => $group['name'], 'virtual' => true));
			}
			// show group with count
			else if (($result = $abook->count()) && $result->count) {
			$row_id = 'E'.$group['ID'];
			$jsresult[$row_id] = $group['name'];
			$OUTPUT->command('add_contact_row', $row_id, array(
			'contactgroup' => rcube::Q($group['name'] . ' (' . intval($result->count) . ')')), 'group');
			}
			}

			$abook->reset();
			$abook->set_group(0);

			return $jsresult;
			}