More CS fixes, replace global $CONFIG usage with $RCMAIL->config->get()

8 files changed, 2229 insertions, 2104 deletions

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 2abec545d..93496eb99 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -121,10 +121,13 @@ $OUTPUT->set_env('mailbox', $RCMAIL->storage->get_folder());
 $OUTPUT->set_env('top_posting', intval($RCMAIL->config->get('reply_mode')) > 0);
 $OUTPUT->set_env('recipients_separator', trim($RCMAIL->config->get('recipients_separator', ',')));
 
+$drafts_mbox     = $RCMAIL->config->get('drafts_mbox');
+$config_show_sig = $RCMAIL->config->get('show_sig', 1);
+
 // add config parameters to client script
-if (!empty($CONFIG['drafts_mbox'])) {
-    $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
-    $OUTPUT->set_env('draft_autosave', $CONFIG['draft_autosave']);
+if (strlen($drafts_mbox)) {
+    $OUTPUT->set_env('drafts_mailbox', $drafts_mbox);
+    $OUTPUT->set_env('draft_autosave', $RCMAIL->config->get('draft_autosave'));
 }
 
 // default font for HTML editor
@@ -142,7 +145,7 @@ if ($font_size = $RCMAIL->config->get('default_font_size')) {
 if ($msg_uid = $COMPOSE['param']['draft_uid']) {
     $compose_mode = RCUBE_COMPOSE_DRAFT;
     $OUTPUT->set_env('draft_id', $msg_uid);
-    $RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
+    $RCMAIL->storage->set_folder($drafts_mbox);
 }
 else if ($msg_uid = $COMPOSE['param']['reply_uid']) {
     $compose_mode = RCUBE_COMPOSE_REPLY;
@@ -159,7 +162,6 @@ else if ($msg_uid = $COMPOSE['param']['uid']) {
 $COMPOSE['mode'] = $compose_mode;
 $OUTPUT->set_env('compose_mode', $compose_mode);
 
-$config_show_sig = $RCMAIL->config->get('show_sig', 1);
 if ($compose_mode == RCUBE_COMPOSE_EDIT || $compose_mode == RCUBE_COMPOSE_DRAFT) {
     // don't add signature in draft/edit mode, we'll also not remove the old-one
     // but only on page display, later we should be able to change identity/sig (#1489229)
@@ -186,7 +188,9 @@ if (!empty($msg_uid) && empty($COMPOSE['as_attachment'])) {
         $RCMAIL->config->set('prefer_html', $_SESSION['msg_formats'][$mbox_name.':'.$msg_uid]);
     }
     else {
-        $prefer_html = $CONFIG['prefer_html'] || $CONFIG['htmleditor'] || $compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT;
+        $prefer_html = $RCMAIL->config->get('prefer_html') || $RCMAIL->config->get('htmleditor')
+            || $compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT;
+
         $RCMAIL->config->set('prefer_html', $prefer_html);
     }
 
@@ -849,7 +853,7 @@ function rcmail_compose_part_body($part, $isHtml = false)
 
 function rcmail_compose_body($attrib)
 {
-    global $RCMAIL, $CONFIG, $OUTPUT, $HTML_MODE, $MESSAGE_BODY;
+    global $RCMAIL, $OUTPUT, $HTML_MODE, $MESSAGE_BODY;
 
     list($form_start, $form_end) = get_form_tags($attrib);
     unset($attrib['form']);
@@ -901,7 +905,7 @@ function rcmail_compose_body($attrib)
     $RCMAIL->html_editor();
 
     // Set language list
-    if (!empty($CONFIG['enable_spellcheck'])) {
+    if ($RCMAIL->config->get('enable_spellcheck')) {
         $engine           = new rcube_spellchecker();
         $dictionary       = (bool) $RCMAIL->config->get('spellcheck_dictionary');
         $spellcheck_langs = $engine->languages();
@@ -1453,20 +1457,21 @@ function rcmail_compose_subject($attrib)
 
 function rcmail_compose_attachment_list($attrib)
 {
-    global $RCMAIL, $OUTPUT, $CONFIG, $COMPOSE;
+    global $RCMAIL, $OUTPUT, $COMPOSE;
 
     // add ID if not given
     if (!$attrib['id'])
         $attrib['id'] = 'rcmAttachmentList';
 
-    $out    = "\n";
-    $jslist = array();
-    $button = '';
+    $out       = "\n";
+    $jslist    = array();
+    $button    = '';
+    $skin_path = $RCMAIL->config->get('skin_path');
 
     if (is_array($COMPOSE['attachments'])) {
         if ($attrib['deleteicon']) {
             $button = html::img(array(
-                'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
+                'src' => $skin_path . $attrib['deleteicon'],
                 'alt' => $RCMAIL->gettext('delete')
             ));
         }
@@ -1503,13 +1508,13 @@ function rcmail_compose_attachment_list($attrib)
     }
 
     if ($attrib['deleteicon'])
-        $COMPOSE['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
+        $COMPOSE['deleteicon'] = $skin_path . $attrib['deleteicon'];
     else if (rcube_utils::get_boolean($attrib['textbuttons']))
         $COMPOSE['textbuttons'] = true;
     if ($attrib['cancelicon'])
-        $OUTPUT->set_env('cancelicon', $CONFIG['skin_path'] . $attrib['cancelicon']);
+        $OUTPUT->set_env('cancelicon', $skin_path . $attrib['cancelicon']);
     if ($attrib['loadingicon'])
-        $OUTPUT->set_env('loadingicon', $CONFIG['skin_path'] . $attrib['loadingicon']);
+        $OUTPUT->set_env('loadingicon', $skin_path . $attrib['loadingicon']);
 
     $OUTPUT->set_env('attachments', $jslist);
     $OUTPUT->add_gui_object('attachmentlist', $attrib['id']);
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 00d66a0d0..0211fabc4 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -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-2013, 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 = 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 (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_col');
 
 // 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,88 +62,91 @@ $RCMAIL->storage->set_threading($a_threading[$_SESSION['mbox']]);
 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']);
 }
 
 // set main env variables, labels and page title
 if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
-  // connect to storage server and trigger error on failure
-  $RCMAIL->storage_connect();
-
-  $mbox_name = $RCMAIL->storage->get_folder();
-
-  if (empty($RCMAIL->action)) {
-    // initialize searching result if search_filter is used
-    if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') {
-      $search_request = md5($mbox_name.$_SESSION['search_filter']);
-
-      $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCUBE_CHARSET, rcmail_sort_column());
-      $_SESSION['search'] = $RCMAIL->storage->get_search_set();
-      $_SESSION['search_request'] = $search_request;
-      $OUTPUT->set_env('search_request', $search_request);
-    }
-
-    $search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);
-    $OUTPUT->set_env('search_mods', $search_mods);
-  }
-
-  $threading = (bool) $RCMAIL->storage->get_threading();
-  $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));
-  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);
-  }
-
-  if ($CONFIG['trash_mbox'])
-    $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
-  if ($CONFIG['drafts_mbox'])
-    $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
-  if ($CONFIG['junk_mbox'])
-    $OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']);
-
-  if (!empty($_SESSION['browser_caps']))
-    $OUTPUT->set_env('browser_capabilities', $_SESSION['browser_caps']);
-
-  if (!$OUTPUT->ajax_call)
-    $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
-      'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
-      'copy', 'move', 'quota', 'replyall', 'replylist', 'importwait');
-
-  $pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true);
-  $pagetitle = str_replace($delimiter, " \xC2\xBB ", $pagetitle);
-
-  $OUTPUT->set_pagetitle($pagetitle);
+    // connect to storage server and trigger error on failure
+    $RCMAIL->storage_connect();
+
+    $mbox_name = $RCMAIL->storage->get_folder();
+
+    if (empty($RCMAIL->action)) {
+        // initialize searching result if search_filter is used
+        if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') {
+            $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCUBE_CHARSET, rcmail_sort_column());
+
+            $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());
+    }
+
+    $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));
+
+    if ($RCMAIL->storage->get_capability('QUOTA')) {
+        $OUTPUT->set_env('quota', true);
+    }
+
+    // set special folders
+    foreach (array('drafts', 'trash', 'junk') as $mbox) {
+        if ($folder = $RCMAIL->config->get($mbox . '_mbox')) {
+            $OUTPUT->set_env($mbox . '_mailbox', $folder);
+        }
+    }
+
+    // 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 (!$OUTPUT->ajax_call) {
+        $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
+            'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
+            'copy', 'move', 'quota', 'replyall', 'replylist', 'importwait');
+    }
+
+    $pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true);
+    $pagetitle = str_replace($delimiter, " \xC2\xBB ", $pagetitle);
+
+    $OUTPUT->set_pagetitle($pagetitle);
 }
 
 // register UI objects
 $OUTPUT->add_handlers(array(
-  'mailboxlist'         => array($RCMAIL, 'folder_list'),
-  'messages'            => 'rcmail_message_list',
-  'messagecountdisplay' => 'rcmail_messagecount_display',
-  'quotadisplay'        => array($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
@@ -164,6 +168,28 @@ $RCMAIL->register_action_map(array(
 
 
 /**
+ * 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
  * or their subfolders, otherwise returns 'from'.
  *
@@ -171,20 +197,20 @@ $RCMAIL->register_action_map(array(
  */
 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)
-    && strtoupper($mbox) != 'INBOX'
-  ) {
-    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';
 }
 
 /**
@@ -196,21 +222,21 @@ function rcmail_message_list_smart_column_name()
  */
 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;
 }
 
 /**
@@ -220,13 +246,13 @@ function rcmail_sort_column()
  */
 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');
 }
 
 /**
@@ -234,390 +260,396 @@ function rcmail_sort_order()
  */
 function rcmail_message_list($attrib)
 {
-  global $CONFIG, $OUTPUT;
-
-  // add some labels to client
-  $OUTPUT->add_label('from', 'to');
-
-  // add id to message list table if not specified
-  if (!strlen($attrib['id']))
-    $attrib['id'] = 'rcubemessagelist';
-
-  // define list of cols to be displayed based on parameter or config
-  if (empty($attrib['columns'])) {
-    $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
-    $OUTPUT->set_env('col_movable', !in_array('list_cols', (array)$CONFIG['dont_override']));
-  }
-  else {
-    $a_show_cols = preg_split('/[\s,;]+/', str_replace(array("'", '"'), '', $attrib['columns']));
-    $attrib['columns'] = $a_show_cols;
-  }
-
-  // save some variables for use in ajax list
-  $_SESSION['list_attrib'] = $attrib;
-  // make sure 'threads' and 'subject' columns are present
-  if (!in_array('subject', $a_show_cols))
-    array_unshift($a_show_cols, 'subject');
-  if (!in_array('threads', $a_show_cols))
-    array_unshift($a_show_cols, 'threads');
-
-  $_SESSION['skin_path'] = $CONFIG['skin_path'];
-
-  // set client env
-  $OUTPUT->add_gui_object('messagelist', $attrib['id']);
-  $OUTPUT->set_env('autoexpand_threads', intval($CONFIG['autoexpand_threads']));
-  $OUTPUT->set_env('sort_col', $_SESSION['sort_col']);
-  $OUTPUT->set_env('sort_order', $_SESSION['sort_order']);
-  $OUTPUT->set_env('messages', array());
-  $OUTPUT->set_env('coltypes', $a_show_cols);
-
-  $OUTPUT->include_script('list.js');
-
-  $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();
-}
+    global $RCMAIL, $OUTPUT;
+
+    // add some labels to client
+    $OUTPUT->add_label('from', 'to');
+
+    // add id to message list table if not specified
+    if (!strlen($attrib['id']))
+        $attrib['id'] = 'rcubemessagelist';
+
+    // define list of cols to be displayed based on parameter or config
+    if (empty($attrib['columns'])) {
+        $list_cols   = $RCMAIL->config->get('list_cols');
+        $a_show_cols = !empty($list_cols) && is_array($list_cols) ? $list_cols : array('subject');
+
+        $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;
+    }
+
+    // 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');
+
+    $_SESSION['skin_path'] = $RCMAIL->config->get('skin_path');
 
+    // 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('coltypes', $a_show_cols);
+
+    $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)
 {
-  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,;]+/', str_replace(array("'", '"'), '', $a_show_cols));
-    $head_replace = true;
-  }
+    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;
+    }
 
-  $mbox = $RCMAIL->storage->get_folder();
+    $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');
+    // 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;
+    $_SESSION['list_attrib']['columns'] = $a_show_cols;
 
-  // Make sure there are no duplicated columns (#1486999)
-  $a_show_cols = array_unique($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));
+    // 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'];
+    $a_show_cols = $plugin['cols'];
+    $a_headers   = $plugin['messages'];
 
-  $thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;
+    $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();
-  }
+    // 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);
+    $OUTPUT->command('set_message_coltypes', $a_show_cols, $thead, $smart_col);
 
-  if (empty($a_headers))
-    return;
+    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]);
-  }
+    // 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;
+    // loop through message headers
+    foreach ($a_headers as $header) {
+        if (empty($header))
+            continue;
 
-    $a_msg_cols = array();
-    $a_msg_flags = array();
+        $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
-        $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'] = $mbox;
-
-    // merge with plugin result (Deprecated, use $header->flags)
-    if (!empty($header->list_flags) && is_array($header->list_flags))
-      $a_msg_flags = array_merge($a_msg_flags, $header->list_flags);
-    if (!empty($header->list_cols) && is_array($header->list_cols))
-      $a_msg_cols = array_merge($a_msg_cols, $header->list_cols);
-
-    $OUTPUT->command('add_message_row',
-      $header->uid,
-      $a_msg_cols,
-      $a_msg_flags,
-      $insert_top);
-  }
-
-  if ($RCMAIL->storage->get_threading()) {
-    $OUTPUT->command('init_threads', (array) $roots, $mbox);
-  }
-}
+        // 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
+                $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']  = $mbox;
+
+        // merge with plugin result (Deprecated, use $header->flags)
+        if (!empty($header->list_flags) && is_array($header->list_flags))
+            $a_msg_flags = array_merge($a_msg_flags, $header->list_flags);
+        if (!empty($header->list_cols) && is_array($header->list_cols))
+            $a_msg_cols = array_merge($a_msg_cols, $header->list_cols);
+
+        $OUTPUT->command('add_message_row',
+            $header->uid,
+            $a_msg_cols,
+            $a_msg_flags,
+            $insert_top);
+    }
+
+    if ($RCMAIL->storage->get_threading()) {
+        $OUTPUT->command('init_threads', (array) $roots, $mbox);
+    }
+}
 
 /*
  * Creates <THEAD> for message list table
  */
 function rcmail_message_list_head($attrib, $a_show_cols)
 {
-  global $RCMAIL;
-
-  $skin_path = $_SESSION['skin_path'];
+    global $RCMAIL;
 
-  // check to see if we have some settings for sorting
-  $sort_col   = $_SESSION['sort_col'];
-  $sort_order = $_SESSION['sort_order'];
+    $skin_path = $_SESSION['skin_path'];
 
-  $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);
+    // check to see if we have some settings for sorting
+    $sort_col   = $_SESSION['sort_col'];
+    $sort_order = $_SESSION['sort_order'];
 
-  $RCMAIL->output->set_env('disabled_sort_col', $disabled_sort);
-  $RCMAIL->output->set_env('disabled_sort_order', $disabled_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);
 
-  // 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');
+    $RCMAIL->output->set_env('disabled_sort_col', $disabled_sort);
+    $RCMAIL->output->set_env('disabled_sort_order', $disabled_order);
 
-  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')));
+    // 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' => $RCMAIL->gettext('listoptions')))
-      );
-  }
-  else
-    $list_menu = '';
-
-  $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">&nbsp;</span>';
-        break;
-      case 'attachment':
-      case 'priority':
-      case 'status':
-        $col_name = '<span class="' . $col .'">&nbsp;</span>';
-        break;
-      case 'threads':
-        $col_name = $list_menu;
-        break;
-      case 'fromto':
-        $col_name = rcube::Q($RCMAIL->gettext($smart_col));
-        break;
-      default:
-        $col_name = rcube::Q($RCMAIL->gettext($col));
+        $a_sort_cols = array('subject', 'date', 'from', 'to', 'fromto', 'size', 'cc');
+
+    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 '.rcmail_output::JS_OBJECT_NAME.".command('sort','".$col."',this)", 'title' => $RCMAIL->gettext('sortby')), $col_name);
-    else if ($col_name[0] != '<')
-      $col_name = '<span class="' . $col .'">' . $col_name . '</span>';
+    $cells = 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) {
+        // get column name
+        switch ($col) {
+        case 'flag':
+            $col_name = '<span class="flagged">&nbsp;</span>';
+            break;
+        case 'attachment':
+        case 'priority':
+        case 'status':
+            $col_name = '<span class="' . $col .'">&nbsp;</span>';
+            break;
+        case 'threads':
+            $col_name = $list_menu;
+            break;
+        case 'fromto':
+            $col_name = rcube::Q($RCMAIL->gettext($smart_col));
+            break;
+        default:
+            $col_name = rcube::Q($RCMAIL->gettext($col));
+        }
 
-  return $cells;
-}
+        // make sort links
+        if (in_array($col, $a_sort_cols)) {
+            $col_name = html::a(array(
+                    'href'    => "./#sort",
+                    'onclick' => 'return '.rcmail_output::JS_OBJECT_NAME.".command('sort','".$col."',this)",
+                    '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);
+    }
+
+    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() : $RCMAIL->gettext('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 = $RCMAIL->gettext('mailboxempty');
-  else
-    $out = $RCMAIL->gettext(array('name' => $RCMAIL->storage->get_threading() ? 'threadsfromto' : 'messagesfromto',
+    if ($max == 0)
+        $out = $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 rcube::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
  *
@@ -625,35 +657,34 @@ function rcmail_get_unseen_count($mbox_name)
  */
 function rcmail_check_safe(&$message)
 {
-  global $RCMAIL;
-
-  if (!$message->is_safe
-    && ($show_images = $RCMAIL->config->get('show_images'))
-    && $message->has_html_part()
-  ) {
-    switch ($show_images) {
-      case 1: // known senders only
-        // get default addressbook, like in addcontact.inc
-        $CONTACTS = $RCMAIL->get_address_book(-1, true);
-
-        if ($CONTACTS) {
-          $result = $CONTACTS->search('email', $message->sender['mailto'], 1, false);
-          if ($result->count) {
-            $message->set_safe(true);
-          }
-        }
+    global $RCMAIL;
 
-        $RCMAIL->plugins->exec_hook('message_check_safe', array('message' => $message));
-        break;
+    if (!$message->is_safe
+        && ($show_images = $RCMAIL->config->get('show_images'))
+        && $message->has_html_part()
+    ) {
+        switch ($show_images) {
+        case 1: // known senders only
+            // get default addressbook, like in addcontact.inc
+            $CONTACTS = $RCMAIL->get_address_book(-1, true);
+
+            if ($CONTACTS) {
+                $result = $CONTACTS->search('email', $message->sender['mailto'], 1, false);
+                if ($result->count) {
+                    $message->set_safe(true);
+                }
+            }
 
-      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)
  *
@@ -664,66 +695,67 @@ function rcmail_check_safe(&$message)
  */
 function rcmail_wash_html($html, $p, $cid_replaces)
 {
-  global $REMOTE_OBJECTS;
-
-  $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='.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;
-  }
-
-  // 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');
-  }
-
-  // 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);
-
-  if (!$p['skip_washer_form_callback'])
-    $washer->add_callback('form', 'rcmail_washtml_callback');
-
-  // allow CSS styles, will be sanitized by rcmail_washtml_callback()
-  if (!$p['skip_washer_style_callback'])
-    $washer->add_callback('style', 'rcmail_washtml_callback');
-
-  // Remove non-UTF8 characters (#1487813)
-  $html = rcube_charset::clean($html);
-
-  $html = $washer->wash($html);
-  $REMOTE_OBJECTS = $washer->extlinks;
-
-  return $html;
-}
+    global $REMOTE_OBJECTS;
+
+    $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='.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;
+    }
+
+    // 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');
+    }
+
+    // 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);
+
+    if (!$p['skip_washer_form_callback']) {
+        $washer->add_callback('form', 'rcmail_washtml_callback');
+    }
+
+    // allow CSS styles, will be sanitized by rcmail_washtml_callback()
+    if (!$p['skip_washer_style_callback']) {
+        $washer->add_callback('style', 'rcmail_washtml_callback');
+    }
+
+    // Remove non-UTF8 characters (#1487813)
+    $html = rcube_charset::clean($html);
+
+    $html = $washer->wash($html);
+    $REMOTE_OBJECTS = $washer->extlinks;
 
+    return $html;
+}
 
 /**
  * Convert the given message part to proper HTML
@@ -735,58 +767,58 @@ function rcmail_wash_html($html, $p, $cid_replaces)
  */
 function rcmail_print_body($part, $p = array())
 {
-  global $RCMAIL;
-
-  // trigger plugin hook
-  $data = $RCMAIL->plugins->exec_hook('message_part_before',
-    array('type' => $part->ctype_secondary, 'body' => $part->body, 'id' => $part->mime_id)
-        + $p + array('safe' => false, 'plain' => false, 'inline_html' => true));
-
-  // convert html to text/plain
-  if ($data['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';
-  }
-  // 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);
-    }
-
-    $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']);
-}
+    global $RCMAIL;
+
+    // trigger plugin hook
+    $data = $RCMAIL->plugins->exec_hook('message_part_before',
+        array('type' => $part->ctype_secondary, 'body' => $part->body, 'id' => $part->mime_id)
+            + $p + array('safe' => false, 'plain' => false, 'inline_html' => true));
+
+    // convert html to text/plain
+    if ($data['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';
+    }
+    // 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);
+        }
+
+        $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
@@ -797,232 +829,245 @@ function rcmail_print_body($part, $p = array())
  */
 function rcmail_plain_body($body)
 {
-  global $RCMAIL;
-
-  // 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);
-
-  // 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]));
-
-      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];
+    global $RCMAIL;
+
+    // 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);
+
+    // 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]));
+
+            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 rcube::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\(:;]/', '', 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;
-      }
+        // 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;
+        }
 
     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;
-
-  // 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 = $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']));
+    global $MESSAGE, $PRINT_MODE, $RCMAIL;
+    static $sa_attrib;
 
-    $output_headers[$hkey] = array(
-        'title' => $header_title,
-        'value' => $header_value,
-        'raw' => $value,
-        'html' => $ishtml,
-    );
-  }
+    // 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);
+    }
 
-  $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 rcube::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'), rcube::Q($row['title']));
-    $table->add(array('class' => 'header '.$hkey), $row['html'] ? $row['value'] : rcube::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);
 }
 
 /**
@@ -1030,20 +1075,21 @@ function rcmail_message_headers($attrib, $headers=null)
  */
 function rcmail_localized_priority($value)
 {
-  global $RCMAIL;
+    global $RCMAIL;
 
-  $labels_map = array(
-    '1' => 'highest',
-    '2' => 'high',
-    '3' => 'normal',
-    '4' => 'low',
-    '5' => 'lowest',
-  );
+    $labels_map = array(
+        '1' => 'highest',
+        '2' => 'high',
+        '3' => 'normal',
+        '4' => 'low',
+        '5' => 'lowest',
+    );
 
-  if ($value && $labels_map[$value])
-    return $RCMAIL->gettext($labels_map[$value]);
+    if ($value && $labels_map[$value]) {
+        return $RCMAIL->gettext($labels_map[$value]);
+    }
 
-  return '';
+    return '';
 }
 
 /**
@@ -1051,18 +1097,21 @@ function rcmail_localized_priority($value)
  */
 function rcmail_message_full_headers($attrib, $headers=NULL)
 {
-  global $OUTPUT, $RCMAIL;
+    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 ".rcmail_output::JS_OBJECT_NAME.".command('show-headers','',this)", 'title' => $RCMAIL->gettext('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
  *
@@ -1071,518 +1120,530 @@ function rcmail_message_full_headers($attrib, $headers=NULL)
  */
 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 (!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', $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 (!$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($part->ctype_parameters) || empty($part->ctype_parameters['charset']))
-          $part->ctype_parameters['charset'] = $MESSAGE->headers->charset;
+    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;
+                }
 
-        // fetch part if not available
-        if (!isset($part->body))
-          $part->body = $MESSAGE->get_part_content($part->mime_id);
+                // 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;
+                }
 
-        // 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));
-          }
-        }
+                if (empty($part->ctype_parameters) || empty($part->ctype_parameters['charset'])) {
+                    $part->ctype_parameters['charset'] = $MESSAGE->headers->charset;
+                }
 
-        // message is cached but not exists (#1485443), or other error
-        if ($part->body === false) {
-          rcmail_message_error($MESSAGE->uid);
-        }
+                // fetch part if not available
+                if (!isset($part->body)) {
+                    $part->body = $MESSAGE->get_part_content($part->mime_id);
+                }
 
-        $plugin = $RCMAIL->plugins->exec_hook('message_body_prefix', array(
-          'part' => $part, 'prefix' => ''));
+                // 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));
+                    }
+                }
 
-        $body = rcmail_print_body($part, array('safe' => $safe_mode, 'plain' => !$CONFIG['prefer_html']));
+                // message is cached but not exists (#1485443), or other error
+                if ($part->body === false) {
+                    rcmail_message_error($MESSAGE->uid);
+                }
 
-        if ($part->ctype_secondary == 'html') {
-          $body = rcmail_html4inline($body, $attrib['id'], 'rcmBody', $attrs, $safe_mode);
-          $div_attr = array('class' => 'message-htmlpart');
-          $style = array();
+                $plugin = $RCMAIL->plugins->exec_hook('message_body_prefix',
+                    array('part' => $part, 'prefix' => ''));
 
-          if (!empty($attrs)) {
-            foreach ($attrs as $a_idx => $a_val)
-              $style[] = $a_idx . ': ' . $a_val;
-            if (!empty($style))
-              $div_attr['style'] = implode('; ', $style);
-          }
+                $body = rcmail_print_body($part, array('safe' => $safe_mode, 'plain' => !$RCMAIL->config->get('prefer_html')));
 
-          $out .= html::div($div_attr, $plugin['prefix'] . $body);
+                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
-          $out .= html::div('message-part', $plugin['prefix'] . $body);
-      }
-    }
-  }
-  else {
-    // Check if we have enough memory to handle the message in it
-    // #1487424: we need up to 10x more memory than the body
-    if (!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 {
-      $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))));
-    }
-  }
-
-  // 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)',
-              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')) . '&nbsp;' : '') .
-              html::a($show_link['href'] . '&_download=1', $RCMAIL->gettext('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', 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,
-              )))
-          );
+            $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))));
+        }
+    }
+
+    // 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)',
+                            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')) . '&nbsp;' : '') .
+                                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);
+    // tell client that there are blocked remote objects
+    if ($REMOTE_OBJECTS && !$safe_mode) {
+        $OUTPUT->set_env('blockedobjects', true);
+    }
 
-  return html::div($attrib, $out);
+    return html::div($attrib, $out);
 }
 
 function rcmail_part_image_type($part)
 {
-  $rcmail = rcmail::get_instance();
-
-  // Skip TIFF images if browser doesn't support this format...
-  $tiff_support = !empty($_SESSION['browser_caps']) && !empty($_SESSION['browser_caps']['tif']);
-  // until we can convert them to JPEG
-  $tiff_support = $tiff_support || $rcmail->config->get('im_convert_path');
-
-  // Content-type regexp
-  $mime_regex = $tiff_support ? '/^image\//i' : '/^image\/(?!tif)/i';
-
-  // Content-Type: image/*...
-  if (preg_match($mime_regex, $part->mimetype)) {
-    return rcmail_fix_mimetype($part->mimetype);
-  }
-
-  // Many clients use application/octet-stream, we'll detect mimetype
-  // by checking filename extension
-
-  // Supported image filename extensions to image type map
-  $types = array(
-    'jpg'  => 'image/jpeg',
-    'jpeg' => 'image/jpeg',
-    'png'  => 'image/png',
-    'gif'  => 'image/gif',
-    'bmp'  => 'image/bmp',
-  );
-  if ($tiff_support) {
-    $types['tif']  = 'image/tiff';
-    $types['tiff'] = 'image/tiff';
-  }
-
-  if ($part->filename
-    && preg_match('/^application\/octet-stream$/i', $part->mimetype)
-    && preg_match('/\.([^.]+)$/i', $part->filename, $m)
-    && ($extension = strtolower($m[1]))
-    && isset($types[$extension])
-  ) {
-    return $types[$extension];
-  }
-}
+    $rcmail = rcmail::get_instance();
+
+    // Skip TIFF images if browser doesn't support this format...
+    $tiff_support = !empty($_SESSION['browser_caps']) && !empty($_SESSION['browser_caps']['tif']);
+    // until we can convert them to JPEG
+    $tiff_support = $tiff_support || $rcmail->config->get('im_convert_path');
 
+    // Content-type regexp
+    $mime_regex = $tiff_support ? '/^image\//i' : '/^image\/(?!tif)/i';
+
+    // Content-Type: image/*...
+    if (preg_match($mime_regex, $part->mimetype)) {
+        return rcmail_fix_mimetype($part->mimetype);
+    }
+
+    // Many clients use application/octet-stream, we'll detect mimetype
+    // by checking filename extension
+
+    // Supported image filename extensions to image type map
+    $types = array(
+        'jpg'  => 'image/jpeg',
+        'jpeg' => 'image/jpeg',
+        'png'  => 'image/png',
+        'gif'  => 'image/gif',
+        'bmp'  => 'image/bmp',
+    );
+    if ($tiff_support) {
+        $types['tif']  = 'image/tiff';
+        $types['tiff'] = 'image/tiff';
+    }
+
+    if ($part->filename
+        && preg_match('/^application\/octet-stream$/i', $part->mimetype)
+        && preg_match('/\.([^.]+)$/i', $part->filename, $m)
+        && ($extension = strtolower($m[1]))
+        && isset($types[$extension])
+    ) {
+        return $types[$extension];
+    }
+}
 
 /**
  * modify a HTML message that it can be displayed inside a HTML page
  */
 function rcmail_html4inline($body, $container_id, $body_id='', &$attributes=null, $allow_remote=false)
 {
-  $last_style_pos = 0;
-  $cont_id = $container_id.($body_id ? ' div.'.$body_id : '');
-
-  // find STYLE tags
-  while (($pos = stripos($body, '<style', $last_style_pos)) && ($pos2 = stripos($body, '</style>', $pos)))
-  {
-    $pos = strpos($body, '>', $pos) + 1;
-    $len = $pos2 - $pos;
-
-    // replace all css definitions with #container [def]
-    $styles = substr($body, $pos, $len);
-    $styles = 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-->',
-      '&lt;?',
-      '?&gt;',
-      '<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
-        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];
+    $last_style_pos = 0;
+    $cont_id        = $container_id.($body_id ? ' div.'.$body_id : '');
+
+    // find STYLE tags
+    while (($pos = stripos($body, '<style', $last_style_pos)) && ($pos2 = stripos($body, '</style>', $pos))) {
+        $pos = strpos($body, '>', $pos) + 1;
+        $len = $pos2 - $pos;
+
+        // replace all css definitions with #container [def]
+        $styles = substr($body, $pos, $len);
+        $styles = 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-->',
+            '&lt;?',
+            '?&gt;',
+            '<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;
-
-  $tag    = strtolower($matches[1]);
-  $attrib = html::parse_attrib_string($matches[2]);
-  $end    = '>';
-
-  // Remove non-printable characters in URL (#1487805)
-  if ($attrib['href'])
-    $attrib['href'] = preg_replace('/[\x00-\x1F]/', '', $attrib['href']);
-
-  if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
-    $tempurl = 'tmp-' . md5($attrib['href']) . '.css';
-    $_SESSION['modcssurls'][$tempurl] = $attrib['href'];
-    $attrib['href'] = $RCMAIL->url(array('task' => 'utils', 'action' => 'modcss', 'u' => $tempurl, 'c' => $GLOBALS['rcmail_html_container_id']));
-    $end = ' />';
-  }
-  else if (preg_match('/^mailto:(.+)/i', $attrib['href'], $mailto)) {
-    list($mailto, $url) = explode('?', html_entity_decode($mailto[1], ENT_QUOTES, 'UTF-8'), 2);
-
-    $url       = urldecode($url);
-    $mailto    = urldecode($mailto);
-    $addresses = rcube_mime::decode_address_list($mailto, null, true);
-    $mailto    = array();
-
-    // 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]);
-      }
-    }
-
-    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" : '')));
+    global $RCMAIL;
+
+    $tag    = strtolower($matches[1]);
+    $attrib = html::parse_attrib_string($matches[2]);
+    $end    = '>';
+
+    // Remove non-printable characters in URL (#1487805)
+    if ($attrib['href'])
+        $attrib['href'] = preg_replace('/[\x00-\x1F]/', '', $attrib['href']);
+
+    if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
+        $tempurl = 'tmp-' . md5($attrib['href']) . '.css';
+        $_SESSION['modcssurls'][$tempurl] = $attrib['href'];
+        $attrib['href'] = $RCMAIL->url(array('task' => 'utils', 'action' => 'modcss', 'u' => $tempurl, 'c' => $GLOBALS['rcmail_html_container_id']));
+        $end = ' />';
     }
-    else {
-      $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';
-  }
-
-  // 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;
-}
+    else if (preg_match('/^mailto:(.+)/i', $attrib['href'], $mailto)) {
+        list($mailto, $url) = explode('?', html_entity_decode($mailto[1], ENT_QUOTES, 'UTF-8'), 2);
+
+        $url       = urldecode($url);
+        $mailto    = urldecode($mailto);
+        $addresses = rcube_mime::decode_address_list($mailto, null, true);
+        $mailto    = array();
+
+        // 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]);
+            }
+        }
 
+        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';
+    }
+
+    // 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;
-
-  $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  = 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 &lt;%s&gt;', rcube::Q($name), rcube::Q($mailto));
-    }
-    else if ($valid) {
-      if ($linked) {
-        $attrs = array(
-           'href' => 'mailto:' . $mailto,
-           'onclick' => sprintf("return %s.command('compose','%s',this)", rcmail_output::JS_OBJECT_NAME, rcube::JQ(format_email_recipient($mailto, $name))),
-           'class' => "rcmContactAddress",
-        );
+    global $RCMAIL, $PRINT_MODE;
 
-        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;
-        }
+    $a_parts = rcube_mime::decode_address_list($input, null, true, $default_charset);
 
-        $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",
-            'onclick' => sprintf("return %s.command('add-contact','%s',this)", rcmail_output::JS_OBJECT_NAME, rcube::JQ($string)),
-            'title' => $RCMAIL->gettext('addtoaddressbook'),
-            'class' => 'rcmaddcontact',
-          ),
-          html::img(array(
-            'src' => $CONFIG['skin_path'] . $addicon,
-            'alt' => "Add contact",
-          )));
-      }
+    if (!sizeof($a_parts)) {
+        return $input;
     }
-    else {
-      $address = '';
-      if ($name)
-        $address .= rcube::Q($name);
-      if ($mailto)
-        $address = trim($address . ' ' . rcube::Q($name ? sprintf('<%s>', $mailto) : $mailto));
+
+    $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;
     }
 
-    $address = html::span('adr', $address);
-    $allvalues[] = $address;
+    foreach ($a_parts as $part) {
+        $j++;
 
-    if (!$moreadrs)
-      $out .= ($out ? ', ' : '') . $address;
+        $name   = $part['name'];
+        $mailto = $part['mailto'];
+        $string = $part['string'];
+        $valid  = rcube_utils::check_email($mailto, false);
 
-    if ($max && $j == $max && $c > $j) {
-      if ($linked) {
-        $moreadrs = $c - $j;
-      }
-      else {
-        $out .= '...';
-        break;
-      }
-    }
-  }
+        // phishing email prevention (#1488981), e.g. "valid@email.addr <phishing@email.addr>"
+        if (!$show_email && $valid && $name && $name != $mailto && strpos($name, '@')) {
+            $name = '';
+        }
 
-  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));
+        // 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 &lt;%s&gt;', 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 {
+            $address = '';
+            if ($name)
+                $address .= rcube::Q($name);
+            if ($mailto)
+                $address = trim($address . ' ' . rcube::Q($name ? sprintf('<%s>', $mailto) : $mailto));
+        }
+
+        $address = html::span('adr', $address);
+        $allvalues[] = $address;
+
+        if (!$moreadrs)
+            $out .= ($out ? ', ' : '') . $address;
+
+        if ($max && $j == $max && $c > $j) {
+            if ($linked) {
+                $moreadrs = $c - $j;
+            }
+            else {
+                $out .= '...';
+                break;
+            }
+        }
     }
-    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) {
+        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)))));
+        }
     }
-  }
 
-  return $out;
+    return $out;
 }
 
-
 /**
  * Wrap text to a given number of characters per line
  * but respect the mail quotation of replies messages (>).
@@ -1595,74 +1656,79 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
  */
 function rcmail_wrap_and_quote($text, $length = 72)
 {
-  // Rebuild the message body with a maximum of $max chars, while keeping quoted message.
-  $max = max(75, $length + 8);
-  $lines = preg_split('/\r?\n/', trim($text));
-  $out = '';
-
-  foreach ($lines as $line) {
-    // don't wrap already quoted lines
-    if ($line[0] == '>')
-      $line = '>' . rtrim($line);
-    else if (mb_strlen($line) > $max) {
-      $newline = '';
-      foreach (explode("\n", rcube_mime::wordwrap($line, $length - 2)) as $l) {
-        if (strlen($l))
-          $newline .= '> ' . $l . "\n";
-        else
-          $newline .= ">\n";
-      }
-      $line = rtrim($newline);
-    }
-    else
-      $line = '> ' . $line;
+    // 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", 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";
-  }
+        // 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) {
+        $parts[] = $key . '=' . ($key == 'folder' ? 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;
-  }
-
-  return $info;
-}
+    $info = array();
+
+    foreach (preg_split('/;\s+/', $str) as $part) {
+        list($key, $val) = explode('=', $part, 2);
+        if ($key == 'folder') {
+            $val = base64_decode($val);
+        }
 
+        $info[$key] = $val;
+    }
+
+    return $info;
+}
 
 /**
  * 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
  *
@@ -1673,76 +1739,78 @@ function rcmail_compose_cleanup($id)
  */
 function rcmail_send_mdn($message, &$smtp_error)
 {
-  global $RCMAIL;
-
-  if (!is_object($message) || !is_a($message, 'rcube_message'))
-    $message = new rcube_message($message);
-
-  if ($message->headers->mdn_to && empty($message->headers->flags['MDNSENT']) &&
-    ($RCMAIL->storage->check_permflag('MDNSENT') || $RCMAIL->storage->check_permflag('*')))
-  {
-    $identity  = rcmail_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";
+    global $RCMAIL;
 
-    if ($message->headers->to) {
-        $report .= "Original-Recipient: {$message->headers->to}\r\n";
+    if (!is_object($message) || !is_a($message, 'rcube_message')) {
+        $message = new rcube_message($message);
     }
 
-    if ($agent = $RCMAIL->config->get('useragent')) {
-      $headers['User-Agent'] = $agent;
-      $report .= "Reporting-UA: $agent\r\n";
-    }
+    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),
+        );
 
-    $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");
+        $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(rcube_mime::wordwrap($body, 75, "\r\n"));
-    $compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline');
+        if ($message->headers->to) {
+            $report .= "Original-Recipient: {$message->headers->to}\r\n";
+        }
 
-    if ($RCMAIL->config->get('mdn_use_from'))
-      $options['mdn_use_from'] = true;
+        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');
 
-    $sent = $RCMAIL->deliver_message($compose, $identity['email'], $mailto, $smtp_error, $body_file, $options);
+        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;
+        if ($sent) {
+            $RCMAIL->storage->set_flag($message->uid, 'MDNSENT');
+            return true;
+        }
     }
-  }
 
-  return false;
+    return false;
 }
 
 /**
@@ -1856,15 +1924,17 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r
 // 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';
-
-  return $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';
+    }
+
+    return $name;
 }
 
 // return attachment filename, handle empty filename case
@@ -1902,92 +1972,104 @@ function rcmail_attachment_name($attachment, $display = false)
 
 function rcmail_search_filter($attrib)
 {
-  global $RCMAIL, $OUTPUT, $CONFIG;
-
-  if (!strlen($attrib['id']))
-    $attrib['id'] = 'rcmlistfilter';
-
-  $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');
-
-  // 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);
-  }
-
-  $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 (!$CONFIG['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']);
-
-  $OUTPUT->add_gui_object('search_filter', $attrib['id']);
-
-  return $out;
+    global $RCMAIL;
+
+    if (!strlen($attrib['id']))
+        $attrib['id'] = 'rcmlistfilter';
+
+    $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');
+
+    // 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);
+    }
+
+    $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']);
+
+    $RCMAIL->output->add_gui_object('search_filter', $attrib['id']);
+
+    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, $RCMAIL;
-
-  // set defaults
-  $attrib += array('id' => 'rcmImportform', 'buttons' => 'yes');
-
-  // 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[]',
-      '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', $RCMAIL->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
-      (rcube_utils::get_boolean($attrib['buttons']) ? 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)"))
-      ) : '')
-    )
-  );
-
-  $OUTPUT->add_gui_object('importform', $attrib['id'].'Frm');
-  return $out;
+    global $RCMAIL;
+
+    // set defaults
+    $attrib += array('id' => 'rcmImportform', 'buttons' => 'yes');
+
+    // 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[]',
+            'multiple' => 'multiple',
+            'accept'   => ".eml, .mbox, message/rfc822, text/*",
+    ));
+
+    $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))));
+
+    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');
+
+    return html::div($attrib, $out);
 }
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index b081bc9b0..daa8c7e54 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -4,7 +4,7 @@
  | program/steps/mail/mark.inc                                           |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -19,112 +19,123 @@
 */
 
 // only process ajax requests
-if (!$OUTPUT->ajax_call)
-  return;
-
-$a_flags_map = array(
-  'undelete' => 'UNDELETED',
-  'delete' => 'DELETED',
-  'read' => 'SEEN',
-  'unread' => 'UNSEEN',
-  'flagged' => 'FLAGGED',
-  'unflagged' => 'UNFLAGGED');
-
-$threading = (bool) $RCMAIL->storage->get_threading();
-
-if (($uids = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST)) && ($flag = rcube_utils::get_input_value('_flag', rcube_utils::INPUT_POST)))
-{
-  $flag = $a_flags_map[$flag] ? $a_flags_map[$flag] : strtoupper($flag);
-
-  if ($flag == 'DELETED' && $CONFIG['skip_deleted'] && $_POST['_from'] != 'show') {
-    // count messages before changing anything
-    $old_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
-    $old_pages = ceil($old_count / $RCMAIL->storage->get_pagesize());
-    $count = sizeof(explode(',', $uids));
-  }
-
-  $marked = $RCMAIL->storage->set_flag($uids, $flag);
-
-  if (!$marked) {
-    // send error message
-    if ($_POST['_from'] != 'show')
-      $OUTPUT->command('list_mailbox');
-    $RCMAIL->display_server_error('errormarking');
-    $OUTPUT->send();
-    exit;
-  }
-  else if (empty($_POST['_quiet'])) {
-    $OUTPUT->show_message('messagemarked', 'confirmation');
-  }
-
-  if ($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid'])) {
-    $ruids = rcube_utils::get_input_value('_ruid', rcube_utils::INPUT_POST);
-    $read = $RCMAIL->storage->set_flag($ruids, 'SEEN');
-
-    if ($read && !$CONFIG['skip_deleted'])
-      $OUTPUT->command('flag_deleted_as_read', $ruids);
-  }
-
-  if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$CONFIG['skip_deleted'])) {
-    rcmail_send_unread_count($RCMAIL->storage->get_folder());
-  }
-  else if ($flag == 'DELETED' && $CONFIG['skip_deleted']) {
-    if ($_POST['_from'] == 'show') {
-      if ($next = rcube_utils::get_input_value('_next_uid', rcube_utils::INPUT_GPC))
-        $OUTPUT->command('show_message', $next);
-      else
-        $OUTPUT->command('command', 'list');
-    } else {
-      $search_request = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC);
-      // refresh saved search set after moving some messages
-      if ($search_request && $RCMAIL->storage->get_search_set()) {
-        $_SESSION['search'] = $RCMAIL->storage->refresh_search();
-      }
-
-      $msg_count      = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
-      $page_size      = $RCMAIL->storage->get_pagesize();
-      $page           = $RCMAIL->storage->get_page();
-      $pages          = ceil($msg_count / $page_size);
-      $nextpage_count = $old_count - $page_size * $page;
-      $remaining      = $msg_count - $page_size * ($page - 1);
-
-      // jump back one page (user removed the whole last page)
-      if ($page > 1 && $remaining == 0) {
-        $page -= 1;
-        $RCMAIL->storage->set_page($page);
-        $_SESSION['page'] = $page;
-        $jump_back = true;
-      }
-
-      // update message count display
-      $OUTPUT->set_env('messagecount', $msg_count);
-      $OUTPUT->set_env('current_page', $page);
-      $OUTPUT->set_env('pagecount', $pages);
-
-      // update mailboxlist
-      $mbox = $RCMAIL->storage->get_folder();
-      $unseen_count = $msg_count ? $RCMAIL->storage->count($mbox, 'UNSEEN') : 0;
-      $old_unseen = rcmail_get_unseen_count($mbox);
-
-      if ($old_unseen != $unseen_count) {
-        $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
-        rcmail_set_unseen_count($mbox, $unseen_count);
-      }
-      $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);
-
-      if ($threading) {
-        $count = rcube_utils::get_input_value('_count', rcube_utils::INPUT_POST);
-      }
-
-      // add new rows from next page (if any)
-      if ($count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
-        $a_headers = $RCMAIL->storage->list_messages($mbox, NULL,
-          rcmail_sort_column(), rcmail_sort_order(), $jump_back ? NULL : $count);
-
-        rcmail_js_message_list($a_headers, false);
-      }
+if (!$OUTPUT->ajax_call) {
+    return;
+}
+
+$threading    = (bool) $RCMAIL->storage->get_threading();
+$skip_deleted = (bool) $RCMAIL->config->get('skip_deleted');
+$read_deleted = (bool) $RCMAIL->config->get('read_when_deleted');
+
+$a_flags_map  = array(
+    'undelete'  => 'UNDELETED',
+    'delete'    => 'DELETED',
+    'read'      => 'SEEN',
+    'unread'    => 'UNSEEN',
+    'flagged'   => 'FLAGGED',
+    'unflagged' => 'UNFLAGGED',
+);
+
+if (($uids = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST))
+    && ($flag = rcube_utils::get_input_value('_flag', rcube_utils::INPUT_POST))
+) {
+    $flag = $a_flags_map[$flag] ? $a_flags_map[$flag] : strtoupper($flag);
+
+    if ($flag == 'DELETED' && $skip_deleted && $_POST['_from'] != 'show') {
+        // count messages before changing anything
+        $old_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
+        $old_pages = ceil($old_count / $RCMAIL->storage->get_pagesize());
+        $count     = sizeof(explode(',', $uids));
+    }
+
+    $marked = $RCMAIL->storage->set_flag($uids, $flag);
+
+    if (!$marked) {
+        // send error message
+        if ($_POST['_from'] != 'show') {
+            $OUTPUT->command('list_mailbox');
+        }
+
+        $RCMAIL->display_server_error('errormarking');
+        $OUTPUT->send();
+        exit;
+    }
+    else if (empty($_POST['_quiet'])) {
+        $OUTPUT->show_message('messagemarked', 'confirmation');
+    }
+
+    if ($flag == 'DELETED' && $read_deleted && !empty($_POST['_ruid'])) {
+        $ruids = rcube_utils::get_input_value('_ruid', rcube_utils::INPUT_POST);
+        $read  = $RCMAIL->storage->set_flag($ruids, 'SEEN');
+
+        if ($read && !$skip_deleted) {
+            $OUTPUT->command('flag_deleted_as_read', $ruids);
+        }
+    }
+
+    if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$skip_deleted)) {
+        rcmail_send_unread_count($RCMAIL->storage->get_folder());
+    }
+    else if ($flag == 'DELETED' && $skip_deleted) {
+        if ($_POST['_from'] == 'show') {
+            if ($next = rcube_utils::get_input_value('_next_uid', rcube_utils::INPUT_GPC))
+                $OUTPUT->command('show_message', $next);
+            else
+                $OUTPUT->command('command', 'list');
+        }
+        else {
+            $search_request = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC);
+
+            // refresh saved search set after moving some messages
+            if ($search_request && $RCMAIL->storage->get_search_set()) {
+                $_SESSION['search'] = $RCMAIL->storage->refresh_search();
+            }
+
+            $msg_count      = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
+            $page_size      = $RCMAIL->storage->get_pagesize();
+            $page           = $RCMAIL->storage->get_page();
+            $pages          = ceil($msg_count / $page_size);
+            $nextpage_count = $old_count - $page_size * $page;
+            $remaining      = $msg_count - $page_size * ($page - 1);
+
+            // jump back one page (user removed the whole last page)
+            if ($page > 1 && $remaining == 0) {
+                $page -= 1;
+                $RCMAIL->storage->set_page($page);
+                $_SESSION['page'] = $page;
+                $jump_back = true;
+            }
+
+            // update message count display
+            $OUTPUT->set_env('messagecount', $msg_count);
+            $OUTPUT->set_env('current_page', $page);
+            $OUTPUT->set_env('pagecount', $pages);
+
+            // update mailboxlist
+            $mbox         = $RCMAIL->storage->get_folder();
+            $unseen_count = $msg_count ? $RCMAIL->storage->count($mbox, 'UNSEEN') : 0;
+            $old_unseen   = rcmail_get_unseen_count($mbox);
+
+            if ($old_unseen != $unseen_count) {
+                $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
+                rcmail_set_unseen_count($mbox, $unseen_count);
+            }
+
+            $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);
+
+            if ($threading) {
+                $count = rcube_utils::get_input_value('_count', rcube_utils::INPUT_POST);
+            }
+
+            // add new rows from next page (if any)
+            if ($count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
+                $a_headers = $RCMAIL->storage->list_messages($mbox, NULL,
+                    rcmail_sort_column(), rcmail_sort_order(), $jump_back ? NULL : $count);
+
+                rcmail_js_message_list($a_headers, false);
+            }
+        }
     }
-  }
 }
 else {
     $OUTPUT->show_message('internalerror', 'error');
diff --git a/program/steps/mail/pagenav.inc b/program/steps/mail/pagenav.inc
index 59c131f69..74cca88f2 100644
--- a/program/steps/mail/pagenav.inc
+++ b/program/steps/mail/pagenav.inc
@@ -35,14 +35,19 @@ if ($prev) {
     $OUTPUT->set_env('prev_uid', $prev);
     $OUTPUT->command('enable_command', 'previousmessage', 'firstmessage', true);
 }
+
 if ($next) {
     $OUTPUT->set_env('next_uid', $next);
     $OUTPUT->command('enable_command', 'nextmessage', 'lastmessage', true);
 }
-if ($first)
+
+if ($first) {
     $OUTPUT->set_env('first_uid', $first);
-if ($last)
+}
+
+if ($last) {
     $OUTPUT->set_env('last_uid', $last);
+}
 
 // Don't need a real messages count value
 $OUTPUT->set_env('messagecount', 1);
@@ -54,4 +59,3 @@ $OUTPUT->command('set_rowcount', $RCMAIL->gettext(array(
 )));
 
 $OUTPUT->send();
-
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index 210bedbb8..a80887254 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -1,14 +1,18 @@
 <?php
+
 /*
  +-----------------------------------------------------------------------+
  | steps/mail/search.inc                                                 |
  |                                                                       |
- | Search functions for rc webmail                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
  | See the README file for a full license statement.                     |
  |                                                                       |
+ | PURPOSE:                                                              |
+ |   Mail messages search action                                         |
  +-----------------------------------------------------------------------+
  | Author: Benjamin Smith <defitro@gmail.com>                            |
  |         Thomas Bruederli <roundcube@gmail.com>                        |
@@ -41,110 +45,108 @@ $search_str = $filter && $filter != 'ALL' ? $filter : '';
 $_SESSION['search_filter'] = $filter;
 
 // Check the search string for type of search
-if (preg_match("/^from:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['from'] = "HEADER FROM";
+if (preg_match("/^from:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['from'] = "HEADER FROM";
 }
-else if (preg_match("/^to:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['to'] = "HEADER TO";
+else if (preg_match("/^to:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['to'] = "HEADER TO";
 }
-else if (preg_match("/^cc:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['cc'] = "HEADER CC";
+else if (preg_match("/^cc:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['cc'] = "HEADER CC";
 }
-else if (preg_match("/^bcc:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['bcc'] = "HEADER BCC";
+else if (preg_match("/^bcc:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['bcc'] = "HEADER BCC";
 }
-else if (preg_match("/^subject:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['subject'] = "HEADER SUBJECT";
+else if (preg_match("/^subject:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['subject'] = "HEADER SUBJECT";
 }
-else if (preg_match("/^body:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['body'] = "BODY";
+else if (preg_match("/^body:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['body'] = "BODY";
 }
-else if (strlen(trim($str)))
-{
-  if ($headers) {
-    foreach (explode(',', $headers) as $header) {
-      if ($header == 'text') {
-        // #1488208: get rid of other headers when searching by "TEXT"
-        $subject = array('text' => 'TEXT');
-        break;
-      }
-      else {
-        $subject[$header] = ($header != 'body' ? 'HEADER ' : '') . strtoupper($header);
-      }
+else if (strlen(trim($str))) {
+    if ($headers) {
+        foreach (explode(',', $headers) as $header) {
+            if ($header == 'text') {
+                // #1488208: get rid of other headers when searching by "TEXT"
+                $subject = array('text' => 'TEXT');
+                break;
+            }
+            else {
+                $subject[$header] = ($header != 'body' ? 'HEADER ' : '') . strtoupper($header);
+            }
+        }
+
+        // save search modifiers for the current folder to user prefs
+        $search_mods        = rcmail_search_mods();
+        $search_mods[$mbox] = array_fill_keys(array_keys($subject), 1);
+
+        $RCMAIL->user->save_prefs(array('search_mods' => $search_mods));
+    }
+    else {
+        // search in subject by default
+        $subject['subject'] = 'HEADER SUBJECT';
     }
-
-    // save search modifiers for the current folder to user prefs
-    $search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);
-    $search_mods[$mbox] = array_fill_keys(array_keys($subject), 1);
-    $RCMAIL->user->save_prefs(array('search_mods' => $search_mods));
-  }
-  else {
-    // search in subject by default
-    $subject['subject'] = 'HEADER SUBJECT';
-  }
 }
 
 $search = isset($srch) ? trim($srch) : trim($str);
 
 if (!empty($subject)) {
-  $search_str .= str_repeat(' OR', count($subject)-1);
-  foreach ($subject as $sub)
-    $search_str .= ' ' . $sub . ' ' . rcube_imap_generic::escape($search);
+    $search_str .= str_repeat(' OR', count($subject)-1);
+    foreach ($subject as $sub) {
+        $search_str .= ' ' . $sub . ' ' . rcube_imap_generic::escape($search);
+    }
 }
 
 $search_str  = trim($search_str);
 $sort_column = rcmail_sort_column();
 
 // execute IMAP search
-if ($search_str)
-  $RCMAIL->storage->search($mbox, $search_str, $imap_charset, $sort_column);
+if ($search_str) {
+    $RCMAIL->storage->search($mbox, $search_str, $imap_charset, $sort_column);
+}
 
 // save search results in session
-if (!is_array($_SESSION['search']))
-  $_SESSION['search'] = array();
+if (!is_array($_SESSION['search'])) {
+    $_SESSION['search'] = array();
+}
 
 if ($search_str) {
-  $_SESSION['search'] = $RCMAIL->storage->get_search_set();
-  $_SESSION['last_text_search'] = $str;
+    $_SESSION['search'] = $RCMAIL->storage->get_search_set();
+    $_SESSION['last_text_search'] = $str;
 }
 $_SESSION['search_request'] = $search_request;
 
 
 // Get the headers
 $result_h = $RCMAIL->storage->list_messages($mbox, 1, $sort_column, rcmail_sort_order());
-$count = $RCMAIL->storage->count($mbox, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
+$count    = $RCMAIL->storage->count($mbox, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
 
 // Make sure we got the headers
 if (!empty($result_h)) {
-  rcmail_js_message_list($result_h);
-  if ($search_str)
-    $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->storage->count(NULL, 'ALL')));
-
-  // remember last HIGHESTMODSEQ value (if supported)
-  // we need it for flag updates in check-recent
-  $data = $RCMAIL->storage->folder_data($mbox_name);
-  if (!empty($data['HIGHESTMODSEQ'])) {
-    $_SESSION['list_mod_seq'] = $data['HIGHESTMODSEQ'];
-  }
+    rcmail_js_message_list($result_h);
+    if ($search_str) {
+        $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->storage->count(NULL, 'ALL')));
+    }
+
+    // remember last HIGHESTMODSEQ value (if supported)
+    // we need it for flag updates in check-recent
+    $data = $RCMAIL->storage->folder_data($mbox_name);
+    if (!empty($data['HIGHESTMODSEQ'])) {
+        $_SESSION['list_mod_seq'] = $data['HIGHESTMODSEQ'];
+    }
 }
 // handle IMAP errors (e.g. #1486905)
 else  if ($err_code = $RCMAIL->storage->get_error_code()) {
-  $RCMAIL->display_server_error();
+    $RCMAIL->display_server_error();
 }
 else {
-  $OUTPUT->show_message('searchnomatch', 'notice');
+    $OUTPUT->show_message('searchnomatch', 'notice');
 }
 
 // update message count display
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index a0c55d25c..b187d5c5c 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -60,236 +60,6 @@ if (!$savedraft) {
 }
 
 
-/****** message sending functions ********/
-
-// encrypt parts of the header
-function rcmail_encrypt_header($what)
-{
-    global $RCMAIL;
-
-    if (!$RCMAIL->config->get('http_received_header_encrypt')) {
-        return $what;
-    }
-
-    return $RCMAIL->encrypt($what);
-}
-
-// get identity record
-function rcmail_get_identity($id)
-{
-    global $RCMAIL, $message_charset;
-
-    if ($sql_arr = $RCMAIL->user->get_identity($id)) {
-        $out = $sql_arr;
-
-        if ($message_charset != RCUBE_CHARSET) {
-            foreach ($out as $k => $v) {
-                $out[$k] = rcube_charset::convert($v, RCUBE_CHARSET, $message_charset);
-            }
-        }
-
-        $out['mailto'] = $sql_arr['email'];
-        $out['string'] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
-
-        return $out;
-    }
-
-    return false;
-}
-
-/**
- * go from this:
- * <img src="http[s]://.../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
- *
- * to this:
- *
- * <img src="/path/on/server/.../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
- */
-function rcmail_fix_emoticon_paths($mime_message)
-{
-    global $RCMAIL;
-
-    $body = $mime_message->getHTMLBody();
-
-    // remove any null-byte characters before parsing
-    $body = preg_replace('/\x00/', '', $body);
-
-    $searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
-    $offset = 0;
-
-    // keep track of added images, so they're only added once
-    $included_images = array();
-
-    if (preg_match_all('# src=[\'"]([^\'"]+)#', $body, $matches, PREG_OFFSET_CAPTURE)) {
-        foreach ($matches[1] as $m) {
-            // find emoticon image tags
-            if (preg_match('#'.$searchstr.'(.*)$#', $m[0], $imatches)) {
-                $image_name = $imatches[1];
-
-                // sanitize image name so resulting attachment doesn't leave images dir
-                $image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i', '', $image_name);
-                $img_file   = INSTALL_PATH . '/' . $searchstr . $image_name;
-
-                if (! in_array($image_name, $included_images)) {
-                    // add the image to the MIME message
-                    if (!$mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name)) {
-                        $RCMAIL->output->show_message("emoticonerror", 'error');
-                    }
-
-                    array_push($included_images, $image_name);
-                }
-
-                $body    = substr_replace($body, $img_file, $m[1] + $offset, strlen($m[0]));
-                $offset += strlen($img_file) - strlen($m[0]);
-            }
-        }
-    }
-
-    $mime_message->setHTMLBody($body);
-}
-
-/**
- * Extract image attachments from HTML content (data URIs)
- */
-function rcmail_extract_inline_images($mime_message, $from)
-{
-    $body   = $mime_message->getHTMLBody();
-    $offset = 0;
-    $list   = array();
-    $regexp = '# src=[\'"](data:(image/[a-z]+);base64,([a-z0-9+/=\r\n]+))([\'"])#i';
-
-    // get domain for the Content-ID, must be the same as in Mail_Mime::get()
-    if (preg_match('#@([0-9a-zA-Z\-\.]+)#', $from, $matches)) {
-        $domain = $matches[1];
-    } else {
-        $domain = 'localhost';
-    }
-
-    if (preg_match_all($regexp, $body, $matches, PREG_OFFSET_CAPTURE)) {
-        foreach ($matches[1] as $idx => $m) {
-            $data = preg_replace('/\r\n/', '', $matches[3][$idx][0]);
-            $data = base64_decode($data);
-
-            if (empty($data)) {
-                continue;
-            }
-
-            $hash      = md5($data) . '@' . $domain;
-            $mime_type = $matches[2][$idx][0];
-            $name      = $list[$hash];
-
-            // add the image to the MIME message
-            if (!$name) {
-                $ext         = preg_replace('#^[^/]+/#', '', $mime_type);
-                $name        = substr($hash, 0, 8) . '.' . $ext;
-                $list[$hash] = $name;
-
-                $mime_message->addHTMLImage($data, $mime_type, $name, false, $hash);
-            }
-
-            $body = substr_replace($body, $name, $m[1] + $offset, strlen($m[0]));
-            $offset += strlen($name) - strlen($m[0]);
-        }
-    }
-
-    $mime_message->setHTMLBody($body);
-}
-
-/**
- * Parse and cleanup email address input (and count addresses)
- *
- * @param string  Address input
- * @param boolean Do count recipients (saved in global $RECIPIENT_COUNT)
- * @param boolean Validate addresses (errors saved in global $EMAIL_FORMAT_ERROR)
- * @return string Canonical recipients string separated by comma
- */
-function rcmail_email_input_format($mailto, $count=false, $check=true)
-{
-    global $RCMAIL, $EMAIL_FORMAT_ERROR, $RECIPIENT_COUNT;
-
-    // simplified email regexp, supporting quoted local part
-    $email_regexp = '(\S+|("[^"]+"))@\S+';
-
-    $delim   = trim($RCMAIL->config->get('recipients_separator', ','));
-    $regexp  = array("/[,;$delim]\s*[\r\n]+/", '/[\r\n]+/', "/[,;$delim]\s*\$/m", '/;/', '/(\S{1})(<'.$email_regexp.'>)/U');
-    $replace = array($delim.' ', ', ', '', $delim, '\\1 \\2');
-
-    // replace new lines and strip ending ', ', make address input more valid
-    $mailto = trim(preg_replace($regexp, $replace, $mailto));
-    $items  = rcube_utils::explode_quoted_string($delim, $mailto);
-    $result = array();
-
-    foreach ($items as $item) {
-        $item = trim($item);
-        // address in brackets without name (do nothing)
-        if (preg_match('/^<'.$email_regexp.'>$/', $item)) {
-            $item     = rcube_utils::idn_to_ascii(trim($item, '<>'));
-            $result[] = $item;
-        }
-        // address without brackets and without name (add brackets)
-        else if (preg_match('/^'.$email_regexp.'$/', $item)) {
-            $item     = rcube_utils::idn_to_ascii($item);
-            $result[] = $item;
-        }
-        // address with name (handle name)
-        else if (preg_match('/<*'.$email_regexp.'>*$/', $item, $matches)) {
-            $address = $matches[0];
-            $name    = trim(str_replace($address, '', $item));
-            if ($name[0] == '"' && $name[count($name)-1] == '"') {
-                $name = substr($name, 1, -1);
-            }
-            $name     = stripcslashes($name);
-            $address  = rcube_utils::idn_to_ascii(trim($address, '<>'));
-            $result[] = format_email_recipient($address, $name);
-            $item     = $address;
-        }
-        else if (trim($item)) {
-            continue;
-        }
-
-        // check address format
-        $item = trim($item, '<>');
-        if ($item && $check && !rcube_utils::check_email($item)) {
-            $EMAIL_FORMAT_ERROR = $item;
-            return;
-        }
-    }
-
-    if ($count) {
-        $RECIPIENT_COUNT += count($result);
-    }
-
-    return implode(', ', $result);
-}
-
-
-function rcmail_generic_message_footer($isHtml)
-{
-    global $RCMAIL;
-
-    if ($isHtml && ($file = $RCMAIL->config->get('generic_message_footer_html'))) {
-        $html_footer = true;
-    }
-    else {
-        $file = $RCMAIL->config->get('generic_message_footer');
-        $html_footer = false;
-    }
-
-    if ($file && realpath($file)) {
-        // sanity check
-        if (!preg_match('/\.(php|ini|conf)$/', $file) && strpos($file, '/etc/') === false) {
-            $footer = file_get_contents($file);
-            if ($isHtml && !$html_footer) {
-                $footer = '<pre>' . $footer . '</pre>';
-            }
-            return $footer;
-        }
-    }
-
-    return false;
-}
-
-
 /****** compose message ********/
 
 if (empty($COMPOSE['param']['message-id'])) {
@@ -911,3 +681,233 @@ else {
 }
 
 $OUTPUT->send('iframe');
+
+
+/****** message sending functions ********/
+
+// encrypt parts of the header
+function rcmail_encrypt_header($what)
+{
+    global $RCMAIL;
+
+    if (!$RCMAIL->config->get('http_received_header_encrypt')) {
+        return $what;
+    }
+
+    return $RCMAIL->encrypt($what);
+}
+
+// get identity record
+function rcmail_get_identity($id)
+{
+    global $RCMAIL, $message_charset;
+
+    if ($sql_arr = $RCMAIL->user->get_identity($id)) {
+        $out = $sql_arr;
+
+        if ($message_charset != RCUBE_CHARSET) {
+            foreach ($out as $k => $v) {
+                $out[$k] = rcube_charset::convert($v, RCUBE_CHARSET, $message_charset);
+            }
+        }
+
+        $out['mailto'] = $sql_arr['email'];
+        $out['string'] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+
+        return $out;
+    }
+
+    return false;
+}
+
+/**
+ * go from this:
+ * <img src="http[s]://.../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
+ *
+ * to this:
+ *
+ * <img src="/path/on/server/.../tiny_mce/plugins/emotions/images/smiley-cool.gif" border="0" alt="Cool" title="Cool" />
+ */
+function rcmail_fix_emoticon_paths($mime_message)
+{
+    global $RCMAIL;
+
+    $body = $mime_message->getHTMLBody();
+
+    // remove any null-byte characters before parsing
+    $body = preg_replace('/\x00/', '', $body);
+
+    $searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
+    $offset = 0;
+
+    // keep track of added images, so they're only added once
+    $included_images = array();
+
+    if (preg_match_all('# src=[\'"]([^\'"]+)#', $body, $matches, PREG_OFFSET_CAPTURE)) {
+        foreach ($matches[1] as $m) {
+            // find emoticon image tags
+            if (preg_match('#'.$searchstr.'(.*)$#', $m[0], $imatches)) {
+                $image_name = $imatches[1];
+
+                // sanitize image name so resulting attachment doesn't leave images dir
+                $image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i', '', $image_name);
+                $img_file   = INSTALL_PATH . '/' . $searchstr . $image_name;
+
+                if (! in_array($image_name, $included_images)) {
+                    // add the image to the MIME message
+                    if (!$mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name)) {
+                        $RCMAIL->output->show_message("emoticonerror", 'error');
+                    }
+
+                    array_push($included_images, $image_name);
+                }
+
+                $body    = substr_replace($body, $img_file, $m[1] + $offset, strlen($m[0]));
+                $offset += strlen($img_file) - strlen($m[0]);
+            }
+        }
+    }
+
+    $mime_message->setHTMLBody($body);
+}
+
+/**
+ * Extract image attachments from HTML content (data URIs)
+ */
+function rcmail_extract_inline_images($mime_message, $from)
+{
+    $body   = $mime_message->getHTMLBody();
+    $offset = 0;
+    $list   = array();
+    $regexp = '# src=[\'"](data:(image/[a-z]+);base64,([a-z0-9+/=\r\n]+))([\'"])#i';
+
+    // get domain for the Content-ID, must be the same as in Mail_Mime::get()
+    if (preg_match('#@([0-9a-zA-Z\-\.]+)#', $from, $matches)) {
+        $domain = $matches[1];
+    } else {
+        $domain = 'localhost';
+    }
+
+    if (preg_match_all($regexp, $body, $matches, PREG_OFFSET_CAPTURE)) {
+        foreach ($matches[1] as $idx => $m) {
+            $data = preg_replace('/\r\n/', '', $matches[3][$idx][0]);
+            $data = base64_decode($data);
+
+            if (empty($data)) {
+                continue;
+            }
+
+            $hash      = md5($data) . '@' . $domain;
+            $mime_type = $matches[2][$idx][0];
+            $name      = $list[$hash];
+
+            // add the image to the MIME message
+            if (!$name) {
+                $ext         = preg_replace('#^[^/]+/#', '', $mime_type);
+                $name        = substr($hash, 0, 8) . '.' . $ext;
+                $list[$hash] = $name;
+
+                $mime_message->addHTMLImage($data, $mime_type, $name, false, $hash);
+            }
+
+            $body = substr_replace($body, $name, $m[1] + $offset, strlen($m[0]));
+            $offset += strlen($name) - strlen($m[0]);
+        }
+    }
+
+    $mime_message->setHTMLBody($body);
+}
+
+/**
+ * Parse and cleanup email address input (and count addresses)
+ *
+ * @param string  Address input
+ * @param boolean Do count recipients (saved in global $RECIPIENT_COUNT)
+ * @param boolean Validate addresses (errors saved in global $EMAIL_FORMAT_ERROR)
+ * @return string Canonical recipients string separated by comma
+ */
+function rcmail_email_input_format($mailto, $count=false, $check=true)
+{
+    global $RCMAIL, $EMAIL_FORMAT_ERROR, $RECIPIENT_COUNT;
+
+    // simplified email regexp, supporting quoted local part
+    $email_regexp = '(\S+|("[^"]+"))@\S+';
+
+    $delim   = trim($RCMAIL->config->get('recipients_separator', ','));
+    $regexp  = array("/[,;$delim]\s*[\r\n]+/", '/[\r\n]+/', "/[,;$delim]\s*\$/m", '/;/', '/(\S{1})(<'.$email_regexp.'>)/U');
+    $replace = array($delim.' ', ', ', '', $delim, '\\1 \\2');
+
+    // replace new lines and strip ending ', ', make address input more valid
+    $mailto = trim(preg_replace($regexp, $replace, $mailto));
+    $items  = rcube_utils::explode_quoted_string($delim, $mailto);
+    $result = array();
+
+    foreach ($items as $item) {
+        $item = trim($item);
+        // address in brackets without name (do nothing)
+        if (preg_match('/^<'.$email_regexp.'>$/', $item)) {
+            $item     = rcube_utils::idn_to_ascii(trim($item, '<>'));
+            $result[] = $item;
+        }
+        // address without brackets and without name (add brackets)
+        else if (preg_match('/^'.$email_regexp.'$/', $item)) {
+            $item     = rcube_utils::idn_to_ascii($item);
+            $result[] = $item;
+        }
+        // address with name (handle name)
+        else if (preg_match('/<*'.$email_regexp.'>*$/', $item, $matches)) {
+            $address = $matches[0];
+            $name    = trim(str_replace($address, '', $item));
+            if ($name[0] == '"' && $name[count($name)-1] == '"') {
+                $name = substr($name, 1, -1);
+            }
+            $name     = stripcslashes($name);
+            $address  = rcube_utils::idn_to_ascii(trim($address, '<>'));
+            $result[] = format_email_recipient($address, $name);
+            $item     = $address;
+        }
+        else if (trim($item)) {
+            continue;
+        }
+
+        // check address format
+        $item = trim($item, '<>');
+        if ($item && $check && !rcube_utils::check_email($item)) {
+            $EMAIL_FORMAT_ERROR = $item;
+            return;
+        }
+    }
+
+    if ($count) {
+        $RECIPIENT_COUNT += count($result);
+    }
+
+    return implode(', ', $result);
+}
+
+
+function rcmail_generic_message_footer($isHtml)
+{
+    global $RCMAIL;
+
+    if ($isHtml && ($file = $RCMAIL->config->get('generic_message_footer_html'))) {
+        $html_footer = true;
+    }
+    else {
+        $file = $RCMAIL->config->get('generic_message_footer');
+        $html_footer = false;
+    }
+
+    if ($file && realpath($file)) {
+        // sanity check
+        if (!preg_match('/\.(php|ini|conf)$/', $file) && strpos($file, '/etc/') === false) {
+            $footer = file_get_contents($file);
+            if ($isHtml && !$html_footer) {
+                $footer = '<pre>' . $footer . '</pre>';
+            }
+            return $footer;
+        }
+    }
+
+    return false;
+}
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 6382e49fe..9498d1dc5 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/show.inc                                           |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,12 +23,12 @@ $PRINT_MODE = $RCMAIL->action == 'print' ? TRUE : FALSE;
 
 // Read browser capabilities and store them in session
 if ($caps = rcube_utils::get_input_value('_caps', rcube_utils::INPUT_GET)) {
-  $browser_caps = array();
-  foreach (explode(',', $caps) as $cap) {
-    $cap = explode('=', $cap);
-    $browser_caps[$cap[0]] = $cap[1];
-  }
-  $_SESSION['browser_caps'] = $browser_caps;
+    $browser_caps = array();
+    foreach (explode(',', $caps) as $cap) {
+        $cap = explode('=', $cap);
+        $browser_caps[$cap[0]] = $cap[1];
+    }
+    $_SESSION['browser_caps'] = $browser_caps;
 }
 
 $uid       = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
@@ -36,298 +36,319 @@ $mbox_name = $RCMAIL->storage->get_folder();
 
 // similar code as in program/steps/mail/get.inc
 if ($uid) {
-  // set message format (need to be done before rcube_message construction)
-  if (!empty($_GET['_format'])) {
-    $prefer_html = $_GET['_format'] == 'html';
-    $RCMAIL->config->set('prefer_html', $prefer_html);
-    $_SESSION['msg_formats'][$mbox_name.':'.$uid] = $prefer_html;
-  }
-  else if (isset($_SESSION['msg_formats'][$mbox_name.':'.$uid])) {
-    $RCMAIL->config->set('prefer_html', $_SESSION['msg_formats'][$mbox_name.':'.$uid]);
-  }
-
-  $MESSAGE = new rcube_message($uid);
-
-  // if message not found (wrong UID)...
-  if (empty($MESSAGE->headers)) {
-    rcmail_message_error($uid);
-  }
-
-
-  // show images?
-  rcmail_check_safe($MESSAGE);
-
-  // set message charset as default
-  if (!empty($MESSAGE->headers->charset))
-    $RCMAIL->storage->set_charset($MESSAGE->headers->charset);
-
-  $OUTPUT->set_pagetitle(abbreviate_string($MESSAGE->subject, 128, '...', true));
-
-  // give message uid to the client
-  $OUTPUT->set_env('uid', $MESSAGE->uid);
-  // set environement
-  $OUTPUT->set_env('safemode', $MESSAGE->is_safe);
-  $OUTPUT->set_env('sender', $MESSAGE->sender['string']);
-  $OUTPUT->set_env('permaurl', $RCMAIL->url(array('_action' => 'show', '_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));
-  $OUTPUT->set_env('delimiter', $RCMAIL->storage->get_hierarchy_delimiter());
-  $OUTPUT->set_env('mailbox', $mbox_name);
-  $OUTPUT->set_env('compose_extwin', $RCMAIL->config->get('compose_extwin',false));
-
-  // mimetypes supported by the browser (default settings)
-  $mimetypes = (array)$RCMAIL->config->get('client_mimetypes');
-
-  // Remove unsupported types, which makes that attachment which cannot be
-  // displayed in a browser will be downloaded directly without displaying an overlay page
-  if (empty($_SESSION['browser_caps']['pdf']) && ($key = array_search('application/pdf', $mimetypes)) !== false) {
-    unset($mimetypes[$key]);
-  }
-  if (empty($_SESSION['browser_caps']['flash']) && ($key = array_search('application/x-shockwave-flash', $mimetypes)) !== false) {
-    unset($mimetypes[$key]);
-  }
-  if (empty($_SESSION['browser_caps']['tif']) && ($key = array_search('image/tiff', $mimetypes)) !== false) {
-    // we can convert tiff to jpeg
-    if (!$RCMAIL->config->get('im_convert_path')) {
-      unset($mimetypes[$key]);
+    // set message format (need to be done before rcube_message construction)
+    if (!empty($_GET['_format'])) {
+        $prefer_html = $_GET['_format'] == 'html';
+        $RCMAIL->config->set('prefer_html', $prefer_html);
+        $_SESSION['msg_formats'][$mbox_name.':'.$uid] = $prefer_html;
     }
-  }
-
-  $OUTPUT->set_env('mimetypes', array_values($mimetypes));
-
-  if ($CONFIG['drafts_mbox'])
-    $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
-  if ($CONFIG['trash_mbox'])
-    $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
-  if ($CONFIG['junk_mbox'])
-    $OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']);
-  if ($CONFIG['delete_junk'])
-    $OUTPUT->set_env('delete_junk', true);
-  if ($CONFIG['flag_for_deletion'])
-    $OUTPUT->set_env('flag_for_deletion', true);
-  if ($CONFIG['read_when_deleted'])
-    $OUTPUT->set_env('read_when_deleted', true);
-  if ($CONFIG['skip_deleted'])
-    $OUTPUT->set_env('skip_deleted', true);
-  if ($CONFIG['display_next'])
-    $OUTPUT->set_env('display_next', true);
-  if ($MESSAGE->headers->get('list-post', false))
-    $OUTPUT->set_env('list_post', true);
-  if ($CONFIG['forward_attachment'])
-    $OUTPUT->set_env('forward_attachment', true);
-
-  if (!$OUTPUT->ajax_call)
-    $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
-      'movingmessage', 'deletingmessage', 'markingmessage', 'replyall', 'replylist');
-
-  $prefer_html = $RCMAIL->config->get('prefer_html');
-  if ($MESSAGE->has_html_part()) {
-    $OUTPUT->set_env('optional_format', $prefer_html ? 'text' : 'html');
-  }
-
-  // check for unset disposition notification
-  if ($MESSAGE->headers->mdn_to
-      && empty($MESSAGE->headers->flags['MDNSENT'])
-      && empty($MESSAGE->headers->flags['SEEN'])
-      && ($RCMAIL->storage->check_permflag('MDNSENT') || $RCMAIL->storage->check_permflag('*'))
-      && $mbox_name != $CONFIG['drafts_mbox']
-      && $mbox_name != $CONFIG['sent_mbox']
-  ) {
-    $mdn_cfg = intval($CONFIG['mdn_requests']);
-
-    if ($mdn_cfg == 1 || (($mdn_cfg == 3 || $mdn_cfg ==  4) && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
-      // Send MDN
-      if (rcmail_send_mdn($MESSAGE, $smtp_error))
-        $OUTPUT->show_message('receiptsent', 'confirmation');
-      else if ($smtp_error)
-        $OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
-      else
-        $OUTPUT->show_message('errorsendingreceipt', 'error');
+    else if (isset($_SESSION['msg_formats'][$mbox_name.':'.$uid])) {
+        $RCMAIL->config->set('prefer_html', $_SESSION['msg_formats'][$mbox_name.':'.$uid]);
     }
-    else if ($mdn_cfg != 2 && $mdn_cfg != 4) {
-      // Ask user
-      $OUTPUT->add_label('mdnrequest');
-      $OUTPUT->set_env('mdn_request', true);
+
+    $MESSAGE = new rcube_message($uid);
+
+    // if message not found (wrong UID)...
+    if (empty($MESSAGE->headers)) {
+        rcmail_message_error($uid);
     }
-  }
-
-  if (empty($MESSAGE->headers->flags['SEEN'])
-    && ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0))
-  ) {
-    $RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid,
-      'mailbox' => $mbox_name, 'message' => $MESSAGE));
-  }
-}
 
 
+    // show images?
+    rcmail_check_safe($MESSAGE);
 
-function rcmail_message_attachments($attrib)
-{
-  global $PRINT_MODE, $MESSAGE, $RCMAIL;
-
-  $out = $ol = '';
-  $attachments = array();
-
-  if (sizeof($MESSAGE->attachments)) {
-    foreach ($MESSAGE->attachments as $attach_prop) {
-      $filename = rcmail_attachment_name($attach_prop, true);
-
-      if ($PRINT_MODE) {
-        $size = $RCMAIL->message_part_size($attach_prop);
-        $ol .= html::tag('li', null, rcube::Q(sprintf("%s (%s)", $filename, $size)));
-      }
-      else {
-        if ($attrib['maxlength'] && mb_strlen($filename) > $attrib['maxlength']) {
-          $title    = $filename;
-          $filename = abbreviate_string($filename, $attrib['maxlength']);
+    // set message charset as default
+    if (!empty($MESSAGE->headers->charset)) {
+        $RCMAIL->storage->set_charset($MESSAGE->headers->charset);
+    }
+
+    $OUTPUT->set_pagetitle(abbreviate_string($MESSAGE->subject, 128, '...', true));
+
+    // set message environment
+    $OUTPUT->set_env('uid', $MESSAGE->uid);
+    $OUTPUT->set_env('safemode', $MESSAGE->is_safe);
+    $OUTPUT->set_env('sender', $MESSAGE->sender['string']);
+    $OUTPUT->set_env('mailbox', $mbox_name);
+    $OUTPUT->set_env('permaurl', $RCMAIL->url(array('_action' => 'show', '_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));
+
+    if ($MESSAGE->headers->get('list-post', false)) {
+        $OUTPUT->set_env('list_post', true);
+    }
+
+    // set environment
+    $OUTPUT->set_env('delimiter', $RCMAIL->storage->get_hierarchy_delimiter());
+
+    // set configuration
+    $RCMAIL->set_env_config(array('delete_junk', 'flag_for_deletion', 'read_when_deleted',
+        'skip_deleted', 'display_next', 'compose_extwin', 'forward_attachment'));
+
+    // set special folders
+    foreach (array('drafts', 'trash', 'junk') as $mbox) {
+        if ($folder = $RCMAIL->config->get($mbox . '_mbox')) {
+            $OUTPUT->set_env($mbox . '_mailbox', $folder);
         }
-        else {
-          $title = '';
+    }
+
+    // mimetypes supported by the browser (default settings)
+    $mimetypes = (array)$RCMAIL->config->get('client_mimetypes');
+
+    // Remove unsupported types, which makes that attachment which cannot be
+    // displayed in a browser will be downloaded directly without displaying an overlay page
+    if (empty($_SESSION['browser_caps']['pdf']) && ($key = array_search('application/pdf', $mimetypes)) !== false) {
+        unset($mimetypes[$key]);
+    }
+    if (empty($_SESSION['browser_caps']['flash']) && ($key = array_search('application/x-shockwave-flash', $mimetypes)) !== false) {
+        unset($mimetypes[$key]);
+    }
+    if (empty($_SESSION['browser_caps']['tif']) && ($key = array_search('image/tiff', $mimetypes)) !== false) {
+        // we can convert tiff to jpeg
+        if (!$RCMAIL->config->get('im_convert_path')) {
+            unset($mimetypes[$key]);
         }
+    }
 
-        $mimetype = rcmail_fix_mimetype($attach_prop->mimetype);
-        $class    = rcube_utils::file2class($mimetype, $filename);
-        $id       = 'attach' . $attach_prop->mime_id;
-        $link     = html::a(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),
-            'onmouseover' => $title ? '' : 'rcube_webmail.long_subject_title_ex(this, 0)',
-            'title' => rcube::Q($title),
-            ), rcube::Q($filename));
-        $ol .= html::tag('li', array('class' => $class, 'id' => $id), $link);
-
-        $attachments[$attach_prop->mime_id] = $mimetype;
-      }
+    $OUTPUT->set_env('mimetypes', array_values($mimetypes));
+
+    if ($MESSAGE->has_html_part()) {
+        $prefer_html = $RCMAIL->config->get('prefer_html');
+        $OUTPUT->set_env('optional_format', $prefer_html ? 'text' : 'html');
+    }
+
+    if (!$OUTPUT->ajax_call) {
+        $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
+            'movingmessage', 'deletingmessage', 'markingmessage', 'replyall', 'replylist');
     }
 
-    $out = html::tag('ul', $attrib, $ol, html::$common_attrib);
-    $RCMAIL->output->set_env('attachments', $attachments);
-  }
+    // check for unset disposition notification
+    if ($MESSAGE->headers->mdn_to
+        && empty($MESSAGE->headers->flags['MDNSENT'])
+        && empty($MESSAGE->headers->flags['SEEN'])
+        && ($RCMAIL->storage->check_permflag('MDNSENT') || $RCMAIL->storage->check_permflag('*'))
+        && $mbox_name != $RCMAIL->config->get('drafts_mbox')
+        && $mbox_name != $RCMAIL->config->get('sent_mbox')
+    ) {
+        $mdn_cfg = intval($RCMAIL->config->get('mdn_requests'));
+
+        if ($mdn_cfg == 1 || (($mdn_cfg == 3 || $mdn_cfg ==  4) && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
+            // Send MDN
+            if (rcmail_send_mdn($MESSAGE, $smtp_error))
+                $OUTPUT->show_message('receiptsent', 'confirmation');
+            else if ($smtp_error)
+                $OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
+            else
+                $OUTPUT->show_message('errorsendingreceipt', 'error');
+        }
+        else if ($mdn_cfg != 2 && $mdn_cfg != 4) {
+            // Ask user
+            $OUTPUT->add_label('mdnrequest');
+            $OUTPUT->set_env('mdn_request', true);
+        }
+    }
 
-  return $out;
+    if (empty($MESSAGE->headers->flags['SEEN'])
+        && ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($RCMAIL->config->get('preview_pane_mark_read')) == 0))
+    ) {
+        $RCMAIL->plugins->exec_hook('message_read', array(
+            'uid'     => $MESSAGE->uid,
+            'mailbox' => $mbox_name,
+            'message' => $MESSAGE,
+        ));
+    }
 }
 
-function rcmail_remote_objects_msg()
+
+$OUTPUT->add_handlers(array(
+    'messageattachments' => 'rcmail_message_attachments',
+    'mailboxname'        => 'rcmail_mailbox_name_display',
+    'messageobjects'     => 'rcmail_message_objects',
+    'contactphoto'       => 'rcmail_message_contactphoto',
+));
+
+
+if ($RCMAIL->action == 'print' && $OUTPUT->template_exists('messageprint'))
+    $OUTPUT->send('messageprint', false);
+else if ($RCMAIL->action == 'preview' && $OUTPUT->template_exists('messagepreview'))
+    $OUTPUT->send('messagepreview', false);
+else
+    $OUTPUT->send('message', false);
+
+
+// mark message as read
+if ($MESSAGE && $MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN']) &&
+    ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($RCMAIL->config->get('preview_pane_mark_read')) == 0))
+) {
+    if ($RCMAIL->storage->set_flag($MESSAGE->uid, 'SEEN')) {
+        if ($count = rcmail_get_unseen_count($mbox_name)) {
+            rcmail_set_unseen_count($mbox_name, $count - 1);
+        }
+    }
+}
+
+exit;
+
+
+
+function rcmail_message_attachments($attrib)
 {
-  global $MESSAGE, $RCMAIL;
+    global $PRINT_MODE, $MESSAGE, $RCMAIL;
+
+    $out = $ol = '';
+    $attachments = array();
+
+    if (sizeof($MESSAGE->attachments)) {
+        foreach ($MESSAGE->attachments as $attach_prop) {
+            $filename = rcmail_attachment_name($attach_prop, true);
+
+            if ($PRINT_MODE) {
+                $size = $RCMAIL->message_part_size($attach_prop);
+                $ol .= html::tag('li', null, rcube::Q(sprintf("%s (%s)", $filename, $size)));
+            }
+            else {
+                if ($attrib['maxlength'] && mb_strlen($filename) > $attrib['maxlength']) {
+                    $title    = $filename;
+                    $filename = abbreviate_string($filename, $attrib['maxlength']);
+                }
+                else {
+                    $title = '';
+                }
+
+                $mimetype = rcmail_fix_mimetype($attach_prop->mimetype);
+                $class    = rcube_utils::file2class($mimetype, $filename);
+                $id       = 'attach' . $attach_prop->mime_id;
+                $link     = html::a(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),
+                    'onmouseover' => $title ? '' : 'rcube_webmail.long_subject_title_ex(this, 0)',
+                    'title'       => rcube::Q($title),
+                    ), rcube::Q($filename));
+
+                $ol .= html::tag('li', array('class' => $class, 'id' => $id), $link);
+
+                $attachments[$attach_prop->mime_id] = $mimetype;
+            }
+        }
 
-  $attrib['id']    = 'remote-objects-message';
-  $attrib['class'] = 'notice';
-  $attrib['style'] = 'display: none';
+        $out = html::tag('ul', $attrib, $ol, html::$common_attrib);
 
-  $msg = rcube::Q($RCMAIL->gettext('blockedimages')) . '&nbsp;';
-  $msg .= html::a(array('href' => "#loadimages", 'onclick' => rcmail_output::JS_OBJECT_NAME.".command('load-images')"), rcube::Q($RCMAIL->gettext('showimages')));
+        $RCMAIL->output->set_env('attachments', $attachments);
+    }
+
+    return $out;
+}
+
+function rcmail_remote_objects_msg()
+{
+    global $MESSAGE, $RCMAIL;
+
+    $attrib['id']    = 'remote-objects-message';
+    $attrib['class'] = 'notice';
+    $attrib['style'] = 'display: none';
+
+    $msg = rcube::Q($RCMAIL->gettext('blockedimages')) . '&nbsp;';
+    $msg .= html::a(array(
+            'href'    => "#loadimages",
+            'onclick' => rcmail_output::JS_OBJECT_NAME.".command('load-images')"
+        ),
+        rcube::Q($RCMAIL->gettext('showimages')));
+
+    // add link to save sender in addressbook and reload message
+    if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('show_images') == 1) {
+        $msg .= ' ' . html::a(array(
+                'href'    => "#alwaysload",
+                'onclick' => rcmail_output::JS_OBJECT_NAME.".command('always-load')",
+                'style'   => "white-space:nowrap"
+            ),
+            rcube::Q($RCMAIL->gettext(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto'])))));
+    }
 
-  // add link to save sender in addressbook and reload message
-  if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('show_images') == 1) {
-    $msg .= ' ' . html::a(array('href' => "#alwaysload", 'onclick' => rcmail_output::JS_OBJECT_NAME.".command('always-load')", 'style' => "white-space:nowrap"),
-      rcube::Q($RCMAIL->gettext(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto'])))));
-  }
+    $RCMAIL->output->add_gui_object('remoteobjectsmsg', $attrib['id']);
 
-  $RCMAIL->output->add_gui_object('remoteobjectsmsg', $attrib['id']);
-  return html::div($attrib, $msg);
+    return html::div($attrib, $msg);
 }
 
 function rcmail_message_buttons()
 {
-  global $RCMAIL;
+    global $RCMAIL;
 
-  $mbox  = $RCMAIL->storage->get_folder();
-  $delim = $RCMAIL->storage->get_hierarchy_delimiter();
-  $dbox  = $RCMAIL->config->get('drafts_mbox');
+    $mbox  = $RCMAIL->storage->get_folder();
+    $delim = $RCMAIL->storage->get_hierarchy_delimiter();
+    $dbox  = $RCMAIL->config->get('drafts_mbox');
 
-  // the message is not a draft
-  if ($mbox != $dbox && strpos($mbox, $dbox.$delim) !== 0) {
-    return '';
-  }
+    // the message is not a draft
+    if ($mbox != $dbox && strpos($mbox, $dbox.$delim) !== 0) {
+        return '';
+    }
 
-  $attrib['id']    = 'message-buttons';
-  $attrib['class'] = 'notice';
+    $attrib['id']    = 'message-buttons';
+    $attrib['class'] = 'notice';
 
-  $msg = rcube::Q($RCMAIL->gettext('isdraft')) . '&nbsp;';
-  $msg .= html::a(array('href' => "#edit", 'onclick' => rcmail_output::JS_OBJECT_NAME.".command('edit')"), rcube::Q($RCMAIL->gettext('edit')));
+    $msg = rcube::Q($RCMAIL->gettext('isdraft')) . '&nbsp;';
+    $msg .= html::a(array(
+            'href'    => "#edit",
+            'onclick' => rcmail_output::JS_OBJECT_NAME.".command('edit')"
+        ),
+        rcube::Q($RCMAIL->gettext('edit')));
 
-  return html::div($attrib, $msg);
+    return html::div($attrib, $msg);
 }
 
 function rcmail_message_objects($attrib)
 {
-  global $RCMAIL, $MESSAGE;
+    global $RCMAIL, $MESSAGE;
 
-  if (!$attrib['id'])
-    $attrib['id'] = 'message-objects';
+    if (!$attrib['id'])
+        $attrib['id'] = 'message-objects';
 
-  $content = array(
-    rcmail_message_buttons(),
-    rcmail_remote_objects_msg(),
-  );
+    $content = array(
+        rcmail_message_buttons(),
+        rcmail_remote_objects_msg(),
+    );
 
-  $plugin = $RCMAIL->plugins->exec_hook('message_objects',
-    array('content' => $content, 'message' => $MESSAGE));
+    $plugin = $RCMAIL->plugins->exec_hook('message_objects',
+        array('content' => $content, 'message' => $MESSAGE));
 
-  $content = implode("\n", $plugin['content']);
+    $content = implode("\n", $plugin['content']);
 
-  return html::div($attrib, $content);
+    return html::div($attrib, $content);
 }
 
 function rcmail_contact_exists($email)
 {
-  global $RCMAIL;
+    global $RCMAIL;
 
-  if ($email) {
-    // @TODO: search in all address books?
-    $CONTACTS = $RCMAIL->get_address_book(-1, true);
+    if ($email) {
+        // @TODO: search in all address books?
+        $CONTACTS = $RCMAIL->get_address_book(-1, true);
 
-    if (is_object($CONTACTS)) {
-      $existing = $CONTACTS->search('email', $email, true, false);
-      if ($existing->count) {
-        return true;
-      }
+        if (is_object($CONTACTS)) {
+            $existing = $CONTACTS->search('email', $email, true, false);
+            if ($existing->count) {
+                return true;
+            }
+        }
     }
-  }
 
-  return false;
+    return false;
 }
 
 function rcmail_message_contactphoto($attrib)
 {
-  global $RCMAIL, $MESSAGE;
+    global $RCMAIL, $MESSAGE;
 
-  $placeholder = $attrib['placeholder'] ? $RCMAIL->config->get('skin_path') . $attrib['placeholder'] : null;
-  if ($MESSAGE->sender)
-    $photo_img = $RCMAIL->url(array('_task' => 'addressbook', '_action' => 'photo', '_email' => $MESSAGE->sender['mailto'], '_alt' => $placeholder));
-  else
-    $photo_img = $placeholder ? $placeholder : 'program/resources/blank.gif';
+    $placeholder = $attrib['placeholder'] ? $RCMAIL->config->get('skin_path') . $attrib['placeholder'] : null;
 
-  return html::img(array('src' => $photo_img) + $attrib);
-}
-
-
-$OUTPUT->add_handlers(array(
-  'messageattachments' => 'rcmail_message_attachments',
-  'mailboxname' => 'rcmail_mailbox_name_display',
-  'messageobjects' => 'rcmail_message_objects',
-  'contactphoto' => 'rcmail_message_contactphoto',
-));
-
-
-if ($RCMAIL->action == 'print' && $OUTPUT->template_exists('messageprint'))
-  $OUTPUT->send('messageprint', false);
-else if ($RCMAIL->action == 'preview' && $OUTPUT->template_exists('messagepreview'))
-  $OUTPUT->send('messagepreview', false);
-else
-  $OUTPUT->send('message', false);
-
-
-// mark message as read
-if ($MESSAGE && $MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN']) &&
-  ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0)))
-{
-  if ($RCMAIL->storage->set_flag($MESSAGE->uid, 'SEEN')) {
-    if ($count = rcmail_get_unseen_count($mbox_name)) {
-      rcmail_set_unseen_count($mbox_name, $count - 1);
+    if ($MESSAGE->sender) {
+        $photo_img = $RCMAIL->url(array(
+            '_task'   => 'addressbook',
+            '_action' => 'photo',
+            '_email'  => $MESSAGE->sender['mailto'],
+            '_alt'    => $placeholder
+        ));
+    }
+    else {
+        $photo_img = $placeholder ? $placeholder : 'program/resources/blank.gif';
     }
-  }
-}
-
-exit;
 
+    return html::img(array('src' => $photo_img) + $attrib);
+}
diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index 719239344..0328d9600 100644
--- a/program/steps/mail/viewsource.inc
+++ b/program/steps/mail/viewsource.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/viewsource.inc                                     |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -22,39 +22,39 @@
 ob_end_clean();
 
 // similar code as in program/steps/mail/get.inc
-if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET))
-{
-  $headers = $RCMAIL->storage->get_message_headers($uid);
-  $charset = $headers->charset ? $headers->charset : $CONFIG['default_charset'];
-  header("Content-Type: text/plain; charset={$charset}");
-
-  if (!empty($_GET['_save'])) {
-    $subject = rcube_mime::decode_header($headers->subject, $headers->charset);
-    $filename = ($subject ? $subject : $RCMAIL->config->get('product_name', 'email')) . '.eml';
-    $browser = $RCMAIL->output->browser;
-
-    if ($browser->ie && $browser->ver < 7)
-      $filename = rawurlencode(abbreviate_string($filename, 55));
-    else if ($browser->ie)
-      $filename = rawurlencode($filename);
-    else
-      $filename = addcslashes($filename, '"');
-
-    header("Content-Length: {$headers->size}");
-    header("Content-Disposition: attachment; filename=\"$filename\"");
-  }
-
-  $RCMAIL->storage->print_raw_body($uid, empty($_GET['_save']));
+if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET)) {
+    $headers = $RCMAIL->storage->get_message_headers($uid);
+    $charset = $headers->charset ? $headers->charset : $RCMAIL->config->get('default_charset');
+
+    header("Content-Type: text/plain; charset={$charset}");
+
+    if (!empty($_GET['_save'])) {
+        $subject  = rcube_mime::decode_header($headers->subject, $headers->charset);
+        $filename = ($subject ? $subject : $RCMAIL->config->get('product_name', 'email')) . '.eml';
+        $browser  = $RCMAIL->output->browser;
+
+        if ($browser->ie && $browser->ver < 7)
+            $filename = rawurlencode(abbreviate_string($filename, 55));
+        else if ($browser->ie)
+            $filename = rawurlencode($filename);
+        else
+            $filename = addcslashes($filename, '"');
+
+        header("Content-Length: {$headers->size}");
+        header("Content-Disposition: attachment; filename=\"$filename\"");
+    }
+
+    $RCMAIL->storage->print_raw_body($uid, empty($_GET['_save']));
 }
-else
-{
-  rcube::raise_error(array(
-      'code' => 500,
-      'type' => 'php',
-      'file' => __FILE__, 'line' => __LINE__,
-      'message' => 'Message UID '.$uid.' not found'),
-    true, true);
+else {
+    rcube::raise_error(array(
+            'code'    => 500,
+            'type'    => 'php',
+            'file'    => __FILE__,
+            'line'    => __LINE__,
+            'message' => "Message UID $uid not found"
+        ),
+        true, true);
 }
 
 exit;
-