diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index f4aeaa19..59043092 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1,3313 +1,3313 @@
 <?php
 
 /**
  * Calendar plugin for Roundcube webmail
  *
  * @author Lazlo Westerhof <hello@lazlo.me>
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * Copyright (C) 2010, Lazlo Westerhof <hello@lazlo.me>
  * Copyright (C) 2014-2015, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 class calendar extends rcube_plugin
 {
   const FREEBUSY_UNKNOWN = 0;
   const FREEBUSY_FREE = 1;
   const FREEBUSY_BUSY = 2;
   const FREEBUSY_TENTATIVE = 3;
   const FREEBUSY_OOF = 4;
 
   const SESSION_KEY = 'calendar_temp';
 
   public $task = '?(?!logout).*';
   public $rc;
   public $lib;
   public $resources_dir;
   public $home;  // declare public to be used in other classes
   public $urlbase;
   public $timezone;
   public $timezone_offset;
   public $gmt_offset;
   public $ui;
 
   public $defaults = array(
     'calendar_default_view' => "agendaWeek",
     'calendar_timeslots'    => 2,
     'calendar_work_start'   => 6,
     'calendar_work_end'     => 18,
     'calendar_agenda_range' => 60,
     'calendar_agenda_sections' => 'smart',
     'calendar_event_coloring'  => 0,
     'calendar_time_indicator'  => true,
     'calendar_allow_invite_shared' => false,
     'calendar_itip_send_option'    => 3,
     'calendar_itip_after_action'   => 0,
   );
 
   private $ical;
   private $itip;
   private $driver;
 
 
   /**
    * Plugin initialization.
    */
   function init()
   {
     $this->require_plugin('libcalendaring');
 
     $this->rc = rcube::get_instance();
     $this->lib = libcalendaring::get_instance();
 
     $this->register_task('calendar', 'calendar');
 
     // load calendar configuration
     $this->load_config();
 
     // load localizations
     $this->add_texts('localization/', $this->rc->task == 'calendar' && (!$this->rc->action || $this->rc->action == 'print'));
 
     $this->timezone = $this->lib->timezone;
     $this->gmt_offset = $this->lib->gmt_offset;
     $this->dst_active = $this->lib->dst_active;
     $this->timezone_offset = $this->gmt_offset / 3600 - $this->dst_active;
 
     require($this->home . '/lib/calendar_ui.php');
     $this->ui = new calendar_ui($this);
 
     // catch iTIP confirmation requests that don're require a valid session
     if ($this->rc->action == 'attend' && !empty($_REQUEST['_t'])) {
       $this->add_hook('startup', array($this, 'itip_attend_response'));
     }
     else if ($this->rc->action == 'feed' && !empty($_REQUEST['_cal'])) {
       $this->add_hook('startup', array($this, 'ical_feed_export'));
     }
     else {
       // default startup routine
       $this->add_hook('startup', array($this, 'startup'));
     }
 
     $this->add_hook('user_delete', array($this, 'user_delete'));
   }
 
   /**
    * Startup hook
    */
   public function startup($args)
   {
     // the calendar module can be enabled/disabled by the kolab_auth plugin
     if ($this->rc->config->get('calendar_disabled', false) || !$this->rc->config->get('calendar_enabled', true))
         return;
 
     // load Calendar user interface
     if (!$this->rc->output->ajax_call && (!$this->rc->output->env['framed'] || $args['action'] == 'preview')) {
       $this->ui->init();
 
       // settings are required in (almost) every GUI step
       if ($args['action'] != 'attend')
         $this->rc->output->set_env('calendar_settings', $this->load_settings());
     }
 
     if ($args['task'] == 'calendar' && $args['action'] != 'save-pref') {
       if ($args['action'] != 'upload') {
         $this->load_driver();
       }
 
       // register calendar actions
       $this->register_action('index', array($this, 'calendar_view'));
       $this->register_action('event', array($this, 'event_action'));
       $this->register_action('calendar', array($this, 'calendar_action'));
       $this->register_action('count', array($this, 'count_events'));
       $this->register_action('load_events', array($this, 'load_events'));
       $this->register_action('export_events', array($this, 'export_events'));
       $this->register_action('import_events', array($this, 'import_events'));
       $this->register_action('upload', array($this, 'attachment_upload'));
       $this->register_action('get-attachment', array($this, 'attachment_get'));
       $this->register_action('freebusy-status', array($this, 'freebusy_status'));
       $this->register_action('freebusy-times', array($this, 'freebusy_times'));
       $this->register_action('randomdata', array($this, 'generate_randomdata'));
       $this->register_action('print', array($this,'print_view'));
       $this->register_action('mailimportitip', array($this, 'mail_import_itip'));
       $this->register_action('mailimportattach', array($this, 'mail_import_attachment'));
       $this->register_action('mailtoevent', array($this, 'mail_message2event'));
       $this->register_action('inlineui', array($this, 'get_inline_ui'));
       $this->register_action('check-recent', array($this, 'check_recent'));
       $this->register_action('itip-status', array($this, 'event_itip_status'));
       $this->register_action('itip-remove', array($this, 'event_itip_remove'));
       $this->register_action('itip-decline-reply', array($this, 'mail_itip_decline_reply'));
       $this->register_action('itip-delegate', array($this, 'mail_itip_delegate'));
       $this->register_action('resources-list', array($this, 'resources_list'));
       $this->register_action('resources-owner', array($this, 'resources_owner'));
       $this->register_action('resources-calendar', array($this, 'resources_calendar'));
       $this->register_action('resources-autocomplete', array($this, 'resources_autocomplete'));
       $this->add_hook('refresh', array($this, 'refresh'));
 
       // remove undo information...
       if ($undo = $_SESSION['calendar_event_undo']) {
         // ...after timeout
         $undo_time = $this->rc->config->get('undo_timeout', 0);
         if ($undo['ts'] < time() - $undo_time) {
           $this->rc->session->remove('calendar_event_undo');
           // @TODO: do EXPUNGE on kolab objects?
         }
       }
     }
     else if ($args['task'] == 'settings') {
       // add hooks for Calendar settings
       $this->add_hook('preferences_sections_list', array($this, 'preferences_sections_list'));
       $this->add_hook('preferences_list', array($this, 'preferences_list'));
       $this->add_hook('preferences_save', array($this, 'preferences_save')); 
     }
     else if ($args['task'] == 'mail') {
       // hooks to catch event invitations on incoming mails
       if ($args['action'] == 'show' || $args['action'] == 'preview') {
         $this->add_hook('template_object_messagebody', array($this, 'mail_messagebody_html'));
       }
 
       // add 'Create event' item to message menu
       if ($this->api->output->type == 'html') {
         $this->api->add_content(html::tag('li', null, 
           $this->api->output->button(array(
             'command'  => 'calendar-create-from-mail',
             'label'    => 'calendar.createfrommail',
             'type'     => 'link',
             'classact' => 'icon calendarlink active',
             'class'    => 'icon calendarlink',
             'innerclass' => 'icon calendar',
           ))),
           'messagemenu');
 
         $this->api->output->add_label('calendar.createfrommail');
       }
 
       $this->add_hook('messages_list', array($this, 'mail_messages_list'));
       $this->add_hook('message_compose', array($this, 'mail_message_compose'));
     }
     else if ($args['task'] == 'addressbook') {
       if ($this->rc->config->get('calendar_contact_birthdays')) {
         $this->add_hook('contact_update', array($this, 'contact_update'));
         $this->add_hook('contact_create', array($this, 'contact_update'));
       }
     }
 
     // add hooks to display alarms
     $this->add_hook('pending_alarms', array($this, 'pending_alarms'));
     $this->add_hook('dismiss_alarms', array($this, 'dismiss_alarms'));
   }
 
   /**
    * Helper method to load the backend driver according to local config
    */
   private function load_driver()
   {
     if (is_object($this->driver))
       return;
 
     $driver_name = $this->rc->config->get('calendar_driver', 'database');
     $driver_class = $driver_name . '_driver';
 
     require_once($this->home . '/drivers/calendar_driver.php');
     require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');
 
     $this->driver = new $driver_class($this);
 
     if ($this->driver->undelete)
       $this->driver->undelete = $this->rc->config->get('undo_timeout', 0) > 0;
   }
 
   /**
    * Load iTIP functions
    */
   private function load_itip()
   {
     if (!$this->itip) {
       require_once($this->home . '/lib/calendar_itip.php');
       $this->itip = new calendar_itip($this);
       
       if ($this->rc->config->get('kolab_invitation_calendars'))
         $this->itip->set_rsvp_actions(array('accepted','tentative','declined','delegated','needs-action'));
     }
 
     return $this->itip;
   }
 
   /**
    * Load iCalendar functions
    */
   public function get_ical()
   {
     if (!$this->ical) {
       $this->ical = libcalendaring::get_ical();
     }
     
     return $this->ical;
   }
 
   /**
    * Get properties of the calendar this user has specified as default
    */
   public function get_default_calendar($sensitivity = null)
   {
     $default_id = $this->rc->config->get('calendar_default_calendar');
     $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_WRITEABLE);
     $calendar = $calendars[$default_id] ?: null;
     if (!$calendar || $sensitivity) {
       foreach ($calendars as $cal) {
         if ($sensitivity && $cal['subtype'] == $sensitivity) {
           $calendar = $cal;
           break;
         }
         if ($cal['default'] && $cal['editable']) {
           $calendar = $cal;
         }
         if ($cal['editable']) {
           $first = $cal;
         }
       }
     }
 
     return $calendar ?: $first;
   }
 
 
   /**
    * Render the main calendar view from skin template
    */
   function calendar_view()
   {
     $this->rc->output->set_pagetitle($this->gettext('calendar'));
 
     // Add CSS stylesheets to the page header
     $this->ui->addCSS();
 
     // Add JS files to the page header
     $this->ui->addJS();
 
     $this->ui->init_templates();
     $this->rc->output->add_label('lowest','low','normal','high','highest','delete','cancel','uploading','noemailwarning','close');
     $this->rc->output->add_label('libcalendaring.itipaccepted','libcalendaring.itiptentative','libcalendaring.itipdeclined','libcalendaring.itipdelegated','libcalendaring.expandattendeegroup','libcalendaring.expandattendeegroupnodata');
 
     // initialize attendees autocompletion
-    rcube_autocomplete_init();
+    $this->rc->autocomplete_init();
 
     $this->rc->output->set_env('timezone', $this->timezone->getName());
     $this->rc->output->set_env('calendar_driver', $this->rc->config->get('calendar_driver'), false);
     $this->rc->output->set_env('calendar_resources', (bool)$this->rc->config->get('calendar_resources_driver'));
     $this->rc->output->set_env('mscolors', jqueryui::get_color_values());
     $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array('id' => 'edit-identities-list', 'aria-label' => $this->gettext('roleorganizer'))));
 
     $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
     if (in_array($view, array('agendaWeek', 'agendaDay', 'month', 'table')))
       $this->rc->output->set_env('view', $view);
 
     if ($date = rcube_utils::get_input_value('date', rcube_utils::INPUT_GPC))
       $this->rc->output->set_env('date', $date);
 
     if ($msgref = rcube_utils::get_input_value('itip', rcube_utils::INPUT_GPC))
       $this->rc->output->set_env('itip_events', $this->itip_events($msgref));
 
     $this->rc->output->send("calendar.calendar");
   }
 
   /**
    * Handler for preferences_sections_list hook.
    * Adds Calendar settings sections into preferences sections list.
    *
    * @param array Original parameters
    * @return array Modified parameters
    */
   function preferences_sections_list($p)
   {
     $p['list']['calendar'] = array(
       'id' => 'calendar', 'section' => $this->gettext('calendar'),
     );
 
     return $p;
   }
 
   /**
    * Handler for preferences_list hook.
    * Adds options blocks into Calendar settings sections in Preferences.
    *
    * @param array Original parameters
    * @return array Modified parameters
    */
   function preferences_list($p)
   {
     if ($p['section'] != 'calendar') {
       return $p;
     }
 
     $no_override = array_flip((array)$this->rc->config->get('dont_override'));
 
     $p['blocks']['view']['name'] = $this->gettext('mainoptions');
 
     if (!isset($no_override['calendar_default_view'])) {
       if (!$p['current']) {
         $p['blocks']['view']['content'] = true;
         return $p;
       }
 
       $field_id = 'rcmfd_default_view';
       $select = new html_select(array('name' => '_default_view', 'id' => $field_id));
       $select->add($this->gettext('day'), "agendaDay");
       $select->add($this->gettext('week'), "agendaWeek");
       $select->add($this->gettext('month'), "month");
       $select->add($this->gettext('agenda'), "table");
       $p['blocks']['view']['options']['default_view'] = array(
         'title' => html::label($field_id, rcube::Q($this->gettext('default_view'))),
         'content' => $select->show($this->rc->config->get('calendar_default_view', $this->defaults['calendar_default_view'])),
       );
     }
 
     if (!isset($no_override['calendar_timeslots'])) {
       if (!$p['current']) {
         $p['blocks']['view']['content'] = true;
         return $p;
       }
 
       $field_id = 'rcmfd_timeslot';
       $choices = array('1', '2', '3', '4', '6');
       $select = new html_select(array('name' => '_timeslots', 'id' => $field_id));
       $select->add($choices);
       $p['blocks']['view']['options']['timeslots'] = array(
         'title' => html::label($field_id, rcube::Q($this->gettext('timeslots'))),
         'content' => $select->show(strval($this->rc->config->get('calendar_timeslots', $this->defaults['calendar_timeslots']))),
       );
     }
 
     if (!isset($no_override['calendar_first_day'])) {
       if (!$p['current']) {
         $p['blocks']['view']['content'] = true;
         return $p;
       }
 
       $field_id = 'rcmfd_firstday';
       $select = new html_select(array('name' => '_first_day', 'id' => $field_id));
       $select->add($this->gettext('sunday'), '0');
       $select->add($this->gettext('monday'), '1');
       $select->add($this->gettext('tuesday'), '2');
       $select->add($this->gettext('wednesday'), '3');
       $select->add($this->gettext('thursday'), '4');
       $select->add($this->gettext('friday'), '5');
       $select->add($this->gettext('saturday'), '6');
       $p['blocks']['view']['options']['first_day'] = array(
         'title' => html::label($field_id, rcube::Q($this->gettext('first_day'))),
         'content' => $select->show(strval($this->rc->config->get('calendar_first_day', $this->defaults['calendar_first_day']))),
       );
     }
 
     if (!isset($no_override['calendar_first_hour'])) {
       if (!$p['current']) {
         $p['blocks']['view']['content'] = true;
         return $p;
       }
 
       $time_format = $this->rc->config->get('time_format', libcalendaring::to_php_date_format($this->rc->config->get('calendar_time_format', $this->defaults['calendar_time_format'])));
       $select_hours = new html_select();
       for ($h = 0; $h < 24; $h++)
         $select_hours->add(date($time_format, mktime($h, 0, 0)), $h);
 
       $field_id = 'rcmfd_firsthour';
       $p['blocks']['view']['options']['first_hour'] = array(
         'title' => html::label($field_id, rcube::Q($this->gettext('first_hour'))),
         'content' => $select_hours->show($this->rc->config->get('calendar_first_hour', $this->defaults['calendar_first_hour']), array('name' => '_first_hour', 'id' => $field_id)),
       );
     }
 
     if (!isset($no_override['calendar_work_start'])) {
       if (!$p['current']) {
         $p['blocks']['view']['content'] = true;
         return $p;
       }
 
       $field_id = 'rcmfd_workstart';
       $p['blocks']['view']['options']['workinghours'] = array(
         'title' => html::label($field_id, rcube::Q($this->gettext('workinghours'))),
         'content' => $select_hours->show($this->rc->config->get('calendar_work_start', $this->defaults['calendar_work_start']), array('name' => '_work_start', 'id' => $field_id)) .
         ' &mdash; ' . $select_hours->show($this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']), array('name' => '_work_end', 'id' => $field_id)),
       );
     }
 
     if (!isset($no_override['calendar_event_coloring'])) {
       if (!$p['current']) {
         $p['blocks']['view']['content'] = true;
         return $p;
       }
 
       $field_id = 'rcmfd_coloring';
       $select_colors = new html_select(array('name' => '_event_coloring', 'id' => $field_id));
       $select_colors->add($this->gettext('coloringmode0'), 0);
       $select_colors->add($this->gettext('coloringmode1'), 1);
       $select_colors->add($this->gettext('coloringmode2'), 2);
       $select_colors->add($this->gettext('coloringmode3'), 3);
 
       $p['blocks']['view']['options']['eventcolors'] = array(
         'title' => html::label($field_id . 'value', rcube::Q($this->gettext('eventcoloring'))),
         'content' => $select_colors->show($this->rc->config->get('calendar_event_coloring', $this->defaults['calendar_event_coloring'])),
       );
     }
 
     // loading driver is expensive, don't do it if not needed
     $this->load_driver();
 
     if (!isset($no_override['calendar_default_alarm_type']) || !isset($no_override['calendar_default_alarm_offset'])) {
       if (!$p['current']) {
         $p['blocks']['view']['content'] = true;
         return $p;
       }
 
       $alarm_type = $alarm_offset = '';
 
       if (!isset($no_override['calendar_default_alarm_type'])) {
         $field_id    = 'rcmfd_alarm';
         $select_type = new html_select(array('name' => '_alarm_type', 'id' => $field_id));
         $select_type->add($this->gettext('none'), '');
 
         foreach ($this->driver->alarm_types as $type) {
           $select_type->add($this->rc->gettext(strtolower("alarm{$type}option"), 'libcalendaring'), $type);
         }
 
         $alarm_type = $select_type->show($this->rc->config->get('calendar_default_alarm_type', ''));
       }
 
       if (!isset($no_override['calendar_default_alarm_offset'])) {
         $field_id      = 'rcmfd_alarm';
         $input_value   = new html_inputfield(array('name' => '_alarm_value', 'id' => $field_id . 'value', 'size' => 3));
         $select_offset = new html_select(array('name' => '_alarm_offset', 'id' => $field_id . 'offset'));
 
         foreach (array('-M','-H','-D','+M','+H','+D') as $trigger) {
           $select_offset->add($this->rc->gettext('trigger' . $trigger, 'libcalendaring'), $trigger);
         }
 
         $preset = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_default_alarm_offset', '-15M'));
         $alarm_offset = $input_value->show($preset[0]) . ' ' . $select_offset->show($preset[1]);
       }
 
       $p['blocks']['view']['options']['alarmtype'] = array(
         'title' => html::label($field_id, rcube::Q($this->gettext('defaultalarmtype'))),
         'content' => $alarm_type . ' ' . $alarm_offset,
       );
     }
 
     if (!isset($no_override['calendar_default_calendar'])) {
       if (!$p['current']) {
         $p['blocks']['view']['content'] = true;
         return $p;
       }
       // default calendar selection
       $field_id = 'rcmfd_default_calendar';
       $select_cal = new html_select(array('name' => '_default_calendar', 'id' => $field_id, 'is_escaped' => true));
       foreach ((array)$this->driver->list_calendars(calendar_driver::FILTER_PERSONAL) as $id => $prop) {
         $select_cal->add($prop['name'], strval($id));
         if ($prop['default'])
           $default_calendar = $id;
       }
       $p['blocks']['view']['options']['defaultcalendar'] = array(
         'title' => html::label($field_id . 'value', rcube::Q($this->gettext('defaultcalendar'))),
         'content' => $select_cal->show($this->rc->config->get('calendar_default_calendar', $default_calendar)),
       );
     }
 
     $p['blocks']['itip']['name'] = $this->gettext('itipoptions');
 
     // Invitations handling
     if (!isset($no_override['calendar_itip_after_action'])) {
       if (!$p['current']) {
         $p['blocks']['itip']['content'] = true;
         return $p;
       }
 
       $field_id = 'rcmfd_after_action';
       $select   = new html_select(array('name' => '_after_action', 'id' => $field_id,
         'onchange' => "\$('#{$field_id}_select')[this.value == 4 ? 'show' : 'hide']()"));
 
       $select->add($this->gettext('afternothing'), '');
       $select->add($this->gettext('aftertrash'), 1);
       $select->add($this->gettext('afterdelete'), 2);
       $select->add($this->gettext('afterflagdeleted'), 3);
       $select->add($this->gettext('aftermoveto'), 4);
 
       $val = $this->rc->config->get('calendar_itip_after_action', $this->defaults['calendar_itip_after_action']);
       if ($val !== null && $val !== '' && !is_int($val)) {
         $folder = $val;
         $val    = 4;
       }
 
       $folders = $this->rc->folder_selector(array(
           'id'            => $field_id . '_select',
           'name'          => '_after_action_folder',
           'maxlength'     => 30,
           'folder_filter' => 'mail',
           'folder_rights' => 'w',
           'style'         => $val !== 4 ? 'display:none' : '',
       ));
 
       $p['blocks']['itip']['options']['after_action'] = array(
         'title'   => html::label($field_id, rcube::Q($this->gettext('afteraction'))),
         'content' => $select->show($val) . $folders->show($folder),
       );
     }
 
     // category definitions
     if (!$this->driver->nocategories && !isset($no_override['calendar_categories'])) {
         $p['blocks']['categories']['name'] = $this->gettext('categories');
 
         if (!$p['current']) {
           $p['blocks']['categories']['content'] = true;
           return $p;
         }
 
         $categories = (array) $this->driver->list_categories();
         $categories_list = '';
         foreach ($categories as $name => $color) {
           $key = md5($name);
           $field_class = 'rcmfd_category_' . str_replace(' ', '_', $name);
           $category_remove = new html_inputfield(array('type' => 'button', 'value' => 'X', 'class' => 'button', 'onclick' => '$(this).parent().remove()', 'title' => $this->gettext('remove_category')));
           $category_name  = new html_inputfield(array('name' => "_categories[$key]", 'class' => $field_class, 'size' => 30, 'disabled' => $this->driver->categoriesimmutable));
           $category_color = new html_inputfield(array('name' => "_colors[$key]", 'class' => "$field_class colors", 'size' => 6));
           $hidden = $this->driver->categoriesimmutable ? html::tag('input', array('type' => 'hidden', 'name' => "_categories[$key]", 'value' => $name)) : '';
           $categories_list .= html::div(null, $hidden . $category_name->show($name) . '&nbsp;' . $category_color->show($color) . '&nbsp;' . $category_remove->show());
         }
 
         $p['blocks']['categories']['options']['category_' . $name] = array(
           'content' => html::div(array('id' => 'calendarcategories'), $categories_list),
         );
 
         $field_id = 'rcmfd_new_category';
         $new_category = new html_inputfield(array('name' => '_new_category', 'id' => $field_id, 'size' => 30));
         $add_category = new html_inputfield(array('type' => 'button', 'class' => 'button', 'value' => $this->gettext('add_category'),  'onclick' => "rcube_calendar_add_category()"));
         $p['blocks']['categories']['options']['categories'] = array(
           'content' => $new_category->show('') . '&nbsp;' . $add_category->show(),
         );
 
         $this->rc->output->add_script('function rcube_calendar_add_category(){
           var name = $("#rcmfd_new_category").val();
           if (name.length) {
             var input = $("<input>").attr("type", "text").attr("name", "_categories[]").attr("size", 30).val(name);
             var color = $("<input>").attr("type", "text").attr("name", "_colors[]").attr("size", 6).addClass("colors").val("000000");
             var button = $("<input>").attr("type", "button").attr("value", "X").addClass("button").click(function(){ $(this).parent().remove() });
             $("<div>").append(input).append("&nbsp;").append(color).append("&nbsp;").append(button).appendTo("#calendarcategories");
             color.miniColors({ colorValues:(rcmail.env.mscolors || []) });
             $("#rcmfd_new_category").val("");
           }
         }');
 
         $this->rc->output->add_script('$("#rcmfd_new_category").keypress(function(event){
           if (event.which == 13) {
             rcube_calendar_add_category();
             event.preventDefault();
           }
         });
         ', 'docready');
 
         // load miniColors js/css files
         jqueryui::miniColors();
     }
 
     // virtual birthdays calendar
     if (!isset($no_override['calendar_contact_birthdays'])) {
       $p['blocks']['birthdays']['name'] = $this->gettext('birthdayscalendar');
 
       if (!$p['current']) {
         $p['blocks']['birthdays']['content'] = true;
         return $p;
       }
 
       $field_id = 'rcmfd_contact_birthdays';
       $input    = new html_checkbox(array('name' => '_contact_birthdays', 'id' => $field_id, 'value' => 1, 'onclick' => '$(".calendar_birthday_props").prop("disabled",!this.checked)'));
 
       $p['blocks']['birthdays']['options']['contact_birthdays'] = array(
         'title'   => html::label($field_id, $this->gettext('displaybirthdayscalendar')),
         'content' => $input->show($this->rc->config->get('calendar_contact_birthdays')?1:0),
       );
 
       $input_attrib = array(
         'class' => 'calendar_birthday_props',
         'disabled' => !$this->rc->config->get('calendar_contact_birthdays'),
       );
 
       $sources = array();
       $checkbox = new html_checkbox(array('name' => '_birthday_adressbooks[]') + $input_attrib);
       foreach ($this->rc->get_address_sources(false, true) as $source) {
         $active = in_array($source['id'], (array)$this->rc->config->get('calendar_birthday_adressbooks', array())) ? $source['id'] : '';
         $sources[] = html::label(null, $checkbox->show($active, array('value' => $source['id'])) . '&nbsp;' . rcube::Q($source['realname'] ?: $source['name']));
       }
 
       $p['blocks']['birthdays']['options']['birthday_adressbooks'] = array(
         'title'   => rcube::Q($this->gettext('birthdayscalendarsources')),
         'content' => join(html::br(), $sources),
       );
 
       $field_id = 'rcmfd_birthdays_alarm';
       $select_type = new html_select(array('name' => '_birthdays_alarm_type', 'id' => $field_id) + $input_attrib);
       $select_type->add($this->gettext('none'), '');
       foreach ($this->driver->alarm_types as $type) {
         $select_type->add($this->rc->gettext(strtolower("alarm{$type}option"), 'libcalendaring'), $type);
       }
 
       $input_value = new html_inputfield(array('name' => '_birthdays_alarm_value', 'id' => $field_id . 'value', 'size' => 3) + $input_attrib);
       $select_offset = new html_select(array('name' => '_birthdays_alarm_offset', 'id' => $field_id . 'offset') + $input_attrib);
       foreach (array('-M','-H','-D') as $trigger)
         $select_offset->add($this->rc->gettext('trigger' . $trigger, 'libcalendaring'), $trigger);
 
       $preset = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D'));
       $p['blocks']['birthdays']['options']['birthdays_alarmoffset'] = array(
         'title' => html::label($field_id . 'value', rcube::Q($this->gettext('showalarms'))),
         'content' => $select_type->show($this->rc->config->get('calendar_birthdays_alarm_type', '')) . ' ' . $input_value->show($preset[0]) . '&nbsp;' . $select_offset->show($preset[1]),
       );
     }
 
     return $p;
   }
 
   /**
    * Handler for preferences_save hook.
    * Executed on Calendar settings form submit.
    *
    * @param array Original parameters
    * @return array Modified parameters
    */
   function preferences_save($p)
   {
     if ($p['section'] == 'calendar') {
       $this->load_driver();
 
       // compose default alarm preset value
       $alarm_offset  = rcube_utils::get_input_value('_alarm_offset', rcube_utils::INPUT_POST);
       $alarm_value   = rcube_utils::get_input_value('_alarm_value', rcube_utils::INPUT_POST);
       $default_alarm = $alarm_offset[0] . intval($alarm_value) . $alarm_offset[1];
 
       $birthdays_alarm_offset = rcube_utils::get_input_value('_birthdays_alarm_offset', rcube_utils::INPUT_POST);
       $birthdays_alarm_value  = rcube_utils::get_input_value('_birthdays_alarm_value', rcube_utils::INPUT_POST);
       $birthdays_alarm_value  = $birthdays_alarm_offset[0] . intval($birthdays_alarm_value) . $birthdays_alarm_offset[1];
 
       $p['prefs'] = array(
         'calendar_default_view' => rcube_utils::get_input_value('_default_view', rcube_utils::INPUT_POST),
         'calendar_timeslots'    => intval(rcube_utils::get_input_value('_timeslots', rcube_utils::INPUT_POST)),
         'calendar_first_day'    => intval(rcube_utils::get_input_value('_first_day', rcube_utils::INPUT_POST)),
         'calendar_first_hour'   => intval(rcube_utils::get_input_value('_first_hour', rcube_utils::INPUT_POST)),
         'calendar_work_start'   => intval(rcube_utils::get_input_value('_work_start', rcube_utils::INPUT_POST)),
         'calendar_work_end'     => intval(rcube_utils::get_input_value('_work_end', rcube_utils::INPUT_POST)),
         'calendar_event_coloring'       => intval(rcube_utils::get_input_value('_event_coloring', rcube_utils::INPUT_POST)),
         'calendar_default_alarm_type'   => rcube_utils::get_input_value('_alarm_type', rcube_utils::INPUT_POST),
         'calendar_default_alarm_offset' => $default_alarm,
         'calendar_default_calendar'     => rcube_utils::get_input_value('_default_calendar', rcube_utils::INPUT_POST),
         'calendar_date_format' => null,  // clear previously saved values
         'calendar_time_format' => null,
         'calendar_contact_birthdays'    => rcube_utils::get_input_value('_contact_birthdays', rcube_utils::INPUT_POST) ? true : false,
         'calendar_birthday_adressbooks' => (array) rcube_utils::get_input_value('_birthday_adressbooks', rcube_utils::INPUT_POST),
         'calendar_birthdays_alarm_type'   => rcube_utils::get_input_value('_birthdays_alarm_type', rcube_utils::INPUT_POST),
         'calendar_birthdays_alarm_offset' => $birthdays_alarm_value ?: null,
         'calendar_itip_after_action'      => intval(rcube_utils::get_input_value('_after_action', rcube_utils::INPUT_POST)),
       );
 
       if ($p['prefs']['calendar_itip_after_action'] == 4) {
         $p['prefs']['calendar_itip_after_action'] = rcube_utils::get_input_value('_after_action_folder', rcube_utils::INPUT_POST, true);
       }
 
       // categories
       if (!$this->driver->nocategories) {
         $old_categories = $new_categories = array();
         foreach ($this->driver->list_categories() as $name => $color) {
           $old_categories[md5($name)] = $name;
         }
 
         $categories = (array) rcube_utils::get_input_value('_categories', rcube_utils::INPUT_POST);
         $colors     = (array) rcube_utils::get_input_value('_colors', rcube_utils::INPUT_POST);
 
         foreach ($categories as $key => $name) {
           $color = preg_replace('/^#/', '', strval($colors[$key]));
 
           // rename categories in existing events -> driver's job
           if ($oldname = $old_categories[$key]) {
             $this->driver->replace_category($oldname, $name, $color);
             unset($old_categories[$key]);
           }
           else
             $this->driver->add_category($name, $color);
 
           $new_categories[$name] = $color;
         }
 
         // these old categories have been removed, alter events accordingly -> driver's job
         foreach ((array)$old_categories[$key] as $key => $name) {
           $this->driver->remove_category($name);
         }
 
         $p['prefs']['calendar_categories'] = $new_categories;
       }
     }
 
     return $p;
   }
 
   /**
    * Dispatcher for calendar actions initiated by the client
    */
   function calendar_action()
   {
     $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
     $cal    = rcube_utils::get_input_value('c', rcube_utils::INPUT_GPC);
     $success = $reload = false;
 
     if (isset($cal['showalarms']))
       $cal['showalarms'] = intval($cal['showalarms']);
 
     switch ($action) {
       case "form-new":
       case "form-edit":
         echo $this->ui->calendar_editform($action, $cal);
         exit;
       case "new":
         $success = $this->driver->create_calendar($cal);
         $reload = true;
         break;
       case "edit":
         $success = $this->driver->edit_calendar($cal);
         $reload = true;
         break;
       case "delete":
         if ($success = $this->driver->delete_calendar($cal))
           $this->rc->output->command('plugin.destroy_source', array('id' => $cal['id']));
         break;
       case "subscribe":
         if (!$this->driver->subscribe_calendar($cal))
           $this->rc->output->show_message($this->gettext('errorsaving'), 'error');
         return;
       case "search":
         $results    = array();
         $color_mode = $this->rc->config->get('calendar_event_coloring', $this->defaults['calendar_event_coloring']);
         $query      = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
         $source     = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
 
         foreach ((array) $this->driver->search_calendars($query, $source) as $id => $prop) {
           $editname = $prop['editname'];
           unset($prop['editname']);  // force full name to be displayed
           $prop['active'] = false;
 
           // let the UI generate HTML and CSS representation for this calendar
           $html = $this->ui->calendar_list_item($id, $prop, $jsenv);
           $cal = $jsenv[$id];
           $cal['editname'] = $editname;
           $cal['html'] = $html;
           if (!empty($prop['color']))
             $cal['css'] = $this->ui->calendar_css_classes($id, $prop, $color_mode);
 
           $results[] = $cal;
         }
         // report more results available
         if ($this->driver->search_more_results)
           $this->rc->output->show_message('autocompletemore', 'info');
 
         $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
         return;
     }
     
     if ($success)
       $this->rc->output->show_message('successfullysaved', 'confirmation');
     else {
       $error_msg = $this->gettext('errorsaving') . ($this->driver->last_error ? ': ' . $this->driver->last_error :'');
       $this->rc->output->show_message($error_msg, 'error');
     }
 
     $this->rc->output->command('plugin.unlock_saving');
 
     if ($success && $reload)
       $this->rc->output->command('plugin.reload_view');
   }
   
   
   /**
    * Dispatcher for event actions initiated by the client
    */
   function event_action()
   {
     $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
     $event  = rcube_utils::get_input_value('e', rcube_utils::INPUT_POST, true);
     $success = $reload = $got_msg = false;
     
     // force notify if hidden + active
     if ((int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']) === 1)
       $event['_notify'] = 1;
 
     // read old event data in order to find changes
     if (($event['_notify'] || $event['_decline']) && $action != 'new') {
       $old = $this->driver->get_event($event);
 
       // load main event if savemode is 'all' or if deleting 'future' events
       if (($event['_savemode'] == 'all' || ($event['_savemode'] == 'future' && $action == 'remove' && !$event['_decline'])) && $old['recurrence_id']) {
         $old['id'] = $old['recurrence_id'];
         $old = $this->driver->get_event($old);
       }
     }
 
     switch ($action) {
       case "new":
         // create UID for new event
         $event['uid'] = $this->generate_uid();
         $this->write_preprocess($event, $action);
         if ($success = $this->driver->new_event($event)) {
           $event['id'] = $event['uid'];
           $event['_savemode'] = 'all';
           $this->cleanup_event($event);
           $this->event_save_success($event, null, $action, true);
         }
         $reload = $success && $event['recurrence'] ? 2 : 1;
         break;
         
       case "edit":
         $this->write_preprocess($event, $action);
         if ($success = $this->driver->edit_event($event)) {
           $this->cleanup_event($event);
           $this->event_save_success($event, $old, $action, $success);
         }
         $reload = $success && ($event['recurrence'] || $event['_savemode'] || $event['_fromcalendar']) ? 2 : 1;
         break;
       
       case "resize":
         $this->write_preprocess($event, $action);
         if ($success = $this->driver->resize_event($event)) {
           $this->event_save_success($event, $old, $action, $success);
         }
         $reload = $event['_savemode'] ? 2 : 1;
         break;
       
       case "move":
         $this->write_preprocess($event, $action);
         if ($success = $this->driver->move_event($event)) {
           $this->event_save_success($event, $old, $action, $success);
         }
         $reload  = $success && $event['_savemode'] ? 2 : 1;
         break;
       
       case "remove":
         // remove previous deletes
         $undo_time = $this->driver->undelete ? $this->rc->config->get('undo_timeout', 0) : 0;
         $this->rc->session->remove('calendar_event_undo');
         
         // search for event if only UID is given
         if (!isset($event['calendar']) && $event['uid']) {
           if (!($event = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE))) {
             break;
           }
           $undo_time = 0;
         }
 
         $success = $this->driver->remove_event($event, $undo_time < 1);
         $reload = (!$success || $event['_savemode']) ? 2 : 1;
 
         if ($undo_time > 0 && $success) {
           $_SESSION['calendar_event_undo'] = array('ts' => time(), 'data' => $event);
           // display message with Undo link.
           $msg = html::span(null, $this->gettext('successremoval'))
             . ' ' . html::a(array('onclick' => sprintf("%s.http_request('event', 'action=undo', %s.display_message('', 'loading'))",
               rcmail_output::JS_OBJECT_NAME, rcmail_output::JS_OBJECT_NAME)), $this->gettext('undo'));
           $this->rc->output->show_message($msg, 'confirmation', null, true, $undo_time);
           $got_msg = true;
         }
         else if ($success) {
           $this->rc->output->show_message('calendar.successremoval', 'confirmation');
           $got_msg = true;
         }
 
         // send cancellation for the main event
         if ($event['_savemode'] == 'all') {
           unset($old['_instance'], $old['recurrence_date'], $old['recurrence_id']);
         }
         // send an update for the main event's recurrence rule instead of a cancellation message
         else if ($event['_savemode'] == 'future' && $success !== false && $success !== true) {
           $event['_savemode'] = 'all';  // force event_save_success() to load master event
           $action = 'edit';
           $success = true;
         }
 
         // send iTIP reply that participant has declined the event
         if ($success && $event['_decline']) {
           $emails = $this->get_user_emails();
           foreach ($old['attendees'] as $i => $attendee) {
             if ($attendee['role'] == 'ORGANIZER')
               $organizer = $attendee;
             else if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
               $old['attendees'][$i]['status'] = 'DECLINED';
               $reply_sender = $attendee['email'];
             }
           }
 
           if ($event['_savemode'] == 'future' && $event['id'] != $old['id']) {
             $old['thisandfuture'] = true;
           }
 
           $itip = $this->load_itip();
           $itip->set_sender_email($reply_sender);
           if ($organizer && $itip->send_itip_message($old, 'REPLY', $organizer, 'itipsubjectdeclined', 'itipmailbodydeclined'))
             $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation');
           else
             $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
         }
         else if ($success) {
           $this->event_save_success($event, $old, $action, $success);
         }
         break;
 
       case "undo":
         // Restore deleted event
         $event  = $_SESSION['calendar_event_undo']['data'];
 
         if ($event)
           $success = $this->driver->restore_event($event);
 
         if ($success) {
           $this->rc->session->remove('calendar_event_undo');
           $this->rc->output->show_message('calendar.successrestore', 'confirmation');
           $got_msg = true;
           $reload = 2;
         }
 
         break;
 
       case "rsvp":
         $itip_sending  = $this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']);
         $status        = rcube_utils::get_input_value('status', rcube_utils::INPUT_POST);
         $attendees     = rcube_utils::get_input_value('attendees', rcube_utils::INPUT_POST);
         $reply_comment = $event['comment'];
 
         $this->write_preprocess($event, 'edit');
         $ev = $this->driver->get_event($event);
         $ev['attendees'] = $event['attendees'];
         $ev['free_busy'] = $event['free_busy'];
         $ev['_savemode'] = $event['_savemode'];
 
         // send invitation to delegatee + add it as attendee
         if ($status == 'delegated' && $event['to']) {
           $itip = $this->load_itip();
           if ($itip->delegate_to($ev, $event['to'], (bool)$event['rsvp'], $attendees)) {
             $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
             $noreply = false;
           }
         }
 
         $event = $ev;
 
         // compose a list of attendees affected by this change
         $updated_attendees = array_filter(array_map(function($j) use ($event) {
           return $event['attendees'][$j];
         }, $attendees));
 
         if ($success = $this->driver->edit_rsvp($event, $status, $updated_attendees)) {
           $noreply = rcube_utils::get_input_value('noreply', rcube_utils::INPUT_GPC);
           $noreply = intval($noreply) || $status == 'needs-action' || $itip_sending === 0;
           $reload  = $event['calendar'] != $ev['calendar'] || $event['recurrence'] ? 2 : 1;
           $organizer = null;
           $emails = $this->get_user_emails();
 
           foreach ($event['attendees'] as $i => $attendee) {
             if ($attendee['role'] == 'ORGANIZER') {
               $organizer = $attendee;
             }
             else if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
               $reply_sender = $attendee['email'];
             }
           }
 
           if (!$noreply) {
             $itip = $this->load_itip();
             $itip->set_sender_email($reply_sender);
             $event['comment'] = $reply_comment;
             $event['thisandfuture'] = $event['_savemode'] == 'future';
             if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
               $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation');
             else
               $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
           }
 
           // refresh all calendars
           if ($event['calendar'] != $ev['calendar']) {
             $this->rc->output->command('plugin.refresh_calendar', array('source' => null, 'refetch' => true));
             $reload = 0;
           }
         }
         break;
 
       case "dismiss":
         $event['ids'] = explode(',', $event['id']);
         $plugin = $this->rc->plugins->exec_hook('dismiss_alarms', $event);
         $success = $plugin['success'];
         foreach ($event['ids'] as $id) {
             if (strpos($id, 'cal:') === 0)
                 $success |= $this->driver->dismiss_alarm(substr($id, 4), $event['snooze']);
         }
         break;
 
       case "changelog":
         $data = $this->driver->get_event_changelog($event);
         if (is_array($data) && !empty($data)) {
           $lib = $this->lib;
           $dtformat = $this->rc->config->get('date_format') . ' ' . $this->rc->config->get('time_format');
           array_walk($data, function(&$change) use ($lib, $dtformat) {
             if ($change['date']) {
               $dt = $lib->adjust_timezone($change['date']);
               if ($dt instanceof DateTime)
                 $change['date'] = $this->rc->format_date($dt, $dtformat, false);
             }
           });
           $this->rc->output->command('plugin.render_event_changelog', $data);
         }
         else {
           $this->rc->output->command('plugin.render_event_changelog', false);
         }
         $got_msg = true;
         $reload = false;
         break;
 
       case "diff":
         $data = $this->driver->get_event_diff($event, $event['rev1'], $event['rev2']);
         if (is_array($data)) {
           // convert some properties, similar to self::_client_event()
           $lib = $this->lib;
           array_walk($data['changes'], function(&$change, $i) use ($event, $lib) {
             // convert date cols
             foreach (array('start','end','created','changed') as $col) {
               if ($change['property'] == $col) {
                 $change['old'] = $lib->adjust_timezone($change['old'], strlen($change['old']) == 10)->format('c');
                 $change['new'] = $lib->adjust_timezone($change['new'], strlen($change['new']) == 10)->format('c');
               }
             }
             // create textual representation for alarms and recurrence
             if ($change['property'] == 'alarms') {
               if (is_array($change['old']))
                 $change['old_'] = libcalendaring::alarm_text($change['old']);
               if (is_array($change['new']))
                 $change['new_'] = libcalendaring::alarm_text(array_merge((array)$change['old'], $change['new']));
             }
             if ($change['property'] == 'recurrence') {
               if (is_array($change['old']))
                 $change['old_'] = $lib->recurrence_text($change['old']);
               if (is_array($change['new']))
                 $change['new_'] = $lib->recurrence_text(array_merge((array)$change['old'], $change['new']));
             }
             if ($change['property'] == 'attachments') {
               if (is_array($change['old']))
                 $change['old']['classname'] = rcube_utils::file2class($change['old']['mimetype'], $change['old']['name']);
               if (is_array($change['new']))
                 $change['new']['classname'] = rcube_utils::file2class($change['new']['mimetype'], $change['new']['name']);
             }
             // compute a nice diff of description texts
             if ($change['property'] == 'description') {
               $change['diff_'] = libkolab::html_diff($change['old'], $change['new']);
             }
           });
           $this->rc->output->command('plugin.event_show_diff', $data);
         }
         else {
           $this->rc->output->command('display_message', $this->gettext('objectdiffnotavailable'), 'error');
         }
         $got_msg = true;
         $reload = false;
         break;
 
       case "show":
         if ($event = $this->driver->get_event_revison($event, $event['rev'])) {
           $this->rc->output->command('plugin.event_show_revision', $this->_client_event($event));
         }
         else {
           $this->rc->output->command('display_message', $this->gettext('objectnotfound'), 'error');
         }
         $got_msg = true;
         $reload = false;
         break;
 
       case "restore":
         if ($success = $this->driver->restore_event_revision($event, $event['rev'])) {
           $_event = $this->driver->get_event($event);
           $reload = $_event['recurrence'] ? 2 : 1;
           $this->rc->output->command('display_message', $this->gettext(array('name' => 'objectrestoresuccess', 'vars' => array('rev' => $event['rev']))), 'confirmation');
           $this->rc->output->command('plugin.close_history_dialog');
         }
         else {
           $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
           $reload = 0;
         }
         $got_msg = true;
         break;
     }
 
     // show confirmation/error message
     if (!$got_msg) {
       if ($success)
         $this->rc->output->show_message('successfullysaved', 'confirmation');
       else
         $this->rc->output->show_message('calendar.errorsaving', 'error');
     }
 
     // unlock client
     $this->rc->output->command('plugin.unlock_saving');
 
     // update event object on the client or trigger a complete refretch if too complicated
     if ($reload) {
       $args = array('source' => $event['calendar']);
       if ($reload > 1)
         $args['refetch'] = true;
       else if ($success && $action != 'remove')
         $args['update'] = $this->_client_event($this->driver->get_event($event), true);
       $this->rc->output->command('plugin.refresh_calendar', $args);
     }
   }
 
   /**
    * Helper method sending iTip notifications after successful event updates
    */
   private function event_save_success(&$event, $old, $action, $success)
   {
     // $success is a new event ID
     if ($success !== true) {
       // send update notification on the main event
       if ($event['_savemode'] == 'future' && $event['_notify'] && $old['attendees'] && $old['recurrence_id']) {
         $master = $this->driver->get_event(array('id' => $old['recurrence_id'], 'calendar' => $old['calendar']), 0, true);
         unset($master['_instance'], $master['recurrence_date']);
 
         $sent = $this->notify_attendees($master, null, $action, $event['_comment'], false);
         if ($sent < 0)
           $this->rc->output->show_message('calendar.errornotifying', 'error');
 
         $event['attendees'] = $master['attendees'];  // this tricks us into the next if clause
       }
 
       // delete old reference if saved as new
       if ($event['_savemode'] == 'future' || $event['_savemode'] == 'new') {
         $old = null;
       }
 
       $event['id'] = $success;
       $event['_savemode'] = 'all';
     }
 
     // send out notifications
     if ($event['_notify'] && ($event['attendees'] || $old['attendees'])) {
       $_savemode = $event['_savemode'];
 
       // send notification for the main event when savemode is 'all'
       if ($action != 'remove' && $_savemode == 'all' && ($event['recurrence_id'] || $old['recurrence_id'] || ($old && $old['id'] != $event['id']))) {
         $event['id'] = $event['recurrence_id'] ?: ($old['recurrence_id'] ?: $old['id']);
         $event = $this->driver->get_event($event, 0, true);
         unset($event['_instance'], $event['recurrence_date']);
       }
       else {
         // make sure we have the complete record
         $event = $action == 'remove' ? $old : $this->driver->get_event($event, 0, true);
       }
 
       $event['_savemode'] = $_savemode;
 
       if ($old) {
         $old['thisandfuture'] = $_savemode == 'future';
       }
 
       // only notify if data really changed (TODO: do diff check on client already)
       if (!$old || $action == 'remove' || self::event_diff($event, $old)) {
         $sent = $this->notify_attendees($event, $old, $action, $event['_comment']);
         if ($sent > 0)
           $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
         else if ($sent < 0)
           $this->rc->output->show_message('calendar.errornotifying', 'error');
       }
     }
   }
 
   /**
    * Handler for load-requests from fullcalendar
    * This will return pure JSON formatted output
    */
   function load_events()
   {
     $events = $this->driver->load_events(
       rcube_utils::get_input_value('start', rcube_utils::INPUT_GET),
       rcube_utils::get_input_value('end', rcube_utils::INPUT_GET),
       ($query = rcube_utils::get_input_value('q', rcube_utils::INPUT_GET)),
       rcube_utils::get_input_value('source', rcube_utils::INPUT_GET)
     );
     echo $this->encode($events, !empty($query));
     exit;
   }
 
   /**
    * Handler for requests fetching event counts for calendars
    */
   public function count_events()
   {
     // don't update session on these requests (avoiding race conditions)
     $this->rc->session->nowrite = true;
 
     $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET);
     if (!$start) {
       $start = new DateTime('today 00:00:00', $this->timezone);
       $start = $start->format('U');
     }
 
     $counts = $this->driver->count_events(
       rcube_utils::get_input_value('source', rcube_utils::INPUT_GET),
       $start,
       rcube_utils::get_input_value('end', rcube_utils::INPUT_GET)
     );
 
     $this->rc->output->command('plugin.update_counts', array('counts' => $counts));
   }
 
   /**
    * Load event data from an iTip message attachment
    */
   public function itip_events($msgref)
   {
     $path = explode('/', $msgref);
     $msg = array_pop($path);
     $mbox = join('/', $path);
     list($uid, $mime_id) = explode('#', $msg);
     $events = array();
 
     if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
       $partstat = 'NEEDS-ACTION';
 /*
       $user_emails = $this->lib->get_user_emails();
       foreach ($event['attendees'] as $attendee) {
         if (in_array($attendee['email'], $user_emails)) {
           $partstat = $attendee['status'];
           break;
         }
       }
 */
       $event['id'] = $event['uid'];
       $event['temporary'] = true;
       $event['readonly'] = true;
       $event['calendar'] = '--invitation--itip';
       $event['className'] = 'fc-invitation-' . strtolower($partstat);
       $event['_mbox'] = $mbox;
       $event['_uid']  = $uid;
       $event['_part'] = $mime_id;
 
       $events[] = $this->_client_event($event, true);
 
       // add recurring instances
       if (!empty($event['recurrence'])) {
         foreach ($this->driver->get_recurring_events($event, $event['start']) as $recurring) {
           $recurring['temporary'] = true;
           $recurring['readonly'] = true;
           $recurring['calendar'] = '--invitation--itip';
           $events[] = $this->_client_event($recurring, true);
         }
       }
     }
 
     return $events;
   }
 
   /**
    * Handler for keep-alive requests
    * This will check for updated data in active calendars and sync them to the client
    */
   public function refresh($attr)
   {
      // refresh the entire calendar every 10th time to also sync deleted events
     if (rand(0,10) == 10) {
         $this->rc->output->command('plugin.refresh_calendar', array('refetch' => true));
         return;
     }
 
     $counts = array();
 
     foreach ($this->driver->list_calendars(calendar_driver::FILTER_ACTIVE) as $cal) {
       $events = $this->driver->load_events(
         rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC),
         rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC),
         rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC),
         $cal['id'],
         1,
         $attr['last']
       );
 
       foreach ($events as $event) {
         $this->rc->output->command('plugin.refresh_calendar',
           array('source' => $cal['id'], 'update' => $this->_client_event($event)));
       }
 
       // refresh count for this calendar
       if ($cal['counts']) {
         $today = new DateTime('today 00:00:00', $this->timezone);
         $counts += $this->driver->count_events($cal['id'], $today->format('U'));
       }
     }
 
     if (!empty($counts)) {
       $this->rc->output->command('plugin.update_counts', array('counts' => $counts));
     }
   }
 
   /**
    * Handler for pending_alarms plugin hook triggered by the calendar module on keep-alive requests.
    * This will check for pending notifications and pass them to the client
    */
   public function pending_alarms($p)
   {
     $this->load_driver();
     $time = $p['time'] ?: time();
     if ($alarms = $this->driver->pending_alarms($time)) {
       foreach ($alarms as $alarm) {
         $alarm['id'] = 'cal:' . $alarm['id'];  // prefix ID with cal:
         $p['alarms'][] = $alarm;
       }
     }
 
     // get alarms for birthdays calendar
     if ($this->rc->config->get('calendar_contact_birthdays') && $this->rc->config->get('calendar_birthdays_alarm_type') == 'DISPLAY') {
       $cache = $this->rc->get_cache('calendar.birthdayalarms', 'db');
 
       foreach ($this->driver->load_birthday_events($time, $time + 86400 * 60) as $e) {
         $alarm = libcalendaring::get_next_alarm($e);
 
         // overwrite alarm time with snooze value (or null if dismissed)
         if ($dismissed = $cache->get($e['id']))
           $alarm['time'] = $dismissed['notifyat'];
 
         // add to list if alarm is set
         if ($alarm && $alarm['time'] && $alarm['time'] <= $time) {
           $e['id'] = 'cal:bday:' . $e['id'];
           $e['notifyat'] = $alarm['time'];
           $p['alarms'][] = $e;
         }
       }
     }
 
     return $p;
   }
 
   /**
    * Handler for alarm dismiss hook triggered by libcalendaring
    */
   public function dismiss_alarms($p)
   {
       $this->load_driver();
       foreach ((array)$p['ids'] as $id) {
           if (strpos($id, 'cal:bday:') === 0) {
               $p['success'] |= $this->driver->dismiss_birthday_alarm(substr($id, 9), $p['snooze']);
           }
           else if (strpos($id, 'cal:') === 0) {
               $p['success'] |= $this->driver->dismiss_alarm(substr($id, 4), $p['snooze']);
           }
       }
 
       return $p;
   }
 
   /**
    * Handler for check-recent requests which are accidentally sent to calendar taks
    */
   function check_recent()
   {
     // NOP
     $this->rc->output->send();
   }
 
   /**
    * Hook triggered when a contact is saved
    */
   function contact_update($p)
   {
     // clear birthdays calendar cache
     if (!empty($p['record']['birthday'])) {
       $cache = $this->rc->get_cache('calendar.birthdays', 'db');
       $cache->remove();
     }
   }
 
   /**
    *
    */
   function import_events()
   {
     // Upload progress update
     if (!empty($_GET['_progress'])) {
       $this->rc->upload_progress();
     }
 
     @set_time_limit(0);
 
     // process uploaded file if there is no error
     $err = $_FILES['_data']['error'];
 
     if (!$err && $_FILES['_data']['tmp_name']) {
       $calendar   = rcube_utils::get_input_value('calendar', rcube_utils::INPUT_GPC);
       $rangestart = $_REQUEST['_range'] ? date_create("now -" . intval($_REQUEST['_range']) . " months") : 0;
 
       // extract zip file
       if ($_FILES['_data']['type'] == 'application/zip') {
         $count = 0;
         if (class_exists('ZipArchive', false)) {
           $zip = new ZipArchive();
           if ($zip->open($_FILES['_data']['tmp_name'])) {
             $randname = uniqid('zip-' . session_id(), true);
             $tmpdir = slashify($this->rc->config->get('temp_dir', sys_get_temp_dir())) . $randname;
             mkdir($tmpdir, 0700);
 
             // extract each ical file from the archive and import it
             for ($i = 0; $i < $zip->numFiles; $i++) { 
               $filename = $zip->getNameIndex($i);
               if (preg_match('/\.ics$/i', $filename)) {
                 $tmpfile = $tmpdir . '/' . basename($filename);
                 if (copy('zip://' . $_FILES['_data']['tmp_name'] . '#'.$filename, $tmpfile)) {
                   $count += $this->import_from_file($tmpfile, $calendar, $rangestart, $errors);
                   unlink($tmpfile);
                 }
               }
             }
 
             rmdir($tmpdir);
             $zip->close();
           }
           else {
             $errors = 1;
             $msg = 'Failed to open zip file.';
           }
         }
         else {
           $errors = 1;
           $msg = 'Zip files are not supported for import.';
         }
       }
       else {
         // attempt to import teh uploaded file directly
         $count = $this->import_from_file($_FILES['_data']['tmp_name'], $calendar, $rangestart, $errors);
       }
 
       if ($count) {
         $this->rc->output->command('display_message', $this->gettext(array('name' => 'importsuccess', 'vars' => array('nr' => $count))), 'confirmation');
         $this->rc->output->command('plugin.import_success', array('source' => $calendar, 'refetch' => true));
       }
       else if (!$errors) {
         $this->rc->output->command('display_message', $this->gettext('importnone'), 'notice');
         $this->rc->output->command('plugin.import_success', array('source' => $calendar));
       }
       else {
         $this->rc->output->command('plugin.import_error', array('message' => $this->gettext('importerror') . ($msg ? ': ' . $msg : '')));
       }
     }
     else {
       if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
         $msg = $this->gettext(array('name' => 'filesizeerror', 'vars' => array(
             'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
       }
       else {
         $msg = $this->gettext('fileuploaderror');
       }
 
       $this->rc->output->command('plugin.import_error', array('message' => $msg));
     }
 
     $this->rc->output->send('iframe');
   }
 
   /**
    * Helper function to parse and import a single .ics file
    */
   private function import_from_file($filepath, $calendar, $rangestart, &$errors)
   {
     $user_email = $this->rc->user->get_username();
 
     $ical = $this->get_ical();
     $errors = !$ical->fopen($filepath);
     $count = $i = 0;
     foreach ($ical as $event) {
       // keep the browser connection alive on long import jobs
       if (++$i > 100 && $i % 100 == 0) {
           echo "<!-- -->";
           ob_flush();
       }
 
       // TODO: correctly handle recurring events which start before $rangestart
       if ($event['end'] < $rangestart && (!$event['recurrence'] || ($event['recurrence']['until'] && $event['recurrence']['until'] < $rangestart)))
         continue;
 
       $event['_owner'] = $user_email;
       $event['calendar'] = $calendar;
       if ($this->driver->new_event($event)) {
         $count++;
       }
       else {
         $errors++;
       }
     }
 
     return $count;
   }
 
 
   /**
    * Construct the ics file for exporting events to iCalendar format;
    */
   function export_events($terminate = true)
   {
     $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET);
     $end   = rcube_utils::get_input_value('end', rcube_utils::INPUT_GET);
 
     if (!isset($start))
       $start = 'today -1 year';
     if (!is_numeric($start))
       $start = strtotime($start . ' 00:00:00');
     if (!$end)
       $end = 'today +10 years';
     if (!is_numeric($end))
       $end = strtotime($end . ' 23:59:59');
 
     $event_id    = rcube_utils::get_input_value('id', rcube_utils::INPUT_GET);
     $attachments = rcube_utils::get_input_value('attachments', rcube_utils::INPUT_GET);
     $calid = $filename = rcube_utils::get_input_value('source', rcube_utils::INPUT_GET);
 
     $calendars = $this->driver->list_calendars();
     $events = array();
 
     if ($calendars[$calid]) {
       $filename = $calendars[$calid]['name'] ? $calendars[$calid]['name'] : $calid;
       $filename = asciiwords(html_entity_decode($filename));  // to 7bit ascii
       if (!empty($event_id)) {
         if ($event = $this->driver->get_event(array('calendar' => $calid, 'id' => $event_id), 0, true)) {
           if ($event['recurrence_id']) {
             $event = $this->driver->get_event(array('calendar' => $calid, 'id' => $event['recurrence_id']), 0, true);
           }
           $events = array($event);
           $filename = asciiwords($event['title']);
           if (empty($filename))
             $filename = 'event';
         }
       }
       else {
          $events = $this->driver->load_events($start, $end, null, $calid, 0);
          if (empty($filename))
            $filename = $calid;
       }
     }
 
     header("Content-Type: text/calendar");
     header("Content-Disposition: inline; filename=".$filename.'.ics');
 
     $this->get_ical()->export($events, '', true, $attachments ? array($this->driver, 'get_attachment_body') : null);
 
     if ($terminate)
       exit;
   }
 
 
   /**
    * Handler for iCal feed requests
    */
   function ical_feed_export()
   {
     $session_exists = !empty($_SESSION['user_id']);
 
     // process HTTP auth info
     if (!empty($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
       $_POST['_user'] = $_SERVER['PHP_AUTH_USER']; // used for rcmail::autoselect_host()
       $auth = $this->rc->plugins->exec_hook('authenticate', array(
         'host' => $this->rc->autoselect_host(),
         'user' => trim($_SERVER['PHP_AUTH_USER']),
         'pass' => $_SERVER['PHP_AUTH_PW'],
         'cookiecheck' => true,
         'valid' => true,
       ));
       if ($auth['valid'] && !$auth['abort'])
         $this->rc->login($auth['user'], $auth['pass'], $auth['host']);
     }
 
     // require HTTP auth
     if (empty($_SESSION['user_id'])) {
       header('WWW-Authenticate: Basic realm="Roundcube Calendar"');
       header('HTTP/1.0 401 Unauthorized');
       exit;
     }
 
     // decode calendar feed hash
     $format = 'ics';
     $calhash = rcube_utils::get_input_value('_cal', rcube_utils::INPUT_GET);
     if (preg_match(($suff_regex = '/\.([a-z0-9]{3,5})$/i'), $calhash, $m)) {
       $format = strtolower($m[1]);
       $calhash = preg_replace($suff_regex, '', $calhash);
     }
 
     if (!strpos($calhash, ':'))
       $calhash = base64_decode($calhash);
 
     list($user, $_GET['source']) = explode(':', $calhash, 2);
 
     // sanity check user
     if ($this->rc->user->get_username() == $user) {
       $this->load_driver();
       $this->export_events(false);
     }
     else {
       header('HTTP/1.0 404 Not Found');
     }
 
     // don't save session data
     if (!$session_exists)
       session_destroy();
     exit;
   }
 
 
   /**
    *
    */
   function load_settings()
   {
     $this->lib->load_settings();
     $this->defaults += $this->lib->defaults;
 
     $settings = array();
 
     // configuration
     $settings['default_calendar'] = $this->rc->config->get('calendar_default_calendar');
     $settings['default_view'] = (string)$this->rc->config->get('calendar_default_view', $this->defaults['calendar_default_view']);
     $settings['date_agenda'] = (string)$this->rc->config->get('calendar_date_agenda', $this->defaults['calendar_date_agenda']);
 
     $settings['timeslots'] = (int)$this->rc->config->get('calendar_timeslots', $this->defaults['calendar_timeslots']);
     $settings['first_day'] = (int)$this->rc->config->get('calendar_first_day', $this->defaults['calendar_first_day']);
     $settings['first_hour'] = (int)$this->rc->config->get('calendar_first_hour', $this->defaults['calendar_first_hour']);
     $settings['work_start'] = (int)$this->rc->config->get('calendar_work_start', $this->defaults['calendar_work_start']);
     $settings['work_end'] = (int)$this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']);
     $settings['agenda_range'] = (int)$this->rc->config->get('calendar_agenda_range', $this->defaults['calendar_agenda_range']);
     $settings['agenda_sections'] = $this->rc->config->get('calendar_agenda_sections', $this->defaults['calendar_agenda_sections']);
     $settings['event_coloring'] = (int)$this->rc->config->get('calendar_event_coloring', $this->defaults['calendar_event_coloring']);
     $settings['time_indicator'] = (int)$this->rc->config->get('calendar_time_indicator', $this->defaults['calendar_time_indicator']);
     $settings['invite_shared'] = (int)$this->rc->config->get('calendar_allow_invite_shared', $this->defaults['calendar_allow_invite_shared']);
     $settings['invitation_calendars'] = (bool)$this->rc->config->get('kolab_invitation_calendars', false);
     $settings['itip_notify'] = (int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']);
 
     // get user identity to create default attendee
     if ($this->ui->screen == 'calendar') {
       foreach ($this->rc->user->list_emails() as $rec) {
         if (!$identity)
           $identity = $rec;
         $identity['emails'][] = $rec['email'];
         $settings['identities'][$rec['identity_id']] = $rec['email'];
       }
       $identity['emails'][] = $this->rc->user->get_username();
       $settings['identity'] = array('name' => $identity['name'], 'email' => strtolower($identity['email']), 'emails' => ';' . strtolower(join(';', $identity['emails'])));
     }
 
     return $settings;
   }
 
   /**
    * Encode events as JSON
    *
    * @param  array  Events as array
    * @param  boolean Add CSS class names according to calendar and categories
    * @return string JSON encoded events
    */
   function encode($events, $addcss = false)
   {
     $json = array();
     foreach ($events as $event) {
       $json[] = $this->_client_event($event, $addcss);
     }
     return json_encode($json);
   }
 
   /**
    * Convert an event object to be used on the client
    */
   private function _client_event($event, $addcss = false)
   {
     // compose a human readable strings for alarms_text and recurrence_text
     if ($event['valarms']) {
       $event['alarms_text'] = libcalendaring::alarms_text($event['valarms']);
       $event['valarms'] = libcalendaring::to_client_alarms($event['valarms']);
     }
     if ($event['recurrence']) {
       $event['recurrence_text'] = $this->lib->recurrence_text($event['recurrence']);
       $event['recurrence'] = $this->lib->to_client_recurrence($event['recurrence'], $event['allday']);
       unset($event['recurrence_date']);
     }
 
     foreach ((array)$event['attachments'] as $k => $attachment) {
       $event['attachments'][$k]['classname'] = rcube_utils::file2class($attachment['mimetype'], $attachment['name']);
     }
 
     // convert link URIs references into structs
     if (array_key_exists('links', $event)) {
       foreach ((array)$event['links'] as $i => $link) {
         if (strpos($link, 'imap://') === 0 && ($msgref = $this->driver->get_message_reference($link))) {
           $event['links'][$i] = $msgref;
         }
       }
     }
 
     // check for organizer in attendees list
     $organizer = null;
     foreach ((array)$event['attendees'] as $i => $attendee) {
       if ($attendee['role'] == 'ORGANIZER') {
         $organizer = $attendee;
       }
       if ($attendee['status'] == 'DELEGATED' && $attendee['rsvp'] == false) {
         $event['attendees'][$i]['noreply'] = true;
       }
       else {
         unset($event['attendees'][$i]['noreply']);
       }
     }
 
     if ($organizer === null && !empty($event['organizer'])) {
       $organizer = $event['organizer'];
       $organizer['role'] = 'ORGANIZER';
       if (!is_array($event['attendees']))
         $event['attendees'] = array();
       array_unshift($event['attendees'], $organizer);
     }
 
     // Convert HTML description into plain text
     if ($this->is_html($event)) {
       $h2t = new rcube_html2text($event['description'], false, true, 0);
       $event['description'] = trim($h2t->get_text());
     }
 
     // mapping url => vurl because of the fullcalendar client script
     $event['vurl'] = $event['url'];
     unset($event['url']);
 
     return array(
       '_id'   => $event['calendar'] . ':' . $event['id'],  // unique identifier for fullcalendar
       'start' => $this->lib->adjust_timezone($event['start'], $event['allday'])->format('c'),
       'end'   => $this->lib->adjust_timezone($event['end'], $event['allday'])->format('c'),
       // 'changed' might be empty for event recurrences (Bug #2185)
       'changed' => $event['changed'] ? $this->lib->adjust_timezone($event['changed'])->format('c') : null,
       'created' => $event['created'] ? $this->lib->adjust_timezone($event['created'])->format('c') : null,
       'title'       => strval($event['title']),
       'description' => strval($event['description']),
       'location'    => strval($event['location']),
       'className'   => ($addcss ? 'fc-event-cal-'.asciiwords($event['calendar'], true).' ' : '') .
           'fc-event-cat-' . asciiwords(strtolower(join('-', (array)$event['categories'])), true) .
           rtrim(' ' . $event['className']),
       'allDay'      => ($event['allday'] == 1),
     ) + $event;
   }
 
 
   /**
    * Generate a unique identifier for an event
    */
   public function generate_uid()
   {
     return strtoupper(md5(time() . uniqid(rand())) . '-' . substr(md5($this->rc->user->get_username()), 0, 16));
   }
 
 
   /**
    * TEMPORARY: generate random event data for testing
    * Create events by opening http://<roundcubeurl>/?_task=calendar&_action=randomdata&_num=500&_date=2014-08-01&_dev=120
    */
   public function generate_randomdata()
   {
     @set_time_limit(0);
 
     $num   = $_REQUEST['_num'] ? intval($_REQUEST['_num']) : 100;
     $date  = $_REQUEST['_date'] ?: 'now';
     $dev   = $_REQUEST['_dev'] ?: 30;
     $cats  = array_keys($this->driver->list_categories());
     $cals  = $this->driver->list_calendars(calendar_driver::FILTER_ACTIVE);
     $count = 0;
 
     while ($count++ < $num) {
       $spread = intval($dev) * 86400; // days
       $refdate = strtotime($date);
       $start = round(($refdate + rand(-$spread, $spread)) / 600) * 600;
       $duration = round(rand(30, 360) / 30) * 30 * 60;
       $allday = rand(0,20) > 18;
       $alarm = rand(-30,12) * 5;
       $fb = rand(0,2);
       
       if (date('G', $start) > 23)
         $start -= 3600;
       
       if ($allday) {
         $start = strtotime(date('Y-m-d 00:00:00', $start));
         $duration = 86399;
       }
       
       $title = '';
       $len = rand(2, 12);
       $words = explode(" ", "The Hough transform is named after Paul Hough who patented the method in 1962. It is a technique which can be used to isolate features of a particular shape within an image. Because it requires that the desired features be specified in some parametric form, the classical Hough transform is most commonly used for the de- tection of regular curves such as lines, circles, ellipses, etc. A generalized Hough transform can be employed in applications where a simple analytic description of a feature(s) is not possible. Due to the computational complexity of the generalized Hough algorithm, we restrict the main focus of this discussion to the classical Hough transform. Despite its domain restrictions, the classical Hough transform (hereafter referred to without the classical prefix ) retains many applications, as most manufac- tured parts (and many anatomical parts investigated in medical imagery) contain feature boundaries which can be described by regular curves. The main advantage of the Hough transform technique is that it is tolerant of gaps in feature boundary descriptions and is relatively unaffected by image noise.");
 //      $chars = "!# abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890";
       for ($i = 0; $i < $len; $i++)
         $title .= $words[rand(0,count($words)-1)] . " ";
       
       $this->driver->new_event(array(
         'uid' => $this->generate_uid(),
         'start' => new DateTime('@'.$start),
         'end' => new DateTime('@'.($start + $duration)),
         'allday' => $allday,
         'title' => rtrim($title),
         'free_busy' => $fb == 2 ? 'outofoffice' : ($fb ? 'busy' : 'free'),
         'categories' => $cats[array_rand($cats)],
         'calendar' => array_rand($cals),
         'alarms' => $alarm > 0 ? "-{$alarm}M:DISPLAY" : '',
         'priority' => rand(0,9),
       ));
     }
     
     $this->rc->output->redirect('');
   }
 
   /**
    * Handler for attachments upload
    */
   public function attachment_upload()
   {
     $this->lib->attachment_upload(self::SESSION_KEY, 'cal-');
   }
 
   /**
    * Handler for attachments download/displaying
    */
   public function attachment_get()
   {
     // show loading page
     if (!empty($_GET['_preload'])) {
         return $this->lib->attachment_loading_page();
     }
 
     $event_id = rcube_utils::get_input_value('_event', rcube_utils::INPUT_GPC);
     $calendar = rcube_utils::get_input_value('_cal', rcube_utils::INPUT_GPC);
     $id       = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
     $rev      = rcube_utils::get_input_value('_rev', rcube_utils::INPUT_GPC);
 
     $event = array('id' => $event_id, 'calendar' => $calendar, 'rev' => $rev);
     $attachment = $this->driver->get_attachment($id, $event);
 
     // show part page
     if (!empty($_GET['_frame'])) {
         $this->lib->attachment = $attachment;
         $this->register_handler('plugin.attachmentframe', array($this->lib, 'attachment_frame'));
         $this->register_handler('plugin.attachmentcontrols', array($this->lib, 'attachment_header'));
         $this->rc->output->send('calendar.attachment');
     }
     // deliver attachment content
     else if ($attachment) {
         $attachment['body'] = $this->driver->get_attachment_body($id, $event);
         $this->lib->attachment_get($attachment);
     }
 
     // if we arrive here, the requested part was not found
     header('HTTP/1.1 404 Not Found');
     exit;
   }
 
   /**
    * Determine whether the given event description is HTML formatted
    */
   private function is_html($event)
   {
       // check for opening and closing <html> or <body> tags
       return (preg_match('/<(html|body)(\s+[a-z]|>)/', $event['description'], $m) && strpos($event['description'], '</'.$m[1].'>') > 0);
   }
 
   /**
    * Prepares new/edited event properties before save
    */
   private function write_preprocess(&$event, $action)
   {
     // convert dates into DateTime objects in user's current timezone
     $event['start'] = new DateTime($event['start'], $this->timezone);
     $event['end'] = new DateTime($event['end'], $this->timezone);
     $event['allday'] = (bool)$event['allday'];
 
     // start/end is all we need for 'move' action (#1480)
     if ($action == 'move') {
       return;
     }
 
     // convert the submitted recurrence settings
     if (is_array($event['recurrence'])) {
       $event['recurrence'] = $this->lib->from_client_recurrence($event['recurrence'], $event['start']);
     }
 
     // convert the submitted alarm values
     if ($event['valarms']) {
       $event['valarms'] = libcalendaring::from_client_alarms($event['valarms']);
     }
 
     $attachments = array();
     $eventid     = 'cal-'.$event['id'];
 
     if (is_array($_SESSION[self::SESSION_KEY]) && $_SESSION[self::SESSION_KEY]['id'] == $eventid) {
       if (!empty($_SESSION[self::SESSION_KEY]['attachments'])) {
         foreach ($_SESSION[self::SESSION_KEY]['attachments'] as $id => $attachment) {
           if (is_array($event['attachments']) && in_array($id, $event['attachments'])) {
             $attachments[$id] = $this->rc->plugins->exec_hook('attachment_get', $attachment);
           }
         }
       }
     }
 
     $event['attachments'] = $attachments;
 
     // convert link references into simple URIs
     if (array_key_exists('links', $event)) {
       $event['links'] = array_map(function($link) {
           return is_array($link) ? $link['uri'] : strval($link);
         }, (array)$event['links']);
     }
 
     // check for organizer in attendees
     if ($action == 'new' || $action == 'edit') {
       if (!$event['attendees'])
         $event['attendees'] = array();
 
       $emails = $this->get_user_emails();
       $organizer = $owner = false;
       foreach ((array)$event['attendees'] as $i => $attendee) {
         if ($attendee['role'] == 'ORGANIZER')
           $organizer = $i;
         if ($attendee['email'] == in_array(strtolower($attendee['email']), $emails))
           $owner = $i;
         if (!isset($attendee['rsvp']))
           $event['attendees'][$i]['rsvp'] = true;
         else if (is_string($attendee['rsvp']))
           $event['attendees'][$i]['rsvp'] = $attendee['rsvp'] == 'true' || $attendee['rsvp'] == '1';
       }
 
       // set new organizer identity
       if ($organizer !== false && !empty($event['_identity']) && ($identity = $this->rc->user->get_identity($event['_identity']))) {
         $event['attendees'][$organizer]['name'] = $identity['name'];
         $event['attendees'][$organizer]['email'] = $identity['email'];
       }
 
       // set owner as organizer if yet missing
       if ($organizer === false && $owner !== false) {
         $event['attendees'][$owner]['role'] = 'ORGANIZER';
         unset($event['attendees'][$owner]['rsvp']);
       }
     }
 
     // mapping url => vurl because of the fullcalendar client script
     if (array_key_exists('vurl', $event)) {
       $event['url'] = $event['vurl'];
       unset($event['vurl']);
     }
   }
 
   /**
    * Releases some resources after successful event save
    */
   private function cleanup_event(&$event)
   {
     // remove temp. attachment files
     if (!empty($_SESSION[self::SESSION_KEY]) && ($eventid = $_SESSION[self::SESSION_KEY]['id'])) {
       $this->rc->plugins->exec_hook('attachments_cleanup', array('group' => $eventid));
       $this->rc->session->remove(self::SESSION_KEY);
     }
   }
 
   /**
    * Send out an invitation/notification to all event attendees
    */
   private function notify_attendees($event, $old, $action = 'edit', $comment = null, $rsvp = null)
   {
     if ($action == 'remove' || ($event['status'] == 'CANCELLED' && $old['status'] != $event['status'])) {
       $event['cancelled'] = true;
       $is_cancelled = true;
     }
 
     if ($rsvp === null)
       $rsvp = !$old || $event['sequence'] > $old['sequence'];
 
     $itip = $this->load_itip();
     $emails = $this->get_user_emails();
     $itip_notify = (int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']);
 
     // add comment to the iTip attachment
     $event['comment'] = $comment;
 
     // set a valid recurrence-id if this is a recurrence instance
     libcalendaring::identify_recurrence_instance($event);
 
     // compose multipart message using PEAR:Mail_Mime
     $method = $action == 'remove' ? 'CANCEL' : 'REQUEST';
     $message = $itip->compose_itip_message($event, $method, $rsvp);
 
     // list existing attendees from $old event
     $old_attendees = array();
     foreach ((array)$old['attendees'] as $attendee) {
       $old_attendees[] = $attendee['email'];
     }
 
     // send to every attendee
     $sent = 0; $current = array();
     foreach ((array)$event['attendees'] as $attendee) {
       $current[] = strtolower($attendee['email']);
       
       // skip myself for obvious reasons
       if (!$attendee['email'] || in_array(strtolower($attendee['email']), $emails))
         continue;
 
       // skip if notification is disabled for this attendee
       if ($attendee['noreply'] && $itip_notify & 2)
         continue;
 
       // skip if this attendee has delegated and set RSVP=FALSE
       if ($attendee['status'] == 'DELEGATED' && $attendee['rsvp'] === false)
         continue;
 
       // which template to use for mail text
       $is_new = !in_array($attendee['email'], $old_attendees);
       $is_rsvp = $is_new || $event['sequence'] > $old['sequence'];
       $bodytext = $is_cancelled ? 'eventcancelmailbody' : ($is_new ? 'invitationmailbody' : 'eventupdatemailbody');
       $subject  = $is_cancelled ? 'eventcancelsubject'  : ($is_new ? 'invitationsubject' : ($event['title'] ? 'eventupdatesubject':'eventupdatesubjectempty'));
 
       $event['comment'] = $comment;
 
       // finally send the message
       if ($itip->send_itip_message($event, $method, $attendee, $subject, $bodytext, $message, $is_rsvp))
         $sent++;
       else
         $sent = -100;
     }
 
     // TODO: on change of a recurring (main) event, also send updates to differing attendess of recurrence exceptions
 
     // send CANCEL message to removed attendees
     foreach ((array)$old['attendees'] as $attendee) {
       if ($attendee['role'] == 'ORGANIZER' || !$attendee['email'] || in_array(strtolower($attendee['email']), $current))
         continue;
 
       $vevent = $old;
       $vevent['cancelled'] = $is_cancelled;
       $vevent['attendees'] = array($attendee);
       $vevent['comment']   = $comment;
       if ($itip->send_itip_message($vevent, 'CANCEL', $attendee, 'eventcancelsubject', 'eventcancelmailbody'))
         $sent++;
       else
         $sent = -100;
     }
 
     return $sent;
   }
 
   /**
    * Echo simple free/busy status text for the given user and time range
    */
   public function freebusy_status()
   {
     $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
     $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC);
     $end   = rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC);
 
     // convert dates into unix timestamps
     if (!empty($start) && !is_numeric($start)) {
       $dts = new DateTime($start, $this->timezone);
       $start = $dts->format('U');
     }
     if (!empty($end) && !is_numeric($end)) {
       $dte = new DateTime($end, $this->timezone);
       $end = $dte->format('U');
     }
     
     if (!$start) $start = time();
     if (!$end) $end = $start + 3600;
     
     $fbtypemap = array(calendar::FREEBUSY_UNKNOWN => 'UNKNOWN', calendar::FREEBUSY_FREE => 'FREE', calendar::FREEBUSY_BUSY => 'BUSY', calendar::FREEBUSY_TENTATIVE => 'TENTATIVE', calendar::FREEBUSY_OOF => 'OUT-OF-OFFICE');
     $status = 'UNKNOWN';
     
     // if the backend has free-busy information
     $fblist = $this->driver->get_freebusy_list($email, $start, $end);
     if (is_array($fblist)) {
       $status = 'FREE';
       
       foreach ($fblist as $slot) {
         list($from, $to, $type) = $slot;
         if ($from < $end && $to > $start) {
           $status = isset($type) && $fbtypemap[$type] ? $fbtypemap[$type] : 'BUSY';
           break;
         }
       }
     }
     
     // let this information be cached for 5min
     send_future_expire_header(300);
     
     echo $status;
     exit;
   }
   
   /**
    * Return a list of free/busy time slots within the given period
    * Echo data in JSON encoding
    */
   public function freebusy_times()
   {
     $email = rcube_utils::get_input_value('email', rcube_utils::INPUT_GPC);
     $start = rcube_utils::get_input_value('start', rcube_utils::INPUT_GPC);
     $end   = rcube_utils::get_input_value('end', rcube_utils::INPUT_GPC);
     $interval  = intval(rcube_utils::get_input_value('interval', rcube_utils::INPUT_GPC));
     $strformat = $interval > 60 ? 'Ymd' : 'YmdHis';
 
     // convert dates into unix timestamps
     if (!empty($start) && !is_numeric($start)) {
       $dts = rcube_utils::anytodatetime($start, $this->timezone);
       $start = $dts ? $dts->format('U') : null;
     }
     if (!empty($end) && !is_numeric($end)) {
       $dte = rcube_utils::anytodatetime($end, $this->timezone);
       $end = $dte ? $dte->format('U') : null;
     }
 
     if (!$start) $start = time();
     if (!$end)   $end = $start + 86400 * 30;
     if (!$interval) $interval = 60;  // 1 hour
     
     if (!$dte) {
       $dts = new DateTime('@'.$start);
       $dts->setTimezone($this->timezone);
     }
     
     $fblist = $this->driver->get_freebusy_list($email, $start, $end);
     $slots = array();
     
     // build a list from $start till $end with blocks representing the fb-status
     for ($s = 0, $t = $start; $t <= $end; $s++) {
       $status = self::FREEBUSY_UNKNOWN;
       $t_end = $t + $interval * 60;
       $dt = new DateTime('@'.$t);
       $dt->setTimezone($this->timezone);
 
       // determine attendee's status
       if (is_array($fblist)) {
         $status = self::FREEBUSY_FREE;
         foreach ($fblist as $slot) {
           list($from, $to, $type) = $slot;
 
           // check for possible all-day times
           if (gmdate('His', $from) == '000000' && gmdate('His', $to) == '235959') {
               // shift into the user's timezone for sane matching
               $from -= $this->gmt_offset;
               $to   -= $this->gmt_offset;
           }
 
           if ($from < $t_end && $to > $t) {
             $status = isset($type) ? $type : self::FREEBUSY_BUSY;
             if ($status == self::FREEBUSY_BUSY)  // can't get any worse :-)
               break;
           }
         }
       }
       
       $slots[$s] = $status;
       $times[$s] = intval($dt->format($strformat));
       $t = $t_end;
     }
     
     $dte = new DateTime('@'.$t_end);
     $dte->setTimezone($this->timezone);
     
     // let this information be cached for 5min
     send_future_expire_header(300);
     
     echo json_encode(array(
       'email' => $email,
       'start' => $dts->format('c'),
       'end'   => $dte->format('c'),
       'interval' => $interval,
       'slots' => $slots,
       'times' => $times,
     ));
     exit;
   }
 
   /**
    * Handler for printing calendars
    */
   public function print_view()
   {
     $title = $this->gettext('print');
 
     $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
     if (!in_array($view, array('agendaWeek', 'agendaDay', 'month', 'table')))
       $view = 'agendaDay';
 
     $this->rc->output->set_env('view',$view);
 
     if ($date = rcube_utils::get_input_value('date', rcube_utils::INPUT_GPC))
       $this->rc->output->set_env('date', $date);
 
     if ($range = rcube_utils::get_input_value('range', rcube_utils::INPUT_GPC))
       $this->rc->output->set_env('listRange', intval($range));
 
     if (isset($_REQUEST['sections']))
       $this->rc->output->set_env('listSections', rcube_utils::get_input_value('sections', rcube_utils::INPUT_GPC));
 
     if ($search = rcube_utils::get_input_value('search', rcube_utils::INPUT_GPC)) {
       $this->rc->output->set_env('search', $search);
       $title .= ' "' . $search . '"';
     }
 
     // Add CSS stylesheets to the page header
     $skin_path = $this->local_skin_path();
     $this->include_stylesheet($skin_path . '/fullcalendar.css');
     $this->include_stylesheet($skin_path . '/print.css');
     
     // Add JS files to the page header
     $this->include_script('print.js');
     $this->include_script('lib/js/fullcalendar.js');
     
     $this->register_handler('plugin.calendar_css', array($this->ui, 'calendar_css'));
     $this->register_handler('plugin.calendar_list', array($this->ui, 'calendar_list'));
     
     $this->rc->output->set_pagetitle($title);
     $this->rc->output->send("calendar.print");
   }
 
   /**
    *
    */
   public function get_inline_ui()
   {
     foreach (array('save','cancel','savingdata') as $label)
       $texts['calendar.'.$label] = $this->gettext($label);
     
     $texts['calendar.new_event'] = $this->gettext('createfrommail');
     
     $this->ui->init_templates();
     $this->ui->calendar_list();  # set env['calendars']
     echo $this->api->output->parse('calendar.eventedit', false, false);
     echo html::tag('script', array('type' => 'text/javascript'),
       "rcmail.set_env('calendars', " . json_encode($this->api->output->env['calendars']) . ");\n".
       "rcmail.set_env('deleteicon', '" . $this->api->output->env['deleteicon'] . "');\n".
       "rcmail.set_env('cancelicon', '" . $this->api->output->env['cancelicon'] . "');\n".
       "rcmail.set_env('loadingicon', '" . $this->api->output->env['loadingicon'] . "');\n".
       "rcmail.gui_object('attachmentlist', '"  . $this->ui->attachmentlist_id . "');\n".
       "rcmail.add_label(" . json_encode($texts) . ");\n"
     );
     exit;
   }
 
   /**
    * Compare two event objects and return differing properties
    *
    * @param array Event A
    * @param array Event B
    * @return array List of differing event properties
    */
   public static function event_diff($a, $b)
   {
     $diff = array();
     $ignore = array('changed' => 1, 'attachments' => 1);
     foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) {
       if (!$ignore[$key] && $key[0] != '_' && $a[$key] != $b[$key])
         $diff[] = $key;
     }
     
     // only compare number of attachments
     if (count($a['attachments']) != count($b['attachments']))
       $diff[] = 'attachments';
     
     return $diff;
   }
 
   /**
    * Update attendee properties on the given event object
    *
    * @param array The event object to be altered
    * @param array List of hash arrays each represeting an updated/added attendee
    */
   public static function merge_attendee_data(&$event, $attendees, $removed = null)
   {
     if (!empty($attendees) && !is_array($attendees[0])) {
       $attendees = array($attendees);
     }
 
     foreach ($attendees as $attendee) {
       $found = false;
 
       foreach ($event['attendees'] as $i => $candidate) {
         if ($candidate['email'] == $attendee['email']) {
           $event['attendees'][$i] = $attendee;
           $found = true;
           break;
         }
       }
 
       if (!$found) {
         $event['attendees'][] = $attendee;
       }
     }
 
     // filter out removed attendees
     if (!empty($removed)) {
       $event['attendees'] = array_filter($event['attendees'], function($attendee) use ($removed) {
         return !in_array($attendee['email'], $removed);
       });
     }
   }
 
 
   /****  Resource management functions  ****/
 
   /**
    * Getter for the configured implementation of the resource directory interface
    */
   private function resources_directory()
   {
     if (is_object($this->resources_dir)) {
       return $this->resources_dir;
     }
 
     if ($driver_name = $this->rc->config->get('calendar_resources_driver')) {
       $driver_class = 'resources_driver_' . $driver_name;
 
       require_once($this->home . '/drivers/resources_driver.php');
       require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');
 
       $this->resources_dir = new $driver_class($this);
     }
 
     return $this->resources_dir;
   }
 
   /**
    * Handler for resoruce autocompletion requests
    */
   public function resources_autocomplete()
   {
     $search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
     $sid    = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
     $maxnum = (int)$this->rc->config->get('autocomplete_max', 15);
     $results = array();
 
     if ($directory = $this->resources_directory()) {
       foreach ($directory->load_resources($search, $maxnum) as $rec) {
         $results[]  = array(
             'name'  => $rec['name'],
             'email' => $rec['email'],
             'type'  => $rec['_type'],
         );
       }
     }
 
     $this->rc->output->command('ksearch_query_results', $results, $search, $sid);
     $this->rc->output->send();
   }
 
   /**
    * Handler for load-requests for resource data
    */
   function resources_list()
   {
     $data = array();
 
     if ($directory = $this->resources_directory()) {
       foreach ($directory->load_resources() as $rec) {
         $data[] = $rec;
       }
     }
 
     $this->rc->output->command('plugin.resource_data', $data);
     $this->rc->output->send();
   }
 
   /**
    * Handler for requests loading resource owner information
    */
   function resources_owner()
   {
     if ($directory = $this->resources_directory()) {
       $id = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
       $data = $directory->get_resource_owner($id);
     }
 
     $this->rc->output->command('plugin.resource_owner', $data);
     $this->rc->output->send();
   }
 
   /**
    * Deliver event data for a resource's calendar
    */
   function resources_calendar()
   {
     $events = array();
 
     if ($directory = $this->resources_directory()) {
       $events = $directory->get_resource_calendar(
         rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC),
         rcube_utils::get_input_value('start', rcube_utils::INPUT_GET),
         rcube_utils::get_input_value('end', rcube_utils::INPUT_GET));
     }
 
     echo $this->encode($events);
     exit;
   }
 
 
   /****  Event invitation plugin hooks ****/
 
   /**
    * Handler for calendar/itip-status requests
    */
   function event_itip_status()
   {
     $data = rcube_utils::get_input_value('data', rcube_utils::INPUT_POST, true);
 
     // find local copy of the referenced event
     $this->load_driver();
     $existing = $this->driver->get_event($data, calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL);
 
     $itip = $this->load_itip();
     $response = $itip->get_itip_status($data, $existing);
 
     // get a list of writeable calendars to save new events to
     if (!$existing && !$data['nosave'] && $response['action'] == 'rsvp' || $response['action'] == 'import') {
       $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
       $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'itip-saveto', 'is_escaped' => true));
       $calendar_select->add('--', '');
       $numcals = 0;
       foreach ($calendars as $calendar) {
         if ($calendar['editable']) {
           $calendar_select->add($calendar['name'], $calendar['id']);
           $numcals++;
         }
       }
       if ($numcals <= 1)
         $calendar_select = null;
     }
 
     if ($calendar_select) {
       $default_calendar = $this->get_default_calendar($data['sensitivity']);
       $response['select'] = html::span('folder-select', $this->gettext('saveincalendar') . '&nbsp;' .
         $calendar_select->show($default_calendar['id']));
     }
     else if ($data['nosave']) {
       $response['select'] = html::tag('input', array('type' => 'hidden', 'name' => 'calendar', 'id' => 'itip-saveto', 'value' => ''));
     }
 
     // render small agenda view for the respective day
     if ($data['method'] == 'REQUEST' && !empty($data['date']) && $response['action'] == 'rsvp') {
       $event_start = rcube_utils::anytodatetime($data['date']);
       $day_start = new Datetime(gmdate('Y-m-d 00:00', $data['date']), $this->lib->timezone);
       $day_end = new Datetime(gmdate('Y-m-d 23:59', $data['date']), $this->lib->timezone);
 
       // get events on that day from the user's personal calendars
       $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
       $events = $this->driver->load_events($day_start->format('U'), $day_end->format('U'), null, array_keys($calendars));
       usort($events, function($a, $b) { return $a['start'] > $b['start'] ? 1 : -1; });
 
       $before = $after = array();
       foreach ($events as $event) {
         // TODO: skip events with free_busy == 'free' ?
         if ($event['uid'] == $data['uid'] || $event['end'] < $day_start || $event['start'] > $day_end)
           continue;
         else if ($event['start'] < $event_start)
           $before[] = $this->mail_agenda_event_row($event);
         else
           $after[] = $this->mail_agenda_event_row($event);
       }
 
       $response['append'] = array(
         'selector' => '.calendar-agenda-preview',
         'replacements' => array(
           '%before%' => !empty($before) ? join("\n", array_slice($before,  -3)) : html::div('event-row no-event', $this->gettext('noearlierevents')),
           '%after%'  => !empty($after)  ? join("\n", array_slice($after, 0, 3)) : html::div('event-row no-event', $this->gettext('nolaterevents')),
         ),
       );
     }
 
     $this->rc->output->command('plugin.update_itip_object_status', $response);
   }
 
   /**
    * Handler for calendar/itip-remove requests
    */
   function event_itip_remove()
   {
     $success  = false;
     $uid      = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
     $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
     $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
 
     // search for event if only UID is given
     if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $instance), calendar_driver::FILTER_WRITEABLE)) {
       $event['_savemode'] = $savemode;
       $success = $this->driver->remove_event($event, true);
     }
 
     if ($success) {
       $this->rc->output->show_message('calendar.successremoval', 'confirmation');
     }
     else {
       $this->rc->output->show_message('calendar.errorsaving', 'error');
     }
   }
 
   /**
    * Handler for URLs that allow an invitee to respond on his invitation mail
    */
   public function itip_attend_response($p)
   {
     if ($p['action'] == 'attend') {
       $this->ui->init();
 
       $this->rc->output->set_env('task', 'calendar');  // override some env vars
       $this->rc->output->set_env('refresh_interval', 0);
       $this->rc->output->set_pagetitle($this->gettext('calendar'));
 
       $itip  = $this->load_itip();
       $token = rcube_utils::get_input_value('_t', rcube_utils::INPUT_GPC);
 
       // read event info stored under the given token
       if ($invitation = $itip->get_invitation($token)) {
         $this->token = $token;
         $this->event = $invitation['event'];
 
         // show message about cancellation
         if ($invitation['cancelled']) {
           $this->invitestatus = html::div('rsvp-status declined', $itip->gettext('eventcancelled'));
         }
         // save submitted RSVP status
         else if (!empty($_POST['rsvp'])) {
           $status = null;
           foreach (array('accepted','tentative','declined') as $method) {
             if ($_POST['rsvp'] == $itip->gettext('itip' . $method)) {
               $status = $method;
               break;
             }
           }
 
           // send itip reply to organizer
           $invitation['event']['comment'] = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
           if ($status && $itip->update_invitation($invitation, $invitation['attendee'], strtoupper($status))) {
             $this->invitestatus = html::div('rsvp-status ' . strtolower($status), $itip->gettext('youhave'.strtolower($status)));
           }
           else
             $this->rc->output->command('display_message', $this->gettext('errorsaving'), 'error', -1);
 
           // if user is logged in...
           if ($this->rc->user->ID) {
             $this->load_driver();
             $invitation = $itip->get_invitation($token);
 
             // save the event to his/her default calendar if not yet present
             if (!$this->driver->get_event($this->event) && ($calendar = $this->get_default_calendar($invitation['event']['sensitivity']))) {
               $invitation['event']['calendar'] = $calendar['id'];
               if ($this->driver->new_event($invitation['event']))
                 $this->rc->output->command('display_message', $this->gettext(array('name' => 'importedsuccessfully', 'vars' => array('calendar' => $calendar['name']))), 'confirmation');
             }
           }
         }
         
         $this->register_handler('plugin.event_inviteform', array($this, 'itip_event_inviteform'));
         $this->register_handler('plugin.event_invitebox', array($this->ui, 'event_invitebox'));
         
         if (!$this->invitestatus) {
           $this->itip->set_rsvp_actions(array('accepted','tentative','declined'));
           $this->register_handler('plugin.event_rsvp_buttons', array($this->ui, 'event_rsvp_buttons'));
         }
         
         $this->rc->output->set_pagetitle($itip->gettext('itipinvitation') . ' ' . $this->event['title']);
       }
       else
         $this->rc->output->command('display_message', $this->gettext('itipinvalidrequest'), 'error', -1);
       
       $this->rc->output->send('calendar.itipattend');
     }
   }
   
   /**
    *
    */
   public function itip_event_inviteform($attrib)
   {
     $hidden = new html_hiddenfield(array('name' => "_t", 'value' => $this->token));
     return html::tag('form', array('action' => $this->rc->url(array('task' => 'calendar', 'action' => 'attend')), 'method' => 'post', 'noclose' => true) + $attrib) . $hidden->show();
   }
 
   /**
    * 
    */
   private function mail_agenda_event_row($event, $class = '')
   {
     $time = $event['allday'] ? $this->gettext('all-day') :
       $this->rc->format_date($event['start'], $this->rc->config->get('time_format')) . ' - ' .
         $this->rc->format_date($event['end'], $this->rc->config->get('time_format'));
 
     return html::div(rtrim('event-row ' . $class),
       html::span('event-date', $time) .
       html::span('event-title', rcube::Q($event['title']))
     );
   }
   
   /**
    * 
    */
   public function mail_messages_list($p)
   {
     if (in_array('attachment', (array)$p['cols']) && !empty($p['messages'])) {
       foreach ($p['messages'] as $header) {
         $part = new StdClass;
         $part->mimetype = $header->ctype;
         if (libcalendaring::part_is_vcalendar($part)) {
           $header->list_flags['attachmentClass'] = 'ical';
         }
         else if (in_array($header->ctype, array('multipart/alternative', 'multipart/mixed'))) {
           // TODO: fetch bodystructure and search for ical parts. Maybe too expensive?
 
           if (!empty($header->structure) && is_array($header->structure->parts)) {
             foreach ($header->structure->parts as $part) {
               if (libcalendaring::part_is_vcalendar($part) && !empty($part->ctype_parameters['method'])) {
                 $header->list_flags['attachmentClass'] = 'ical';
                 break;
               }
             }
           }
         }
       }
     }
   }
 
   /**
    * Add UI element to copy event invitations or updates to the calendar
    */
   public function mail_messagebody_html($p)
   {
     // load iCalendar functions (if necessary)
     if (!empty($this->lib->ical_parts)) {
       $this->get_ical();
       $this->load_itip();
     }
 
     $html = '';
     $has_events = false;
     $ical_objects = $this->lib->get_mail_ical_objects();
 
     // show a box for every event in the file
     foreach ($ical_objects as $idx => $event) {
       if ($event['_type'] != 'event')  // skip non-event objects (#2928)
         continue;
 
       $has_events = true;
 
       // get prepared inline UI for this event object
       if ($ical_objects->method) {
         $append = '';
 
         // prepare a small agenda preview to be filled with actual event data on async request
         if ($ical_objects->method == 'REQUEST') {
           $append = html::div('calendar-agenda-preview',
             html::tag('h3', 'preview-title', $this->gettext('agenda') . ' ' .
               html::span('date', $this->rc->format_date($event['start'], $this->rc->config->get('date_format')))
             ) . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%');
         }
 
         $html .= html::div('calendar-invitebox',
           $this->itip->mail_itip_inline_ui(
             $event,
             $ical_objects->method,
             $ical_objects->mime_id . ':' . $idx,
             'calendar',
             rcube_utils::anytodatetime($ical_objects->message_date),
             $this->rc->url(array('task' => 'calendar')) . '&view=agendaDay&date=' . $event['start']->format('U')
           ) . $append
         );
       }
 
       // limit listing
       if ($idx >= 3)
         break;
     }
 
     // prepend event boxes to message body
     if ($html) {
       $this->ui->init();
       $p['content'] = $html . $p['content'];
       $this->rc->output->add_label('calendar.savingdata','calendar.deleteventconfirm','calendar.declinedeleteconfirm');
     }
 
     // add "Save to calendar" button into attachment menu
     if ($has_events) {
       $this->add_button(array(
         'id'         => 'attachmentsavecal',
         'name'       => 'attachmentsavecal',
         'type'       => 'link',
         'wrapper'    => 'li',
         'command'    => 'attachment-save-calendar',
         'class'      => 'icon calendarlink',
         'classact'   => 'icon calendarlink active',
         'innerclass' => 'icon calendar',
         'label'      => 'calendar.savetocalendar',
         ), 'attachmentmenu');
     }
 
     return $p;
   }
 
 
   /**
    * Handler for POST request to import an event attached to a mail message
    */
   public function mail_import_itip()
   {
     $itip_sending = $this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']);
 
     $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
     $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
     $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
     $status  = rcube_utils::get_input_value('_status', rcube_utils::INPUT_POST);
     $delete  = intval(rcube_utils::get_input_value('_del', rcube_utils::INPUT_POST));
     $noreply = intval(rcube_utils::get_input_value('_noreply', rcube_utils::INPUT_POST));
     $noreply = $noreply || $status == 'needs-action' || $itip_sending === 0;
     $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
     $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
 
     $error_msg = $this->gettext('errorimportingevent');
     $success = false;
     $delegate = null;
 
     if ($status == 'delegated') {
       $delegates = rcube_mime::decode_address_list(rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST, true), 1, false);
       $delegate  = reset($delegates);
 
       if (empty($delegate) || empty($delegate['mailto'])) {
         $this->rc->output->command('display_message', $this->gettext('libcalendaring.delegateinvalidaddress'), 'error');
         return;
       }
     }
 
     // successfully parsed events?
     if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
       // forward iTip request to delegatee
       if ($delegate) {
         $rsvpme = intval(rcube_utils::get_input_value('_rsvp', rcube_utils::INPUT_POST));
 
         $itip = $this->load_itip();
         if ($itip->delegate_to($event, $delegate, $rsvpme ? true : false)) {
           $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
         }
         else {
           $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
         }
 
         // the delegator is set to non-participant, thus save as non-blocking
         $event['free_busy'] = 'free';
       }
 
       // find writeable calendar to store event
       $cal_id = !empty($_REQUEST['_folder']) ? rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST) : null;
       $dontsave = ($_REQUEST['_folder'] === '' && $event['_method'] == 'REQUEST');
       $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
       $calendar = $calendars[$cal_id];
 
       // select default calendar except user explicitly selected 'none'
       if (!$calendar && !$dontsave)
          $calendar = $this->get_default_calendar($event['sensitivity']);
 
       $metadata = array(
         'uid' => $event['uid'],
         '_instance' => $event['_instance'],
         'changed' => is_object($event['changed']) ? $event['changed']->format('U') : 0,
         'sequence' => intval($event['sequence']),
         'fallback' => strtoupper($status),
         'method' => $event['_method'],
         'task' => 'calendar',
       );
 
       // update my attendee status according to submitted method
       if (!empty($status)) {
         $organizer = null;
         $emails = $this->get_user_emails();
         foreach ($event['attendees'] as $i => $attendee) {
           if ($attendee['role'] == 'ORGANIZER') {
             $organizer = $attendee;
           }
           else if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
             $event['attendees'][$i]['status'] = strtoupper($status);
             if (!in_array($event['attendees'][$i]['status'], array('NEEDS-ACTION','DELEGATED')))
               $event['attendees'][$i]['rsvp'] = false;  // unset RSVP attribute
 
             $metadata['attendee'] = $attendee['email'];
             $metadata['rsvp'] = $attendee['role'] != 'NON-PARTICIPANT';
             $reply_sender = $attendee['email'];
             $event_attendee = $attendee;
           }
         }
 
         // add attendee with this user's default identity if not listed
         if (!$reply_sender) {
           $sender_identity = $this->rc->user->list_emails(true);
           $event['attendees'][] = array(
             'name' => $sender_identity['name'],
             'email' => $sender_identity['email'],
             'role' => 'OPT-PARTICIPANT',
             'status' => strtoupper($status),
           );
           $metadata['attendee'] = $sender_identity['email'];
         }
       }
       
       // save to calendar
       if ($calendar && $calendar['editable']) {
         // check for existing event with the same UID
         $existing = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL);
 
         if ($existing) {
           // forward savemode for correct updates of recurring events
           $existing['_savemode'] = $savemode ?: $event['_savemode'];
 
           // only update attendee status
           if ($event['_method'] == 'REPLY') {
             // try to identify the attendee using the email sender address
             $existing_attendee = -1;
             $existing_attendee_emails = array();
             foreach ($existing['attendees'] as $i => $attendee) {
               $existing_attendee_emails[] = $attendee['email'];
               if ($event['_sender'] && ($attendee['email'] == $event['_sender'] || $attendee['email'] == $event['_sender_utf'])) {
                 $existing_attendee = $i;
               }
             }
             $event_attendee = null;
             $update_attendees = array();
             foreach ($event['attendees'] as $attendee) {
               if ($event['_sender'] && ($attendee['email'] == $event['_sender'] || $attendee['email'] == $event['_sender_utf'])) {
                 $event_attendee = $attendee;
                 $update_attendees[] = $attendee;
                 $metadata['fallback'] = $attendee['status'];
                 $metadata['attendee'] = $attendee['email'];
                 $metadata['rsvp'] = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
                 if ($attendee['status'] != 'DELEGATED') {
                   break;
                 }
               }
               // also copy delegate attendee
               else if (!empty($attendee['delegated-from']) &&
                        (stripos($attendee['delegated-from'], $event['_sender']) !== false ||
                         stripos($attendee['delegated-from'], $event['_sender_utf']) !== false)) {
                 $update_attendees[] = $attendee;
                 if (!in_array($attendee['email'], $existing_attendee_emails)) {
                   $existing['attendees'][] = $attendee;
                 }
               }
             }
 
             // if delegatee has declined, set delegator's RSVP=True
             if ($event_attendee && $event_attendee['status'] == 'DECLINED' && $event_attendee['delegated-from']) {
               foreach ($existing['attendees'] as $i => $attendee) {
                 if ($attendee['email'] == $event_attendee['delegated-from']) {
                   $existing['attendees'][$i]['rsvp'] = true;
                   break;
                 }
               }
             }
 
             // found matching attendee entry in both existing and new events
             if ($existing_attendee >= 0 && $event_attendee) {
               $existing['attendees'][$existing_attendee] = $event_attendee;
               $success = $this->driver->update_attendees($existing, $update_attendees);
             }
             // update the entire attendees block
             else if (($event['sequence'] >= $existing['sequence'] || $event['changed'] >= $existing['changed']) && $event_attendee) {
               $existing['attendees'][] = $event_attendee;
               $success = $this->driver->update_attendees($existing, $update_attendees);
             }
             else {
               $error_msg = $this->gettext('newerversionexists');
             }
           }
           // delete the event when declined (#1670)
           else if ($status == 'declined' && $delete) {
              $deleted = $this->driver->remove_event($existing, true);
              $success = true;
           }
           // import the (newer) event
           else if ($event['sequence'] >= $existing['sequence'] || $event['changed'] >= $existing['changed']) {
             $event['id'] = $existing['id'];
             $event['calendar'] = $existing['calendar'];
 
             // preserve my participant status for regular updates
             if (empty($status)) {
               $emails = $this->get_user_emails();
               foreach ($event['attendees'] as $i => $attendee) {
                 if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
                   foreach ($existing['attendees'] as $j => $_attendee) {
                     if ($attendee['email'] == $_attendee['email']) {
                       $event['attendees'][$i] = $existing['attendees'][$j];
                       break;
                     }
                   }
                 }
               }
             }
 
             // set status=CANCELLED on CANCEL messages
             if ($event['_method'] == 'CANCEL')
               $event['status'] = 'CANCELLED';
             // show me as free when declined (#1670)
             if ($status == 'declined' || $event['status'] == 'CANCELLED' || $event_attendee['role'] == 'NON-PARTICIPANT')
               $event['free_busy'] = 'free';
 
             $success = $this->driver->edit_event($event);
           }
           else if (!empty($status)) {
             $existing['attendees'] = $event['attendees'];
             if ($status == 'declined' || $event_attendee['role'] == 'NON-PARTICIPANT')  // show me as free when declined (#1670)
               $existing['free_busy'] = 'free';
             $success = $this->driver->edit_event($existing);
           }
           else
             $error_msg = $this->gettext('newerversionexists');
         }
         else if (!$existing && ($status != 'declined' || $this->rc->config->get('kolab_invitation_calendars'))) {
           if ($status == 'declined' || $event['status'] == 'CANCELLED' || $event_attendee['role'] == 'NON-PARTICIPANT') {
             $event['free_busy'] = 'free';
           }
 
           // if the RSVP reply only refers to a single instance:
           // store unmodified master event with current instance as exception
           if (!empty($instance) && !empty($savemode) && $savemode != 'all') {
             $master = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event');
             if ($master['recurrence'] && !$master['_instance']) {
               // compute recurring events until this instance's date
               if ($recurrence_date = rcube_utils::anytodatetime($instance, $master['start']->getTimezone())) {
                 $recurrence_date->setTime(23,59,59);
 
                 foreach ($this->driver->get_recurring_events($master, $master['start'], $recurrence_date) as $recurring) {
                   if ($recurring['_instance'] == $instance) {
                     // copy attendees block with my partstat to exception
                     $recurring['attendees'] = $event['attendees'];
                     $master['recurrence']['EXCEPTIONS'][] = $recurring;
                     $event = $recurring;  // set reference for iTip reply
                     break;
                   }
                 }
 
                 $master['calendar'] = $event['calendar'] = $calendar['id'];
                 $success = $this->driver->new_event($master);
               }
               else {
                 $master = null;
               }
             }
             else {
               $master = null;
             }
           }
 
           // save to the selected/default calendar
           if (!$master) {
             $event['calendar'] = $calendar['id'];
             $success = $this->driver->new_event($event);
           }
         }
         else if ($status == 'declined')
           $error_msg = null;
       }
       else if ($status == 'declined' || $dontsave)
         $error_msg = null;
       else
         $error_msg = $this->gettext('nowritecalendarfound');
     }
 
     if ($success) {
       $message = $event['_method'] == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : ($existing ? 'updatedsuccessfully' : 'importedsuccessfully'));
       $this->rc->output->command('display_message', $this->gettext(array('name' => $message, 'vars' => array('calendar' => $calendar['name']))), 'confirmation');
     }
 
     if ($success || $dontsave) {
       $metadata['calendar'] = $event['calendar'];
       $metadata['nosave'] = $dontsave;
       $metadata['rsvp'] = intval($metadata['rsvp']);
       $metadata['after_action'] = $this->rc->config->get('calendar_itip_after_action', $this->defaults['calendar_itip_after_action']);
       $this->rc->output->command('plugin.itip_message_processed', $metadata);
       $error_msg = null;
     }
     else if ($error_msg) {
       $this->rc->output->command('display_message', $error_msg, 'error');
     }
 
     // send iTip reply
     if ($event['_method'] == 'REQUEST' && $organizer && !$noreply && !in_array(strtolower($organizer['email']), $emails) && !$error_msg) {
       $event['comment'] = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
       $itip = $this->load_itip();
       $itip->set_sender_email($reply_sender);
       if ($itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
         $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation');
       else
         $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
     }
 
     $this->rc->output->send();
   }
 
 
   /**
    * Handler for calendar/itip-remove requests
    */
   function mail_itip_decline_reply()
   {
     $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
     $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
     $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
 
     if (($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) && $event['_method'] == 'REPLY') {
       $event['comment'] = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
 
       foreach ($event['attendees'] as $_attendee) {
         if ($_attendee['role'] != 'ORGANIZER') {
           $attendee = $_attendee;
           break;
         }
       }
 
       $itip = $this->load_itip();
       if ($itip->send_itip_message($event, 'CANCEL', $attendee, 'itipsubjectcancel', 'itipmailbodycancel'))
         $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $attendee['name'] ? $attendee['name'] : $attendee['email']))), 'confirmation');
       else
         $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
     }
     else {
       $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
     }
   }
 
   /**
    * Handler for calendar/itip-delegate requests
    */
   function mail_itip_delegate()
   {
     // forward request to mail_import_itip() with the right status
     $_POST['_status'] = $_REQUEST['_status'] = 'delegated';
     $this->mail_import_itip();
   }
 
   /**
    * Import the full payload from a mail message attachment
    */
   public function mail_import_attachment()
   {
     $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
     $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
     $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
     $charset = RCUBE_CHARSET;
 
     // establish imap connection
     $imap = $this->rc->get_storage();
     $imap->set_mailbox($mbox);
 
     if ($uid && $mime_id) {
       $part = $imap->get_message_part($uid, $mime_id);
       if ($part->ctype_parameters['charset'])
         $charset = $part->ctype_parameters['charset'];
 //      $headers = $imap->get_message_headers($uid);
 
       if ($part) {
         $events = $this->get_ical()->import($part, $charset);
       }
     }
 
     $success = $existing = 0;
     if (!empty($events)) {
       // find writeable calendar to store event
       $cal_id = !empty($_REQUEST['_calendar']) ? rcube_utils::get_input_value('_calendar', rcube_utils::INPUT_POST) : null;
       $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
 
       foreach ($events as $event) {
         // save to calendar
         $calendar = $calendars[$cal_id] ?: $this->get_default_calendar($event['sensitivity']);
         if ($calendar && $calendar['editable'] && $event['_type'] == 'event') {
           $event['calendar'] = $calendar['id'];
 
           if (!$this->driver->get_event($event['uid'], calendar_driver::FILTER_WRITEABLE)) {
             $success += (bool)$this->driver->new_event($event);
           }
           else {
             $existing++;
           }
         }
       }
     }
 
     if ($success) {
       $this->rc->output->command('display_message', $this->gettext(array(
         'name' => 'importsuccess',
         'vars' => array('nr' => $success),
       )), 'confirmation');
     }
     else if ($existing) {
       $this->rc->output->command('display_message', $this->gettext('importwarningexists'), 'warning');
     }
     else {
       $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
     }
   }
 
   /**
    * Read email message and return contents for a new event based on that message
    */
   public function mail_message2event()
   {
     $uid   = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
     $mbox  = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
     $event = array();
 
     // establish imap connection
     $imap = $this->rc->get_storage();
     $imap->set_mailbox($mbox);
     $message = new rcube_message($uid);
 
     if ($message->headers) {
       $event['title'] = trim($message->subject);
       $event['description'] = trim($message->first_text_part());
 
       $this->load_driver();
 
       // add a reference to the email message
       if ($msgref = $this->driver->get_message_reference($message->headers, $mbox)) {
         $event['links'] = array($msgref);
       }
       // copy mail attachments to event
       else if ($message->attachments) {
         $eventid = 'cal-';
         if (!is_array($_SESSION[self::SESSION_KEY]) || $_SESSION[self::SESSION_KEY]['id'] != $eventid) {
           $_SESSION[self::SESSION_KEY] = array();
           $_SESSION[self::SESSION_KEY]['id'] = $eventid;
           $_SESSION[self::SESSION_KEY]['attachments'] = array();
         }
 
         foreach ((array)$message->attachments as $part) {
           $attachment = array(
             'data' => $imap->get_message_part($uid, $part->mime_id, $part),
             'size' => $part->size,
             'name' => $part->filename,
             'mimetype' => $part->mimetype,
             'group' => $eventid,
           );
 
           $attachment = $this->rc->plugins->exec_hook('attachment_save', $attachment);
 
           if ($attachment['status'] && !$attachment['abort']) {
             $id = $attachment['id'];
             $attachment['classname'] = rcube_utils::file2class($attachment['mimetype'], $attachment['name']);
 
             // store new attachment in session
             unset($attachment['status'], $attachment['abort'], $attachment['data']);
             $_SESSION[self::SESSION_KEY]['attachments'][$id] = $attachment;
 
             $attachment['id'] = 'rcmfile' . $attachment['id'];  // add prefix to consider it 'new'
             $event['attachments'][] = $attachment;
           }
         }
       }
       
       $this->rc->output->command('plugin.mail2event_dialog', $event);
     }
     else {
       $this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error');
     }
     
     $this->rc->output->send();
   }
 
   /**
    * Handler for the 'message_compose' plugin hook. This will check for
    * a compose parameter 'calendar_event' and create an attachment with the
    * referenced event in iCal format
    */
   public function mail_message_compose($args)
   {
     // set the submitted event ID as attachment
     if (!empty($args['param']['calendar_event'])) {
       $this->load_driver();
 
       list($cal, $id) = explode(':', $args['param']['calendar_event'], 2);
       if ($event = $this->driver->get_event(array('id' => $id, 'calendar' => $cal))) {
         $filename = asciiwords($event['title']);
         if (empty($filename))
           $filename = 'event';
 
         // save ics to a temp file and register as attachment
         $tmp_path = tempnam($this->rc->config->get('temp_dir'), 'rcmAttmntCal');
         file_put_contents($tmp_path, $this->get_ical()->export(array($event), '', false, array($this->driver, 'get_attachment_body')));
 
         $args['attachments'][] = array('path' => $tmp_path, 'name' => $filename . '.ics', 'mimetype' => 'text/calendar');
         $args['param']['subject'] = $event['title'];
       }
     }
 
     return $args;
   }
 
 
   /**
    * Get a list of email addresses of the current user (from login and identities)
    */
   public function get_user_emails()
   {
     return $this->lib->get_user_emails();
   }
 
 
   /**
    * Build an absolute URL with the given parameters
    */
   public function get_url($param = array())
   {
     $param += array('task' => 'calendar');
     return $this->rc->url($param, true, true);
   }
 
 
   public function ical_feed_hash($source)
   {
     return base64_encode($this->rc->user->get_username() . ':' . $source);
   }
 
   /**
    * Handler for user_delete plugin hook
    */
   public function user_delete($args)
   {
      // delete itipinvitations entries related to this user
      $db = $this->rc->get_dbh();
      $table_itipinvitations = $db->table_name('itipinvitations', true);
      $db->query("DELETE FROM $table_itipinvitations WHERE `user_id` = ?", $args['user']->ID);
 
      $this->load_driver();
      return $this->driver->user_delete($args);
   }
 
   /**
    * Magic getter for public access to protected members
    */
   public function __get($name)
   {
     switch ($name) {
       case 'ical':
         return $this->get_ical();
 
       case 'itip':
         return $this->load_itip();
 
       case 'driver':
         $this->load_driver();
         return $this->driver;
     }
 
     return null;
   }
 
 }
diff --git a/plugins/calendar/calendar_base.js b/plugins/calendar/calendar_base.js
index fa9aa5e2..3f00925b 100644
--- a/plugins/calendar/calendar_base.js
+++ b/plugins/calendar/calendar_base.js
@@ -1,138 +1,138 @@
 /**
  * Base Javascript class for the Calendar plugin
  *
  * @author Lazlo Westerhof <hello@lazlo.me>
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this page.
  *
  * Copyright (C) 2010, Lazlo Westerhof <hello@lazlo.me>
  * Copyright (C) 2013-2015, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @licend  The above is the entire license notice
  * for the JavaScript code in this page.
  */
 
 // Basic setup for Roundcube calendar client class
 function rcube_calendar(settings)
 {
     // extend base class
     rcube_libcalendaring.call(this, settings);
 
     // member vars
     this.ui_loaded = false;
     this.selected_attachment = null;
 
     // private vars
     var me = this;
 
     // create new event from current mail message
     this.create_from_mail = function(uid)
     {
       if (uid || (uid = rcmail.get_single_uid())) {
         // load calendar UI (scripts and edit dialog template)
         if (!this.ui_loaded) {
           $.when(
             $.getScript(rcmail.assets_path('plugins/calendar/calendar_ui.js')),
             $.getScript(rcmail.assets_path('plugins/calendar/lib/js/fullcalendar.js')),
-            $.get(rcmail.url('calendar/inlineui'), function(html){ $(document.body).append(html); }, 'html')
+            $.get(rcmail.url('calendar/inlineui'), function(html) { $(document.body).append(html); }, 'html')
           ).then(function() {
             // disable attendees feature (autocompletion and stuff is not initialized)
             for (var c in rcmail.env.calendars)
               rcmail.env.calendars[c].attendees = rcmail.env.calendars[c].resources = false;
-            
+
             me.ui_loaded = true;
             me.ui = new rcube_calendar_ui(me.settings);
             me.create_from_mail(uid);  // start over
           });
+
           return;
         }
-        else {
-          // get message contents for event dialog
-          var lock = rcmail.set_busy(true, 'loading');
-          rcmail.http_post('calendar/mailtoevent', {
-              '_mbox': rcmail.env.mailbox,
-              '_uid': uid
-            }, lock);
-        }
+
+        // get message contents for event dialog
+        var lock = rcmail.set_busy(true, 'loading');
+        rcmail.http_post('calendar/mailtoevent', {
+            '_mbox': rcmail.env.mailbox,
+            '_uid': uid
+          }, lock);
       }
     };
-    
+
     // callback function triggered from server with contents for the new event
     this.mail2event_dialog = function(event)
     {
       if (event.title) {
         this.ui.add_event(event);
         if (rcmail.message_list)
           rcmail.message_list.blur();
       }
     };
 
     // handler for attachment-save-calendar commands
     this.save_to_calendar = function(p)
     {
       // TODO: show dialog to select the calendar for importing
       if (this.selected_attachment && window.rcube_libcalendaring) {
         rcmail.http_post('calendar/mailimportattach', {
             _uid: rcmail.env.uid,
             _mbox: rcmail.env.mailbox,
             _part: this.selected_attachment
             // _calendar: $('#calendar-attachment-saveto').val(),
           }, rcmail.set_busy(true, 'itip.savingdata'));
       }
     }
 }
 
 
 /* calendar plugin initialization (for non-calendar tasks) */
 window.rcmail && rcmail.addEventListener('init', function(evt) {
   if (rcmail.task != 'calendar') {
     var cal = new rcube_calendar($.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings));
 
     // register create-from-mail command to message_commands array
     if (rcmail.env.task == 'mail') {
-      rcmail.register_command('calendar-create-from-mail', function() { cal.create_from_mail() });
-      rcmail.register_command('attachment-save-calendar', function() { cal.save_to_calendar() });
-      rcmail.addEventListener('plugin.mail2event_dialog', function(p){ cal.mail2event_dialog(p) });
-      rcmail.addEventListener('plugin.unlock_saving', function(p){ cal.ui && cal.ui.unlock_saving(); });
-      
+      rcmail.register_command('calendar-create-from-mail', function() { cal.create_from_mail(); });
+      rcmail.register_command('attachment-save-calendar', function() { cal.save_to_calendar(); });
+      rcmail.addEventListener('plugin.mail2event_dialog', function(p) { cal.mail2event_dialog(p); });
+      rcmail.addEventListener('plugin.unlock_saving', function(p) { cal.ui && cal.ui.unlock_saving(); });
+
       if (rcmail.env.action != 'show') {
         rcmail.env.message_commands.push('calendar-create-from-mail');
         rcmail.add_element($('<a>'));
       }
       else {
         rcmail.enable_command('calendar-create-from-mail', true);
       }
 
       rcmail.addEventListener('beforemenu-open', function(p) {
         if (p.menu == 'attachmentmenu') {
           cal.selected_attachment = p.id;
           var mimetype = rcmail.env.attachments[p.id];
           rcmail.enable_command('attachment-save-calendar', mimetype == 'text/calendar' || mimetype == 'text/x-vcalendar' || mimetype == 'application/ics');
         }
       });
     }
   }
 
   rcmail.register_command('plugin.calendar', function() { rcmail.switch_task('calendar'); }, true);
-  
-  rcmail.addEventListener('plugin.ping_url', function(p){
+
+  rcmail.addEventListener('plugin.ping_url', function(p) {
     var action = p.action;
     p.action = p.event = null;
     new Image().src = rcmail.url(action, p);
   });
 });
diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index 3b261f57..84b70f22 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -1,1496 +1,1496 @@
 <?php
 
 /**
  * Database driver for the Calendar plugin
  *
  * @author Lazlo Westerhof <hello@lazlo.me>
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * Copyright (C) 2010, Lazlo Westerhof <hello@lazlo.me>
  * Copyright (C) 2012-2015, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 
 class database_driver extends calendar_driver
 {
   const DB_DATE_FORMAT = 'Y-m-d H:i:s';
 
   public static $scheduling_properties = array('start', 'end', 'allday', 'recurrence', 'location', 'cancelled');
 
   // features this backend supports
   public $alarms = true;
   public $attendees = true;
   public $freebusy = false;
   public $attachments = true;
   public $alarm_types = array('DISPLAY');
 
   private $rc;
   private $cal;
   private $cache = array();
   private $calendars = array();
   private $calendar_ids = '';
   private $free_busy_map = array('free' => 0, 'busy' => 1, 'out-of-office' => 2, 'outofoffice' => 2, 'tentative' => 3);
   private $sensitivity_map = array('public' => 0, 'private' => 1, 'confidential' => 2);
   private $server_timezone;
   
   private $db_events = 'events';
   private $db_calendars = 'calendars';
   private $db_attachments = 'attachments';
 
 
   /**
    * Default constructor
    */
   public function __construct($cal)
   {
     $this->cal = $cal;
     $this->rc = $cal->rc;
     $this->server_timezone = new DateTimeZone(date_default_timezone_get());
     
     // read database config
     $db = $this->rc->get_dbh();
     $this->db_events = $this->rc->config->get('db_table_events', $db->table_name($this->db_events));
     $this->db_calendars = $this->rc->config->get('db_table_calendars', $db->table_name($this->db_calendars));
     $this->db_attachments = $this->rc->config->get('db_table_attachments', $db->table_name($this->db_attachments));
     
     $this->_read_calendars();
   }
 
   /**
    * Read available calendars for the current user and store them internally
    */
   private function _read_calendars()
   {
     $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
     
     if (!empty($this->rc->user->ID)) {
       $calendar_ids = array();
       $result = $this->rc->db->query(
         "SELECT *, calendar_id AS id FROM " . $this->db_calendars . "
          WHERE user_id=?
          ORDER BY name",
          $this->rc->user->ID
       );
       while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
         $arr['showalarms'] = intval($arr['showalarms']);
         $arr['active']     = !in_array($arr['id'], $hidden);
         $arr['name']       = html::quote($arr['name']);
         $arr['listname']   = html::quote($arr['name']);
         $arr['rights']     = 'lrswikxteav';
         $arr['editable']  = true;
         $this->calendars[$arr['calendar_id']] = $arr;
         $calendar_ids[] = $this->rc->db->quote($arr['calendar_id']);
       }
       $this->calendar_ids = join(',', $calendar_ids);
     }
   }
 
   /**
    * Get a list of available calendars from this source
    *
    * @param integer Bitmask defining filter criterias
    *
    * @return array List of calendars
    */
   public function list_calendars($filter = 0)
   {
     // attempt to create a default calendar for this user
     if (empty($this->calendars)) {
       if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000', 'showalarms' => true)))
         $this->_read_calendars();
     }
 
     $calendars = $this->calendars;
 
     // filter active calendars
     if ($filter & self::FILTER_ACTIVE) {
       foreach ($calendars as $idx => $cal) {
         if (!$cal['active']) {
           unset($calendars[$idx]);
         }
       }
     }
 
     // 'personal' is unsupported in this driver
 
     // append the virtual birthdays calendar
     if ($this->rc->config->get('calendar_contact_birthdays', false)) {
       $prefs = $this->rc->config->get('birthday_calendar', array('color' => '87CEFA'));
       $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
 
       $id = self::BIRTHDAY_CALENDAR_ID;
       if (!$active || !in_array($id, $hidden)) {
         $calendars[$id] = array(
           'id'         => $id,
           'name'       => $this->cal->gettext('birthdays'),
           'listname'   => $this->cal->gettext('birthdays'),
           'color'      => $prefs['color'],
           'showalarms' => (bool)$this->rc->config->get('calendar_birthdays_alarm_type'),
           'active'     => !in_array($id, $hidden),
           'group'      => 'x-birthdays',
           'editable'  => false,
           'default'    => false,
           'children'   => false,
         );
       }
     }
 
     return $calendars;
   }
 
   /**
    * Create a new calendar assigned to the current user
    *
    * @param array Hash array with calendar properties
    *    name: Calendar name
    *   color: The color of the calendar
    * @return mixed ID of the calendar on success, False on error
    */
   public function create_calendar($prop)
   {
     $result = $this->rc->db->query(
       "INSERT INTO " . $this->db_calendars . "
        (user_id, name, color, showalarms)
        VALUES (?, ?, ?, ?)",
        $this->rc->user->ID,
        $prop['name'],
        $prop['color'],
        $prop['showalarms']?1:0
     );
     
     if ($result)
       return $this->rc->db->insert_id($this->db_calendars);
     
     return false;
   }
 
   /**
    * Update properties of an existing calendar
    *
    * @see calendar_driver::edit_calendar()
    */
   public function edit_calendar($prop)
   {
     // birthday calendar properties are saved in user prefs
     if ($prop['id'] == self::BIRTHDAY_CALENDAR_ID) {
       $prefs['birthday_calendar'] = $this->rc->config->get('birthday_calendar', array('color' => '87CEFA'));
       if (isset($prop['color']))
         $prefs['birthday_calendar']['color'] = $prop['color'];
       if (isset($prop['showalarms']))
         $prefs['calendar_birthdays_alarm_type'] = $prop['showalarms'] ? $this->alarm_types[0] : '';
       $this->rc->user->save_prefs($prefs);
       return true;
     }
 
     $query = $this->rc->db->query(
       "UPDATE " . $this->db_calendars . "
        SET   name=?, color=?, showalarms=?
        WHERE calendar_id=?
        AND   user_id=?",
       $prop['name'],
       $prop['color'],
       $prop['showalarms']?1:0,
       $prop['id'],
       $this->rc->user->ID
     );
     
     return $this->rc->db->affected_rows($query);
   }
 
   /**
    * Set active/subscribed state of a calendar
    * Save a list of hidden calendars in user prefs
    *
    * @see calendar_driver::subscribe_calendar()
    */
   public function subscribe_calendar($prop)
   {
     $hidden = array_flip(explode(',', $this->rc->config->get('hidden_calendars', '')));
     
     if ($prop['active'])
       unset($hidden[$prop['id']]);
     else
       $hidden[$prop['id']] = 1;
     
     return $this->rc->user->save_prefs(array('hidden_calendars' => join(',', array_keys($hidden))));
   }
 
   /**
    * Delete the given calendar with all its contents
    *
    * @see calendar_driver::delete_calendar()
    */
   public function delete_calendar($prop)
   {
     if (!$this->calendars[$prop['id']])
       return false;
 
     // events and attachments will be deleted by foreign key cascade
 
     $query = $this->rc->db->query(
       "DELETE FROM " . $this->db_calendars . "
        WHERE calendar_id=?",
        $prop['id']
     );
 
     return $this->rc->db->affected_rows($query);
   }
 
   /**
    * Search for shared or otherwise not listed calendars the user has access
    *
    * @param string Search string
    * @param string Section/source to search
    * @return array List of calendars
    */
   public function search_calendars($query, $source)
   {
     // not implemented
     return array();
   }
 
   /**
    * Add a single event to the database
    *
    * @param array Hash array with event properties
    * @see calendar_driver::new_event()
    */
   public function new_event($event)
   {
     if (!$this->validate($event))
       return false;
 
     if (!empty($this->calendars)) {
       if ($event['calendar'] && !$this->calendars[$event['calendar']])
         return false;
       if (!$event['calendar'])
         $event['calendar'] = reset(array_keys($this->calendars));
 
       if ($event_id = $this->_insert_event($event)) {
         $this->_update_recurring($event);
       }
 
       return $event_id;
     }
     
     return false;
   }
 
   /**
    *
    */
   private function _insert_event(&$event)
   {
     $event = $this->_save_preprocess($event);
 
     $this->rc->db->query(sprintf(
       "INSERT INTO " . $this->db_events . "
        (calendar_id, created, changed, uid, recurrence_id, instance, isexception, %s, %s, all_day, recurrence,
           title, description, location, categories, url, free_busy, priority, sensitivity, status, attendees, alarms, notifyat)
        VALUES (?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
         $this->rc->db->quote_identifier('start'),
         $this->rc->db->quote_identifier('end'),
         $this->rc->db->now(),
         $this->rc->db->now()
       ),
       $event['calendar'],
       strval($event['uid']),
       intval($event['recurrence_id']),
       strval($event['_instance']),
       intval($event['isexception']),
       $event['start']->format(self::DB_DATE_FORMAT),
       $event['end']->format(self::DB_DATE_FORMAT),
       intval($event['all_day']),
       $event['_recurrence'],
       strval($event['title']),
       strval($event['description']),
       strval($event['location']),
       join(',', (array)$event['categories']),
       strval($event['url']),
       intval($event['free_busy']),
       intval($event['priority']),
       intval($event['sensitivity']),
       strval($event['status']),
       $event['attendees'],
       $event['alarms'],
       $event['notifyat']
     );
 
     $event_id = $this->rc->db->insert_id($this->db_events);
 
     if ($event_id) {
       $event['id'] = $event_id;
 
       // add attachments
       if (!empty($event['attachments'])) {
         foreach ($event['attachments'] as $attachment) {
           $this->add_attachment($attachment, $event_id);
           unset($attachment);
         }
       }
 
       return $event_id;
     }
 
     return false;
   }
 
   /**
    * Update an event entry with the given data
    *
    * @param array Hash array with event properties
    * @see calendar_driver::edit_event()
    */
   public function edit_event($event)
   {
     if (!empty($this->calendars)) {
       $update_master = false;
       $update_recurring = true;
       $old = $this->get_event($event);
       $ret = true;
 
       // check if update affects scheduling and update attendee status accordingly
       $reschedule = $this->_check_scheduling($event, $old, true);
 
       // increment sequence number
       if (empty($event['sequence']) && $reschedule)
         $event['sequence'] = max($event['sequence'], $old['sequence']) + 1;
       
       // modify a recurring event, check submitted savemode to do the right things
       if ($old['recurrence'] || $old['recurrence_id']) {
         $master = $old['recurrence_id'] ? $this->get_event(array('id' => $old['recurrence_id'])) : $old;
         
         // keep saved exceptions (not submitted by the client)
         if ($old['recurrence']['EXDATE'])
           $event['recurrence']['EXDATE'] = $old['recurrence']['EXDATE'];
         
         switch ($event['_savemode']) {
           case 'new':
             $event['uid'] = $this->cal->generate_uid();
             return $this->new_event($event);
           
           case 'current':
             // save as exception
             $event['isexception'] = 1;
             $update_recurring = false;
 
             // set exception to first instance (= master)
             if ($event['id'] == $master['id']) {
               $event += $old;
               $event['recurrence_id'] = $master['id'];
               $event['_instance'] = libcalendaring::recurrence_instance_identifier($old);
               $event['isexception'] = 1;
               $event_id = $this->_insert_event($event);
               return $event_id;
             }
             break;
           
           case 'future':
             if ($master['id'] != $event['id']) {
               // set until-date on master event, then save this instance as new recurring event
               $master['recurrence']['UNTIL'] = clone $event['start'];
               $master['recurrence']['UNTIL']->sub(new DateInterval('P1D'));
               unset($master['recurrence']['COUNT']);
               $update_master = true;
               
               // if recurrence COUNT, update value to the correct number of future occurences
               if ($event['recurrence']['COUNT']) {
                 $fromdate = clone $event['start'];
                 $fromdate->setTimezone($this->server_timezone);
                 $sqlresult = $this->rc->db->query(sprintf(
                   "SELECT event_id FROM " . $this->db_events . "
                    WHERE calendar_id IN (%s)
                    AND %s >= ?
                    AND recurrence_id=?",
                   $this->calendar_ids,
                   $this->rc->db->quote_identifier('start')
                   ),
                   $fromdate->format(self::DB_DATE_FORMAT),
                   $master['id']);
                 if ($count = $this->rc->db->num_rows($sqlresult))
                   $event['recurrence']['COUNT'] = $count;
               }
             
               $update_recurring = true;
               $event['recurrence_id'] = 0;
               $event['isexception'] = 0;
               $event['_instance'] = '';
               break;
             }
             // else: 'future' == 'all' if modifying the master event
           
           default:  // 'all' is default
             $event['id'] = $master['id'];
             $event['recurrence_id'] = 0;
             
             // use start date from master but try to be smart on time or duration changes
             $old_start_date = $old['start']->format('Y-m-d');
             $old_start_time = $old['allday'] ? '' : $old['start']->format('H:i');
             $old_duration = $old['end']->format('U') - $old['start']->format('U');
             
             $new_start_date = $event['start']->format('Y-m-d');
             $new_start_time = $event['allday'] ? '' : $event['start']->format('H:i');
             $new_duration = $event['end']->format('U') - $event['start']->format('U');
             
             $diff = $old_start_date != $new_start_date || $old_start_time != $new_start_time || $old_duration != $new_duration;
             $date_shift = $old['start']->diff($event['start']);
             
             // shifted or resized
             if ($diff && ($old_start_date == $new_start_date || $old_duration == $new_duration)) {
               $event['start'] = $master['start']->add($old['start']->diff($event['start']));
               $event['end'] = clone $event['start'];
               $event['end']->add(new DateInterval('PT'.$new_duration.'S'));
             }
             // dates did not change, use the ones from master
             else if ($new_start_date . $new_start_time == $old_start_date . $old_start_time) {
               $event['start'] = $master['start'];
               $event['end'] = $master['end'];
             }
             
             // adjust recurrence-id when start changed and therefore the entire recurrence chain changes
             if (is_array($event['recurrence']) && ($old_start_date != $new_start_date || $old_start_time != $new_start_time)
                 && ($exceptions = $this->_load_exceptions($old))) {
               $recurrence_id_format = libcalendaring::recurrence_id_format($event);
               foreach ($exceptions as $exception) {
                 $recurrence_id = rcube_utils::anytodatetime($exception['_instance'], $old['start']->getTimezone());
                 if (is_a($recurrence_id, 'DateTime')) {
                   $recurrence_id->add($date_shift);
                   $exception['_instance'] = $recurrence_id->format($recurrence_id_format);
                   $this->_update_event($exception, false);
                 }
               }
             }
             
             $ret = $event['id'];  // return master ID
             break;
         }
       }
       
       $success = $this->_update_event($event, $update_recurring);
       
       if ($success && $update_master)
         $this->_update_event($master, true);
       
       return $success ? $ret : false;
     }
     
     return false;
   }
 
   /**
    * Extended event editing with possible changes to the argument
    *
    * @param array  Hash array with event properties
    * @param string New participant status
    * @param array  List of hash arrays with updated attendees
    * @return boolean True on success, False on error
    */
   public function edit_rsvp(&$event, $status, $attendees)
   {
     $update_event = $event;
 
     // apply changes to master (and all exceptions)
     if ($event['_savemode'] == 'all' && $event['recurrence_id']) {
       $update_event = $this->get_event(array('id' => $event['recurrence_id']));
       $update_event['_savemode'] = $event['_savemode'];
       calendar::merge_attendee_data($update_event, $attendees);
     }
 
     if ($ret = $this->update_attendees($update_event, $attendees)) {
       // replace $event with effectively updated event (for iTip reply)
       if ($ret !== true && $ret != $update_event['id'] && ($new_event = $this->get_event(array('id' => $ret)))) {
         $event = $new_event;
       }
       else {
         $event = $update_event;
       }
     }
 
     return $ret;
   }
 
   /**
    * Update the participant status for the given attendees
    *
    * @see calendar_driver::update_attendees()
    */
   public function update_attendees(&$event, $attendees)
   {
     $success = $this->edit_event($event, true);
 
     // apply attendee updates to recurrence exceptions too
     if ($success && $event['_savemode'] == 'all' && !empty($event['recurrence']) && empty($event['recurrence_id']) && ($exceptions = $this->_load_exceptions($event))) {
       foreach ($exceptions as $exception) {
         calendar::merge_attendee_data($exception, $attendees);
         $this->_update_event($exception, false);
       }
     }
 
     return $success;
   }
 
   /**
    * Determine whether the current change affects scheduling and reset attendee status accordingly
    */
   private function _check_scheduling(&$event, $old, $update = true)
   {
     // skip this check when importing iCal/iTip events
     if (isset($event['sequence']) || !empty($event['_method'])) {
       return false;
     }
 
     $reschedule = false;
 
     // iterate through the list of properties considered 'significant' for scheduling
     foreach (self::$scheduling_properties as $prop) {
         $a = $old[$prop];
         $b = $event[$prop];
         if ($event['allday'] && ($prop == 'start' || $prop == 'end') && $a instanceof DateTime && $b instanceof DateTime) {
             $a = $a->format('Y-m-d');
             $b = $b->format('Y-m-d');
         }
         if ($prop == 'recurrence' && is_array($a) && is_array($b)) {
             unset($a['EXCEPTIONS'], $b['EXCEPTIONS']);
             $a = array_filter($a);
             $b = array_filter($b);
 
             // advanced rrule comparison: no rescheduling if series was shortened
             if ($a['COUNT'] && $b['COUNT'] && $b['COUNT'] < $a['COUNT']) {
               unset($a['COUNT'], $b['COUNT']);
             }
             else if ($a['UNTIL'] && $b['UNTIL'] && $b['UNTIL'] < $a['UNTIL']) {
               unset($a['UNTIL'], $b['UNTIL']);
             }
         }
         if ($a != $b) {
             $reschedule = true;
             break;
         }
     }
 
     // reset all attendee status to needs-action (#4360)
     if ($update && $reschedule && is_array($event['attendees'])) {
       $is_organizer = false;
       $emails = $this->cal->get_user_emails();
       $attendees = $event['attendees'];
       foreach ($attendees as $i => $attendee) {
         if ($attendee['role'] == 'ORGANIZER' && $attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
           $is_organizer = true;
         }
         else if ($attendee['role'] != 'ORGANIZER' && $attendee['role'] != 'NON-PARTICIPANT' && $attendee['status'] != 'DELEGATED') {
           $attendees[$i]['status'] = 'NEEDS-ACTION';
           $attendees[$i]['rsvp'] = true;
         }
       }
 
       // update attendees only if I'm the organizer
       if ($is_organizer || ($event['organizer'] && in_array(strtolower($event['organizer']['email']), $emails))) {
         $event['attendees'] = $attendees;
       }
     }
 
     return $reschedule;
   }
 
   /**
    * Convert save data to be used in SQL statements
    */
   private function _save_preprocess($event)
   {
     // shift dates to server's timezone (except for all-day events)
     if (!$event['allday']) {
       $event['start'] = clone $event['start'];
       $event['start']->setTimezone($this->server_timezone);
       $event['end'] = clone $event['end'];
       $event['end']->setTimezone($this->server_timezone);
     }
     
     // compose vcalendar-style recurrencue rule from structured data
     $rrule = $event['recurrence'] ? libcalendaring::to_rrule($event['recurrence']) : '';
     $event['_recurrence'] = rtrim($rrule, ';');
     $event['free_busy'] = intval($this->free_busy_map[strtolower($event['free_busy'])]);
     $event['sensitivity'] = intval($this->sensitivity_map[strtolower($event['sensitivity'])]);
 
     if ($event['free_busy'] == 'tentative') {
         $event['status'] = 'TENTATIVE';
     }
 
     if (isset($event['allday'])) {
       $event['all_day'] = $event['allday'] ? 1 : 0;
     }
 
     // compute absolute time to notify the user
     $event['notifyat'] = $this->_get_notification($event);
 
     if (is_array($event['valarms'])) {
         $event['alarms'] = $this->serialize_alarms($event['valarms']);
     }
 
     // process event attendees
     if (!empty($event['attendees']))
       $event['attendees'] = json_encode((array)$event['attendees']);
     else
       $event['attendees'] = '';
 
     return $event;
   }
   
   /**
    * Compute absolute time to notify the user
    */
   private function _get_notification($event)
   {
     if ($event['valarms'] && $event['start'] > new DateTime()) {
       $alarm = libcalendaring::get_next_alarm($event);
 
       if ($alarm['time'] && in_array($alarm['action'], $this->alarm_types))
         return date('Y-m-d H:i:s', $alarm['time']);
     }
 
     return null;
   }
 
   /**
    * Save the given event record to database
    *
    * @param array Event data
    * @param boolean True if recurring events instances should be updated, too
    */
   private function _update_event($event, $update_recurring = true)
   {
     $event = $this->_save_preprocess($event);
     $sql_set = array();
     $set_cols = array('start', 'end', 'all_day', 'recurrence_id', 'isexception', 'sequence', 'title', 'description', 'location', 'categories', 'url', 'free_busy', 'priority', 'sensitivity', 'status', 'attendees', 'alarms', 'notifyat');
     foreach ($set_cols as $col) {
       if (is_object($event[$col]) && is_a($event[$col], 'DateTime'))
         $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]->format(self::DB_DATE_FORMAT));
       else if (is_array($event[$col]))
         $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote(join(',', $event[$col]));
       else if (array_key_exists($col, $event))
         $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]);
     }
     
     if ($event['_recurrence'])
       $sql_set[] = $this->rc->db->quote_identifier('recurrence') . '=' . $this->rc->db->quote($event['_recurrence']);
     
     if ($event['_instance'])
       $sql_set[] = $this->rc->db->quote_identifier('instance') . '=' . $this->rc->db->quote($event['_instance']);
     
     if ($event['_fromcalendar'] && $event['_fromcalendar'] != $event['calendar'])
         $sql_set[] = 'calendar_id=' . $this->rc->db->quote($event['calendar']);
     
     $query = $this->rc->db->query(sprintf(
       "UPDATE " . $this->db_events . "
        SET   changed=%s %s
        WHERE event_id=?
        AND   calendar_id IN (" . $this->calendar_ids . ")",
         $this->rc->db->now(),
         ($sql_set ? ', ' . join(', ', $sql_set) : '')
       ),
       $event['id']
     );
 
     $success = $this->rc->db->affected_rows($query);
 
     // add attachments
     if ($success && !empty($event['attachments'])) {
       foreach ($event['attachments'] as $attachment) {
         $this->add_attachment($attachment, $event['id']);
         unset($attachment);
       }
     }
 
     // remove attachments
     if ($success && !empty($event['deleted_attachments'])) {
       foreach ($event['deleted_attachments'] as $attachment) {
         $this->remove_attachment($attachment, $event['id']);
       }
     }
 
     if ($success) {
       unset($this->cache[$event['id']]);
       if ($update_recurring)
         $this->_update_recurring($event);
     }
 
     return $success;
   }
 
   /**
    * Insert "fake" entries for recurring occurences of this event
    */
   private function _update_recurring($event)
   {
     if (empty($this->calendars))
       return;
 
     if (!empty($event['recurrence'])) {
       $exdata = array();
       $exceptions = $this->_load_exceptions($event);
 
       foreach ($exceptions as $exception) {
         $exdate = substr($exception['_instance'], 0, 8);
         $exdata[$exdate] = $exception;
       }
     }
 
     // clear existing recurrence copies
     $this->rc->db->query(
       "DELETE FROM " . $this->db_events . "
        WHERE recurrence_id=?
        AND isexception=0
        AND calendar_id IN (" . $this->calendar_ids . ")",
        $event['id']
     );
 
     // create new fake entries
     if (!empty($event['recurrence'])) {
       // include library class
       require_once($this->cal->home . '/lib/calendar_recurrence.php');
       
       $recurrence = new calendar_recurrence($this->cal, $event);
 
       $count = 0;
       $event['allday'] = $event['all_day'];
       $duration = $event['start']->diff($event['end']);
       $recurrence_id_format = libcalendaring::recurrence_id_format($event);
       while ($next_start = $recurrence->next_start()) {
         $instance = $next_start->format($recurrence_id_format);
         $datestr = substr($instance, 0, 8);
 
         // skip exceptions
         // TODO: merge updated data from master event
         if ($exdata[$datestr]) {
           continue;
         }
 
         $next_start->setTimezone($this->server_timezone);
         $next_end = clone $next_start;
         $next_end->add($duration);
 
         $notify_at = $this->_get_notification(array('alarms' => $event['alarms'], 'start' => $next_start, 'end' => $next_end, 'status' => $event['status']));
         $query = $this->rc->db->query(sprintf(
           "INSERT INTO " . $this->db_events . "
            (calendar_id, recurrence_id, created, changed, uid, instance, %s, %s, all_day, sequence, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, alarms, attendees, notifyat)
             SELECT calendar_id, ?, %s, %s, uid, ?, ?, ?, all_day, sequence, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, alarms, attendees, ?
             FROM  " . $this->db_events . " WHERE event_id=? AND calendar_id IN (" . $this->calendar_ids . ")",
             $this->rc->db->quote_identifier('start'),
             $this->rc->db->quote_identifier('end'),
             $this->rc->db->now(),
             $this->rc->db->now()
           ),
           $event['id'],
           $instance,
           $next_start->format(self::DB_DATE_FORMAT),
           $next_end->format(self::DB_DATE_FORMAT),
           $notify_at,
           $event['id']
         );
         
         if (!$this->rc->db->affected_rows($query))
           break;
         
         // stop adding events for inifinite recurrence after 20 years
         if (++$count > 999 || (!$recurrence->recurEnd && !$recurrence->recurCount && $next_start->format('Y') > date('Y') + 20))
           break;
       }
       
       // remove all exceptions after recurrence end
       if ($next_end && !empty($exceptions)) {
           $this->rc->db->query(
           "DELETE FROM " . $this->db_events . "
            WHERE `recurrence_id`=?
            AND `isexception`=1
            AND `start` > ?
            AND `calendar_id` IN (" . $this->calendar_ids . ")",
            $event['id'],
            $next_end->format(self::DB_DATE_FORMAT)
         );
       }
     }
   }
   
   /**
    *
    */
   private function _load_exceptions($event, $instance_id = null)
   {
     $sql_add_where = '';
     if (!empty($instance_id)) {
       $sql_add_where = 'AND `instance`=?';
     }
 
     $result = $this->rc->db->query(
       "SELECT * FROM " . $this->db_events . "
        WHERE `recurrence_id`=?
        AND `isexception`=1
        AND `calendar_id` IN (" . $this->calendar_ids . ")
        $sql_add_where
        ORDER BY `instance`, `start`",
        $event['id'],
        $instance_id
     );
 
     $exceptions = array();
     while ($result && ($sql_arr = $this->rc->db->fetch_assoc($result)) && $sql_arr['event_id']) {
       $exception = $this->_read_postprocess($sql_arr);
       $instance = $exception['_instance'] ?: $exception['start']->format($exception['allday'] ? 'Ymd' : 'Ymd\THis');
       $exceptions[$instance] = $exception;
     }
 
     return $exceptions;
   }
 
   /**
    * Move a single event
    *
    * @param array Hash array with event properties
    * @see calendar_driver::move_event()
    */
   public function move_event($event)
   {
     // let edit_event() do all the magic
     return $this->edit_event($event + (array)$this->get_event($event));
   }
 
   /**
    * Resize a single event
    *
    * @param array Hash array with event properties
    * @see calendar_driver::resize_event()
    */
   public function resize_event($event)
   {
     // let edit_event() do all the magic
     return $this->edit_event($event + (array)$this->get_event($event));
   }
 
   /**
    * Remove a single event from the database
    *
    * @param array   Hash array with event properties
    * @param boolean Remove record irreversible (@TODO)
    *
    * @see calendar_driver::remove_event()
    */
   public function remove_event($event, $force = true)
   {
     if (!empty($this->calendars)) {
       $event += (array)$this->get_event($event);
       $master = $event;
       $update_master = false;
       $savemode = 'all';
       $ret = true;
 
       // read master if deleting a recurring event
       if ($event['recurrence'] || $event['recurrence_id']) {
         $master = $event['recurrence_id'] ? $this->get_event(array('id' => $event['recurrence_id'])) : $event;
         $savemode = $event['_savemode'];
       }
 
       switch ($savemode) {
         case 'current':
           // add exception to master event
           $master['recurrence']['EXDATE'][] = $event['start'];
           $update_master = true;
           
           // just delete this single occurence
           $query = $this->rc->db->query(
             "DELETE FROM " . $this->db_events . "
              WHERE calendar_id IN (" . $this->calendar_ids . ")
              AND event_id=?",
             $event['id']
           );
           break;
 
         case 'future':
           if ($master['id'] != $event['id']) {
             // set until-date on master event
             $master['recurrence']['UNTIL'] = clone $event['start'];
             $master['recurrence']['UNTIL']->sub(new DateInterval('P1D'));
             unset($master['recurrence']['COUNT']);
             $update_master = true;
             
             // delete this and all future instances
             $fromdate = clone $event['start'];
             $fromdate->setTimezone($this->server_timezone);
             $query = $this->rc->db->query(
               "DELETE FROM " . $this->db_events . "
                WHERE calendar_id IN (" . $this->calendar_ids . ")
                AND " . $this->rc->db->quote_identifier('start') . " >= ?
                AND recurrence_id=?",
               $fromdate->format(self::DB_DATE_FORMAT),
               $master['id']
             );
             $ret = $master['id'];
             break;
           }
           // else: future == all if modifying the master event
 
         default:  // 'all' is default
           $query = $this->rc->db->query(
             "DELETE FROM " . $this->db_events . "
              WHERE (event_id=? OR recurrence_id=?)
              AND calendar_id IN (" . $this->calendar_ids . ")",
              $master['id'],
              $master['id']
           );
           break;
       }
 
       $success = $this->rc->db->affected_rows($query);
       if ($success && $update_master)
         $this->_update_event($master, true);
 
       return $success ? $ret : false;
     }
     
     return false;
   }
 
   /**
    * Return data of a specific event
    * @param mixed  Hash array with event properties or event UID
    * @param integer Bitmask defining the scope to search events in
    * @param boolean If true, recurrence exceptions shall be added
    * @return array Hash array with event properties
    */
   public function get_event($event, $scope = 0, $full = false)
   {
     $id  = is_array($event) ? ($event['id'] ?: $event['uid']) : $event;
     $cal = is_array($event) ? $event['calendar'] : null;
     $col = is_array($event) && is_numeric($id) ? 'event_id' : 'uid';
 
     $where_add = '';
     if (is_array($event) && !$event['id'] && !empty($event['_instance'])) {
       $where_add = 'AND instance=' . $this->rc->db->quote($event['_instance']);
     }
 
     if ($this->cache[$id])
       return $this->cache[$id];
 
     // get event from the address books birthday calendar
     if ($cal == self::BIRTHDAY_CALENDAR_ID) {
       return $this->get_birthday_event($id);
     }
 
     if ($scope & self::FILTER_ACTIVE) {
       $calendars = $this->calendars;
       foreach ($calendars as $idx => $cal) {
         if (!$cal['active']) {
           unset($calendars[$idx]);
         }
       }
       $cals = join(',', $calendars);
     }
     else {
       $cals = $this->calendar_ids;
     }
 
     $result = $this->rc->db->query(sprintf(
       "SELECT e.*, (SELECT COUNT(attachment_id) FROM " . $this->db_attachments . " 
          WHERE event_id = e.event_id OR event_id = e.recurrence_id) AS _attachments
        FROM " . $this->db_events . " AS e
        WHERE e.calendar_id IN (%s)
        AND e.$col=?
        %s",
        $cals,
        $where_add
       ),
       $id);
 
     if ($result && ($sql_arr = $this->rc->db->fetch_assoc($result)) && $sql_arr['event_id']) {
       $event = $this->_read_postprocess($sql_arr);
 
       // also load recurrence exceptions
       if (!empty($event['recurrence']) && $full) {
         $event['recurrence']['EXCEPTIONS'] = array_values($this->_load_exceptions($event));
       }
 
       $this->cache[$id] = $event;
       return $this->cache[$id];
     }
 
     return false;
   }
 
   /**
    * Get event data
    *
    * @see calendar_driver::load_events()
    */
   public function load_events($start, $end, $query = null, $calendars = null, $virtual = 1, $modifiedsince = null)
   {
     if (empty($calendars))
       $calendars = array_keys($this->calendars);
     else if (!is_array($calendars))
       $calendars = explode(',', strval($calendars));
       
     // only allow to select from calendars of this use
     $calendar_ids = array_map(array($this->rc->db, 'quote'), array_intersect($calendars, array_keys($this->calendars)));
     
     // compose (slow) SQL query for searching
     // FIXME: improve searching using a dedicated col and normalized values
     if ($query) {
       foreach (array('title','location','description','categories','attendees') as $col)
         $sql_query[] = $this->rc->db->ilike($col, '%'.$query.'%');
       $sql_add = 'AND (' . join(' OR ', $sql_query) . ')';
     }
     
     if (!$virtual)
       $sql_add .= ' AND e.recurrence_id = 0';
     
     if ($modifiedsince)
       $sql_add .= ' AND e.changed >= ' . $this->rc->db->quote(date('Y-m-d H:i:s', $modifiedsince));
     
     $events = array();
     if (!empty($calendar_ids)) {
       $result = $this->rc->db->query(sprintf(
         "SELECT e.*, (SELECT COUNT(attachment_id) FROM " . $this->db_attachments . "
             WHERE event_id = e.event_id OR event_id = e.recurrence_id) AS _attachments
          FROM " . $this->db_events . " e
          WHERE e.calendar_id IN (%s)
             AND e.start <= %s AND e.end >= %s
             %s",
          join(',', $calendar_ids),
          $this->rc->db->fromunixtime($end),
          $this->rc->db->fromunixtime($start),
          $sql_add
        ));
 
       while ($result && ($sql_arr = $this->rc->db->fetch_assoc($result))) {
         $event = $this->_read_postprocess($sql_arr);
         $add = true;
 
         if (!empty($event['recurrence']) && !$event['recurrence_id']) {
           // load recurrence exceptions (i.e. for export)
           if (!$virtual) {
             $event['recurrence']['EXCEPTIONS'] = $this->_load_exceptions($event);
           }
           // check for exception on first instance
           else {
             $instance = libcalendaring::recurrence_instance_identifier($event);
             $exceptions = $this->_load_exceptions($event, $instance);
             if ($exceptions && is_array($exceptions[$instance])) {
               $event = $exceptions[$instance];
               $add = false;
             }
           }
         }
 
         if ($add)
           $events[] = $event;
       }
     }
 
     // add events from the address books birthday calendar
     if (in_array(self::BIRTHDAY_CALENDAR_ID, $calendars) && empty($query)) {
       $events = array_merge($events, $this->load_birthday_events($start, $end, $search, $modifiedsince));
     }
 
     return $events;
   }
 
   /**
    * Get number of events in the given calendar
    *
    * @param  mixed   List of calendar IDs to count events (either as array or comma-separated string)
    * @param  integer Date range start (unix timestamp)
    * @param  integer Date range end (unix timestamp)
    * @return array   Hash array with counts grouped by calendar ID
    */
   public function count_events($calendars, $start, $end = null)
   {
       // not implemented
       return array();
   }
 
   /**
    * Convert sql record into a rcube style event object
    */
   private function _read_postprocess($event)
   {
     $free_busy_map = array_flip($this->free_busy_map);
     $sensitivity_map = array_flip($this->sensitivity_map);
     
     $event['id'] = $event['event_id'];
     $event['start'] = new DateTime($event['start']);
     $event['end'] = new DateTime($event['end']);
     $event['allday'] = intval($event['all_day']);
     $event['created'] = new DateTime($event['created']);
     $event['changed'] = new DateTime($event['changed']);
     $event['free_busy'] = $free_busy_map[$event['free_busy']];
     $event['sensitivity'] = $sensitivity_map[$event['sensitivity']];
     $event['calendar'] = $event['calendar_id'];
     $event['recurrence_id'] = intval($event['recurrence_id']);
     $event['isexception'] = intval($event['isexception']);
     
     // parse recurrence rule
     if ($event['recurrence'] && preg_match_all('/([A-Z]+)=([^;]+);?/', $event['recurrence'], $m, PREG_SET_ORDER)) {
       $event['recurrence'] = array();
       foreach ($m as $rr) {
         if (is_numeric($rr[2]))
           $rr[2] = intval($rr[2]);
         else if ($rr[1] == 'UNTIL')
           $rr[2] = date_create($rr[2]);
         else if ($rr[1] == 'RDATE')
           $rr[2] = array_map('date_create', explode(',', $rr[2]));
         else if ($rr[1] == 'EXDATE')
           $rr[2] = array_map('date_create', explode(',', $rr[2]));
         $event['recurrence'][$rr[1]] = $rr[2];
       }
     }
     
     if ($event['recurrence_id']) {
       libcalendaring::identify_recurrence_instance($event);
     }
     
     if (strlen($event['instance'])) {
       $event['_instance'] = $event['instance'];
 
       if (empty($event['recurrence_id'])) {
         $event['recurrence_date'] = rcube_utils::anytodatetime($event['_instance'], $event['start']->getTimezone());
       }
     }
     
     if ($event['_attachments'] > 0) {
       $event['attachments'] = (array)$this->list_attachments($event);
     }
     
     // decode serialized event attendees
     if (strlen($event['attendees'])) {
       $event['attendees'] = $this->unserialize_attendees($event['attendees']);
     }
     else {
       $event['attendees'] = array();
     }
     
     // decode serialized alarms
     if ($event['alarms']) {
       $event['valarms'] = $this->unserialize_alarms($event['alarms']);
     }
     
     unset($event['event_id'], $event['calendar_id'], $event['notifyat'], $event['all_day'], $event['instance'], $event['_attachments']);
     return $event;
   }
 
   /**
    * Get a list of pending alarms to be displayed to the user
    *
    * @see calendar_driver::pending_alarms()
    */
   public function pending_alarms($time, $calendars = null)
   {
     if (empty($calendars))
       $calendars = array_keys($this->calendars);
     else if (is_string($calendars))
       $calendars = explode(',', $calendars);
     
     // only allow to select from calendars with activated alarms
     $calendar_ids = array();
     foreach ($calendars as $cid) {
       if ($this->calendars[$cid] && $this->calendars[$cid]['showalarms'])
         $calendar_ids[] = $cid;
     }
     $calendar_ids = array_map(array($this->rc->db, 'quote'), $calendar_ids);
     
     $alarms = array();
     if (!empty($calendar_ids)) {
       $result = $this->rc->db->query(sprintf(
         "SELECT * FROM " . $this->db_events . "
          WHERE calendar_id IN (%s)
          AND notifyat <= %s AND %s > %s",
          join(',', $calendar_ids),
          $this->rc->db->fromunixtime($time),
          $this->rc->db->quote_identifier('end'),
          $this->rc->db->fromunixtime($time)
        ));
 
       while ($result && ($event = $this->rc->db->fetch_assoc($result)))
         $alarms[] = $this->_read_postprocess($event);
     }
 
     return $alarms;
   }
 
   /**
    * Feedback after showing/sending an alarm notification
    *
    * @see calendar_driver::dismiss_alarm()
    */
   public function dismiss_alarm($event_id, $snooze = 0)
   {
     // set new notifyat time or unset if not snoozed
     $notify_at = $snooze > 0 ? date(self::DB_DATE_FORMAT, time() + $snooze) : null;
     
     $query = $this->rc->db->query(sprintf(
       "UPDATE " . $this->db_events . "
        SET   changed=%s, notifyat=?
        WHERE event_id=?
        AND calendar_id IN (" . $this->calendar_ids . ")",
         $this->rc->db->now()),
       $notify_at,
       $event_id
     );
     
     return $this->rc->db->affected_rows($query);
   }
 
   /**
    * Save an attachment related to the given event
    */
   private function add_attachment($attachment, $event_id)
   {
     $data = $attachment['data'] ? $attachment['data'] : file_get_contents($attachment['path']);
     
     $query = $this->rc->db->query(
       "INSERT INTO " . $this->db_attachments .
       " (event_id, filename, mimetype, size, data)" .
       " VALUES (?, ?, ?, ?, ?)",
       $event_id,
       $attachment['name'],
       $attachment['mimetype'],
       strlen($data),
       base64_encode($data)
     );
 
     return $this->rc->db->affected_rows($query);
   }
 
   /**
    * Remove a specific attachment from the given event
    */
   private function remove_attachment($attachment_id, $event_id)
   {
     $query = $this->rc->db->query(
       "DELETE FROM " . $this->db_attachments .
       " WHERE attachment_id = ?" .
         " AND event_id IN (SELECT event_id FROM " . $this->db_events .
           " WHERE event_id = ?"  .
             " AND calendar_id IN (" . $this->calendar_ids . "))",
       $attachment_id,
       $event_id
     );
 
     return $this->rc->db->affected_rows($query);
   }
 
   /**
    * List attachments of specified event
    */
   public function list_attachments($event)
   {
     $attachments = array();
 
     if (!empty($this->calendar_ids)) {
       $result = $this->rc->db->query(
         "SELECT attachment_id AS id, filename AS name, mimetype, size " .
         " FROM " . $this->db_attachments .
         " WHERE event_id IN (SELECT event_id FROM " . $this->db_events .
           " WHERE event_id=?"  .
             " AND calendar_id IN (" . $this->calendar_ids . "))".
         " ORDER BY filename",
         $event['recurrence_id'] ? $event['recurrence_id'] : $event['event_id']
       );
 
       while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
         $attachments[] = $arr;
       }
     }
 
     return $attachments;
   }
 
   /**
    * Get attachment properties
    */
   public function get_attachment($id, $event)
   {
     if (!empty($this->calendar_ids)) {
       $result = $this->rc->db->query(
         "SELECT attachment_id AS id, filename AS name, mimetype, size " .
         " FROM " . $this->db_attachments .
         " WHERE attachment_id=?".
           " AND event_id=?",
         $id,
         $event['recurrence_id'] ? $event['recurrence_id'] : $event['id']
       );
 
       if ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
         return $arr;
       }
     }
 
     return null;
   }
 
   /**
    * Get attachment body
    */
   public function get_attachment_body($id, $event)
   {
     if (!empty($this->calendar_ids)) {
       $result = $this->rc->db->query(
         "SELECT data " .
         " FROM " . $this->db_attachments .
         " WHERE attachment_id=?".
           " AND event_id=?",
         $id,
         $event['id']
       );
 
       if ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
         return base64_decode($arr['data']);
       }
     }
 
     return null;
   }
 
   /**
    * Remove the given category
    */
   public function remove_category($name)
   {
     $query = $this->rc->db->query(
       "UPDATE " . $this->db_events . "
        SET   categories=''
        WHERE categories=?
        AND   calendar_id IN (" . $this->calendar_ids . ")",
       $name
     );
     
     return $this->rc->db->affected_rows($query);
   }
 
   /**
    * Update/replace a category
    */
   public function replace_category($oldname, $name, $color)
   {
     $query = $this->rc->db->query(
       "UPDATE " . $this->db_events . "
        SET   categories=?
        WHERE categories=?
        AND   calendar_id IN (" . $this->calendar_ids . ")",
       $name,
       $oldname
     );
     
     return $this->rc->db->affected_rows($query);
   }
 
   /**
    * Helper method to serialize the list of alarms into a string
    */
   private function serialize_alarms($valarms)
   {
       foreach ((array)$valarms as $i => $alarm) {
           if ($alarm['trigger'] instanceof DateTime) {
               $valarms[$i]['trigger'] = '@' . $alarm['trigger']->format('c');
           }
       }
 
       return $valarms ? json_encode($valarms) : null;
   }
 
   /**
    * Helper method to decode a serialized list of alarms
    */
   private function unserialize_alarms($alarms)
   {
       // decode json serialized alarms
       if ($alarms && $alarms[0] == '[') {
           $valarms = json_decode($alarms, true);
           foreach ($valarms as $i => $alarm) {
               if ($alarm['trigger'][0] == '@') {
                   try {
                       $valarms[$i]['trigger'] = new DateTime(substr($alarm['trigger'], 1));
                   }
                   catch (Exception $e) {
                       unset($valarms[$i]);
                   }
               }
           }
       }
       // convert legacy alarms data
       else if (strlen($alarms)) {
           list($trigger, $action) = explode(':', $alarms, 2);
           if ($trigger = libcalendaring::parse_alarm_value($trigger)) {
               $valarms = array(array('action' => $action, 'trigger' => $trigger[3] ?: $trigger[0]));
           }
       }
 
       return $valarms;
   }
 
   /**
    * Helper method to decode the attendees list from string
    */
   private function unserialize_attendees($s_attendees)
   {
     $attendees = array();
 
     // decode json serialized string
     if ($s_attendees[0] == '[') {
       $attendees = json_decode($s_attendees, true);
     }
     // decode the old serialization format
     else {
-      foreach (explode("\n", $event['attendees']) as $line) {
+      foreach (explode("\n", $s_attendees) as $line) {
         $att = array();
         foreach (rcube_utils::explode_quoted_string(';', $line) as $prop) {
           list($key, $value) = explode("=", $prop);
           $att[strtolower($key)] = stripslashes(trim($value, '""'));
         }
         $attendees[] = $att;
       }
     }
 
     return $attendees;
   }
 
   /**
    * Handler for user_delete plugin hook
    */
   public function user_delete($args)
   {
       $db = $this->rc->db;
       $user = $args['user'];
       $event_ids = array();
 
       $events = $db->query(
           "SELECT event_id FROM " . $this->db_events . " AS ev" .
           " LEFT JOIN " . $this->db_calendars . " cal ON (ev.calendar_id = cal.calendar_id)".
           " WHERE user_id=?",
           $user->ID);
 
       while ($row = $db->fetch_assoc($events)) {
           $event_ids[] = $row['event_id'];
       }
 
       if (!empty($event_ids)) {
           foreach (array($this->db_attachments, $this->db_events) as $table) {
               $db->query(sprintf("DELETE FROM $table WHERE event_id IN (%s)", join(',', $event_ids)));
           }
       }
 
       foreach (array($this->db_calendars, 'itipinvitations') as $table) {
           $db->query("DELETE FROM $table WHERE user_id=?", $user->ID);
       }
   }
 
 }
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 8d47099f..557d9dae 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -1,881 +1,881 @@
 <?php
 /**
  * User Interface class for the Calendar plugin
  *
  * @author Lazlo Westerhof <hello@lazlo.me>
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * Copyright (C) 2010, Lazlo Westerhof <hello@lazlo.me>
  * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 
 class calendar_ui
 {
   private $rc;
   private $cal;
   private $ready = false;
   public $screen;
 
   function __construct($cal)
   {
     $this->cal = $cal;
     $this->rc = $cal->rc;
     $this->screen = $this->rc->task == 'calendar' ? ($this->rc->action ? $this->rc->action: 'calendar') : 'other';
   }
     
   /**
    * Calendar UI initialization and requests handlers
    */
   public function init()
   {
     if ($this->ready)  // already done
       return;
       
     // add taskbar button
     $this->cal->add_button(array(
       'command' => 'calendar',
       'class'   => 'button-calendar',
       'classsel' => 'button-calendar button-selected',
       'innerclass' => 'button-inner',
       'label'   => 'calendar.calendar',
       ), 'taskbar');
     
     // load basic client script
     $this->cal->include_script('calendar_base.js');
     
     $skin_path = $this->cal->local_skin_path();
     $this->cal->include_stylesheet($skin_path . '/calendar.css');
     
     $this->ready = true;
   }
 
   /**
    * Register handler methods for the template engine
    */
   public function init_templates()
   {
     $this->cal->register_handler('plugin.calendar_css', array($this, 'calendar_css'));
     $this->cal->register_handler('plugin.calendar_list', array($this, 'calendar_list'));
     $this->cal->register_handler('plugin.calendar_select', array($this, 'calendar_select'));
     $this->cal->register_handler('plugin.identity_select', array($this, 'identity_select'));
     $this->cal->register_handler('plugin.category_select', array($this, 'category_select'));
     $this->cal->register_handler('plugin.status_select', array($this, 'status_select'));
     $this->cal->register_handler('plugin.freebusy_select', array($this, 'freebusy_select'));
     $this->cal->register_handler('plugin.priority_select', array($this, 'priority_select'));
     $this->cal->register_handler('plugin.sensitivity_select', array($this, 'sensitivity_select'));
     $this->cal->register_handler('plugin.alarm_select', array($this, 'alarm_select'));
     $this->cal->register_handler('plugin.recurrence_form', array($this->cal->lib, 'recurrence_form'));
     $this->cal->register_handler('plugin.attachments_form', array($this, 'attachments_form'));
     $this->cal->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
     $this->cal->register_handler('plugin.filedroparea', array($this, 'file_drop_area'));
     $this->cal->register_handler('plugin.attendees_list', array($this, 'attendees_list'));
     $this->cal->register_handler('plugin.attendees_form', array($this, 'attendees_form'));
     $this->cal->register_handler('plugin.resources_form', array($this, 'resources_form'));
     $this->cal->register_handler('plugin.resources_list', array($this, 'resources_list'));
     $this->cal->register_handler('plugin.resources_searchform', array($this, 'resources_search_form'));
     $this->cal->register_handler('plugin.resource_info', array($this, 'resource_info'));
     $this->cal->register_handler('plugin.resource_calendar', array($this, 'resource_calendar'));
     $this->cal->register_handler('plugin.attendees_freebusy_table', array($this, 'attendees_freebusy_table'));
     $this->cal->register_handler('plugin.edit_attendees_notify', array($this, 'edit_attendees_notify'));
     $this->cal->register_handler('plugin.edit_recurring_warning', array($this, 'recurring_event_warning'));
     $this->cal->register_handler('plugin.event_rsvp_buttons', array($this, 'event_rsvp_buttons'));
     $this->cal->register_handler('plugin.angenda_options', array($this, 'angenda_options'));
     $this->cal->register_handler('plugin.events_import_form', array($this, 'events_import_form'));
     $this->cal->register_handler('plugin.events_export_form', array($this, 'events_export_form'));
     $this->cal->register_handler('plugin.object_changelog_table', array('libkolab', 'object_changelog_table'));
     $this->cal->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));  // use generic method from rcube_template
   }
 
   /**
    * Adds CSS stylesheets to the page header
    */
   public function addCSS()
   {
     $skin_path = $this->cal->local_skin_path();
     $this->cal->include_stylesheet($skin_path . '/fullcalendar.css');
   }
 
   /**
    * Adds JS files to the page header
    */
   public function addJS()
   {
     $this->cal->include_script('calendar_ui.js');
     $this->cal->include_script('lib/js/fullcalendar.js');
     $this->rc->output->include_script('treelist.js');
 
     // include kolab folderlist widget if available
     if (in_array('libkolab', $this->cal->api->loaded_plugins())) {
         $this->cal->api->include_script('libkolab/js/folderlist.js');
         $this->cal->api->include_script('libkolab/js/audittrail.js');
     }
 
     jqueryui::miniColors();
   }
 
   /**
    *
    */
   function calendar_css($attrib = array())
   {
     $mode = $this->rc->config->get('calendar_event_coloring', $this->cal->defaults['calendar_event_coloring']);
     $categories = $this->cal->driver->list_categories();
     $css = "\n";
     
     foreach ((array)$categories as $class => $color) {
       if (empty($color))
         continue;
       
       $class = 'cat-' . asciiwords(strtolower($class), true);
       $css  .= ".$class { color: #$color }\n";
       if ($mode > 0) {
         if ($mode == 2) {
           $css .= ".fc-event-$class .fc-event-bg {";
           $css .= " opacity: 0.9;";
           $css .= " filter: alpha(opacity=90);";
         }
         else {
           $css .= ".fc-event-$class.fc-event-skin, ";
           $css .= ".fc-event-$class .fc-event-skin, ";
           $css .= ".fc-event-$class .fc-event-inner {";
         }
         $css .= " background-color: #" . $color . ";";
         if ($mode % 2)
           $css .= " border-color: #$color;";
         $css .= "}\n";
       }
     }
     
     $calendars = $this->cal->driver->list_calendars();
     foreach ((array)$calendars as $id => $prop) {
       if (!$prop['color'])
         continue;
       $css .= $this->calendar_css_classes($id, $prop, $mode);
     }
     
     return html::tag('style', array('type' => 'text/css'), $css);
   }
 
   /**
    *
    */
   public function calendar_css_classes($id, $prop, $mode)
   {
     $color = $prop['color'];
     $class = 'cal-' . asciiwords($id, true);
     $css .= "li .$class, #eventshow .$class { color: #$color; }\n";
 
     if ($mode != 1) {
       if ($mode == 3) {
         $css .= ".fc-event-$class .fc-event-bg {";
         $css .= " opacity: 0.9;";
         $css .= " filter: alpha(opacity=90);";
       }
       else {
         $css .= ".fc-event-$class, ";
         $css .= ".fc-event-$class .fc-event-inner {";
       }
       if (!$prop['printmode'])
         $css .= " background-color: #$color;";
       if ($mode % 2 == 0)
       $css .= " border-color: #$color;";
       $css .= "}\n";
     }
 
     return $css . ".$class .handle { background-color: #$color; }\n";
   }
 
   /**
    *
    */
   function calendar_list($attrib = array())
   {
     $html = '';
     $jsenv = array();
     $tree = true;
     $calendars = $this->cal->driver->list_calendars(0, $tree);
 
     // walk folder tree
     if (is_object($tree)) {
       $html = $this->list_tree_html($tree, $calendars, $jsenv, $attrib);
 
       // append birthdays calendar which isn't part of $tree
       if ($bdaycal = $calendars[calendar_driver::BIRTHDAY_CALENDAR_ID]) {
         $calendars = array(calendar_driver::BIRTHDAY_CALENDAR_ID => $bdaycal);
       }
       else {
         $calendars = array();  // clear array for flat listing
       }
     }
     else {
       // fall-back to flat folder listing
       $attrib['class'] .= ' flat';
     }
 
     foreach ((array)$calendars as $id => $prop) {
       if ($attrib['activeonly'] && !$prop['active'])
         continue;
 
       $html .= html::tag('li', array('id' => 'rcmlical' . $id, 'class' => $prop['group']),
         $content = $this->calendar_list_item($id, $prop, $jsenv, $attrib['activeonly'])
       );
     }
 
     $this->rc->output->set_env('calendars', $jsenv);
     $this->rc->output->add_gui_object('calendarslist', $attrib['id']);
 
     return html::tag('ul', $attrib, $html, html::$common_attrib);
   }
 
   /**
    * Return html for a structured list <ul> for the folder tree
    */
   public function list_tree_html($node, $data, &$jsenv, $attrib)
   {
     $out = '';
     foreach ($node->children as $folder) {
       $id = $folder->id;
       $prop = $data[$id];
       $is_collapsed = false; // TODO: determine this somehow?
 
       $content = $this->calendar_list_item($id, $prop, $jsenv, $attrib['activeonly']);
 
       if (!empty($folder->children)) {
         $content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
           $this->list_tree_html($folder, $data, $jsenv, $attrib));
       }
 
       if (strlen($content)) {
         $out .= html::tag('li', array(
             'id' => 'rcmlical' . rcube_utils::html_identifier($id),
             'class' => $prop['group'] . ($prop['virtual'] ? ' virtual' : ''),
           ),
           $content);
       }
     }
 
     return $out;
   }
 
   /**
    * Helper method to build a calendar list item (HTML content and js data)
    */
   public function calendar_list_item($id, $prop, &$jsenv, $activeonly = false)
   {
     // enrich calendar properties with settings from the driver
     if (!$prop['virtual']) {
       unset($prop['user_id']);
       $prop['alarms']      = $this->cal->driver->alarms;
       $prop['attendees']   = $this->cal->driver->attendees;
       $prop['freebusy']    = $this->cal->driver->freebusy;
       $prop['attachments'] = $this->cal->driver->attachments;
       $prop['undelete']    = $this->cal->driver->undelete;
       $prop['feedurl']     = $this->cal->get_url(array('_cal' => $this->cal->ical_feed_hash($id) . '.ics', 'action' => 'feed'));
 
       $jsenv[$id] = $prop;
     }
 
     $classes = array('calendar', 'cal-'  . asciiwords($id, true));
     $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
       html_entity_decode($prop['name'], ENT_COMPAT, RCUBE_CHARSET) : '');
 
     if ($prop['virtual'])
       $classes[] = 'virtual';
     else if (!$prop['editable'])
       $classes[] = 'readonly';
     if ($prop['subscribed'])
       $classes[] = 'subscribed';
     if ($prop['subscribed'] === 2)
       $classes[] = 'partial';
     if ($prop['class'])
       $classes[] = $prop['class'];
 
     $content = '';
     if (!$activeonly || $prop['active']) {
       $label_id = 'cl:' . $id;
       $content = html::div(join(' ', $classes),
         html::span(array('class' => 'calname', 'id' => $label_id, 'title' => $title), $prop['editname'] ? rcube::Q($prop['editname']) : $prop['listname']) .
         ($prop['virtual'] ? '' :
           html::tag('input', array('type' => 'checkbox', 'name' => '_cal[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id), '') .
           html::span('actions', 
             ($prop['removable'] ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->cal->gettext('removelist')), ' ') : '') .
             html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->cal->gettext('quickview'), 'role' => 'checkbox', 'aria-checked' => 'false'), '') .
             (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->cal->gettext('calendarsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '')
           ) .
           html::span(array('class' => 'handle', 'style' => "background-color: #" . ($prop['color'] ?: 'f00')), '&nbsp;')
         )
       );
     }
 
     return $content;
   }
 
   /**
    *
    */
   function angenda_options($attrib = array())
   {
     $attrib += array('id' => 'agendaoptions');
     $attrib['style'] .= 'display:none';
     
     $select_range = new html_select(array('name' => 'listrange', 'id' => 'agenda-listrange'));
     $select_range->add(1 . ' ' . preg_replace('/\(.+\)/', '', $this->cal->lib->gettext('days')), $days);
     foreach (array(2,5,7,14,30,60,90,180,365) as $days)
       $select_range->add($days . ' ' . preg_replace('/\(|\)/', '', $this->cal->lib->gettext('days')), $days);
     
     $html .= html::label('agenda-listrange', $this->cal->gettext('listrange'));
     $html .= $select_range->show($this->rc->config->get('calendar_agenda_range', $this->cal->defaults['calendar_agenda_range']));
     
     $select_sections = new html_select(array('name' => 'listsections', 'id' => 'agenda-listsections'));
     $select_sections->add('---', '');
     foreach (array('day' => 'libcalendaring.days', 'week' => 'libcalendaring.weeks', 'month' => 'libcalendaring.months', 'smart' => 'calendar.smartsections') as $val => $label)
       $select_sections->add(preg_replace('/\(|\)/', '', ucfirst($this->rc->gettext($label))), $val);
     
     $html .= html::span('spacer', '&nbsp;');
     $html .= html::label('agenda-listsections', $this->cal->gettext('listsections'));
     $html .= $select_sections->show($this->rc->config->get('calendar_agenda_sections', $this->cal->defaults['calendar_agenda_sections']));
     
     return html::div($attrib, $html);
   }
 
   /**
    * Render a HTML select box for calendar selection
    */
   function calendar_select($attrib = array())
   {
     $attrib['name']       = 'calendar';
     $attrib['is_escaped'] = true;
     $select = new html_select($attrib);
 
     foreach ((array)$this->cal->driver->list_calendars() as $id => $prop) {
       if ($prop['editable'] || strpos($prop['rights'], 'i') !== false)
         $select->add($prop['name'], $id);
     }
 
     return $select->show(null);
   }
 
   /**
    * Render a HTML select box for user identity selection
    */
   function identity_select($attrib = array())
   {
     $attrib['name'] = 'identity';
     $select         = new html_select($attrib);
     $identities     = $this->rc->user->list_emails();
 
     foreach ($identities as $ident) {
         $select->add(format_email_recipient($ident['email'], $ident['name']), $ident['identity_id']);
     }
 
     return $select->show(null);
   }
 
   /**
    * Render a HTML select box to select an event category
    */
   function category_select($attrib = array())
   {
     $attrib['name'] = 'categories';
     $select = new html_select($attrib);
     $select->add('---', '');
     foreach (array_keys((array)$this->cal->driver->list_categories()) as $cat) {
       $select->add($cat, $cat);
     }
 
     return $select->show(null);
   }
 
   /**
    * Render a HTML select box for status property
    */
   function status_select($attrib = array())
   {
     $attrib['name'] = 'status';
     $select = new html_select($attrib);
     $select->add('---', '');
     $select->add($this->cal->gettext('status-confirmed'), 'CONFIRMED');
     $select->add($this->cal->gettext('status-cancelled'), 'CANCELLED');
     //$select->add($this->cal->gettext('tentative'), 'TENTATIVE');
     return $select->show(null);
   }
 
   /**
    * Render a HTML select box for free/busy/out-of-office property
    */
   function freebusy_select($attrib = array())
   {
     $attrib['name'] = 'freebusy';
     $select = new html_select($attrib);
     $select->add($this->cal->gettext('free'), 'free');
     $select->add($this->cal->gettext('busy'), 'busy');
     // out-of-office is not supported by libkolabxml (#3220)
     // $select->add($this->cal->gettext('outofoffice'), 'outofoffice');
     $select->add($this->cal->gettext('tentative'), 'tentative');
     return $select->show(null);
   }
 
   /**
    * Render a HTML select for event priorities
    */
   function priority_select($attrib = array())
   {
     $attrib['name'] = 'priority';
     $select = new html_select($attrib);
     $select->add('---', '0');
     $select->add('1 '.$this->cal->gettext('highest'), '1');
     $select->add('2 '.$this->cal->gettext('high'),    '2');
     $select->add('3 ',                                '3');
     $select->add('4 ',                                '4');
     $select->add('5 '.$this->cal->gettext('normal'),  '5');
     $select->add('6 ',                                '6');
     $select->add('7 ',                                '7');
     $select->add('8 '.$this->cal->gettext('low'),     '8');
     $select->add('9 '.$this->cal->gettext('lowest'),  '9');
     return $select->show(null);
   }
   
   /**
    * Render HTML input for sensitivity selection
    */
   function sensitivity_select($attrib = array())
   {
     $attrib['name'] = 'sensitivity';
     $select = new html_select($attrib);
     $select->add($this->cal->gettext('public'), 'public');
     $select->add($this->cal->gettext('private'), 'private');
     $select->add($this->cal->gettext('confidential'), 'confidential');
     return $select->show(null);
   }
   
   /**
    * Render HTML form for alarm configuration
    */
   function alarm_select($attrib = array())
   {
     return $this->cal->lib->alarm_select($attrib, $this->cal->driver->alarm_types, $this->cal->driver->alarm_absolute);
   }
 
   /**
    *
    */
   function edit_attendees_notify($attrib = array())
   {
     $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1));
     return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('sendnotifications')));
   }
 
   /**
    * Generate the form for recurrence settings
    */
   function recurring_event_warning($attrib = array())
   {
     $attrib['id'] = 'edit-recurring-warning';
     
     $radio = new html_radiobutton(array('name' => '_savemode', 'class' => 'edit-recurring-savemode'));
     $form = html::label(null, $radio->show('', array('value' => 'current')) . $this->cal->gettext('currentevent')) . ' ' .
        html::label(null, $radio->show('', array('value' => 'future')) . $this->cal->gettext('futurevents')) . ' ' .
        html::label(null, $radio->show('all', array('value' => 'all')) . $this->cal->gettext('allevents')) . ' ' .
        html::label(null, $radio->show('', array('value' => 'new')) . $this->cal->gettext('saveasnew'));
        
     return html::div($attrib, html::div('message', html::span('ui-icon ui-icon-alert', '') . $this->cal->gettext('changerecurringeventwarning')) . html::div('savemode', $form));
   }
 
   /**
    * Form for uploading and importing events
    */
   function events_import_form($attrib = array())
   {
     if (!$attrib['id'])
       $attrib['id'] = 'rcmImportForm';
 
     // Get max filesize, enable upload progress bar
     $max_filesize = $this->rc->upload_init();
 
     $accept = '.ics, text/calendar, text/x-vcalendar, application/ics';
     if (class_exists('ZipArchive', false)) {
       $accept .= ', .zip, application/zip';
     }
 
     $input = new html_inputfield(array(
       'type' => 'file', 'name' => '_data', 'size' => $attrib['uploadfieldsize'],
       'accept' => $accept));
 
     $select = new html_select(array('name' => '_range', 'id' => 'event-import-range'));
     $select->add(array(
         $this->cal->gettext('onemonthback'),
         $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>2))),
         $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>3))),
         $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>6))),
         $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>12))),
         $this->cal->gettext('all'),
       ),
       array('1','2','3','6','12',0));
 
     $html .= html::div('form-section',
       html::div(null, $input->show()) .
       html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
     );
 
     $html .= html::div('form-section',
       html::label('event-import-calendar', $this->cal->gettext('calendar')) .
       $this->calendar_select(array('name' => 'calendar', 'id' => 'event-import-calendar'))
     );
 
     $html .= html::div('form-section',
       html::label('event-import-range', $this->cal->gettext('importrange')) .
       $select->show(1)
     );
 
     $this->rc->output->add_gui_object('importform', $attrib['id']);
     $this->rc->output->add_label('import');
 
     return html::tag('form', array('action' => $this->rc->url(array('task' => 'calendar', 'action' => 'import_events')),
       'method' => "post", 'enctype' => 'multipart/form-data', 'id' => $attrib['id']),
       $html
     );
   }
 
   /**
    * Form to select options for exporting events
    */
   function events_export_form($attrib = array())
   {
     if (!$attrib['id'])
       $attrib['id'] = 'rcmExportForm';
 
     $html .= html::div('form-section',
       html::label('event-export-calendar', $this->cal->gettext('calendar')) .
       $this->calendar_select(array('name' => 'calendar', 'id' => 'event-export-calendar'))
     );
 
     $select = new html_select(array('name' => 'range', 'id' => 'event-export-range'));
     $select->add(array(
         $this->cal->gettext('all'),
         $this->cal->gettext('onemonthback'),
         $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>2))),
         $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>3))),
         $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>6))),
         $this->cal->gettext(array('name' => 'nmonthsback', 'vars' => array('nr'=>12))),
         $this->cal->gettext('customdate'),
       ),
       array(0,'1','2','3','6','12','custom'));
 
     $startdate = new html_inputfield(array('name' => 'start', 'size' => 11, 'id' => 'event-export-startdate'));
 
     $html .= html::div('form-section',
       html::label('event-export-range', $this->cal->gettext('exportrange')) .
       $select->show(0) .
       html::span(array('style'=>'display:none'), $startdate->show())
     );
 
     $checkbox = new html_checkbox(array('name' => 'attachments', 'id' => 'event-export-attachments', 'value' => 1));
     $html .= html::div('form-section',
       html::label('event-export-range', $this->cal->gettext('exportattachments')) .
       $checkbox->show(1)
     );
 
     $this->rc->output->add_gui_object('exportform', $attrib['id']);
 
     return html::tag('form', array('action' => $this->rc->url(array('task' => 'calendar', 'action' => 'export_events')),
       'method' => "post", 'id' => $attrib['id']),
       $html
     );
   }
 
   /**
    * Generate the form for event attachments upload
    */
   function attachments_form($attrib = array())
   {
     // add ID if not given
     if (!$attrib['id'])
       $attrib['id'] = 'rcmUploadForm';
 
     // Get max filesize, enable upload progress bar
-    $max_filesize = rcube_upload_init();
+    $max_filesize = $this->rc->upload_init();
 
     $button = new html_inputfield(array('type' => 'button'));
     $input = new html_inputfield(array(
       'type' => 'file', 'name' => '_attachments[]',
       'multiple' => 'multiple', 'size' => $attrib['attachmentfieldsize']));
 
     return html::div($attrib,
       html::div(null, $input->show()) .
-      html::div('formbuttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction',
+      html::div('buttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction',
         'onclick' => rcmail_output::JS_OBJECT_NAME . ".upload_file(this.form)"))) .
       html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
     );
   }
 
   /**
    * Register UI object for HTML5 drag & drop file upload
    */
   function file_drop_area($attrib = array())
   {
       if ($attrib['id']) {
           $this->rc->output->add_gui_object('filedrop', $attrib['id']);
           $this->rc->output->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
       }
   }
 
   /**
    * Generate HTML element for attachments list
    */
   function attachments_list($attrib = array())
   {
     if (!$attrib['id'])
       $attrib['id'] = 'rcmAttachmentList';
 
     $skin_path = $this->cal->local_skin_path();
     if ($attrib['deleteicon']) {
       $_SESSION[calendar::SESSION_KEY . '_deleteicon'] = $skin_path . $attrib['deleteicon'];
       $this->rc->output->set_env('deleteicon', $skin_path . $attrib['deleteicon']);
     }
     if ($attrib['cancelicon'])
       $this->rc->output->set_env('cancelicon', $skin_path . $attrib['cancelicon']);
     if ($attrib['loadingicon'])
       $this->rc->output->set_env('loadingicon', $skin_path . $attrib['loadingicon']);
 
     $this->rc->output->add_gui_object('attachmentlist', $attrib['id']);
     $this->attachmentlist_id = $attrib['id'];
 
     return html::tag('ul', $attrib, '', html::$common_attrib);
   }
 
   /**
    * Handler for calendar form template.
    * The form content could be overriden by the driver
    */
   function calendar_editform($action, $calendar = array())
   {
     // compose default calendar form fields
     $input_name = new html_inputfield(array('name' => 'name', 'id' => 'calendar-name', 'size' => 20));
     $input_color = new html_inputfield(array('name' => 'color', 'id' => 'calendar-color', 'size' => 6));
 
     $formfields = array(
       'name' => array(
         'label' => $this->cal->gettext('name'),
         'value' => $input_name->show($calendar['name']),
         'id' => 'calendar-name',
       ),
       'color' => array(
         'label' => $this->cal->gettext('color'),
         'value' => $input_color->show($calendar['color']),
         'id' => 'calendar-color',
       ),
     );
 
     if ($this->cal->driver->alarms) {
       $checkbox = new html_checkbox(array('name' => 'showalarms', 'id' => 'calendar-showalarms', 'value' => 1));
       $formfields['showalarms'] = array(
         'label' => $this->cal->gettext('showalarms'),
         'value' => $checkbox->show($calendar['showalarms']?1:0),
         'id' => 'calendar-showalarms',
       );
     }
 
     // allow driver to extend or replace the form content
     return html::tag('form', array('action' => "#", 'method' => "get", 'id' => 'calendarpropform'),
       $this->cal->driver->calendar_form($action, $calendar, $formfields)
     );
   }
 
   /**
    *
    */
   function attendees_list($attrib = array())
   {
     // add "noreply" checkbox to attendees table only
     $invitations = strpos($attrib['id'], 'attend') !== false;
 
     $invite = new html_checkbox(array('value' => 1, 'id' => 'edit-attendees-invite'));
     $table  = new html_table(array('cols' => 5 + intval($invitations), 'border' => 0, 'cellpadding' => 0, 'class' => 'rectable'));
 
     $table->add_header('role', $this->cal->gettext('role'));
     $table->add_header('name', $this->cal->gettext($attrib['coltitle'] ?: 'attendee'));
     $table->add_header('availability', $this->cal->gettext('availability'));
     $table->add_header('confirmstate', $this->cal->gettext('confirmstate'));
     if ($invitations) {
       $table->add_header(array('class' => 'invite', 'title' => $this->cal->gettext('sendinvitations')),
         $invite->show(1) . html::label('edit-attendees-invite', $this->cal->gettext('sendinvitations')));
     }
     $table->add_header('options', '');
 
     // hide invite column if disabled by config
     $itip_notify = (int)$this->rc->config->get('calendar_itip_send_option', $this->cal->defaults['calendar_itip_send_option']);
     if ($invitations && !($itip_notify & 2)) {
         $css = sprintf('#%s td.invite, #%s th.invite { display:none !important }', $attrib['id'], $attrib['id']);
         $this->rc->output->add_footer(html::tag('style', array('type' => 'text/css'), $css));
     }
 
     return $table->show($attrib);
   }
 
   /**
    *
    */
   function attendees_form($attrib = array())
   {
     $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => 30));
     $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment',
         'rows' => 4, 'cols' => 55, 'title' => $this->cal->gettext('itipcommenttitle')));
 
     return html::div($attrib,
       html::div(null, $input->show() . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-add', 'value' => $this->cal->gettext('addattendee'))) . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-schedule', 'value' => $this->cal->gettext('scheduletime').'...'))) .
       html::p('attendees-commentbox', html::label(null, $this->cal->gettext('itipcomment') . $textarea->show()))
     );
   }
 
   /**
    *
    */
   function resources_form($attrib = array())
   {
     $input = new html_inputfield(array('name' => 'resource', 'id' => 'edit-resource-name', 'size' => 30));
 
     return html::div($attrib,
       html::div(null, $input->show() . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-resource-add', 'value' => $this->cal->gettext('addresource'))) . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-resource-find', 'value' => $this->cal->gettext('findresources').'...')))
       );
   }
 
   /**
    *
    */
   function resources_list($attrib = array())
   {
     $attrib += array('id' => 'calendar-resources-list');
 
     $this->rc->output->add_gui_object('resourceslist', $attrib['id']);
 
     return html::tag('ul', $attrib, '', html::$common_attrib);
   }
 
   /**
    *
    */
   public function resource_info($attrib = array())
   {
     $attrib += array('id' => 'calendar-resources-info');
 
     $this->rc->output->add_gui_object('resourceinfo', $attrib['id']);
     $this->rc->output->add_gui_object('resourceownerinfo', $attrib['id'] . '-owner');
 
     // copy address book labels for owner details to client
     $this->rc->output->add_label('name','firstname','surname','department','jobtitle','email','phone','address');
 
     $table_attrib = array('id','class','style','width','summary','cellpadding','cellspacing','border');
 
     return html::tag('table', $attrib,
         html::tag('tbody', null, ''), $table_attrib) .
 
       html::tag('table', array('id' => $attrib['id'] . '-owner', 'style' => 'display:none') + $attrib,
         html::tag('thead', null,
           html::tag('tr', null,
             html::tag('td', array('colspan' => 2), rcube::Q($this->cal->gettext('resourceowner')))
           )
         ) .
         html::tag('tbody', null, ''),
         $table_attrib);
   }
 
   /**
    *
    */
   public function resource_calendar($attrib = array())
   {
     $attrib += array('id' => 'calendar-resources-calendar');
 
     $this->rc->output->add_gui_object('resourceinfocalendar', $attrib['id']);
 
     return html::div($attrib, '');
   }
 
   /**
    * GUI object 'searchform' for the resource finder dialog
    *
    * @param array Named parameters
    * @return string HTML code for the gui object
    */
   function resources_search_form($attrib)
   {
     $attrib += array('command' => 'search-resource', 'id' => 'rcmcalresqsearchbox', 'autocomplete' => 'off');
     $attrib['name'] = '_q';
 
     $input_q = new html_inputfield($attrib);
     $out = $input_q->show();
 
     // add form tag around text field
     $out = $this->rc->output->form_tag(array(
       'name' => "rcmcalresoursqsearchform",
       'onsubmit' => rcmail_output::JS_OBJECT_NAME . ".command('" . $attrib['command'] . "'); return false",
       'style' => "display:inline"),
       $out);
 
     return $out;
   }
 
   /**
    *
    */
   function attendees_freebusy_table($attrib = array())
   {
     $table = new html_table(array('cols' => 2, 'border' => 0, 'cellspacing' => 0));
     $table->add('attendees',
       html::tag('h3', 'boxtitle', $this->cal->gettext('tabattendees')) .
       html::div('timesheader', '&nbsp;') .
       html::div(array('id' => 'schedule-attendees-list', 'class' => 'attendees-list'), '')
     );
     $table->add('times',
       html::div('scroll',
         html::tag('table', array('id' => 'schedule-freebusy-times', 'border' => 0, 'cellspacing' => 0), html::tag('thead') . html::tag('tbody')) .
         html::div(array('id' => 'schedule-event-time', 'style' => 'display:none'), '&nbsp;')
       )
     );
     
     return $table->show($attrib);
   }
 
   /**
    *
    */
   function event_invitebox($attrib = array())
   {
     if ($this->cal->event) {
       return html::div($attrib,
         $this->cal->itip->itip_object_details_table($this->cal->event, $this->cal->itip->gettext('itipinvitation')) .
         $this->cal->invitestatus
       );
     }
     
     return '';
   }
 
   function event_rsvp_buttons($attrib = array())
   {
     $actions = array('accepted','tentative','declined');
     if ($attrib['delegate'] !== 'false')
       $actions[] = 'delegated';
 
     return $this->cal->itip->itip_rsvp_buttons($attrib, $actions);
   }
 
 }
diff --git a/plugins/calendar/skins/classic/calendar.css b/plugins/calendar/skins/classic/calendar.css
index f8a4fa31..c511ff02 100644
--- a/plugins/calendar/skins/classic/calendar.css
+++ b/plugins/calendar/skins/classic/calendar.css
@@ -1,1757 +1,1758 @@
 /*** Style for Calendar plugin ***/
 
 body.calendarmain {
 	overflow: hidden;
 }
 
 #taskbar a.button-calendar {
 	background: url(images/calendar.png) 0px 1px no-repeat;
 }
 
 /* hack for IE 6/7 */
 * html #taskbar a.button-calendar {
 	background-image: url(images/calendar.gif);
 }
 
 #main {
 	position: absolute;
 	clear: both;
 	top: 72px;
 	left: 0;
 	right: 0;
 	bottom: 10px;
 }
 
 #calendarsidebar {
 	position: absolute;
 	top: 0px;
 	left: 10px;
 	bottom: 0;
 	width: 230px;
 }
 
 #datepicker {
 	position: relative;
 	top: 42px;
 	width: 100%;
 }
 
 #datepicker .ui-datepicker {
 	width: 97% !important;
 	box-shadow: none;
 	-moz-box-shadow: none;
 	-webkit-box-shadow: none;
 }
 
 #datepicker .ui-datepicker-activerange a {
 	border-color: #c33;
 	color: #a22;
 }
 
 #datepicker .ui-datepicker-activerange a.ui-state-active {
 	color: #fff;
 }
 
 #datepicker .ui-priority-secondary {
 	opacity: 0.4;
 }
 
 #datepicker td.ui-datepicker-week-col {
 	cursor: pointer;
 }
 
 #calendarsidebartoggle {
 	position: absolute;
 	left: 244px;
 	width: 8px;
 	top: 4px;
 	bottom: 0;
 	background: url(images/toggle.gif) 0 48% no-repeat transparent;
 	cursor: pointer;
 }
 
 div.sidebarclosed {
 	background-position: -8px 48% !important;
 }
 
 #calendarsidebartoggle:hover {
 	background-color: #ddd;
 }
 
 #calendar {
 	position: absolute;
 	top: 4px;
 	left: 256px;
 	right: 10px;
 	bottom: 0;
 }
 
 #print {
 	width: 680px;
 }
 
 pre {
  font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
 }
 
 #calendars {
 	position: absolute;
 	top: 228px;
 	left: 0;
 	bottom: 0;
 	right: 0;
 	background-color: #F9F9F9;
 	border: 1px solid #999999;
 	overflow: hidden;
 }
 
 #calendars .boxlistcontent {
 	top: 43px;
 }
 
 #calendars .listsearchbox {
 	padding: 2px 4px;
 }
 
 #calendarslist {
 	list-style: none;
 	margin: 0;
 	padding: 0;
 }
 
 #attachmentlist li,
 #calendarslist li {
 	margin: 0;
 	padding: 1px;
 	display: block;
 	background: #fff;
 	border-bottom: 1px solid #EBEBEB;
 	white-space: nowrap;
 	cursor: default;
 }
 
 #calendars .treelist li {
 	margin: 0;
 	padding: 0;
 	position: relative;
 }
 
 #calendars .treelist ul li:last-child {
 	border-bottom: 0;
 }
 
 #calendars .treelist li div.folder,
 #calendars .treelist li div.calendar {
 	position: relative;
 	height: 22px;
 }
 
 #calendars .treelist li span.calname {
 	display: block;
 	padding: 0px 30px 2px 2px;
 	position: absolute;
 	top: 4px;
 	left: 38px;
 	right: 40px;
 	cursor: default;
 	background: url(images/calendars.png) right 20px no-repeat;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
 
 #calendars .treelist li div.virtual > span.calname {
 	color: #aaa;
 	left: 20px;
 }
 
 #calendars .treelist.flat li span.calname {
 	left: 24px;
 	right: 22px;
 }
 
 #calendars .treelist li span.handle {
 	display: inline-block;
 	position: absolute;
 	top: 5px;
 	right: 6px;
 	padding: 0;
 	width: 12px;
 	height: 12px;
 	border-radius: 3px;
 	font-size: 0.8em;
 }
 
 #calendars .treelist li a.subscribed {
 	display: inline-block;
 	position: absolute;
 	top: 2px;
 	right: 22px;
 	height: 16px;
 	width: 16px;
 	padding: 0;
 	background: url(images/calendars.png) -100px 0 no-repeat;
 	overflow: hidden;
 	text-indent: -5000px;
 	cursor: pointer;
 }
 
 #calendars .treelist div:hover > a.subscribed {
 	background-position: 0 -126px;
 }
 
 #calendars .treelist div.subscribed a.subscribed {
 	background-position: 0 -144px;
 }
 
 #calendars .treelist li input {
 	position: absolute;
 	top: 1px;
 	left: 18px;
 }
 
 #calendars .treelist li div.treetoggle {
 	top: -1px;
 	left: 1px !important;
 }
 
 #calendars .treelist ul li div.treetoggle {
 	left: 17px !important;
 }
 
 #calendars .treelist ul ul li div.treetoggle {
 	left: 33px !important;
 }
 
 #calendars .treelist.flat li input {
 	left: 4px;
 }
 
 #calendars .treelist ul li div.folder,
 #calendars .treelist ul li div.calendar {
 	margin-left: 16px;
 }
 
 #calendars .treelist ul ul li div.folder,
 #calendars .treelist ul ul li div.calendar {
 	margin-left: 32px;
 }
 
 #calendars .treelist ul ul ul li div.folder,
 #calendars .treelist ul ul ul li div.calendar {
 	margin-left: 48px;
 }
 
 #calendars .treelist li.selected {
 	background-color: #ccc;
 }
 
 #calendars .treelist li.selected > span.calname {
 	font-weight: bold;
 }
 
 #calendars .treelist div.readonly span.calname {
 	background-position: right -20px;
 }
 
 #calendars .treelist li.user > div > span.calname {
 	background-position: right -38px;
 }
 
 #calendarslist li.virtual span.calname {
 	color: #666;
 }
 
 #calendars .searchresults .boxtitle {
 	border-top: 1px solid #aaa;
 	margin-bottom: 0;
 }
 
 #calfeedurl,
 #caldavurl {
 	width: 98%;
 	background: #fbfbfb;
 	padding: 4px;
 	margin-bottom: 1em;
 	resize: none;
 }
 
 #agendalist {
 	width: 100%;
 	margin: 0 auto;
 	margin-top: 60px;
 	border: 1px solid #C1DAD7;
 	display: none;
 }
 
 #agendalist table {
 	width: 100%;
 }
 
 #agendalist td,
 #agendalist th {
 	border-right: 1px solid #C1DAD7;
 	border-bottom: 1px solid #C1DAD7;
 	background: #fff;
 	padding: 6px 6px 6px 12px;
 }
 
 #agendalist tr {
 	vertical-align: top;
 }
 
 #agendalist th {
 	font-weight: bold;
 }
 
 #calendartoolbar {
 	position: absolute;
 	top: 0px;
 	left: 0px;
 	height: 35px;
 }
 
 #calendartoolbar a {
 	padding-right: 10px;
 }
 
 #calendartoolbar a.button,
 #calendartoolbar a.buttonPas {
 	display: block;
 	float: left;
 	width: 32px;
 	height: 32px;
 	padding: 0;
 	margin-right: 10px;
 	overflow: hidden;
 	background: url(images/toolbar.png) 0 0 no-repeat transparent;
 	opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
 }
 
 #calendartoolbar a.buttonPas {
 	opacity: 0.35;
 }
 
 #calendartoolbar a.addeventSel {
 	background-position: 0 -32px;
 }
 
 #calendartoolbar a.delete {
   background-position: -32px 0;
 }
 
 #calendartoolbar a.deleteSel {
   background-position: -32px -32px;
 }
 
 #calendartoolbar a.print {
   background-position: -64px 0;
 }
 
 #calendartoolbar a.printSel {
   background-position: -64px -32px;
 }
 
 #calendartoolbar a.import {
 	background-position: -168px 0;
 }
 
 #calendartoolbar a.importSel {
 	background-position: -168px -32px;
 }
 
 #calendartoolbar a.export {
 	background-position: -128px 0;
 }
 
 #calendartoolbar a.exportSel {
 	background-position: -128px -32px;
 }
 
 .calendarmain #quicksearchbar {
 	top: 80px;
 	right: 4px;
 }
 
+#eventedit.uidialog,
 .calendarmain div.uidialog {
 	display: none;
 }
 
 #user {
 	position: absolute;
 	top: 10px;
 	right: 100px;
 	left: 100px;
 	text-align: center;
 }
 
 a.morelink {
 	font-size: 90%;
 	color: #C33;
 	text-decoration: none;
 }
 
 a.morelink:hover {
 	text-decoration: underline;
 }
 
 a.miniColors-trigger {
 	margin-top: -3px;
 }
 
 #attachmentcontainer {
 	position: absolute;
 	top: 80px;
 	left: 20px;
 	right: 20px;
 	bottom: 20px;
 }
 
 #attachmentframe {
 	width: 100%;
 	height: 100%;
 	border: 1px solid #999999;
 	background-color: #F9F9F9;
 }
 
 #partheader {
 	position: absolute;
 	top: 20px;
 	left: 220px;
 	right: 20px;
 	height: 40px;
 }
 
 #partheader table td {
 	padding-left: 2px;
 	padding-right: 4px;
 	vertical-align: middle;
 	font-size: 11px;
 }
 
 #partheader table td.title {
 	color: #666;
 	font-weight: bold;
 }
 
 .attachments-list ul {
 	margin: 0px;
 	padding: 0px;
 	list-style-image: none;
 	list-style-type: none;
 }
 
 .attachments-list ul li {
 	height: 18px;
 	font-size: 12px;
 	padding-top: 2px;
 	padding-right: 8px;
 	white-space: nowrap;
 }
 
 .attachments-list ul li img {
 	padding-right: 2px;
 	vertical-align: middle;
 }
 
 .attachments-list ul li a {
 	text-decoration: none;
 }
 
 .attachments-list ul li a:hover {
 	text-decoration: underline;
 }
 
 #attachmentlist {
 	margin: 0 -0.8em;
 }
 
 #attachmentlist li {
 	padding: 2px 2px 3px 0.8em;
 }
 
 #eventshow .attachments-list ul li {
 	float: left;
 }
 
 #edit-attachments-form {
 	padding-top: 1.2em;
 }
 
 #edit-attachments-form .formbuttons {
 	margin: 0.5em 0;
 }
 
 .event-attendees span.attendee {
 	padding-right: 18px;
 	margin-right: 0.5em;
 	background: url(images/attendee-status.gif) right 0 no-repeat;
 }
 
 .event-attendees span.attendee a.mailtolink {
 	text-decoration: none;
 	white-space: nowrap;
 }
 
 .event-attendees span.attendee a.mailtolink:hover {
 	text-decoration: underline;
 }
 
 .event-attendees span.accepted {
 	background-position: right -20px;
 }
 
 .event-attendees span.declined {
 	background-position: right -40px;
 }
 
 .event-attendees span.tentative {
 	background-position: right -60px;
 }
 
 .event-attendees span.delegated {
 	background-position: right -180px;
 }
 
 .event-attendees span.organizer {
 	background-position: right -80px;
 }
 
 #all-event-attendees span.attendee {
 	display: block;
 	margin-bottom: 4px;
 	padding-bottom: 3px;
 	border-bottom: 1px solid #ddd;
 }
 
 /* jQuery UI overrides */
 
 .calendarmain .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
 	float: left;
 }
 
 #eventshow h1 {
 	font-size: 20px;
 	margin: 0.1em 0 0.4em 0;
 }
 
 #eventshow label,
 #eventshow h5.label {
 	font-weight: normal;
 	font-size: 0.9em;
 	color: #999;
 	margin: 0 0 0.2em 0;
 }
 
 #eventshow {
 	margin: 0 -0.2em;
 }
 
 #eventshow.status-cancelled {
 	background: url(images/badge_cancelled.png) top right no-repeat;
 }
 
 #eventshow.sensitivity-private {
 	background: url(images/badge_private.png) top right no-repeat;
 }
 
 #eventshow.sensitivity-confidential {
 	background: url(images/badge_confidential.png) top right no-repeat;
 }
 
 .sensitivity-private #event-title {
 	margin-right: 50px;
 }
 
 .sensitivity-confidential #event-title {
 	margin-right: 60px;
 }
 
 #eventshow div.event-line {
 	margin-top: 0.1em;
 	margin-bottom: 0.3em;
 }
 
 #eventshow #event-url .event-text {
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
 
 #event-rsvp .itip-reply-controls {
 	margin-top: 0.5em;
 }
 
 #eventshow .itip-reply-controls label {
 	font-size: 1em;
 	color: #333;
 }
 
 #event-partstat .changersvp {
 	cursor: pointer;
 	color: #333;
 	text-decoration: none;
 }
 
 #event-partstat:hover .changersvp {
 	text-decoration: underline;
 }
 
 #event-partstat .changersvp.accepted {
 	color: #589b1e;
 }
 
 #event-partstat .changersvp.tentative {
 	color: #f0bb1d;
 }
 
 #event-partstat .changersvp.declined {
 	color: #ea0000;
 }
 
 #event-partstat .changersvp.delegated {
 	color: #018be9;
 }
 
 #eventedit {
 	position: relative;
 	padding: 0.5em 0.1em;
 }
 
 #eventedit input.text,
 #eventedit textarea {
 	width: 97%;
 }
 
 #eventtabs {
 	position: relative;
 	padding: 0;
 	border: 0;
 	border-radius: 0;
 }
 
 div.form-section,
 #eventshow div.event-section,
 #eventtabs div.event-section {
 	margin-top: 0.2em;
 	margin-bottom: 0.8em;
 }
 
 #eventtabs .tabsbar {
 	position: absolute;
 	top: 0;
 }
 
 #eventtabs .ui-tabs-panel {
 	padding: 1em 0.8em;
 	border: 1px solid #aaa;
 	border-width: 0 1px 1px 1px;
 }
 
 #eventtabs .ui-tabs-nav {
 	background: none;
 	padding: 0;
 	border-width: 0 0 1px 0;
 	border-radius: 0;
 }
 
 #eventtabs .border-after {
 	padding-bottom: 0.6em;
 	margin-bottom: 0.6em;
 	border-bottom: 1px solid #999;
 }
 
 #eventshow label,
 #eventedit label,
 .form-section label {
 	display: inline-block;
 	min-width: 7em;
 	padding-right: 0.5em;
 }
 
 #eventedit .formtable td.label {
 	min-width: 6em;
 }
 
 td.topalign {
 	vertical-align: top;
 }
 
 #eventedit .edit-alarm-item {
 	position: relative;
 	padding-right: 30px;
 	margin-bottom: 2px;
 }
 
 #eventedit .edit-alarm-buttons {
 	position: absolute;
 	top: 2px;
 	right: 0;
 }
 
 #eventedit .edit-alarm-buttons a.iconlink {
 	display: none;
 	width: 18px;
 	height: 17px;
 	padding: 1px;
 	text-indent: -5000px;
 	overflow: hidden;
 }
 
 #eventedit .edit-alarm-buttons a.add-alarm {
 	background: url(images/plus.png) 1px 1px no-repeat;
 }
 
 #eventedit .edit-alarm-buttons a.delete-alarm {
 	background: url(images/delete.png) 1px 1px no-repeat;
 }
 
 #eventedit .edit-alarm-buttons a.delete-alarm,
 #eventedit .first .edit-alarm-buttons a.add-alarm {
 	display: inline-block;
 }
 
 #eventedit .first .edit-alarm-buttons a.delete-alarm {
 	display: none;
 }
 
 #eventedit label.weekday,
 #eventedit label.monthday {
 	min-width: 3em;
 }
 
 #eventedit label.month {
 	min-width: 5em;
 }
 
 #edit-recurrence-yearly-bymonthblock {
 	margin-left: 7.5em;
 }
 
 #edit-recurrence-rdates {
 	display: block;
 	list-style: none;
 	margin: 0 0 0.8em 0;
 	padding: 0;
 	max-height: 300px;
 	overflow: auto;
 }
 
 #edit-recurrence-rdates li {
 	display: block;
 	position: relative;
 	width: 14em;
 	padding: 1px;
 }
 
 #edit-recurrence-rdates li a.delete {
 	position: absolute;
 	top: 1px;
 	right: 0;
 }
 
 #eventedit .recurrence-form {
 	display: none;
 }
 
 #eventedit .formtable td {
 	padding: 0.2em 0;
 }
 
 .ui-dialog .event-update-confirm {
 	padding: 0 0.5em 0.5em 0.5em;
 }
 
 .event-dialog-message,
 .event-update-confirm .message {
 	margin-top: 0.5em;
 	padding: 0.8em;
 	background-color: #F7FDCB;
 	border: 1px solid #C2D071;
 }
 
 .event-dialog-message .message,
 .event-update-confirm .message {
 	margin-bottom: 0.5em;
 }
 
 .edit-recurring-warning .savemode {
 	padding-left: 20px;
 }
 
 .event-update-confirm .savemode {
 	padding-left: 30px;
 }
 
 .event-dialog-message span.ui-icon,
 .event-update-confirm span.ui-icon {
 	float: left;
 	margin: 0 7px 20px 0;
 }
 
 .event-dialog-message label,
 .event-update-confirm label {
 	min-width: 3em;
 	padding-right: 1em;
 }
 
 .event-update-confirm a.button {
 	margin: 0 0.5em 0 0.2em;
 	min-width: 5em;
 }
 
 #event-rsvp,
 #edit-attendees-notify {
 	margin: 0.3em 0;
 	padding: 0.5em;
 	background-color: #F7FDCB;
 	border: 1px solid #C2D071;
 }
 
 .edit-attendees-table {
 	width: 100%;
 	display: table;
 	table-layout: fixed;
 	border-collapse: collapse;
 	border: 1px solid #ccc;
 }
 
 .edit-attendees-table th,
 .edit-attendees-table td {
 	padding: 3px;
 	border-bottom: 1px solid #ccc;
 	text-align: left;
 }
 
 .edit-attendees-table th.role,
 .edit-attendees-table td.role {
 	width: 8em;
 }
 
 .edit-attendees-table th.availability,
 .edit-attendees-table th.confirmstate,
 .edit-attendees-table td.availability,
 .edit-attendees-table td.confirmstate {
 	width: 4em;
 }
 
 .edit-attendees-table th.options,
 .edit-attendees-table td.options {
 	width: 2em;
 	text-align: right;
 	padding-right: 4px;
 }
 
 .edit-attendees-table th.invite,
 .edit-attendees-table td.invite {
 	width: 24px;
 	padding: 2px;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: hidden;
 }
 
 #eventedit .edit-attendees-table th.invite label {
 	display: none;
 }
 
 .edit-attendees-table th.name,
 .edit-attendees-table td.name {
 	width: auto;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
 .edit-attendees-table thead th,
 .edit-attendees-table thead td {
 	background: url(images/listheader.gif) top left repeat-x #CCC;
 }
 
 #edit-attendees-form,
 #edit-resources-form {
 	position: relative;
 	margin-top: 1em;
 }
 
 #edit-attendees-form #edit-attendee-schedule,
 #edit-resources-form #edit-resource-find {
 	position: absolute;
 	top: 0;
 	right: 0;
 }
 
 .edit-attendees-table select.edit-attendee-role {
 	border: 0;
 	padding: 2px;
 	background: white;
 }
 
 .availability img.availabilityicon {
 	margin: 1px;
 	width: 14px;
 	height: 14px;
 	border-radius: 4px;
 	-moz-border-radius: 4px;
 }
 
 .availability img.availabilityicon.loading {
 	background: url(images/loading_blue.gif) center no-repeat;
 }
 
 #schedule-freebusy-times td.unknown,
 .availability img.availabilityicon.unknown {
 	background: #ddd;
 }
 
 #schedule-freebusy-times td.free,
 .availability img.availabilityicon.free {
 	background: #0c0;
 }
 
 #schedule-freebusy-times td.busy,
 .availability img.availabilityicon.busy {
 	background: #c00;
 }
 
 #schedule-freebusy-times td.tentative,
 .availability img.availabilityicon.tentative {
 	background: #66d;
 }
 
 #schedule-freebusy-times td.out-of-office,
 .availability img.availabilityicon.out-of-office {
 	background: #f0b400;
 }
 
 #schedule-freebusy-times td.all-busy,
 #schedule-freebusy-times td.all-tentative,
 #schedule-freebusy-times td.all-out-of-office {
 	background-image: url(images/freebusy-colors.png);
 	background-position: top right;
 	background-repeat: no-repeat;
 }
 
 #schedule-freebusy-times td.all-tentative {
 	background-position: right -40px;
 }
 
 #schedule-freebusy-times td.all-out-of-office {
 	background-position: right -80px;
 }
 
 #edit-attendees-legend {
 	margin-top: 3em;
 	margin-bottom: 0.5em;
 }
 
 #edit-attendees-legend .legend {
 	margin-right: 2em;
 	white-space: nowrap;
 }
 
 #edit-attendees-legend img.availabilityicon {
 	vertical-align: middle;
 }
 
 .edit-attendees-table tbody td.confirmstate {
 	overflow: hidden;
 	white-space: nowrap;
 	text-indent: -2000%;
 }
 
 .edit-attendees-table td.confirmstate span {
 	display: block;
 	width: 20px;
 	background: url(images/attendee-status.gif) 5px 0 no-repeat;
 }
 
 .edit-attendees-table td.confirmstate span.needs-action {
 }
 
 .edit-attendees-table td.confirmstate span.accepted {
 	background-position: 5px -20px;
 }
 
 .edit-attendees-table td.confirmstate span.declined {
 	background-position: 5px -40px;
 }
 
 .edit-attendees-table td.confirmstate span.tentative {
 	background-position: 5px -60px;
 }
 
 .edit-attendees-table td.confirmstate span.delegated {
 	background-position: 5px -180px;
 }
 
 #attendees-freebusy-table {
 	width: 100%;
 	table-layout: fixed;
 	border-collapse: collapse;
 	margin: 0.5em 0;
 }
 
 #attendees-freebusy-table td.attendees {
 	width: 18em;
 	border: 1px solid #ccc;
 	vertical-align: top;
 	overflow: hidden;
 }
 
 #attendees-freebusy-table td.times {
 	width: auto;
 	vertical-align: top;
 	border: 1px solid #ccc;
 }
 
 #attendees-freebusy-table div.scroll {
 	position: relative;
 	overflow: auto;
 }
 
 #attendees-freebusy-table h3.boxtitle {
 	margin: 0;
 	height: auto !important;
 	border-color: #ccc;
 }
 
 .attendees-list .attendee {
 	padding: 3px 4px 3px 1px;
 	background: url(images/attendee-status.gif) 2px -97px no-repeat;
 	white-space: nowrap;
 }
 
 .attendees-list a.attendee-role-toggle {
 	display: inline-block;
 	width: 16px;
 	margin-right: 3px;
 	cursor: pointer;
 }
 
 .attendees-list div.attendee {
 	border-top: 1px solid #ccc;
 }
 
 .attendees-list span.attendee {
 	padding-left: 20px;
 	margin-right: 2em;
 }
 
 .attendees-list .organizer {
 	background-position: 3px -77px;
 }
 
 .attendees-list .opt-participant {
 	background-position: 2px -117px;
 }
 
 .attendees-list .non-participant {
 	background-position: 2px -137px;
 }
 
 .attendees-list .chair {
 	background-position: 2px -157px;
 }
 
 .attendees-list .loading {
 	background: url(images/loading_blue.gif) 1px 50% no-repeat;
 }
 
 .attendees-list .total {
 	background: none;
 	padding-left: 4px;
 	font-weight: bold;
 }
 
 .attendees-list .spacer,
 #schedule-freebusy-times tr.spacer td {
 	background: 0;
 	font-size: 50%;
 }
 
 #schedule-freebusy-times {
 	border-collapse: collapse;
 	width: 100%;
 }
 
 #schedule-freebusy-times td {
 	padding: 3px;
 	border: 1px solid #ccc;
 }
 
 #schedule-freebusy-times tr.dates th {
 	border-color: #aaa;
 	border-style: solid;
 	border-width: 0 1px 0 1px;
 	white-space: nowrap;
 }
 
 #attendees-freebusy-table div.timesheader,
 #schedule-freebusy-times tr.times td {
 	min-width: 30px;
 	font-size: 9px;
 	padding: 5px 2px 6px 2px;
 	text-align: center;
 }
 
 #schedule-freebusy-times tr.times td.allday {
 	min-width: 60px;
 }
 
 #schedule-freebusy-times tr.times td {
 	cursor: pointer;
 }
 
 #schedule-event-time {
 	position: absolute;
 	border: 2px solid #333;
 	background: #777;
 	background: rgba(60, 60, 60, 0.6);
 	opacity: 0.5;
 	border-radius: 4px;
 	cursor: move;
 	filter: alpha(opacity=40); /* IE8 */
 }
 
 #eventfreebusy .schedule-options {
 	position: relative;
 	margin-bottom: 1.5em;
 }
 
 #eventfreebusy .schedule-buttons {
 	position: absolute;
 	top: 0;
 	right: 0;
 }
 
 #eventfreebusy .schedule-find-buttons {
 	padding-bottom:0.5em;
 }
 
 #eventfreebusy .schedule-find-buttons button {
 	min-width: 9em;
 	text-align: center;
 }
 
 span.edit-alarm-set {
 	white-space: nowrap;
 }
 
 a.dropdown-link {
 	color: #CC0000;
 	font-size: 12px;
 	text-decoration: none;
 }
 
 a.dropdown-link:after {
 	content: ' ▼';
 	font-size: 11px;
 	color: #666;
 }
 
 #eventedit .ui-tabs-panel {
 	min-height: 20em;
 }
 
 .alarm-item {
 	margin: 0.4em 0 1em 0;
 }
 
 .alarm-item .event-title {
 	font-size: 14px;
 	margin: 0.1em 0 0.3em 0;
 }
 
 .alarm-item div.event-section {
 	margin-top: 0.1em;
 	margin-bottom: 0.3em;
 }
 
 .alarm-item .alarm-actions {
 	margin-top: 0.4em;
 }
 
 .alarm-item div.alarm-actions a {
 	color: #CC0000;
 	margin-right: 0.8em;
 	text-decoration: none;
 }
 
 a.alarm-action-snooze:after {
 	content: ' ▼';
 	font-size: 10px;
 	color: #666;
 }
 
 #alarm-snooze-dropdown {
 	z-index: 5000;
 }
 
 .ui-dialog-buttonset a.dropdown-link {
 	margin-right: 1em;
 }
 
 .ui-datepicker-calendar .ui-datepicker-today .ui-state-default {
 	border-color: #cccccc;
 	background: #ffffcc;
 	color: #000;
 }
 
 .ui-datepicker-calendar .ui-datepicker-week-col {
 	text-align: right;
 	padding-right: 0.5em;
 }
 
 .ui-datepicker th {
     padding: 0.3em 0;
     font-size: 10px;
 }
 
 .ui-datepicker td span,
 .ui-datepicker td a {
 	padding-left: 0.1em;
 }
 
 .ui-autocomplete {
 	max-height: 160px;
 	overflow-y: auto;
 	overflow-x: hidden;
 }
 
 .ui-autocomplete .ui-menu-item {
 	white-space: nowrap;
 }
 
 * html .ui-autocomplete {
 	height: 160px;
 }
 
 span.spacer {
 	padding-left: 3em;
 }
 
 #agendaoptions {
 	position: absolute;
 	left: 0;
 	right: 0;
 	bottom: 0;
 	height: auto;
 	z-index: 200;
 	border: 1px solid #ccc;
 	padding: 2px 5px 1px;
 	font-size: 90%;
 }
 
 #agendaoptions label {
 	color: #444;
 	text-shadow: 1px 1px #eee;
 	padding-right: 0.5em;
 }
 
 #calendar-kolabform {
 	position: relative;
 	padding-top: 24px;
 	margin: 0 -8px;
 	min-width: 660px;
 	min-height: 400px;
 }
 
 #calendar-kolabform div.tabsbar {
 	top: 0;
 	right: 2px;
 	left: 2px;
 	height: 24px;
 }
 
 #calendar-kolabform fieldset.tabbed {
 	background-color: #fff;
 	margin-top: 0;
 }
 
 #calendar-kolabform span.tablink {
 	background-color: #e8e8e9;
 	background-image: -moz-linear-gradient(center top, #f4f4f4, #e6e6e6);
 	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, #f4f4f4), color-stop(1.0, #e6e6e6));
 	filter: progid:DXImageTransform.Microsoft.gradient(enabled='true', startColorstr=#f4f4f4, endColorstr=#e6e6e6, GradientType=0);
 	height: 24px !important;
 }
 
 #calendar-kolabform span.tablink-selected {
 	background: #fff;
 	height: 25px !important;
 }
 
 #calendar-kolabform span.tablink a,
 #calendar-kolabform span.tablink-selected a {
 	background: none;
 	border: 1px solid #AAAAAA;
 	border-top-left-radius: 2px;
 	border-top-right-radius: 2px;
 	padding: 4px 10px 0 10px;
 	margin-left: 0;
 }
 
 #calendar-kolabform table td.title {
   font-weight: bold;
   white-space: nowrap;
   color: #666;
   padding-right: 10px;
 }
 
 #resource-dialog-right {
 	position: absolute;
 	top: 10px;
 	left: 300px;
 	right: 8px;
 	bottom: 10px;
 }
 
 #resource-info,
 #resource-availability {
 	position: absolute;
 	top: 0;
 	left: 0;
 	right: 0;
 	height: 48%;
 	border: 1px solid #999;
 	background-color: #F9F9F9;
 	overflow: auto;
 }
 
 #resource-availability {
 	top: auto;
 	bottom: 0;
 	height: 49%;
 	overflow: hidden;
 }
 
 #resource-info .boxtitle,
 #resource-availability .boxtitle {
 	margin-top: 0;
 }
 
 #resource-freebusy-calendar {
 	position: absolute;
 	top: 20px;
 	left: -1px;
 	right: -1px;
 	bottom: -1px;
 }
 
 #resource-freebusy-calendar .fc-content {
 	top: 0;
 }
 
 #resource-freebusy-calendar .fc-content .fc-event-bg {
 	background: 0;
 }
 
 #resource-freebusy-calendar .fc-event.status-busy,
 #resource-freebusy-calendar .status-busy .fc-event-skin {
 	border-color: #e26569;
 	background-color: #e26569;
 }
 
 #resource-freebusy-calendar .fc-event.status-tentative,
 #resource-freebusy-calendar .status-tentative .fc-event-skin {
 	border-color: #8383fc;
 	background: #8383fc;
 }
 
 #resource-freebusy-calendar .fc-event.status-outofoffice,
 #resource-freebusy-calendar .status-outofoffice .fc-event-skin {
 	border-color: #fbaa68;
 	background: #fbaa68;
 }
 
 #resources-list div.treetoggle {
 	left: 3px !important;
 	top: -2px;
 }
 
 #resources-list li ul div.treetoggle {
 	left: 23px !important;
 }
 
 #resource-selection {
   position: absolute;
 	top: 10px;
 	bottom: 10px;
 	left: 8px;
 	width: 280px;
 	border: 1px solid #999999;
 	background-color: #F9F9F9;
 	overflow: hidden;
 }
 
 #resource-selection .boxlistcontent {
 	top: 25px;
 	border-top: 1px solid #eee;
 }
 
 #resourcequicksearch {
 	position: absolute;
 	top: 3px;
 	left: 7px;
 	right: 4px;
 	height: 17px;
 	background: #fff;
 	border: 1px solid #888;
 	border-radius: 10px;
 	-webkit-box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
 	-moz-box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
 	box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
 }
 
 #resourcesearchbox {
 	position: absolute;
 	top: 1px;
 	left: 24px;
 	width: 140px;
 	height: 15px;
 	font-size: 11px;
 	padding: 0px;
 	border: none;
 	outline: none;
 	background: #fff;
 }
 
 #resourcesearchreset {
 	position: absolute;
 	top: 2px;
 	right: 2px;
 	text-decoration: none;
 }
 
 #resource-details,
 #resource-details-owner {
 	margin: 8px;
 }
 
 #resource-details td.title,
 #resource-details-owner td.title {
 	color: #666;
 	padding-right: 10px;
 	min-width: 10em;
 }
 
 #resource-details-owner thead td {
 	color: #333;
 	font-size: 13px;
 	font-weight: bold;
 }
 
 /* fullcalendar style overrides */
 
 #calendar .fc-header-right {
 	padding-right: 200px;
 	padding-top: 0;
 }
 
 .rcube-fc-content {
 	position: absolute !important;
 	top: 38px;
 	left: 0;
 	right: 0;
 	bottom: 0;
 	overflow: hidden;
 }
 
 .fc-event-title {
 	font-weight: bold;
 }
 
 .cal-event-status-cancelled .fc-event-title {
 	text-decoration: line-through;
 }
 
 .fc-event-hori .fc-event-title {
 	font-weight: normal;
 	white-space: nowrap;
 }
 
 .fc-event-hori .fc-event-time {
 	white-space: nowrap;
 	font-weight: normal !important;
 	font-size: 10px;
 	padding-right: 0.6em;
 }
 
 .fc-event-vert.fc-invitation-needs-action,
 .fc-event-hori.fc-invitation-needs-action {
 	border: 1px dashed #5757c7 !important;
 }
 
 .fc-event-vert.fc-invitation-tentative,
 .fc-event-hori.fc-invitation-tentative {
 	border: 1px dashed #eb8900 !important;
 }
 
 .fc-event-vert.fc-invitation-declined,
 .fc-event-hori.fc-invitation-declined {
 	border: 1px dashed #c00 !important;
 }
 
 .fc-grid .fc-event-time {
 	font-weight: normal !important;
 	padding-right: 0.3em;
 }
 
 .fc-event-cateories {
 	font-style:italic; 
 }
 
 .fc-event-location {
 	font-size: 90%;
 }
 
 .fc-more-link {
 	color: #999;
 	padding-top: 1px;
 	cursor: pointer;
 }
 
 .fc-agenda-slots td div {
 	height: 22px;
 }
 
 .fc-mon, .fc-tue, .fc-wed, .fc-thu, .fc-fri {
 	background-color: #fdfdfd;
 }
 
 .fc-widget-header {
 	background-color: #fff;
 }
 
 .fc-icon-alarms,
 .fc-icon-sensitive,
 .fc-icon-recurring {
 	display: inline-block;
 	width: 11px;
 	height: 11px;
 	background: url(images/eventicons.gif) 0 0 no-repeat;
 	margin-left: 3px;
 	line-height: 10px;
 }
 
 .fc-icon-alarms {
 	background-position: 0 -13px;
 }
 
 .fc-icon-sensitive {
 	background-position: 0 -25px;
 }
 
 .fc-list-section .fc-event {
 	cursor: pointer;
 }
 
 #calendar .fc-event-vert .fc-event-head,
 #calendar .fc-event-vert .fc-event-content {
 	position: relative;
 	z-index: 2;
 	width: 100%;
 	overflow: hidden;
 }
 
 .fc-view-list div.fc-list-header,
 .fc-view-table td.fc-list-header,
 .edit-attendees-table thead td {
 	padding: 3px;
 	background: #dddddd;
 	background-image: -moz-linear-gradient(center top, #f4f4f4, #d2d2d2);
 	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.00, #f4f4f4), color-stop(1.00, #d2d2d2));
 	filter: progid:DXImageTransform.Microsoft.gradient(enabled='true', startColorstr=#f4f4f4, endColorstr=#d2d2d2, GradientType=0);
 	font-weight: bold;
 	color: #333;
 }
 
 .fc-view-list .fc-event-skin .fc-event-content {
 	background: #F6F6F6;
 	padding: 2px;
 }
 
 .fc-view-list .fc-event-skin .fc-event-title,
 .fc-view-list .fc-event-skin .fc-event-location {
 	color: #333;
 }
 
 .fc-view-table table.fc-list-smart {
 	table-layout: auto;
 }
 
 .fc-listappend {
 	text-align: center;
 	margin: 1em 0;
 }
 
 .fc-listappend .message {
 	padding: 0.5em;
 	margin-bottom: 0.5em;
 	font-size: 150%;
 	color: #999;
 }
 
 .fc-listappend .formlinks a {
 	font-size: 12px;
 	padding: 0 0.3em;
 }
 
 .fc-event-temp {
 	opacity: 0.4;
 	filter: alpha(opacity=40); /* IE8 */
 }
 
 /* Settings section */
 
 fieldset #calendarcategories div {
 	margin-bottom: 0.3em;
 }
 
 /* Invitation UI in mail */
 
 .messagelist tbody .attachment span.ical {
 	display: inline-block;
 	vertical-align: middle;
 	height: 18px;
 	width: 20px;
 	padding: 0;
 	background: url(images/calendar-small.png) 1px 1px no-repeat;
 }
 
 #messagemenu li a.calendarlink,
 #attachmentmenu li a.calendarlink {
 	background-image: url(images/calendars.png);
 	background-position: 7px -109px;
 	background-repeat: no-repeat;
 }
 
 div.calendar-invitebox {
 	min-height: 20px;
 	margin: 5px 8px;
 	padding: 3px 6px 6px 34px;
 	border: 1px solid #C2D071;
 	background: url(images/calendar.png) 6px 5px no-repeat #F7FDCB;
 }
 
 div.calendar-invitebox td.ititle {
 	font-weight: bold;
 	padding-right: 0.5em;
 }
 
 div.calendar-invitebox td.label {
 	color: #666;
 	padding-right: 1em;
 }
 
 #event-rsvp .rsvp-buttons,
 div.calendar-invitebox .itip-buttons div {
 	margin-top: 0.5em;
 }
 
 #event-rsvp input.button,
 div.calendar-invitebox input.button,
 div.calendar-invitebox select {
 	font-size: 11px;
 	margin-right: 0.5em;
 }
 
 div.calendar-invitebox .folder-select {
 	font-size: 11px;
 	margin-left: 1em;
 }
 
 div.calendar-invitebox .rsvp-status.loading {
 	color: #666;
 	padding: 1px 0 2px 24px;
 	background: url(images/loading_blue.gif) top left no-repeat;
 }
 
 div.calendar-invitebox .rsvp-status.declined,
 div.calendar-invitebox .rsvp-status.tentative,
 div.calendar-invitebox .rsvp-status.delegated,
 div.calendar-invitebox .rsvp-status.accepted {
 	padding: 0 0 1px 22px;
 	background: url(images/attendee-status.gif) 2px -20px no-repeat;
 }
 
 div.calendar-invitebox .rsvp-status.declined {
 	background-position: 2px -40px;
 }
 
 div.calendar-invitebox .rsvp-status.tentative {
 	background-position: 2px -60px;
 }
 
 div.calendar-invitebox .rsvp-status.delegated {
 	background-position: 2px -180px;
 }
 
 div.calendar-invitebox .calendar-agenda-preview {
 	display: none;
 	border-top: 1px solid #dfdfdf;
 	margin-top: 1em;
 	padding-top: 0.6em;
 }
 
 div.calendar-invitebox .calendar-agenda-preview h3.preview-title {
 	margin: 0 0 0.5em 0;
 	font-size: 12px;
 }
 
 div.calendar-invitebox .calendar-agenda-preview .event-row {
 	color: #777;
 	padding: 2px 0;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
 div.calendar-invitebox .calendar-agenda-preview .event-row.current {
 	color: #000;
 	font-weight: bold;
 }
 
 div.calendar-invitebox .calendar-agenda-preview .event-row.no-event {
 	font-style: italic;
 }
 
 div.calendar-invitebox .calendar-agenda-preview .event-date {
 	display: inline-block;
 	min-width: 8em;
 	margin-right: 1em;
 	white-space: nowrap;
 }
 
 /* iTIP attend reply page */
 
 .calendaritipattend .centerbox {
 	width: 40em;
 	margin: 80px auto;
 	padding: 10px 10px 10px 90px;
 	border: 1px solid #ccc;
 	box-shadow: 1px 1px 24px #ccc;
 	-moz-box-shadow: 1px 1px 18px #ccc;
 	-webkit-box-shadow: #ccc 1px 1px 18px;
 	background: url(images/invitation.png) 10px 10px no-repeat #fbfbfb;
 }
 
 .calendaritipattend .calendar-invitebox {
 	background: none;
 	padding-left: 0;
 	border: 0;
 	margin: 0 0 2em 0;
 }
 
 .calendaritipattend .calendar-invitebox .rsvp-status {
 	margin-top: 2.5em;
 	font-size: 110%;
 	font-weight: bold;
 }
 
 .calendaritipattend .calendar-invitebox td.title,
 .calendaritipattend .calendar-invitebox td.ititle {
 	font-size: 120%;
 }
 
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 0669a8fd..50c5910b 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -1,2327 +1,2329 @@
 /**
  * Roundcube Calendar plugin styles for skin "Larry"
  *
  * Copyright (c) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
  * Screendesign by FLINT / Büro für Gestaltung, bueroflint.com
  *
  * The contents are subject to the Creative Commons Attribution-ShareAlike
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
  */
 
 body.calendarmain {
 	overflow: hidden;
 }
 
 body.calendarmain #mainscreen {
 	left: 0;
 }
 
 /* overrides for tablets and mobile phones */
 @media screen and (max-device-width: 1024px){
 	body.calendarmain {
 		overflow: visible;
 	}
 
 	body.calendarmain #mainscreen {
 		min-width: 1000px !important;
 		min-height: 520px !important;
 	}
 
 	body.calendarmain #header {
 		min-width: 1020px !important;
 	}
 }
 
 #calendarsidebar {
 	position: absolute;
 	top: 0;
 	left: 10px;
 	bottom: 0;
 	width: 250px;
 }
 
 #datepicker {
 	position: absolute;
 	top: 40px;
 	left: 0;
 	width: 100%;
 	min-height: 190px;
 }
 
 #datepicker .ui-datepicker {
 	width: 100% !important;
 	box-shadow: none;
 	-moz-box-shadow: none;
 	-webkit-box-shadow: none;
 }
 
 #datepicker .ui-datepicker td a {
 	padding: 5px 4px;
 	font-size: 12px;
 }
 
 #datepicker td.ui-datepicker-activerange {
 	border-color: #69a2b6;
 }
 
 #datepicker .ui-datepicker-activerange a {
 	color: #185d7a;
 	background: #d9f1fb;
 	background: -moz-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d9f1fb), color-stop(100%,#c5e3ee));
 	background: -o-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
 	background: -ms-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
 	background: linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d9f1fb', endColorstr='#c5e3ee', GradientType=0);
 }
 
 #datepicker .ui-datepicker-days-cell-over a.ui-state-default {
 	color: #fff;
 	border-color: #2fa0c0;
 	background: rgba(73,180,210,0.6);
 	text-shadow: 0px 1px 1px #666;
 	filter: none;
 }
 
 #datepicker .ui-datepicker-activerange a.ui-state-active {
 	color: #fff;
 	background: #00acd4;
 	background: -moz-linear-gradient(top, #00acd4 0%, #008fc7 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00acd4), color-stop(100%,#008fc7));
 	background: -o-linear-gradient(top, #00acd4 0%, #008fc7 100%);
 	background: -ms-linear-gradient(top, #00acd4 0%, #008fc7 100%);
 	background: linear-gradient(top, #00acd4 0%, #008fc7 100%);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00acd4', endColorstr='#008fc7', GradientType=0);
 }
 
 #datepicker td.ui-datepicker-week-col {
 	cursor: pointer;
 }
 
 #datepicker .ui-datepicker-title {
 	margin: 2px 2.3em 3px 2.3em;
 }
 
 #datepicker .ui-datepicker .ui-datepicker-prev,
 #datepicker .ui-datepicker .ui-datepicker-next {
 	top: 4px;
 }
 
 #calsidebarsplitter {
 	position: absolute;
 	left: 264px;
 	width: 6px;
 	top: 40px !important;
 	bottom: 0;
 	background: url(images/toggle.gif) -1px 48% no-repeat transparent;
 }
 
 div.sidebarclosed {
 	background-position: -8px 48% !important;
 	cursor: pointer;
 }
 
 #calsidebarsplitter:hover {
 	background-color: #ddd;
 }
 
 #calendar {
 	position: absolute;
 	top: 0;
 	left: 276px;
 	right: 0;
 	bottom: 0;
 }
 
 .calendarmain #message.statusbar {
 	border: 1px solid #c3c3c3;
 	border-bottom-color: #ababab;
 }
 
 #timezonedisplay {
 	position: absolute;
 	bottom: 5px;
 	right: 12px;
 	font-size: 0.85em;
 	color: #666;
 }
 
 #print {
 	width: 680px;
 }
 
 pre {
  font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
 }
 
 #calendars {
 	position: absolute;
 	top: 276px;
 	left: 0;
 	bottom: 0;
 	right: 0;
 }
 
 #calendars .boxtitle {
 	position: relative;
 }
 
 #calendars .boxtitle a.iconbutton.search {
 	position: absolute;
 	top: 8px;
 	right: 8px;
 	width: 16px;
 	cursor: pointer;
 	background-position: -2px -317px;
 }
 
 #calendars .listsearchbox {
 	display: none;
 }
 
 #calendars .listsearchbox.expanded {
 	display: block;
 }
 
 #calendars .scroller {
 	top: 34px;
 }
 
 #calendars .listsearchbox.expanded + .scroller {
 	top: 68px;
 }
 
 #calendars .treelist li {
 	margin: 0;
 	position: relative;
 }
 
 #calendars .treelist li div.folder,
 #calendars .treelist li div.calendar {
 	position: relative;
 	height: 28px;
 }
 
 #calendars .treelist li div.virtual {
 	height: 22px;
 }
 
 #calendars .treelist li span.calname {
 	display: block;
 	padding: 0px 18px 2px 2px;
 	position: absolute;
 	top: 7px;
 	left: 38px;
 	right: 45px;
 	cursor: default;
 	background: url(images/calendars.png) right 20px no-repeat;
 	overflow-x: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	color: #004458;
 }
 
 .quickview-active #calendars .treelist div input,
 .quickview-active #calendars .treelist div .calname {
 	opacity: 0.35;
 }
 
 .quickview-active #calendars .treelist div.focusview .calname {
 	opacity: 1.0;
 	background-image: none;
 }
 
 #calendars .treelist li div.virtual > span.calname {
 	color: #aaa;
 	top: 4px;
 	left: 20px;
 }
 
 #calendars .treelist li.x-birthdays span.calname,
 #calendars .treelist li.x-invitations span.calname {
 	font-style: italic;
 }
 
 #calendars .treelist.flat li span.calname {
 	left: 24px;
 	right: 42px;
 }
 
 #calendars .treelist li span.handle {
 	display: inline-block;
 	position: absolute;
 	top: 8px;
 	right: 6px;
 	padding: 0;
 	width: 10px;
 	height: 10px;
 	border-radius: 7px;
 	font-size: 0.8em;
 	border: 1px solid rgba(0, 0, 0, 0.5);
 	-webkit-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
 	-moz-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
 	box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
 }
 
 #calendars .treelist div span.actions {
 	display: inline-block;
 	position: absolute;
 	top: 2px;
 	right: 22px;
 	padding: 5px 20px 0 6px;
 /*	min-width: 40px; */
 	height: 19px;
 	text-align: right;
 	z-index: 4;
 }
 
 #calendars .treelist div:hover span.actions {
 	top: 1px;
 	right: 21px;
 	border: 1px solid #c6c6c6;
 	border-radius: 4px;
 	background: #f7f7f7;
 	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
 	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
 	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
 	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
 }
 
 #calendars .treelist li a.subscribed {
 	display: inline-block;
 	position: absolute;
 	top: 5px;
 	right: 3px;
 	height: 16px;
 	width: 16px;
 	padding: 0;
 	background: url(images/calendars.png) -100px 0 no-repeat;
 	overflow: hidden;
 	text-indent: -5000px;
 	cursor: pointer;
 }
 
 #calendars .treelist div:hover a.subscribed,
 #calendars .treelist div a.subscribed:focus {
 	background-position: 0 -110px;
 }
 
 #calendars .treelist div.subscribed a.subscribed,
 #calendars .treelist div.subscribed a.subscribed:focus {
 	background-position: -16px -110px;
 }
 
 #calendars .treelist div.subscribed.partial a.subscribed,
 #calendars .treelist div.subscribed.partial a.subscribed:focus {
 	background-position: -16px -148px;
 }
 
 #calendars .treelist div a.remove:focus,
 #calendars .treelist div a.quickview:focus,
 #calendars .treelist div a.subscribed:focus {
 	border-radius: 3px;
 	outline: 2px solid rgba(30,150,192, 0.5);
 }
 
 #calendars .treelist div a.remove,
 #calendars .treelist div a.quickview {
 	display: inline-block;
 	width: 16px;
 	height: 16px;
 	margin-right: 4px;
 	padding: 0;
 	background: url(images/calendars.png) -100px 0 no-repeat;
 	overflow: hidden;
 	text-indent: -5000px;
 	cursor: pointer;
 }
 
 #calendars .treelist div a.quickview:focus,
 #calendars .treelist div:hover a.quickview {
 	background-position: 0 -128px;
 	background-color: transparent !important;
 }
 
 #calendars .treelist div.focusview a.quickview {
 	background-position: -16px -128px;
 }
 
 #calendars .treelist div a.remove:focus,
 #calendars .treelist div:hover a.remove {
 	background-position: -16px -168px;
 	background-color: transparent !important;
 }
 
 #calendars .searchresults .treelist div a.remove {
 	display: none;
 }
 
 #calendars .treelist li input {
 	position: absolute;
 	top: 5px;
 	left: 18px;
 }
 
 #calendars .treelist li div.treetoggle {
 	top: 8px;
 }
 
 #calendars .treelist li.virtual div.treetoggle {
 	top: 6px;
 }
 
 #calendars .treelist.flat li input {
 	left: 4px;
 }
 
 #calendars .treelist ul li div.folder,
 #calendars .treelist ul li div.calendar {
 	margin-left: 16px;
 }
 
 #calendars .treelist ul ul li div.folder,
 #calendars .treelist ul ul li div.calendar {
 	margin-left: 32px;
 }
 
 #calendars .treelist ul ul ul li div.folder,
 #calendars .treelist ul ul ul li div.calendar {
 	margin-left: 48px;
 }
 
 #calendars .treelist li.selected > div.calendar {
 	background-color: #c7e3ef;
 }
 
 #calendars .treelist li.selected > span.calname {
 	font-weight: bold;
 }
 
 #calendars .treelist div.readonly span.calname {
 	background-position: right -20px;
 }
 
 #calendars .treelist li.user > div > span.calname {
 	background-position: right -38px;
 }
 /*
 #calendars .treelist div.user.readonly span.calname {
 	background-position: right -56px;
 }
 
 #calendars .treelist div.shared span.calname {
 	background-position: right -74px;
 }
 
 #calendars .treelist div.shared.readonly span.calname {
 	background-position: right -92px;
 }
 */
 
 #calendars .treelist .calendar .count {
 	position: absolute;
 	display: inline-block;
 	top: 5px;
 	right: 68px;
 	min-width: 1.3em;
 	padding: 2px 4px;
 	background: #005d76;
 	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
 	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
 	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
 	background: linear-gradient(to bottom, #005d76 0%, #004558 100%);
 	-webkit-box-shadow: inset 0 1px 1px 0 #002635;
 	box-shadow: inset 0 1px 1px 0 #002635;
 	border-radius: 10px;
 	color: #fff;
 	text-align: center;
 	font-style: normal;
 	font-weight: bold;
 	text-shadow: none;
 	z-index: 3;
 }
 
 #calendars .searchresults {
 	background: #b0ccd7;
 	margin-top: 8px;
 }
 
 #calendars .searchresults .boxtitle {
 	background: none;
-	padding: 2px 8px 2px 8px;
+	padding: 2px 8px;
+	border-radius: 0;
 }
 
 #calendars .searchresults .listing li {
 	background-color: #c7e3ef;
 }
 
 #calfeedurl,
 #caldavurl {
 	width: 98%;
 	background: #fbfbfb;
 	padding: 4px;
 	margin-bottom: 1em;
 	resize: none;
 }
 
 #agendalist {
 	width: 100%;
 	margin: 0 auto;
 	margin-top: 60px;
 	border: 1px solid #C1DAD7;
 	display: none;
 }
 
 #agendalist table {
 	width: 100%;
 }
 
 #agendalist td,
 #agendalist th {
 	border-right: 1px solid #C1DAD7;
 	border-bottom: 1px solid #C1DAD7;
 	background: #fff;
 	padding: 6px 6px 6px 12px;
 }
 
 #agendalist tr {
 	vertical-align: top;
 }
 
 #agendalist th {
 	font-weight: bold;
 }
 
 #calendartoolbar {
 	position: absolute;
 	top: -6px;
 	left: 0;
 	height: 40px;
 	white-space: nowrap;
 }
 
 #calendartoolbar a.button {
 	background-image: url(images/toolbar.png);
 	padding-left: 0;
 	padding-right: 0;
 	min-width: 50px;
 	max-width: 60px;
 }
 
 #calendartoolbar a.button.addevent {
 	background-position: center 1px;
 	max-width: 70px;
 }
 
 #calendartoolbar a.button.export {
 	background-position: center -40px;
 }
 
 #calendartoolbar a.button.import {
 	background-position: center -440px;
 }
 
 #calendartoolbar a.button.print {
 	background-position: center -80px;
 }
 
 body.calendarmain #quicksearchbar {
 	z-index: 20;
 }
 
 body.calendarmain #searchmenulink {
 	width: 15px;
 }
 
+#eventedit.uidialog,
 .calendarmain div.uidialog {
 	display: none;
 }
 
 #user {
 	position: absolute;
 	top: 10px;
 	right: 100px;
 	left: 100px;
 	text-align: center;
 }
 
 a.morelink {
 	font-size: 90%;
 	color: #0069a6;
 	text-decoration: none;
 }
 
 a.morelink:hover {
 	text-decoration: underline;
 }
 
 a.miniColors-trigger {
 	margin-top: -3px;
 }
 
 .calendar.attachmentwin #attachmenttoolbar {
 	position: relative;
 	top: -6px;
 	height: 40px;
 }
 
 .calendar.attachmentwin #attachmentcontainer {
 	position: absolute;
 	top: 0;
 	left: 232px;
 	right: 0;
 	bottom: 0;
 }
 
 .calendar.attachmentwin #attachmentframe {
 	width: 100%;
 	height: 100%;
 	border: 0;
 	background-color: #fff;
 	border-radius: 4px;
 }
 
 .calendar.attachmentwin #partheader {
 	position: absolute;
 	top: 0;
 	left: 0;
 	width: 220px;
 	bottom: 0;
 }
 
 .calendar.attachmentwin #partheader table {
 	table-layout: fixed;
 	overflow: hidden;
 }
 
 .calendar.attachmentwin #partheader table td {
 	color: #666;
 	padding: 4px 6px;
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
 
 .calendar.attachmentwin #partheader table td.header {
 	font-weight: bold;
 }
 
 .calendar.attachmentwin #partheader table td.title {
 	width: 60px;
 	padding-right: 0;
 }
 
 #edit-attachments {
 	margin: 0.6em 0;
 }
 
 #edit-attachments ul li {
 	display: block;
 	color: #333;
 	font-weight: bold;
 	padding: 4px 4px 3px 30px;
 	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
 	line-height: 20px;
 }
 
 #edit-attachments ul li a.file {
 	padding: 0;
 }
 
 #edit-attachments-form {
 	margin-top: 1em;
 	padding-top: 0.8em;
 	border-top: 2px solid #fafafa;
 }
 
-#edit-attachments-form .formbuttons {
+#edit-attachments-form .buttons {
 	margin: 0.5em 0;
 }
 
 #eventedit .droptarget {
 	background-image: url(../../../../skins/larry/images/filedrop.png) !important;
 	background-position: center bottom !important;
 	background-repeat: no-repeat !important;
 }
 
 #eventedit .droptarget.hover,
 #eventedit .droptarget.active {
 	border-color: #019bc6;
 	box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
 	-moz-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
 	-webkit-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
 	-o-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
 }
 
 #eventedit .droptarget.hover {
 	background-color: #d9ecf4;
 	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 }
 
 #event-attachments .attachmentslist li {
 	float: left;
 	margin-right: 1em;
 }
 
 #event-attachments .attachmentslist li a {
 	outline: none;
 }
 
 #event-panel-attachments.disabled .attachmentslist li a.delete {
 	visibility: hidden;
 }
 
 .event-attendees span.attendee {
 	padding-right: 18px;
 	margin-right: 0.5em;
 	background: url(images/attendee-status.png) right 0 no-repeat;
 }
 
 .event-attendees span.attendee a.mailtolink {
 	text-decoration: none;
 	white-space: nowrap;
 	outline: none;
 }
 
 .event-attendees span.attendee a.mailtolink:hover {
 	text-decoration: underline;
 }
 
 .event-attendees span.accepted {
 	background-position: right -20px;
 }
 
 .event-attendees span.declined {
 	background-position: right -40px;
 }
 
 .event-attendees span.tentative {
 	background-position: right -60px;
 }
 
 .event-attendees span.delegated {
 	background-position: right -180px;
 }
 
 .event-attendees span.organizer {
 	background-position: right -80px;
 }
 
 #all-event-attendees span.attendee {
 	display: block;
 	margin-bottom: 0.4em;
 	padding-bottom: 0.3em;
 	border-bottom: 1px solid #ddd;
 }
 
 .calendarmain .fc-view-table td.fc-list-header,
 #attendees-freebusy-table h3.boxtitle,
 #schedule-freebusy-times thead th,
 .edit-attendees-table thead th
  {
 	color: #69939e;
 	font-size: 11px;
 	font-weight: bold;
 	background: #d6eaf3;
 	background: -moz-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
 	background: -webkit-gradient(linear, left top, right top, color-stop(0,#e3f2f6), color-stop(8%,#d6eaf3), color-stop(100%,#d6eaf3));
 	background: -o-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
 	background: -ms-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px ,#d6eaf3 100%);
 	background: linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
 	border: 0;
 	border-bottom: 1px solid #ccc;
 	height: 18px;
 	line-height: 18px;
 	padding: 8px 7px 3px 7px;
 }
 
 /* jQuery UI overrides */
 
 .calendarmain .eventdialog h1 {
 	font-size: 18px;
 	margin: -0.3em 0 0.4em 0;
 }
 
 .calendarmain .eventdialog label,
 .calendarmain .eventdialog h5.label {
 	font-weight: normal;
 	font-size: 1em;
 	color: #999;
 	margin: 0 0 0.2em 0;
 }
 
 .calendarmain .eventdialog label span.index,
 .calendarmain .eventdialog h5.label .index {
 	vertical-align: inherit;
 	margin-left: 0.6em;
 }
 
 .calendarmain .eventdialog {
 	margin: 0 -0.2em;
 }
 
 .calendarmain .eventdialog.status-cancelled {
 	background: url(images/badge_cancelled.png) top right no-repeat;
 }
 
 .calendarmain .eventdialog.sensitivity-private {
 	background: url(images/badge_private.png) top right no-repeat;
 }
 
 .calendarmain .eventdialog.sensitivity-confidential {
 	background: url(images/badge_confidential.png) top right no-repeat;
 }
 
 .calendarmain .sensitivity-private #event-title {
 	margin-right: 50px;
 }
 
 .calendarmain .sensitivity-confidential #event-title {
 	margin-right: 60px;
 }
 
 .calendarmain .eventdialog div.event-line {
 	margin-top: 0.1em;
 	margin-bottom: 0.3em;
 }
 
 .calendarmain .eventdialog div.event-line a.iconbutton {
 	margin-left: 0.5em;
 	line-height: 17px;
 }
 
 .calendarmain .eventdialog div.event-line span.event-text + label {
 	margin-left: 2em;
 }
 
 .calendarmain .eventdialog #event-rsvp-comment,
 .calendarmain .eventdialog #event-created-changed {
 	margin-top: 0.6em;
 }
 
 .eventdialog .event-text-old,
 .eventdialog .event-text-new,
 .eventdialog .event-text-diff {
 	padding: 2px;
 }
 
 .eventdialog .event-text-diff del,
 .eventdialog .event-text-diff ins {
 	text-decoration: none;
 	color: inherit;
 }
 
 .eventdialog .event-text-old,
 .eventdialog .event-text-diff del {
 	background-color: #fdd;
 	/* text-decoration: line-through; */
 }
 
 .eventdialog .event-text-new,
 .eventdialog .event-text-diff ins {
 	background-color: #dfd;
 }
 
 #eventdiff .attachmentslist li a,
 #eventdiff .attachmentslist li a:hover {
 	cursor: default;
 	text-decoration: none;
 }
 
 .changelog-table .loading {
 	color: #666;
 	margin: 1em 0;
 	padding: 1px 0 2px 24px;
 	background: url(images/loading_blue.gif) top left no-repeat;
 }
 
 .changelog-dialog .compare-button {
 	margin: 4px 0;
 }
 
 .changelog-table tbody td {
 	padding: 4px 7px;
 	vertical-align: middle;
 }
 
 .changelog-table tbody tr:last-child td {
 	border-bottom: 0;
 }
 
 .changelog-table tbody tr.undisclosed td.date,
 .changelog-table tbody tr.undisclosed td.user {
 	font-style: italic;
 }
 
 .changelog-table .diff {
 	width: 4em;
 	padding: 2px;
 }
 
 .changelog-table .revision {
 	width: 6em;
 }
 
 .changelog-table .date {
 	width: 11em;
 }
 
 .changelog-table .user {
 	width: auto;
 }
 
 .changelog-table .operation {
 	width: 15%;
 }
 
 .changelog-table .actions {
 	width: 50px;
 	text-align: right;
 	padding: 4px;
 }
 
 .changelog-table td a.iconbutton.restore,
 .changelog-table td a.iconbutton.preview {
 	width: 16px;
 	margin-right: 2px;
 	background-image: url(images/calendars.png);
 	background-position: -1px -147px;
 }
 
 .changelog-table td a.iconbutton.restore {
 	background-image: url(images/calendars.png);
 	background-position: -1px -167px;
 }
 
 .changelog-table tr.first td a.iconbutton {
 	opacity: 0.3;
 	cursor: default;
 }
 
 #event-partstat .changersvp {
 	cursor: pointer;
 	color: #333;
 	text-decoration: none;
 }
 
 #event-partstat .iconbutton {
 	visibility: hidden;
 }
 
 #event-partstat .changersvp:focus .iconbutton,
 #event-partstat:hover .iconbutton {
 	visibility: visible;
 }
 
 #eventedit {
 	position: relative;
 	top: -1.5em;
 	padding: 0.5em 0.1em;
 	margin: 0 -0.2em;
 }
 
 #eventedit input.text,
 #eventedit textarea {
 	width: 97%;
 }
 
 #eventtabs {
 	position: relative;
 	padding: 0;
 	border: 0;
 	border-radius: 0;
 }
 
 div.form-section,
 .calendarmain .eventdialog div.event-section,
 #eventtabs div.event-section {
 	margin-top: 0.2em;
 	margin-bottom: 0.6em;
 }
 
 #eventtabs .border-after {
 	padding-bottom: 0.8em;
 	margin-bottom: 0.8em;
 	border-bottom: 2px solid #fafafa;
 }
 
 .calendarmain .eventdialog label,
 #eventedit label,
 .form-section label {
 	display: inline-block;
 	min-width: 7em;
 	padding-right: 0.5em;
 }
 
 .calendarmain .eventdialog #event-url .event-text {
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
 
 #event-links .attachmentslist {
 	display: inline-block;
 }
 
 #event-links label,
 #edit-event-links label {
 	float: left;
 	margin-top: 0.3em;
 	padding-right: 0.75em;
 }
 
 #edit-event-links .event-text {
 	margin-left: 8em;
 	min-height: 22px;
 }
 
 #edit-event-links .attachmentslist li.message a.messagelink,
 #event-links .attachmentslist li.message a.messagelink {
 	padding: 0 0 0 24px;
 }
 
 #edit-event-links .attachmentslist li a.delete {
 	top: 0;
 	background-position: -6px -378px;
 }
 
 #edit-event-links .attachmentslist li.deleted a.messagelink,
 #edit-event-links .attachmentslist li.deleted a.messagelink:hover {
 	text-decoration: line-through;
 }
 
 #eventedit .formtable td.label {
 	min-width: 6em;
 }
 
 td.topalign {
 	vertical-align: top;
 }
 
 #eventedit label.weekday,
 #eventedit label.monthday {
 	min-width: 3em;
 }
 
 #eventedit label.month {
 	min-width: 5em;
 }
 
 #eventedit .formtable td {
 	padding: 0.2em 0;
 }
 
 .ui-dialog .event-update-confirm {
 	padding: 0 0.5em 0.5em 0.5em;
 }
 
 .event-dialog-message,
 .event-update-confirm .message {
 	margin-top: 0.5em;
 	padding: 0.8em;
 	border: 1px solid #ffdf0e;
 	background-color: #fef893;
 }
 
 .event-dialog-message .message,
 .event-update-confirm .message {
 	margin-bottom: 0.5em;
 }
 
 .edit-recurring-warning .savemode {
 	padding-left: 20px;
 }
 
 .event-update-confirm .savemode {
 	padding-left: 30px;
 }
 
 .event-dialog-message span.ui-icon,
 .event-update-confirm span.ui-icon {
 	float: left;
 	margin: 0 7px 20px 0;
 }
 
 .event-dialog-message label,
 .event-update-confirm label {
 	min-width: 3em;
 	padding-right: 1em;
 }
 
 .event-update-confirm a.button {
 	margin: 0 0.5em 0 0.2em;
 	min-width: 5em;
 	text-align: center;
 }
 
 .libcal-rsvp-replymode li a {
 	cursor: default;
 }
 
 #event-rsvp,
 #edit-attendees-notify {
 	margin: 0.6em 0 0.3em 0;
 	padding: 0.5em;
 }
 
 #event-rsvp .itip-reply-controls {
 	margin-top: 0.5em;
 }
 
 #event-rsvp .itip-reply-controls label {
 	color: #333;
 }
 
 #event-rsvp .itip-reply-controls textarea {
 	width: 95%;
 }
 
 #eventedit .edit-attendees-table {
 	width: 100%;
 	margin-top: 0.5em;
 }
 
 #eventedit .edit-attendees-table th.role,
 #eventedit .edit-attendees-table td.role {
 	width: 9em;
 }
 
 #eventedit .edit-attendees-table th.availability,
 #eventedit .edit-attendees-table td.availability,
 #eventedit .edit-attendees-table th.confirmstate,
 #eventedit .edit-attendees-table td.confirmstate {
 	width: 4em;
 }
 
 #eventedit .edit-attendees-table th.options,
 #eventedit .edit-attendees-table td.options {
 	width: 16px;
 	padding: 2px 4px;
 }
 
 #eventedit .edit-attendees-table th.invite,
 #eventedit .edit-attendees-table td.invite {
 	width: 44px;
 	padding: 2px;
 }
 
 #eventedit .edit-attendees-table th.invite label {
 	display: inline-block;
 	position: relative;
 	top: 4px;
 	width: 24px;
 	height: 18px;
 	min-width: 24px;
 	padding: 0;
 	overflow: hidden;
 	text-indent: -5000px;
 	white-space: nowrap;
 	background: url(images/sendinvitation.png) 1px 0 no-repeat;
 }
 
 #eventedit .edit-attendees-table tbody tr:last-child td {
 	border-bottom: 0;
 }
 
 #eventedit .edit-attendees-table th.name,
 #eventedit .edit-attendees-table td.name {
 	width: auto;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
 #eventedit .edit-attendees-table td.name select {
 	width: 100%;
 }
 
 #eventedit .edit-attendees-table td.name .attendee-name {
 	display: block;
 	position: relative;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	padding: 5px 7px 6px;
 	margin: -5px -7px -6px;
 }
 
 #eventedit .edit-attendees-table a.deletelink {
 	display: inline-block;
 	width: 17px;
 	height: 17px;
 	padding: 0;
 	overflow: hidden;
 	text-indent: 1000px;
 }
 
 #eventedit .edit-attendees-table a.expandlink {
 	position: absolute;
 	top: 4px;
 	right: 6px;
 	width: 16px;
 	height: 16px;
 }
 
 #edit-attendees-form,
 #edit-resources-form {
 	position: relative;
 	margin-top: 15px;
 }
 
 #edit-attendees-form .attendees-invitebox {
 	text-align: right;
 	margin: 0;
 }
 
 #edit-attendees-form .attendees-invitebox label {
 	padding-right: 3px;
 }
 
 #edit-resources-form #edit-resource-find {
 	position: absolute;
 	top: 0;
 	right: 0;
 }
 
 #edit-attendees-form #edit-attendee-schedule {
 	position: absolute;
 	right: 0;
 	top: 0;
 }
 
 .edit-attendees-table select.edit-attendee-role {
 	border: 0;
 	padding: 2px;
 	background: white;
 	width: 100%;
 }
 
 .availability img.availabilityicon {
 	margin: 1px;
 	width: 14px;
 	height: 14px;
 	border-radius: 4px;
 	-moz-border-radius: 4px;
 }
 
 .availability img.availabilityicon.loading {
 	background: url(images/loading_blue.gif) center no-repeat;
 }
 
 #schedule-freebusy-times td.unknown,
 .availability img.availabilityicon.unknown {
 	background: #ddd;
 }
 
 #schedule-freebusy-times td.free,
 .availability img.availabilityicon.free {
 	background: #abd640;
 }
 
 #schedule-freebusy-times td.busy,
 .availability img.availabilityicon.busy {
 	background: #e26569;
 }
 
 #schedule-freebusy-times td.tentative,
 .availability img.availabilityicon.tentative {
 	background: #8383fc;
 }
 
 #schedule-freebusy-times td.out-of-office,
 .availability img.availabilityicon.out-of-office {
 	background: #fbaa68;
 }
 
 #schedule-freebusy-times td.all-busy,
 #schedule-freebusy-times td.all-tentative,
 #schedule-freebusy-times td.all-out-of-office {
 	background-image: url(images/freebusy-colors.png);
 	background-position: top right;
 	background-repeat: no-repeat;
 }
 
 #schedule-freebusy-times td.all-tentative {
 	background-position: right -40px;
 }
 
 #schedule-freebusy-times td.all-out-of-office {
 	background-position: right -80px;
 }
 
 #edit-attendees-legend {
 	margin-top: 3em;
 	margin-bottom: 0.5em;
 }
 
 #edit-attendees-legend .legend {
 	margin-right: 2em;
 	white-space: nowrap;
 }
 
 #edit-attendees-legend img.availabilityicon {
 	vertical-align: middle;
 }
 
 .edit-attendees-table tbody td.confirmstate {
 	overflow: hidden;
 	white-space: nowrap;
 	text-indent: -2000%;
 }
 
 .edit-attendees-table td.confirmstate span {
 	display: block;
 	width: 20px;
 	background: url(images/attendee-status.png) 5px 0 no-repeat;
 }
 
 .edit-attendees-table td.confirmstate span.needs-action {
 }
 
 .edit-attendees-table td.confirmstate span.accepted {
 	background-position: 5px -20px;
 }
 
 .edit-attendees-table td.confirmstate span.declined {
 	background-position: 5px -40px;
 }
 
 .edit-attendees-table td.confirmstate span.tentative {
 	background-position: 5px -60px;
 }
 
 .edit-attendees-table td.confirmstate span.delegated {
 	background-position: 5px -180px;
 }
 
 #attendees-freebusy-table {
 	width: 100%;
 	table-layout: fixed;
 	border: 1px solid #bbd3da;
 }
 
 #attendees-freebusy-table td.attendees {
 	width: 18em;
 	vertical-align: top;
 	overflow: hidden;
 }
 
 #attendees-freebusy-table td.times {
 	width: auto;
 	vertical-align: top;
 }
 
 #attendees-freebusy-table div.scroll {
 	position: relative;
 	overflow: auto;
 }
 
 #attendees-freebusy-table h3.boxtitle {
 	margin: 0;
 	border-color: #ccc;
 }
 
 .attendees-list .attendee {
 	padding: 4px 4px 4px 1px;
 	background: url(images/attendee-status.png) 2px -97px no-repeat;
 	white-space: nowrap;
 }
 
 .attendees-list a.attendee-role-toggle {
 	display: inline-block;
 	width: 16px;
 	margin-right: 3px;
 	cursor: pointer;
 }
 
 .attendees-list div.attendee {
 	border-top: 1px solid #ccc;
 }
 
 .attendees-list span.attendee {
 	padding-left: 20px;
 	margin-right: 2em;
 }
 
 .attendees-list .organizer {
 	background-position: 3px -77px;
 }
 
 .attendees-list .opt-participant {
 	background-position: 2px -117px;
 }
 
 .attendees-list .non-participant {
 	background-position: 2px -137px;
 }
 
 .attendees-list .chair {
 	background-position: 2px -157px;
 }
 
 .attendees-list .loading {
 	background: url(images/loading_blue.gif) 1px 50% no-repeat;
 }
 
 .attendees-list .total {
 	background: none;
 	padding-left: 4px;
 	font-weight: bold;
 }
 
 .attendees-list .spacer,
 #schedule-freebusy-times tr.spacer td {
 	background: 0;
 	font-size: 50%;
 }
 
 #schedule-freebusy-times {
 	border-collapse: collapse;
 	width: 100%;
 }
 
 #schedule-freebusy-times td {
 	padding: 4px;
 	border: 1px solid #ccc;
 }
 
 #attendees-freebusy-table div.timesheader,
 #schedule-freebusy-times tr.times td {
 	min-width: 30px;
 	font-size: 9px;
 	padding: 5px 2px 6px 2px;
 	text-align: center;
 	color: #004658;
 }
 
 #schedule-freebusy-times tr.times td.allday {
 	min-width: 60px;
 }
 
 #schedule-freebusy-times tr.times td {
 	cursor: pointer;
 }
 
 #schedule-event-time {
 	position: absolute;
 	border: 2px solid #333;
 	background: #777;
 	background: rgba(60, 60, 60, 0.6);
 	opacity: 0.5;
 	border-radius: 4px;
 	cursor: move;
 	filter: alpha(opacity=40); /* IE8 */
 }
 
 #eventfreebusy .schedule-options {
 	position: relative;
 	margin-bottom: 1.5em;
 }
 
 #eventfreebusy .schedule-buttons {
 	position: absolute;
 	top: 0.5em;
 	right: 0;
 	margin-right: 0;
 }
 
 #eventfreebusy .schedule-find-buttons {
 	padding-bottom:0.5em;
 }
 
 #eventfreebusy .schedule-find-buttons button {
 	min-width: 9em;
 	text-align: center;
 }
 
 #eventedit .attendees-commentbox label {
 	display: block;
 }
 
 #eventedit .ui-tabs-panel {
 	min-height: 24em;
 }
 
 #rcmKSearchpane ul li.resource i.icon,
 #rcmKSearchpane ul li.collection i.icon {
 	background-image: url(images/autocomplete.png);
 	background-position: -1px -2px;
 }
 
 #rcmKSearchpane ul li.collection i.icon {
 	background-position: -1px -26px;
 }
 
 a.dropdown-link {
 	font-size: 11px;
 	text-decoration: none;
 }
 
 a.dropdown-link:after {
 	content: ' ▼';
 	font-size: 10px;
 	color: #666;
 }
 
 .ui-dialog-buttonset a.dropdown-link {
 	position: relative;
 	top: 2px;
 	margin: 0 1em;
 	color: #333;
 }
 
 #calendarsidebar .ui-datepicker-calendar {
 	table-layout: fixed;
 }
 
 .ui-datepicker-calendar .ui-datepicker-week-col {
 	border: 0;
 	color: #999;
 	font-size: 90%;
 	text-align: right;
 	padding-right: 6px;
 	width: 20px;
 	overflow: hidden;
 }
 
 .ui-autocomplete {
 	max-height: 160px;
 	overflow-y: auto;
 	overflow-x: hidden;
 }
 
 .ui-autocomplete .ui-menu-item {
 	white-space: nowrap;
 }
 
 * html .ui-autocomplete {
 	height: 160px;
 }
 
 .calendarmain span.spacer {
 	padding-left: 3em;
 }
 
 #agendaoptions {
 	position: absolute;
 	bottom: 0;
 	left: 0;
 	right: 0;
 	height: auto;
 	z-index: 10;
 	padding: 4px 5px;
 	border: 1px solid #c3c3c3;
 	border-top-color: #ddd;
 	border-bottom-color: #bbb;
 	border-radius: 0 0 4px 4px;
 	background: #ebebeb;
 	background: -moz-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ebebeb), color-stop(100%,#c6c6c6));
 	background: -o-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
 	background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
 	background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
 }
 
 #agendaoptions label {
 	text-shadow: 1px 1px #fff;
 	padding-right: 0.5em;
 }
 
 #calendar-kolabform {
 	position: relative;
 	margin: 0 -8px;
 	min-width: 660px;
 	min-height: 400px;
 }
 
 #calendar-kolabform table td.title {
 	font-weight: bold;
 	white-space: nowrap;
 	color: #666;
 	padding-right: 10px;
 }
 
 #resource-selection {
 	position: absolute;
 	top: 0;
 	left: 8px;
 	right: 0;
 	bottom: 0;
 }
 
 #resource-selection .scroller {
 	top: 34px;
 }
 
 #resource-dialog-left {
 	position: absolute;
 	top: 10px;
 	left: 0;
 	width: 380px;
 	bottom: 10px;
 }
 
 #resource-dialog-right {
 	position: absolute;
 	top: 10px;
 	left: 392px;
 	right: 8px;
 	bottom: 10px;
 }
 
 #resource-info {
 	position: absolute;
 	top: 0;
 	left: 0;
 	right: 0;
 	height: 48%;
 }
 
 #resource-info table {
 	margin: 8px;
 	width: 97%;
 }
 
 #resource-info thead td {
 	background: none;
 	font-weight: bold;
 	font-size: 14px;
 }
 
 #resource-availability {
 	position: absolute;
 	bottom: 0;
 	left: 0;
 	right: 0;
 	height: 49%;
 }
 
 #resource-freebusy-calendar {
 	position: absolute;
 	top: 33px;
 	left: -1px;
 	right: -1px;
 	bottom: -1px;
 }
 
 #resource-freebusy-calendar .fc-content {
 	top: 0;
 }
 
 #resource-freebusy-calendar .fc-content .fc-event-bg {
 	background: 0;
 }
 
 #resource-freebusy-calendar .fc-event.status-busy,
 #resource-freebusy-calendar .status-busy .fc-event-skin {
 	border-color: #e26569;
 	background-color: #e26569;
 }
 
 #resource-freebusy-calendar .fc-event.status-tentative,
 #resource-freebusy-calendar .status-tentative .fc-event-skin {
 	border-color: #8383fc;
 	background: #8383fc;
 }
 
 #resource-freebusy-calendar .fc-event.status-outofoffice,
 #resource-freebusy-calendar .status-outofoffice .fc-event-skin {
 	border-color: #fbaa68;
 	background: #fbaa68;
 }
 
 #resourcequicksearch {
 	padding: 4px;
 	background: #c7e3ef;
 }
 
 #resourcesearchbox {
 	width: 100%;
 	height: 26px;
 	-moz-box-sizing: border-box;
 	     box-sizing: border-box;
 }
 
 #resourcequicksearch .iconbutton.searchoptions {
 	position: absolute;
 	top: 5px;
 	left: 6px;
 	width: 16px;
 }
 
 .searchbox .iconbutton.reset {
 	position: absolute;
 	top: 4px;
 	right: 1px;
 }
 
 
 
 /* fullcalendar style overrides */
 
 .rcube-fc-content {
 	overflow: hidden;
 	border: 0;
 	border-radius: 4px;
 	box-shadow: 0 0 2px #999;
 	-o-box-shadow: 0 0 2px #999;
 	-webkit-box-shadow: 0 0 2px #999;
 	-moz-box-shadow: 0 0 2px #999;
 }
 
 .calendarmain .fc-content {
 	position: absolute !important;
 	top: 40px;
 	left: 0;
 	right: 0;
 	bottom: 0;
 	background: #fff;
 }
 
 .calendarmain.quickview-active .fc-content {
 	background-image: url('images/focusview.png');
 	background-position: center;
 	background-repeat: no-repeat;
 }
 
 #fish-eye-view .fc-content {
 	top: 2px;
 	bottom: 2px;
 }
 
 #quickview-calendar {
 	padding: 8px;
 	overflow: hidden;
 }
 
 .calendarmain .fc-button,
 .calendarmain .fc-button.fc-state-default,
 .calendarmain .fc-button.fc-state-hover {
 	background-color: #f5f5f5;
 	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
 	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
 	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
 	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
 	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
 	background-position: 0 0;
 }
 
 .calendarmain #calendar .fc-button,
 .calendarmain #calendar .fc-button.fc-state-default,
 .calendarmain #calendar .fc-button.fc-state-hover {
 	margin: 0 0 0 0;
 	height: 20px;
 	line-height: 20px;
 	color: #505050;
 	text-shadow: 0px 1px 1px #fff;
 	border: 1px solid #e6e6e6;
 	background: #d8d8d8;
 	background: -moz-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d8d8d8), color-stop(100%,#bababa));
 	background: -o-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
 	background: -ms-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
 	background: linear-gradient(top, #d8d8d8 0%, #bababa 100%);
 	box-shadow: 0 1px 1px 0 #999;
 	-o-box-shadow: 0 1px 1px 0 #999;
 	-webkit-box-shadow: 0 1px 1px 0 #999;
 	-moz-box-shadow: 0 1px 1px 0 #999;
 	text-decoration: none;
 }
 
 .calendarmain #calendar .fc-button.fc-state-disabled {
 	color: #999;
 	background: #d8d8d8;
 }
 
 .calendarmain .fc-button.fc-state-active,
 .calendarmain .fc-button.fc-state-down,
 .calendarmain #calendar .fc-button.fc-state-active,
 .calendarmain #calendar .fc-button.fc-state-down {
 	color: #333;
 	background: #bababa;
 	background: -moz-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#bababa), color-stop(100%,#d8d8d8));
 	background: -o-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
 	background: -ms-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
 	background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
 }
 
 .calendarmain #calendar .fc-header .fc-button {
 	margin-left: -1px;
 	margin-right: 0;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button {
 	display: inline-block;
 	margin: 0;
 	text-align: center;
 	font-size: 10px;
 	color: #555;
 	min-width: 50px;
 	max-width: 75px;
 	height: 13px;
 	line-height: 1em;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	margin: -7px 0 0 0;
 	padding: 28px 2px 0 2px;
 	text-shadow: 0px 1px 1px #EEE;
 	border: 0;
 	background: url(images/toolbar.png) center 100px no-repeat;
 	box-shadow: none;
 	-o-box-shadow: none;
 	-webkit-box-shadow: none;
 	-moz-box-shadow: none;
 	outline: none;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button:focus {
 	color: #fff;
 	text-shadow: 0px 1px 1px #666;
 	background-color: rgba(30,150,192, 0.5);
 	border-radius: 3px;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button.fc-state-active {
 	font-weight: bold;
 	color: #222;
 	text-shadow: none;
 	background-color: transparent;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button-agendaDay {
 	background-position: center -120px;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button-agendaDay.fc-state-active {
 	background-position: center -160px;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button-agendaWeek {
 	background-position: center -200px;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button-agendaWeek.fc-state-active {
 	background-position: center -240px;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button-month {
 	background-position: center -280px;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button-month.fc-state-active {
 	background-position: center -320px;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button-table {
 	background-position: center -360px;
 }
 
 .calendarmain #calendar .fc-header-left .fc-button-table.fc-state-active {
 	background-position: center -400px;
 }
 
 .calendarmain #calendar .fc-header-right {
 	padding-right: 252px;
 	padding-top: 4px;
 }
 
 .calendarmain #calendar .fc-header-title {
 	padding-top: 5px;
 }
 
 .fc-event {
 	font-size: 1em !important;
 }
 
 .fc-event-hori.fc-type-freebusy,
 .fc-event-vert.fc-type-freebusy {
 	opacity: 0.60;
 /*
 	color: #fff !important;
 	background: rgba(80,80,80,0.85) !important;
 	background: -moz-linear-gradient(top, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.9) 100%) !important;
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(80,80,80,0.85)), color-stop(100%,rgba(48,48,48,0.9))) !important;
 	background: -webkit-linear-gradient(top, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.85) 100%) !important;
 	background: -o-linear-gradient(top, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.85) 100%) !important;
 	background: -ms-linear-gradient(top, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.85) 100%) !important;
 	background: linear-gradient(to bottom, rgba(80,80,80,0.85) 0%, rgba(48,48,48,0.85) 100%) !important;
 	border-color: #444 !important;
 	cursor: default !important;
 */
 	-moz-box-shadow: inset 0px 1px 0 0px #888;
 	-webkit-box-shadow: inset 0px 1px 0 0px #888;
 	-o-box-shadow: inset 0px 1px 0 0px #888;
 	box-shadow: inset 0px 1px 0 0px #888;
 }
 
 .fc-event-row.fc-type-freebusy td {
 	color: #999;
 }
 
 .fc-event-hori.fc-type-freebusy .fc-event-skin,
 .fc-event-hori.fc-type-freebusy .fc-event-inner,
 .fc-event-vert.fc-type-freebusy .fc-event-skin,
 .fc-event-vert.fc-type-freebusy .fc-event-inner {
 /*
 	background-color: transparent !important;
 	border-color: #444 !important;
 	color: #fff !important;
 	text-shadow: 0 1px 1px #000;
 */
 }
 
 .fc-event-hori.fc-type-freebusy .fc-event-title,
 .fc-event-vert.fc-type-freebusy .fc-event-title {
 	position: absolute;
 	top: -5000px;
 }
 
 .fc-event-vert.fc-invitation-needs-action,
 .fc-event-hori.fc-invitation-needs-action {
 	border: 1px dashed #5757c7 !important;
 }
 
 .fc-event-vert.fc-invitation-tentative,
 .fc-event-hori.fc-invitation-tentative {
 	border: 1px dashed #eb8900 !important;
 }
 
 .fc-event-vert.fc-invitation-declined,
 .fc-event-hori.fc-invitation-declined {
 	border: 1px dashed #c00 !important;
 }
 
 .fc-event-vert.fc-event-ns-other.fc-invitation-declined,
 .fc-event-hori.fc-event-ns-other.fc-invitation-declined {
 	opacity: 0.7;
 }
 
 .fc-event-ns-other.fc-invitation-declined .fc-event-title {
 	text-decoration: line-through;
 }
 
 .fc-event-vert.fc-invitation-tentative .fc-event-head,
 .fc-event-vert.fc-invitation-declined .fc-event-head,
 .fc-event-vert.fc-invitation-needs-action .fc-event-head {
 /*	background-color: transparent !important; */
 }
 
 .fc-event-vert.fc-invitation-tentative .fc-event-bg {
 	background: url(data:image/gif;base64,R0lGODlhCAAIAPABAOuJAP///yH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAQAsAAAAAAgACAAAAg4Egmipx+ZaDPCtVPFNBQA7) 0 0 repeat #fff;
 }
 
 .fc-event-vert.fc-invitation-needs-action .fc-event-bg {
 	background: url(data:image/gif;base64,R0lGODlhCAAIAPABAFdXx////yH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAQAsAAAAAAgACAAAAg4Egmipx+ZaDPCtVPFNBQA7) 0 0 repeat #fff;
 }
 
 .fc-event-vert.fc-invitation-declined .fc-event-bg {
 	background: url(data:image/gif;base64,R0lGODlhCAAIAPABAMwAAP///yH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAQAsAAAAAAgACAAAAg4Egmipx+ZaDPCtVPFNBQA7) 0 0 repeat #fff;
 }
 
 .fc-view-table tr.fc-invitation-tentative td,
 .fc-view-table tr.fc-invitation-declined td,
 .fc-view-table tr.fc-invitation-needs-action td {
 	color: #888;
 }
 
 .fc-view-table tr.fc-invitation-tentative td.fc-event-title,
 .fc-view-table tr.fc-invitation-declined td.fc-event-title,
 .fc-view-table tr.fc-invitation-needs-action td.fc-event-title {
 	font-weight: normal;
 }
 
 #quickview-calendar .fc-view-table tr.fc-invitation-tentative td,
 #quickview-calendar .fc-view-table tr.fc-invitation-declined td,
 #quickview-calendar .fc-view-table tr.fc-invitation-needs-action td {
 	color: #333;
 }
 
 .calendarmain .fc-event:focus {
 	outline: 1px solid rgba(71,135,177, 0.4);
 	-webkit-box-shadow: 0 0 2px 3px rgba(71,135,177, 0.6);
 	   -moz-box-shadow: 0 0 2px 3px rgba(71,135,177, 0.6);
 	     -o-box-shadow: 0 0 2px 3px rgba(71,135,177, 0.6);
 	        box-shadow: 0 0 2px 3px rgba(71,135,177, 0.6);
 }
 .fc-event-title {
 	font-weight: bold;
 }
 
 .cal-event-status-cancelled .fc-event-title {
 	text-decoration: line-through;
 }
 
 .fc-event-hori .fc-event-title {
 	font-weight: normal;
 	white-space: nowrap;
 }
 
 .fc-event-hori .fc-event-time {
 	white-space: nowrap;
 	font-weight: normal !important;
 	font-size: 10px;
 	padding-right: 0.6em;
 }
 
 .fc-grid .fc-event-time {
 	font-weight: normal !important;
 	padding-right: 0.3em;
 }
 
 .calendarmain .fc-event-vert .fc-event-inner {
 	z-index: 0;
 }
 
 .fc-event-cateories {
 	font-style:italic; 
 }
 
 div.fc-event-location {
 	font-size: 90%;
 }
 
 .fc-more-link {
 	color: #999;
 	padding-top: 1px;
 	cursor: pointer;
 }
 
 .fc-agenda-slots td div {
 	height: 22px;
 }
 
 .fc-sat, .fc-sun {
 	background-color: rgba(198,198,198, 0.08);
 }
 
 .calendarmain .fc-state-highlight {
 	background-color: rgba(233,198,14, 0.12);
 }
 
 .fc-widget-header {
 	background-color: #d6eaf3;
 	color: #004458;
 	text-shadow: 0px 1px 1px #fff;
 }
 
 .fc-view thead th.fc-widget-header {
 	padding: 8px 0;
 	color: #69939e;
 }
 
 .fc-day-number {
 	color: #578da5;
 }
 
 .fc-icon-alarms,
 .fc-icon-sensitive,
 .fc-icon-recurring {
 	display: inline-block;
 	width: 11px;
 	height: 11px;
 	background: url(images/eventicons.png) 0 0 no-repeat;
 	margin-left: 3px;
 	line-height: 10px;
 }
 
 .fc-icon-alarms {
 	background-position: 0 -13px;
 }
 
 .fc-icon-sensitive {
 	background-position: 0 -25px;
 }
 
 .fc-list-section .fc-event {
 	cursor: pointer;
 }
 
 .calendarmain .fc-view-table td.fc-list-header {
 	color: #004458;
 	font-size: 12px;
 }
 
 .calendarmain .fc-view-table tr.fc-event td {
 	border-color: #ddd;
 	padding: 4px 7px;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
 .calendarmain .fc-view-table tr.fc-event td.fc-event-handle {
 	padding: 5px 0 2px 7px;
 	width: 12px;
 }
 
 .calendarmain .fc-view-table .fc-event-handle .fc-event-skin {
 	margin: 0;
 	padding: 0;
 	display: inline-block;
 	width: 10px;
 	height: 10px;
 	font-size: 6px;
 	border-radius: 8px;
 }
 
 .calendarmain .fc-view-table .fc-event-handle .fc-event-inner {
 	display: inline-block;
 	width: 10px;
 	height: 10px;
 	padding: 0;
 	margin: -1px;
 	font-size: 10px;
 	border-radius: 8px;
 	border: 1px solid rgba(0, 0, 0, 0.4);
 	-webkit-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
 	-moz-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
 	box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
 }
 
 .calendarmain .fc-view-table col.fc-event-location {
 	width: 25%;
 }
 
 .fc-view-table table.fc-list-smart {
 /*	table-layout: auto; */
 }
 
 .fc-listappend {
 	text-align: center;
 	margin: 1em 0;
 }
 
 .fc-listappend .message {
 	padding: 0.5em;
 	margin-bottom: 0.5em;
 	font-size: 150%;
 	color: #999;
 }
 
 .fc-listappend .formlinks a {
 	font-size: 12px;
 	padding: 0 0.3em;
 }
 
 .fc-event-temp {
 	opacity: 0.4;
 	filter: alpha(opacity=40); /* IE8 */
 }
 
 /* Settings section */
 
 fieldset #calendarcategories div {
 	margin-bottom: 0.3em;
 }
 
 /* Invitation UI in mail */
 
 .messagelist tbody .attachment span.ical {
 	display: inline-block;
 	vertical-align: middle;
 	height: 18px;
 	width: 20px;
 	padding: 0;
 	background: url(images/ical-attachment.png) 2px 1px no-repeat;
 }
 
 ul.toolbarmenu li a.calendarlink span.calendar,
 #attachmentmenu li a.calendarlink span.calendar {
 	background-position: 0px -2197px;
 }
 
 div.calendar-invitebox {
 	min-height: 20px;
 	margin: 5px 8px;
 	padding: 3px 6px 6px 34px;
 	border: 1px solid #ffdf0e;
 	background: url(images/calendar.png) 6px 5px no-repeat #fef893;
 }
 
 div.calendar-invitebox td.ititle {
 	font-weight: bold;
 	padding-right: 0.5em;
 }
 
 div.calendar-invitebox td {
 	padding: 2px;
 }
 
 div.calendar-invitebox td.label {
 	color: #666;
 	padding-right: 1em;
 }
 
 div.calendar-invitebox td.sensitivity {
 	color: #d31400;
 	font-weight: bold;
 }
 
 div.calendar-invitebox td.recurrence-id {
 	text-transform: uppercase;
 	font-style: italic;
 }
 
 div.calendar-invitebox td em {
 	font-weight: bold;
 }
 
 #event-rsvp .rsvp-buttons,
 div.calendar-invitebox .itip-buttons div {
 	margin-top: 0.5em;
 }
 
 #event-rsvp input.button,
 div.calendar-invitebox input.button {
 	font-weight: bold;
 	margin-right: 0.5em;
 }
 
 div.calendar-invitebox input.button.preview {
 	margin-left: 1em;
 	margin-right: 0;
 }
 
 div.calendar-invitebox .folder-select {
 	font-weight: 10px;
 	margin-left: 1em;
 	white-space: nowrap;
 }
 
 div.calendar-invitebox .rsvp-status {
 	padding-left: 2px;
 }
 
 div.calendar-invitebox .rsvp-status.loading {
 	color: #666;
 	padding: 1px 0 2px 24px;
 	background: url(images/loading_blue.gif) top left no-repeat;
 }
 
 div.calendar-invitebox .rsvp-status.hint {
 	color: #666;
 	text-shadow: none;
 	font-style: italic;
 }
 
 #event-partstat .changersvp,
 div.calendar-invitebox .rsvp-status.declined,
 div.calendar-invitebox .rsvp-status.tentative,
 div.calendar-invitebox .rsvp-status.accepted,
 div.calendar-invitebox .rsvp-status.delegated,
 div.calendar-invitebox .rsvp-status.needs-action  {
 	padding: 0 0 1px 22px;
 	background: url(images/attendee-status.png) 2px -20px no-repeat;
 }
 
 #event-partstat .changersvp.declined,
 div.calendar-invitebox .rsvp-status.declined {
 	background-position: 2px -40px;
 }
 
 #event-partstat .changersvp.tentative,
 div.calendar-invitebox .rsvp-status.tentative {
 	background-position: 2px -60px;
 }
 
 #event-partstat .changersvp.delegated,
 div.calendar-invitebox .rsvp-status.delegated {
 	background-position: 2px -180px;
 }
 
 #event-partstat .changersvp.needs-action,
 div.calendar-invitebox .rsvp-status.needs-action {
 	background-position: 2px 0;
 }
 
 div.calendar-invitebox .calendar-agenda-preview {
 	display: none;
 	border-top: 1px solid #dfdfdf;
 	margin-top: 1em;
 	padding-top: 0.6em;
 }
 
 div.calendar-invitebox .calendar-agenda-preview h3.preview-title {
 	margin: 0 0 0.5em 0;
 	font-size: 12px;
 	color: #333;
 }
 
 div.calendar-invitebox .calendar-agenda-preview .event-row {
 	color: #777;
 	padding: 2px 0;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
 div.calendar-invitebox .calendar-agenda-preview .event-row.current {
 	color: #333;
 	font-weight: bold;
 }
 
 div.calendar-invitebox .calendar-agenda-preview .event-row.no-event {
 	font-style: italic;
 }
 
 div.calendar-invitebox .calendar-agenda-preview .event-date {
 	display: inline-block;
 	min-width: 8em;
 	margin-right: 1em;
 	white-space: nowrap;
 }
 
 
 /* iTIP attend reply page */
 
 .calendaritipattend .centerbox {
 	width: 40em;
 	min-height: 7em;
 	margin: 80px auto 0 auto;
 	padding: 10px 10px 10px 90px;
 	background: url(images/invitation.png) 10px 10px no-repeat #fff;
 }
 
 .calendaritipattend #message {
 	width: 46em;
 	margin: 0 auto;
 	padding: 10px;
 }
 
 .calendaritipattend .calendar-invitebox {
 	background: none;
 	padding-left: 0;
 	border: 0;
 	margin: 0 0 2em 0;
 }
 
 .calendaritipattend .calendar-invitebox .rsvp-status {
 	margin-top: 2.5em;
 	font-size: 110%;
 	font-weight: bold;
 }
 
 .calendaritipattend .calendar-invitebox td.title,
 .calendaritipattend .calendar-invitebox td.ititle {
 	font-size: 120%;
 }
 
 .calendaritipattend .itip-reply-controls .noreply-toggle,
 .calendaritipattend .itip-reply-controls #noreply-event-rsvp {
 	display: none;
 }
 
 .calendaritipattend .itip-reply-controls a.reply-comment-toggle {
 	margin-left: 2px;
 }
 
diff --git a/plugins/calendar/skins/larry/templates/eventedit.html b/plugins/calendar/skins/larry/templates/eventedit.html
index 4d0585bf..42c20080 100644
--- a/plugins/calendar/skins/larry/templates/eventedit.html
+++ b/plugins/calendar/skins/larry/templates/eventedit.html
@@ -1,133 +1,133 @@
 <div id="eventedit" class="uidialog uidialog-tabbed" aria-hidden="true">
 	<form id="eventtabs" action="#" method="post" enctype="multipart/form-data">
 		<ul>
 			<li><a href="#event-panel-summary"><roundcube:label name="calendar.tabsummary" /></a></li><li id="edit-tab-recurrence"><a href="#event-panel-recurrence"><roundcube:label name="calendar.tabrecurrence" /></a></li><li id="edit-tab-attendees"><a href="#event-panel-attendees"><roundcube:label name="calendar.tabattendees" /></a></li><li id="edit-tab-resources"><a href="#event-panel-resources"><roundcube:label name="calendar.tabresources" /></a></li><li id="edit-tab-attachments"><a href="#event-panel-attachments"><roundcube:label name="calendar.tabattachments" /></a></li>
 		</ul>
 		<!-- basic info -->
 		<div id="event-panel-summary">
 			<div class="event-section">
 				<label for="edit-title"><roundcube:label name="calendar.title" /></label>
 				<br />
 				<input type="text" class="text" name="title" id="edit-title" size="40" required="true" />
 			</div>
 			<div class="event-section">
 				<label for="edit-location"><roundcube:label name="calendar.location" /></label>
 				<br />
 				<input type="text" class="text" name="location" id="edit-location" size="40" />
 			</div>
 			<div class="event-section">
 				<label for="edit-description"><roundcube:label name="calendar.description" /></label>
 				<br />
 				<textarea name="description" id="edit-description" class="text" rows="5" cols="40"></textarea>
 			</div>
 			<div class="event-section">
 				<label for="edit-url"><roundcube:label name="calendar.url" /></label>
 				<br />
 				<input type="text" class="text" name="vurl" id="edit-url" size="40" />
 			</div>
 			<div class="event-section">
 				<label style="float:right;padding-right:0.5em"><input type="checkbox" name="allday" id="edit-allday" value="1" /><roundcube:label name="calendar.all-day" /></label>
 				<label for="edit-startdate"><roundcube:label name="calendar.start" /></label>
 				<input type="text" name="startdate" size="11" id="edit-startdate" required="true" /> &nbsp;
 				<input type="text" name="starttime" size="6" id="edit-starttime" aria-label="<roundcube:label name='calendar.starttime' />" />
 			</div>
 			<div class="event-section">
 				<label for="edit-enddate"><roundcube:label name="calendar.end" /></label>
 				<input type="text" name="enddate" size="11" id="edit-enddate" required="true" /> &nbsp;
 				<input type="text" name="endtime" size="6" id="edit-endtime" aria-label="<roundcube:label name='calendar.endtime' />" />
 			</div>
 			<div class="event-section" id="edit-alarms">
 				<div class="edit-alarm-item first">
 					<label for="edit-alarm-item"><roundcube:label name="calendar.alarms" /></label>
 					<roundcube:object name="plugin.alarm_select" id="edit-alarm-item" />
 					<span class="edit-alarm-buttons">
 						<a href="#add" class="iconbutton add add-alarm"><roundcube:label name="libcalendaring.addalarm" /></a>
 						<a href="#delete" class="iconbutton remove delete-alarm"><roundcube:label name="libcalendaring.removealarm" /></a>
 					</span>
 				</div>
 			</div>
 			<div class="event-section" id="calendar-select">
 				<label for="edit-calendar"><roundcube:label name="calendar.calendar" /></label>
 				<roundcube:object name="plugin.calendar_select" id="edit-calendar" />
 			</div>
 			<div class="event-section">
 				<label for="edit-categories"><roundcube:label name="calendar.category" /></label>
 				<roundcube:object name="plugin.category_select" id="edit-categories" />
 			</div>
 			<div class="event-section">
 				<label for="edit-event-status"><roundcube:label name="calendar.status" /></label>
 				<roundcube:object name="plugin.status_select" id="edit-event-status" />
 			</div>
 			<div class="event-section">
 				<label for="edit-free-busy"><roundcube:label name="calendar.freebusy" /></label>
 				<roundcube:object name="plugin.freebusy_select" id="edit-free-busy" />
 			</div>
 			<div class="event-section">
 				<label for="edit-priority"><roundcube:label name="calendar.priority" /></label>
 				<roundcube:object name="plugin.priority_select" id="edit-priority" />
 			</div>
 			<div class="event-section">
 				<label for="edit-sensitivity"><roundcube:label name="calendar.sensitivity" /></label>
 				<roundcube:object name="plugin.sensitivity_select" id="edit-sensitivity" />
 			</div>
 			<div class="event-section" id="edit-event-links">
 				<label><roundcube:label name="calendar.links" /></label>
 				<div class="event-text"></div>
 				<br style="clear:left">
 			</div>
 		</div>
 		<!-- recurrence settings -->
 		<div id="event-panel-recurrence">
 			<div class="event-section border-after">
 				<roundcube:object name="plugin.recurrence_form" part="frequency" />
 			</div>
 			<div class="recurrence-form border-after" id="recurrence-form-daily">
 				<roundcube:object name="plugin.recurrence_form" part="daily" class="event-section" />
 			</div>
 			<div class="recurrence-form border-after" id="recurrence-form-weekly">
 				<roundcube:object name="plugin.recurrence_form" part="weekly" class="event-section" />
 			</div>
 			<div class="recurrence-form border-after" id="recurrence-form-monthly">
 				<roundcube:object name="plugin.recurrence_form" part="monthly" class="event-section" />
 			</div>
 			<div class="recurrence-form border-after" id="recurrence-form-yearly">
 				<roundcube:object name="plugin.recurrence_form" part="yearly" class="event-section" />
 			</div>
 			<div class="recurrence-form" id="recurrence-form-until">
 				<roundcube:object name="plugin.recurrence_form" part="until" class="event-section" />
 			</div>
 			<div class="recurrence-form" id="recurrence-form-rdate">
 				<roundcube:object name="plugin.recurrence_form" part="rdate" class="event-section" />
 			</div>
 		</div>
 		<!-- attendees list -->
 		<div id="event-panel-attendees">
 			<h3 id="aria-label-attendeestable" class="voice"><roundcube:label name="calendar.arialabeleventattendees" /></h3>
 			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="records-table edit-attendees-table" coltitle="attendee" aria-labelledby="aria-label-attendeestable" />
 			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
 			<roundcube:include file="/templates/freebusylegend.html" />
 		</div>
 		<!-- resources list -->
 		<div id="event-panel-resources">
 			<h3 id="aria-label-resourcestable" class="voice"><roundcube:label name="calendar.arialabeleventresources" /></h3>
 			<roundcube:object name="plugin.attendees_list" id="edit-resources-table" class="records-table edit-attendees-table" coltitle="resource" aria-labelledby="aria-label-resourcestable" />
 			<roundcube:object name="plugin.resources_form" id="edit-resources-form" />
 			<roundcube:include file="/templates/freebusylegend.html" />
 		</div>
 		<!-- attachments list (with upload form) -->
 		<div id="event-panel-attachments">
 			<div id="edit-attachments">
-				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+				<roundcube:object name="plugin.attachments_list" id="attachmentlist" class="attachmentslist" />
 			</div>
 			<div id="edit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
-				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h2>
+				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
 				<roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" attachmentFieldSize="30" />
 			</div>
 			<roundcube:object name="plugin.filedroparea" id="event-panel-attachments" />
 		</div>
 	</form>
 
 	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="event-dialog-message" style="display:none" />
 	<roundcube:object name="plugin.edit_recurring_warning" class="event-dialog-message edit-recurring-warning" style="display:none" />
 	<div id="edit-localchanges-warning" class="event-dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
 </div>
\ No newline at end of file
diff --git a/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css b/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css
index 11ca84e4..a2e78856 100644
--- a/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css
+++ b/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css
@@ -1,250 +1,255 @@
 
 #directorylistbox .listsearchbox + .scroller {
 	top: 34px;
 }
 
 #directorylistbox .listsearchbox.expanded + .scroller {
 	top: 68px;
 }
 
 #directorylistbox .boxtitle a.iconbutton.search {
 	position: absolute;
 	top: 8px;
 	right: 8px;
 	width: 16px;
 	cursor: pointer;
 	background-position: -2px -317px;
 }
 
 #directorylist li.addressbook.selected > div a {
 	background-position: 6px -791px;
 }
 
 #directorylist ul li.addressbook.selected > div a {
 	background-position: 32px -791px;
 }
 
 #directorylist ul ul li.addressbook.selected > div a {
 	background-position: 58px -791px;
 }
 
 #directorylist ul ul ul li.addressbook.selected > div a {
 	background-position: 84px -791px;
 }
 
 #directorylistbox ul.treelist li.virtual {
 	background-image: none !important;
 }
 
 #directorylistbox ul.treelist li.virtual > div a {
 	color: #aaa;
 	background-image: none;
 	height: 16px;
 	padding-top: 3px;
 	padding-bottom: 3px;
 }
 
 #directorylistbox ul.treelist li.virtual > .treetoggle {
 	top: 6px !important;
 }
 
 #directorylistbox ul.treelist li input[type='checkbox'] {
 	position: absolute;
 	top: 4px;
 	left: 10px;
 }
 
 #directorylistbox ul.treelist ul li input[type='checkbox'] {
 	left: 36px;
 }
 
 #directorylist li input[type='checkbox'] {
 	display: none;
 }
 
 #directorylistbox ul.treelist div span.subscribed {
 	display: inline-block;
 	position: absolute;
 	top: 4px;
 	right: 5px;
 	height: 16px;
 	width: 16px;
 	padding: 0;
 	background: url(folder_icons.png) -100px 0 no-repeat;
 	overflow: hidden;
 	text-indent: -5000px;
 	cursor: pointer;
 }
 
 #directorylistbox ul.treelist div span.subscribed:focus,
 #directorylistbox ul.treelist div:hover span.subscribed {
 	background-position: 0px -160px;
 }
 
 #directorylistbox ul.treelist div.subscribed span.subscribed {
 	background-position: -16px -160px;
 }
 
 #directorylistbox ul.treelist div span.subscribed:focus {
 	border-radius: 3px;
 	outline: 2px solid rgba(30,150,192, 0.5);
 }
 
 #directorylistbox .searchresults .listing li {
 	background-color: #c7e3ef;
 }
 
+#directorylistbox .searchresults .boxtitle {
+	padding: 2px 8px;
+	border-radius: 0;
+}
+
 #directorylist li.addressbook.readonly,
 #directorylist li.addressbook.shared,
 #directorylist li.addressbook.other {
 	background-image: url(folder_icons.png);
 	background-position: right -1000px;
 	background-repeat: no-repeat;
 }
 
 #directorylist li.addressbook.readonly {
 	background-position: 98% -21px;
 }
 
 #directorylist li.addressbook.personal.readonly,
 #directorylist li.addressbook.other.readonly {
 	background-position: 98% -77px;
 }
 
 #directorylist li.addressbook.shared {
 	background-position: 98% -103px;
 }
 
 #directorylist li.addressbook.shared.readonly {
 	background-position: 98% -130px;
 }
 
 #directorylist li.addressbook.virtual.user {
 	background-image: url(folder_icons.png) !important;
 	background-position: 98% -52px;
 }
 
 #directorylist li.addressbook.readonly a,
 #directorylist li.addressbook.shared a,
 #directorylist li.addressbook.other a {
 	padding-right: 24px;
 }
 
 #directorylist li.addressbook.other.readonly a,
 #directorylist li.addressbook.shared.readonly a {
 	padding-right: 36px;
 }
 
 /* for contextmenu */
 #directorylist a.contextRow {
 	background-color: #C7E3EF;
 }
 
 #contactdiff,
 #contacthistory {
 	display: none;
 }
 
 .formbuttons .formbuttons-secondary-kolab {
 	display: block;
 	margin: 2px 2px 0 0;
 	text-align: center;
 }
 
 .formbuttons .btn-contact-history {
 	display: inline-block;
 	padding: 1px;
 	color: #333;
 	text-decoration: none;
 }
 
 .formbuttons .btn-contact-history:hover {
 	text-decoration: underline;
 }
 
 .formbuttons .btn-contact-history:before {
 	content: "";
 	display: inline-block;
 	position: relative;
 	top: 5px;
 	width: 16px;
 	height: 16px;
 	margin-right: 3px;
 	background: url('folder_icons.png') 0px -200px no-repeat;
 }
 
 #contactdiff .contact-names,
 #contactdiff .contact-names-new {
 	margin-top: 0;
 }
 
 #contactdiff .contact-names.diff-text-old {
 	margin-bottom: 0;
 }
 
 #contactdiff .diff-text-diff del,
 #contactdiff .diff-text-diff ins {
 	text-decoration: none;
 	color: inherit;
 }
 
 #contactdiff .diff-img-old,
 #contactdiff .diff-text-old,
 #contactdiff .diff-text-diff del {
 	background-color: #fdd;
 	text-decoration: line-through;
 }
 
 #contactdiff .diff-text-new,
 #contactdiff .diff-img-new,
 #contactdiff .diff-text-diff ins,
 #contactdiff .diff-text-diff .diffmod img {
 	background-color: #dfd;
 }
 
 #contactdiff .diff-img-old,
 #contactdiff .diff-img-new {
 	min-width: 48px;
 	max-width: 112px;
 }
 
 #contactdiff label {
 	color: #666;
 	font-weight: bold;
 }
 
 #contactdiff label span.index {
 	vertical-align: inherit;
 	margin-left: 0.6em;
 	font-weight: normal;
 }
 
 #contactdiff .contact-name {
 	font-size: 120%;
 	font-weight: bold;
 }
 
 #contactdiff .subtype {
 	color: #666;
 }
 
 #contactdiff span.subtype {
 	margin-left: 0.5em;
 }
 
 #contactdiff div.subtype {
 	margin-top: 0.2em;
 }
 
 #contactdiff .subtype:before {
 	content: "(";
 }
 
 #contactdiff .subtype:after {
 	content: ")";
 }
 
 div.contextmenu.rcmmainmenu ul.iconized li a.history > span.icon {
 	background: url(folder_icons.png) 1px -214px no-repeat;
 }
 
diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index cdd7b5a3..13bcca53 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -1,2751 +1,2818 @@
 /**
  * Kolab files plugin
  *
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
  * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @licend  The above is the entire license notice
  * for the JavaScript code in this file.
  */
 
 window.rcmail && window.files_api && rcmail.addEventListener('init', function() {
   if (rcmail.task == 'mail') {
     // mail compose
     if (rcmail.env.action == 'compose') {
-      var elem = $('#compose-attachments > div'),
-        input = $('<input class="button" type="button">')
-          .attr('tabindex', $('input', elem).attr('tabindex') || 0)
-          .val(rcmail.gettext('kolab_files.fromcloud'))
-          .click(function() { kolab_files_selector_dialog(); })
-          .appendTo(elem);
-
-      if (rcmail.gui_objects.filelist) {
-        rcmail.file_list = new rcube_list_widget(rcmail.gui_objects.filelist, {
-          multiselect: true,
-          keyboard: true,
-          column_movable: false,
-          dblclick_time: rcmail.dblclick_time
-        });
-        rcmail.file_list.addEventListener('select', function(o) { kolab_files_list_select(o); })
-          .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
-
-        rcmail.enable_command('files-sort', 'files-search', 'files-search-reset', true);
-
-        rcmail.file_list.init();
-        kolab_files_list_coltypes();
-      }
+      kolab_files_from_cloud_widget($('#compose-attachments > div'));
 
       // register some commands to skip warning message on compose page
       $.merge(rcmail.env.compose_commands, ['files-list', 'files-sort', 'files-search', 'files-search-reset']);
     }
     // mail preview
     else if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
       var attachment_list = $('#attachment-list');
 
       if ($('li', attachment_list).length) {
         var link = $('<a href="#" class="button filesaveall">')
           .text(rcmail.gettext('kolab_files.saveall'))
           .click(function() { kolab_directory_selector_dialog(); })
           .insertAfter(attachment_list);
       }
 
       rcmail.addEventListener('menu-open', kolab_files_attach_menu_open);
       rcmail.enable_command('folder-create', true);
     }
     // attachment preview
     else if (rcmail.env.action == 'get') {
       rcmail.enable_command('folder-create', true);
     }
 
+    if (!rcmail.env.action || rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
+      // add "attach from cloud" button for event/task dialog in mail
+      rcmail.addEventListener('plugin.mail2event_dialog', function() {
+        if (!$('#calendar-attachment-form input.fromcloud').length)
+          kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
+      });
+    }
+
+    kolab_files_init();
+  }
+  else if (rcmail.task == 'calendar') {
+    // add "attach from cloud" button for event dialog
+    if (!rcmail.env.action)
+      kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
+    kolab_files_init();
+  }
+  else if (rcmail.task == 'tasks') {
+    // add "attach from cloud" button for task dialog
+    if (!rcmail.env.action)
+      kolab_files_from_cloud_widget($('#taskedit-attachment-form > div.buttons'));
     kolab_files_init();
   }
   else if (rcmail.task == 'files') {
     if (rcmail.gui_objects.filelist) {
       rcmail.file_list = new rcube_list_widget(rcmail.gui_objects.filelist, {
         multiselect: true,
         draggable: true,
         keyboard: true,
         column_movable: rcmail.env.col_movable,
         dblclick_time: rcmail.dblclick_time
       });
 
       rcmail.file_list.addEventListener('dblclick', function(o) { kolab_files_list_dblclick(o); })
         .addEventListener('select', function(o) { kolab_files_list_select(o); })
         .addEventListener('keypress', function(o) { kolab_files_list_keypress(o); })
         .addEventListener('dragstart', function(e) { kolab_files_drag_start(e); })
         .addEventListener('dragmove', function(e) { kolab_files_drag_move(e); })
         .addEventListener('dragend', function(e) { kolab_files_drag_end(e); })
         .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e); })
         .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
 
       rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset', 'folder-create', true);
 
       rcmail.file_list.init();
       kolab_files_list_coltypes();
       kolab_files_drag_drop_init($(rcmail.gui_objects.filelist).parents('.droptarget'));
     }
 
     // "one file only" commands
     rcmail.env.file_commands = ['files-get'];
     // "one or more file" commands
     rcmail.env.file_commands_all = ['files-delete', 'files-move', 'files-copy'];
 
     kolab_files_init();
 
     if (rcmail.env.action == 'open') {
       rcmail.enable_command('files-get', 'files-delete', rcmail.env.file);
 
       if (rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore)
         manticore = new manticore_api({
           iframe: $('#fileframe').get(0),
           export_menu: rcmail.gui_objects.exportmenu ? $('ul', rcmail.gui_objects.exportmenu).get(0) : null,
           title_input: $('#document-title').get(0),
           ready: function(data) { manticore_init(); },
           set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
           hide_message: function(id) { return rcmail.hide_message(id); },
           display_message: function(label, type) { return rcmail.display_message('kolab_files.' + label, type); },
           gettext: function(label) { return rcmail.get_label('kolab_files.' + label); }
         });
     }
     else {
       file_api.folder_list();
       file_api.browser_capabilities_check();
       rcmail.enable_command('folder-mount', rcmail.env.external_sources);
     }
   }
 });
 
 
 /**********************************************************/
 /*********          Shared functionality         **********/
 /**********************************************************/
 
 // Initializes API object
 function kolab_files_init()
 {
   if (window.file_api)
     return;
 
   // Initialize application object (don't change var name!)
   file_api = $.extend(new files_api(), new kolab_files_ui());
 
   file_api.set_env({
     token: kolab_files_token(),
     url: rcmail.env.files_url,
     sort_col: 'name',
     sort_reverse: false,
     search_threads: rcmail.env.search_threads,
     resources_dir: rcmail.assets_path('program/resources'),
     caps: rcmail.env.files_caps,
     supported_mimetypes: rcmail.env.file_mimetypes
   });
 
   file_api.translations = rcmail.labels;
 };
 
 // returns API authorization token
 function kolab_files_token()
 {
   // consider the token from parent window more reliable (fresher) than in framed window
   // it's because keep-alive is not requested in frames
   return window.parent && parent.rcmail && parent.rcmail.env.files_token ? parent.rcmail.env.files_token : rcmail.env.files_token;
 };
 
+function kolab_files_from_cloud_widget(elem)
+{
+  var input = $('<input class="button fromcloud" type="button">')
+      .attr('tabindex', $('input', elem).attr('tabindex') || 0)
+      .val(rcmail.gettext('kolab_files.fromcloud'))
+      .click(function() { kolab_files_selector_dialog(); })
+      .appendTo(elem);
+
+  if (rcmail.gui_objects.filelist) {
+    rcmail.file_list = new rcube_list_widget(rcmail.gui_objects.filelist, {
+      multiselect: true,
+      keyboard: true,
+      column_movable: false,
+      dblclick_time: rcmail.dblclick_time
+    });
+    rcmail.file_list.addEventListener('select', function(o) { kolab_files_list_select(o); })
+      .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
+
+    rcmail.enable_command('files-sort', 'files-search', 'files-search-reset', true);
+
+    rcmail.file_list.init();
+    kolab_files_list_coltypes();
+  }
+}
+
 // folder selection dialog
 function kolab_directory_selector_dialog(id)
 {
   var dialog = $('#files-dialog'),
     input = $('#file-save-as-input'),
     form = $('#file-save-as'),
     list = $('#folderlistbox'),
     buttons = {}, label = 'saveto',
     win = window, fn;
 
   // attachment is specified
   if (id) {
     var attach = $('#attach' + id + '> a').first(),
       filename = attach.attr('title');
 
     if (!filename) {
       attach = attach.clone();
       $('.attachment-size', attach).remove();
       filename = $.trim(attach.text());
     }
 
     form.show();
     dialog.addClass('saveas');
     input.val(filename);
   }
   // attachment preview page
   else if (rcmail.env.action == 'get') {
     id = rcmail.env.part;
     form.show();
     dialog.addClass('saveas');
     input.val(rcmail.env.filename);
   }
   else {
     form.hide();
     dialog.removeClass('saveas');
     label = 'saveall';
   }
 
   $('#foldercreatelink').attr('tabindex', 0);
 
   buttons[rcmail.gettext('kolab_files.save')] = function () {
     if (!file_api.env.folder)
       return;
 
     var lock = rcmail.set_busy(true, 'saving'),
       request = {
         act: 'save-file',
         source: rcmail.env.mailbox,
         uid: rcmail.env.uid,
         dest: file_api.env.folder
       };
 
     if (id) {
       request.id = id;
       request.name = input.val();
     }
 
     rcmail.http_post('plugin.kolab_files', request, lock);
     kolab_dialog_close(this);
   };
 
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
     kolab_dialog_close(this);
   };
 
   if (!rcmail.env.folders_loaded) {
     fn = function() {
-      file_api.folder_list();
+      rcmail.env.folder_list_selector = '#files-dialog #files-folder-list';
+      rcmail.env.folder_search_selector = '#files-dialog #foldersearch';
+      file_api.folder_list({writable: 1});
       rcmail.env.folders_loaded = true;
     };
   }
 
   // show dialog window
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.' + label),
     buttons: buttons,
     button_classes: ['mainaction'],
     minWidth: 250,
     minHeight: 300,
     height: 400,
     width: 300
   }, fn);
 
   // "enable" folder creation when dialog is displayed in parent window
-  if (rcmail.is_framed() && !parent.rcmail.folder_create) {
+  if (rcmail.is_framed()) {
     parent.rcmail.enable_command('folder-create', true);
     parent.rcmail.folder_create = function() {
       win.kolab_files_folder_create_dialog();
     };
   }
 };
 
 // file selection dialog
 function kolab_files_selector_dialog()
 {
   var dialog = $('#files-compose-dialog'), buttons = {};
 
   buttons[rcmail.gettext('kolab_files.attachsel')] = function () {
     var list = [];
     $('#filelist tr.selected').each(function() {
       list.push($(this).data('file'));
     });
 
     kolab_dialog_close(this);
 
     if (list.length) {
       // display upload indicator and cancel button
       var content = '<span>' + rcmail.get_label('kolab_files.attaching') + '</span>',
         id = new Date().getTime();
 
       rcmail.add2attachment_list(id, {name:'', html:content, classname:'uploading', complete:false});
 
       // send request
       rcmail.http_post('plugin.kolab_files', {
         act: 'attach-file',
         files: list,
         id: rcmail.env.compose_id,
         uploadid: id
       });
     }
   };
 
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
     kolab_dialog_close(this);
   };
 
   // show dialog window
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.selectfiles'),
     buttons: buttons,
     button_classes: ['mainaction'],
     minWidth: 500,
     minHeight: 300,
     width: 700,
     height: 500
   }, function() { rcmail.file_list.resize(); });
 
   if (!rcmail.env.files_loaded) {
+    rcmail.env.folder_list_selector = '#files-compose-dialog #files-folder-list';
+    rcmail.env.folder_search_selector = '#files-compose-dialog #foldersearch';
     file_api.folder_list();
     rcmail.env.files_loaded = true;
   }
   else {
     rcmail.file_list.clear_selection();
   }
 };
 
 function kolab_files_attach_menu_open(p)
 {
   if (!p || !p.props || p.props.menu != 'attachmentmenu')
     return;
 
   var id = p.props.id;
 
   $('#attachmenusaveas').unbind('click').attr('onclick', '').click(function(e) {
     return kolab_directory_selector_dialog(id);
   });
 };
 
 // folder creation dialog
 function kolab_files_folder_create_dialog()
 {
   var dialog = $('#files-folder-create-dialog'),
     buttons = {},
     select = $('select[name="parent"]', dialog).html(''),
     input = $('input[name="name"]', dialog).val('');
 
   buttons[rcmail.gettext('kolab_files.create')] = function () {
     var folder = '', name = input.val(), parent = select.val();
 
     if (!name)
       return;
 
     if (parent)
       folder = parent + file_api.env.directory_separator;
 
     folder += name;
 
     file_api.folder_create(folder);
     kolab_dialog_close(this);
   };
 
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
     kolab_dialog_close(this);
   };
 
   // show dialog window
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.foldercreate'),
     buttons: buttons,
     button_classes: ['mainaction']
   });
 
   // Fix submitting form with Enter
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // build parent selector
   kolab_files_folder_select_element(select, {empty: true});
 };
 
 // folder edit dialog
 function kolab_files_folder_edit_dialog()
 {
   var dialog = $('#files-folder-edit-dialog'),
     buttons = {},
     separator = file_api.env.directory_separator,
     arr = file_api.env.folder.split(separator),
     folder = arr.pop(),
     path = arr.join(separator),
     select = $('select[name="parent"]', dialog).html(''),
     input = $('input[name="name"]', dialog).val(folder);
 
   buttons[rcmail.gettext('kolab_files.save')] = function () {
     var folder = '', name = input.val(), parent = select.val();
 
     if (!name)
       return;
 
     if (parent)
       folder = parent + separator;
 
     folder += name;
 
     file_api.folder_rename(file_api.env.folder, folder);
     kolab_dialog_close(this);
   };
 
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
     kolab_dialog_close(this);
   };
 
   // show dialog window
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.folderedit'),
     buttons: buttons,
     button_classes: ['mainaction']
   });
 
   // Fix submitting form with Enter
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // build parent selector
   kolab_files_folder_select_element(select, {selected: path, empty: true});
 };
 
 // folder mounting dialog
 function kolab_files_folder_mount_dialog()
 {
   var args = {buttons: {}, title: rcmail.gettext('kolab_files.foldermount')},
     dialog = $('#files-folder-mount-dialog'),
     input = $('#folder-mount-name').val('');
 
   args.buttons[rcmail.gettext('kolab_files.save')] = function () {
     var args = {}, folder = input.val(),
       driver = $('input[name="driver"]:checked', dialog).val();
 
     if (!folder || !driver)
       return;
 
     args.folder = folder;
     args.driver = driver;
 
     $('#source-' + driver + ' input').each(function() {
       if (this.name.startsWith(driver + '[')) {
         args[this.name.substring(driver.length + 1, this.name.length - 1)] = this.value;
       }
     });
 
     $('.auth-options input', dialog).each(function() {
       args[this.name] = this.type == 'checkbox' && !this.checked ? '' : this.value;
     });
 
     file_api.folder_mount(args);
     kolab_dialog_close(this);
   };
 
   args.buttons[rcmail.gettext('kolab_files.cancel')] = function () {
     kolab_dialog_close(this);
   };
 
   // close folderoption menu
   rcmail.hide_menu('folderoptions');
 
   // initialize drivers list
   if (!rcmail.drivers_list_initialized) {
     rcmail.drivers_list_initialized = true;
 
     $('td.source', dialog).each(function() {
       $(this).click(function() {
         $('td.selected', dialog).removeClass('selected');
         dialog.find('.driverform').hide();
         $(this).addClass('selected').find('.driverform').show();
         $('input[type="radio"]', this).prop('checked', true);
      });
    });
   }
 
   args.button_classes = ['mainaction'];
 
   // show dialog window
   kolab_dialog_show(dialog, args, function() {
     $('td.source:first', dialog).click();
     input.focus();
   });
 };
 
 // file edition dialog
 function kolab_files_file_edit_dialog(file)
 {
   var dialog = $('#files-file-edit-dialog'),
     buttons = {}, name = file_api.file_name(file)
     input = $('input[name="name"]', dialog).val(name);
 
   buttons[rcmail.gettext('kolab_files.save')] = function () {
     var folder = file_api.file_path(file), name = input.val();
 
     if (!name)
       return;
 
     name = folder + file_api.env.directory_separator + name;
 
     // @TODO: now we only update filename
     if (name != file)
       file_api.file_rename(file, name);
     kolab_dialog_close(this);
   };
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
     kolab_dialog_close(this);
   };
 
   // Fix submitting form with Enter
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // show dialog window
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.fileedit'),
     buttons: buttons,
     button_classes: ['mainaction']
   });
 };
 
 // file creation dialog
 function kolab_files_file_create_dialog()
 {
   var dialog = $('#files-file-create-dialog'),
     buttons = {},
     type_select = $('select[name="type"]', dialog),
     select = $('select[name="parent"]', dialog).html(''),
     input = $('input[name="name"]', dialog).val('');
 
   buttons[rcmail.gettext('kolab_files.create')] = function () {
     var folder = select.val(), type = type_select.val(), name = input.val();
 
     if (!name || !folder)
       return;
 
     if (!/\.[a-z0-9]{1,5}$/.test(name)) {
       name += '.' + rcmail.env.file_extensions[type];
     }
 
     name = folder + file_api.env.directory_separator + name;
 
     file_api.file_create(name, type);
     kolab_dialog_close(this);
   };
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
     kolab_dialog_close(this);
   };
 
   // Fix submitting form with Enter
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // show dialog window
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.createfile'),
     buttons: buttons,
     button_classes: ['mainaction']
   });
 
   // build folder selector
   kolab_files_folder_select_element(select);
 };
 
 // builds folder selector options
 function kolab_files_folder_select_element(select, params)
 {
   var options = [],
     selected = params && params.selected ? params.selected : file_api.env.folder;
 
   if (params && params.empty)
     options.push($('<option>').val('').text('---'));
 
   $.each(file_api.env.folders, function(i, f) {
     var n, name = escapeHTML(f.name);
 
     for (n=0; n<f.depth; n++)
       name = '&nbsp;&nbsp;&nbsp;' + name;
 
     options.push($('<option>').val(i).html(name));
   });
 
   select.empty().append(options);
 
   if (selected)
     select.val(selected);
 };
 
 function kolab_dialog_show(content, params, onopen)
 {
   params = $.extend({
     modal: true,
     resizable: true,
     closeOnEscape: (!bw.ie6 && !bw.ie7),  // disabled for performance reasons
     minWidth: 400,
     minHeight: 300,
     width: 500,
     height: 400
   }, params || {});
 
   // dialog close handler
   params.close = function(e, ui) {
     var elem, stack = rcmail.dialog_stack;
 
     content.appendTo(document.body).hide();
     $(this).parent().remove(); // remove dialog
 
     // focus previously focused element (guessed)
     stack.pop();
     if (stack.length) {
       elem = stack[stack.length-1].find('input[type!="hidden"]:not(:hidden):first');
       if (!elem.length)
         elem = stack[stack.length-1].parent().find('a[role="button"], .ui-dialog-buttonpane button').first();
     }
 
     (elem && elem.length ? elem : window).focus();
   };
 
   // display it as popup
   var dialog = rcmail.show_popup_dialog('', params.title, params.buttons, params);
 
   content.appendTo(dialog).show().find('input[type!="hidden"]:not(:hidden):first').focus();
 
   if (onopen) onopen(content);
 
   // save dialog reference, to handle focus when closing one of opened dialogs
   if (!rcmail.dialog_stack)
     rcmail.dialog_stack = [];
 
   rcmail.dialog_stack.push(dialog);
 };
 
 // Handle form submit with Enter key, click first dialog button instead
 function kolab_dialog_submit_handler()
 {
   $(this).parents('.ui-dialog').find('.ui-button').first().click();
   return false;
 };
 
 // Hides dialog
 function kolab_dialog_close(dialog)
 {
   (rcmail.is_framed() ? window.parent : window).$(dialog).dialog('close');
 };
 
 // smart upload button
 function kolab_files_upload_input(button)
 {
   var link = $(button),
     file = $('<input>'),
     offset = link.offset();
 
   function move_file_input(e) {
     file.css({top: (e.pageY - offset.top - 10) + 'px', left: (e.pageX - offset.left - 10) + 'px'});
   }
 
   file.attr({name: 'file[]', type: 'file', multiple: 'multiple', size: 5, title: link.attr('title'), tabindex: "-1"})
     .change(function() { rcmail.files_upload('#filesuploadform'); })
     .click(function() { setTimeout(function() { link.mouseleave(); }, 20); })
     // opacity:0 does the trick, display/visibility doesn't work
     .css({opacity: 0, cursor: 'pointer', outline: 'none', position: 'absolute'});
 
   // In FF and IE we need to move the browser file-input's button under the cursor
   // Thanks to the size attribute above we know the length of the input field
   if (bw.mz || bw.ie)
     file.css({marginLeft: '-80px'});
 
   // Note: now, I observe problem with cursor style on FF < 4 only
   // Need position: relative (Bug #2615)
   link.css({overflow: 'hidden', cursor: 'pointer', position: 'relative'})
     .mouseenter(function() { this.__active = true; })
     // place button under the cursor
     .mousemove(function(e) {
       if (rcmail.commands['files-upload'] && this.__active)
         move_file_input(e);
       // move the input away if button is disabled
       else
         $(this).mouseleave();
     })
     .mouseleave(function() {
       file.css({top: '-10000px', left: '-10000px'});
       this.__active = false;
     })
     .attr('onclick', '') // remove default button action
     .click(function(e) {
       // forward click if mouse-enter event was missed
       if (rcmail.commands['files-upload'] && !this.__active) {
         this.__active = true;
         move_file_input(e);
         file.trigger(e);
       }
     })
     .mouseleave() // initially disable/hide input
     .append(file);
 };
 
 
 /***********************************************************/
 /**********          Main functionality           **********/
 /***********************************************************/
 
 // for reordering column array (Konqueror workaround)
 // and for setting some message list global variables
 function kolab_files_list_coltypes()
 {
   var n, list = rcmail.file_list;
 
   rcmail.env.subject_col = null;
 
-  if ((n = $.inArray('name', rcmail.env.coltypes)) >= 0) {
+  if ((n = $.inArray('name', rcmail.env.file_coltypes)) >= 0) {
     rcmail.env.subject_col = n;
     list.subject_col = n;
   }
 
   list.init_header();
 };
 
 function kolab_files_set_list_options(cols, sort_col, sort_order)
 {
-  var update = 0, i, idx, name, newcols = [], oldcols = rcmail.env.coltypes;
+  var update = 0, i, idx, name, newcols = [], oldcols = rcmail.env.file_coltypes;
 
   if (sort_col === undefined)
     sort_col = rcmail.env.sort_col;
   if (!sort_order)
     sort_order = rcmail.env.sort_order;
 
   if (rcmail.env.sort_col != sort_col || rcmail.env.sort_order != sort_order) {
     update = 1;
     rcmail.set_list_sorting(sort_col, sort_order);
   }
 
   if (cols && cols.length) {
     // make sure new columns are added at the end of the list
     for (i=0; i<oldcols.length; i++) {
       name = oldcols[i];
       idx = $.inArray(name, cols);
       if (idx != -1) {
         newcols.push(name);
         delete cols[idx];
       }
     }
     for (i=0; i<cols.length; i++)
       if (cols[i])
         newcols.push(cols[i]);
 
     if (newcols.join() != oldcols.join()) {
       update += 2;
       oldcols = newcols;
     }
   }
 
   if (update == 1)
     rcmail.command('files-list', {sort: sort_col, reverse: sort_order == 'DESC'});
   else if (update) {
     rcmail.http_post('files/prefs', {
       kolab_files_list_cols: oldcols,
       kolab_files_sort_col: sort_col,
       kolab_files_sort_order: sort_order
       }, rcmail.set_busy(true, 'loading'));
   }
 };
 
 function kolab_files_set_coltypes(list)
 {
   var i, found, name, cols = list.list.tHead.rows[0].cells;
 
-  rcmail.env.coltypes = [];
+  rcmail.env.file_coltypes = [];
 
   for (i=0; i<cols.length; i++)
     if (cols[i].id && cols[i].id.match(/^rcm/)) {
       name = cols[i].id.replace(/^rcm/, '');
-      rcmail.env.coltypes.push(name);
+      rcmail.env.file_coltypes.push(name);
     }
 
-//  if ((found = $.inArray('name', rcmail.env.coltypes)) >= 0)
+//  if ((found = $.inArray('name', rcmail.env.file_coltypes)) >= 0)
 //    rcmail.env.subject_col = found;
   rcmail.env.subject_col = list.subject_col;
 
-  rcmail.http_post('files/prefs', {kolab_files_list_cols: rcmail.env.coltypes});
+  rcmail.http_post('files/prefs', {kolab_files_list_cols: rcmail.env.file_coltypes});
 };
 
 function kolab_files_list_dblclick(list)
 {
   rcmail.command('files-open');
 };
 
 function kolab_files_list_select(list)
 {
   var selected = list.selection.length;
 
   rcmail.enable_command(rcmail.env.file_commands_all, selected);
   rcmail.enable_command(rcmail.env.file_commands, selected == 1);
 
     // reset all-pages-selection
 //  if (list.selection.length && list.selection.length != list.rowcount)
 //    rcmail.select_all_mode = false;
 
-  // enable files-
   if (selected == 1) {
     // get file mimetype
-    var type = $('tr.selected', list.list).data('type');
+    var elem = $('tr.selected', list.list),
+      type = elem.data('type'),
+      file = elem.data('file');
+
     rcmail.env.viewer = file_api.file_type_supported(type, rcmail.env.files_caps);
+
+    if (!file_api.is_writable(file.replace(/\/[^/]+$/, '')))
+      rcmail.enable_command('files-delete', false);
   }
   else
     rcmail.env.viewer = 0;
-/*
-    ) {
-//      caps = this.browser_capabilities().join();
-      href = '?' + $.param({_task: 'files', _action: 'open', file: file, viewer: viewer == 2 ? 1 : 0});
-      var win = window.open(href, rcmail.html_identifier('rcubefile'+file));
-      if (win)
-        setTimeout(function() { win.focus(); }, 10);
-    }
-*/
+
   rcmail.enable_command('files-open', rcmail.env.viewer);
 };
 
 function kolab_files_list_keypress(list)
 {
   if (list.modkey == CONTROL_KEY)
     return;
 
   if (list.key_pressed == list.ENTER_KEY)
     rcmail.command('files-open');
   else if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
     rcmail.command('files-delete');
 };
 
 function kolab_files_drag_start(e)
 {
   rcmail.env.drag_target = null;
 
   if (rcmail.folder_list)
     rcmail.folder_list.drag_start();
 };
 
 function kolab_files_drag_end(e)
 {
   if (rcmail.folder_list) {
     rcmail.folder_list.drag_end();
 
     if (rcmail.env.drag_target) {
       var modkey = rcube_event.get_modifier(e),
         menu = rcmail.gui_objects.file_dragmenu;
 
       rcmail.file_list.draglayer.hide();
 
       if (menu && modkey == SHIFT_KEY && rcmail.commands['files-copy']) {
         var pos = rcube_event.get_mouse_pos(e);
         $(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'}).show();
         return;
       }
 
       rcmail.command('files-move', rcmail.env.drag_target);
     }
   }
 };
 
 function kolab_files_drag_move(e)
 {
   if (rcmail.folder_list) {
     var mouse = rcube_event.get_mouse_pos(e);
 
     rcmail.env.drag_target = rcmail.folder_list.intersects(mouse, true);
   }
 };
 
 function kolab_files_drag_menu_action(command)
 {
   var menu = rcmail.gui_objects.file_dragmenu;
 
   if (menu)
     $(menu).hide();
 
   rcmail.command(command, rcmail.env.drag_target);
 };
 
 function kolab_files_selected()
 {
   var files = [];
   $.each(rcmail.file_list.get_selection(), function(i, v) {
     var name, row = $('#rcmrow'+v);
 
     if (row.length == 1 && (name = row.data('file')))
       files.push(name);
   });
 
   return files;
 };
 
 function kolab_files_frame_load(frame)
 {
   var win = frame.contentWindow;
 
   try {
     rcmail.file_editor = win.file_editor && win.file_editor.editable ? win.file_editor : null;
   }
   catch (e) {};
 
   if (rcmail.file_editor)
     rcmail.enable_command('files-edit', true);
 
   rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable) ||
     (rcmail.env.file_data && /^image\//i.test(rcmail.env.file_data.type)));
 
   // detect Print button and check if it can be accessed
   try {
     if ($('#fileframe').contents().find('#print').length)
       rcmail.enable_command('files-print', true);
   }
   catch(e) {};
 };
 
 // activate html5 file drop feature (if browser supports it)
 function kolab_files_drag_drop_init(container)
 {
   if (!window.FormData && !(window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary)) {
     return;
   }
 
   if (!container.length)
     return;
 
   $(document.body).bind('dragover dragleave drop', function(e) {
-    if (!file_api.env.folder)
+    if (!file_api.is_writable())
       return;
 
     e.preventDefault();
     container[e.type == 'dragover' ? 'addClass' : 'removeClass']('active');
   });
 
   container.bind('dragover dragleave', function(e) {
     return kolab_files_drag_hover(e);
   })
   container.children('div').bind('dragover dragleave', function(e) {
     return kolab_files_drag_hover(e);
   })
   container.get(0).addEventListener('drop', function(e) {
       // abort event and reset UI
       kolab_files_drag_hover(e);
       return file_api.file_drop(e);
     }, false);
 };
 
+
 // handler for drag/drop on element
 function kolab_files_drag_hover(e)
 {
-  if (!file_api.env.folder)
+  if (!file_api.is_writable())
     return;
 
   e.preventDefault();
   e.stopPropagation();
 
   var elem = $(e.target);
 
   if (!elem.hasClass('droptarget'))
     elem = elem.parents('.droptarget');
 
   elem[e.type == 'dragover' ? 'addClass' : 'removeClass']('hover');
 };
 
 // returns localized file size
 function kolab_files_file_size(size)
 {
   var i, units = ['GB', 'MB', 'KB', 'B'];
 
   size = file_api.file_size(size);
 
   for (i = 0; i < units.length; i++)
     if (size.toUpperCase().indexOf(units[i]) > 0)
       return size.replace(units[i], rcmail.gettext(units[i]));
 
   return size;
 };
 
 function kolab_files_progress_str(param)
 {
   var current, total = file_api.file_size(param.total).toUpperCase();
 
   if (total.indexOf('GB') > 0)
     current = parseFloat(param.current/1073741824).toFixed(1);
   else if (total.indexOf('MB') > 0)
     current = parseFloat(param.current/1048576).toFixed(1);
   else if (total.indexOf('KB') > 0)
     current = parseInt(param.current/1024);
   else
     current = param.current;
 
   total = kolab_files_file_size(param.total);
 
   return rcmail.gettext('uploadprogress')
     .replace(/\$percent/, param.percent + '%')
     .replace(/\$current/, current)
     .replace(/\$total/, total);
 };
 
 
 /**********************************************************/
 /*********    Manticore editor functionality     **********/
 /**********************************************************/
 
 // Initialize document toolbar functionality
 function manticore_init()
 {
   rcmail.enable_command('document-save', 'document-export', true);
 };
 
 rcube_webmail.prototype.document_save = function()
 {
   manticore.save();
 };
 
 rcube_webmail.prototype.document_export = function(type)
 {
   manticore.export(type || 'odt');
 };
 
 
 /***********************************************************/
 /**********              Commands                 **********/
 /***********************************************************/
 
 rcube_webmail.prototype.files_sort = function(props)
 {
   var params = {},
     sort_order = this.env.sort_order,
     sort_col = !this.env.disabled_sort_col ? props : this.env.sort_col;
 
   if (!this.env.disabled_sort_order)
     sort_order = this.env.sort_col == sort_col && sort_order == 'ASC' ? 'DESC' : 'ASC';
 
   // set table header and update env
   this.set_list_sorting(sort_col, sort_order);
 
   this.http_post('files/prefs', {kolab_files_sort_col: sort_col, kolab_files_sort_order: sort_order});
 
   params.sort = sort_col;
   params.reverse = sort_order == 'DESC';
 
   this.command('files-list', params);
 };
 
 rcube_webmail.prototype.files_search = function()
 {
   var value = $(this.gui_objects.filesearchbox).val();
 
   if (value)
     file_api.file_search(value, $('#search_all_folders').is(':checked'));
   else
     file_api.file_search_reset();
 };
 
 rcube_webmail.prototype.files_search_reset = function()
 {
   $(this.gui_objects.filesearchbox).val('');
 
   file_api.file_search_reset();
 };
 
 rcube_webmail.prototype.files_folder_delete = function()
 {
   if (confirm(this.get_label('kolab_files.folderdeleteconfirm')))
     file_api.folder_delete(file_api.env.folder);
 };
 
 rcube_webmail.prototype.files_delete = function()
 {
   if (!confirm(this.get_label('kolab_files.filedeleteconfirm')))
     return;
 
   var files = this.env.file ? [this.env.file] : kolab_files_selected();
   file_api.file_delete(files);
 };
 
 rcube_webmail.prototype.files_move = function(folder)
 {
   var files = kolab_files_selected();
   file_api.file_move(files, folder);
 };
 
 rcube_webmail.prototype.files_copy = function(folder)
 {
   var files = kolab_files_selected();
   file_api.file_copy(files, folder);
 };
 
 rcube_webmail.prototype.files_upload = function(form)
 {
   if (form)
     file_api.file_upload(form);
 };
 
 rcube_webmail.prototype.files_list = function(param)
 {
   // just rcmail wrapper, to handle command busy states
   file_api.file_list(param);
 }
 
 rcube_webmail.prototype.files_list_update = function(head)
 {
   var list = this.file_list;
 
   list.clear();
   $('thead', list.fixed_header ? list.fixed_header : list.list).html(head);
   kolab_files_list_coltypes();
   file_api.file_list();
 };
 
 rcube_webmail.prototype.files_get = function()
 {
   var files = this.env.file ? [this.env.file] : kolab_files_selected();
 
   if (files.length == 1)
     file_api.file_get(files[0], {'force-download': true});
 };
 
 rcube_webmail.prototype.files_open = function()
 {
   var files = kolab_files_selected();
 
   if (files.length == 1)
     file_api.file_open(files[0], rcmail.env.viewer);
 };
 
 // enable file editor
 rcube_webmail.prototype.files_edit = function()
 {
   if (this.file_editor) {
     this.file_editor.enable();
     this.enable_command('files-save', true);
   }
 };
 
 rcube_webmail.prototype.files_save = function()
 {
   if (!this.file_editor)
     return;
 
   // binary files like ODF need to be updated using FormData
   if (this.file_editor.getContentCallback) {
     if (!file_api.file_uploader_support())
       return;
 
     file_api.req = file_api.set_busy(true, 'saving');
 //    this.file_editor.disable();
     this.file_editor.getContentCallback(function(content, filename) {
       file_api.file_uploader([content], {
         action: 'file_update',
         params: {file: rcmail.env.file, info: 1, token: file_api.env.token},
         response_handler: 'file_save_response',
         fieldname: 'content',
         single: true
       });
     });
 
     return;
   }
 
   var content = this.file_editor.getContent();
 
   file_api.file_save(this.env.file, content);
 };
 
 rcube_webmail.prototype.files_print = function()
 {
   if (this.file_editor && this.file_editor.printable)
     this.file_editor.print();
   else if (/^image\//i.test(this.env.file_data.type)) {
     var frame = $('#fileframe').get(0),
       win = frame ? frame.contentWindow : null;
 
     if (win) {
       win.focus();
       win.print();
     }
   }
   else {
     // e.g. Print button in PDF viewer
     try {
       $('#fileframe').contents().find('#print').click();
     }
     catch(e) {};
   }
 };
 
 rcube_webmail.prototype.files_set_quota = function(p)
 {
   if (p.total && window.file_api) {
     p.used *= 1024;
     p.total *= 1024;
     p.title = file_api.file_size(p.used) + ' / ' + file_api.file_size(p.total)
         + ' (' + p.percent + '%)';
   }
 
   p.type = this.env.quota_type;
 
   this.set_quota(p);
 };
 
 rcube_webmail.prototype.files_create = function()
 {
   kolab_files_file_create_dialog();
 };
 
 rcube_webmail.prototype.folder_create = function()
 {
   kolab_files_folder_create_dialog();
 };
 
 rcube_webmail.prototype.folder_rename = function()
 {
   kolab_files_folder_edit_dialog();
 };
 
 rcube_webmail.prototype.folder_mount = function()
 {
   kolab_files_folder_mount_dialog();
 };
 
 
 /**********************************************************/
 /*********          Files API handler            **********/
 /**********************************************************/
 
 function kolab_files_ui()
 {
   this.requests = {};
   this.uploads = [];
 
 /*
   // Called on "session expired" session
   this.logout = function(response) {};
 
   // called when a request timed out
   this.request_timed_out = function() {};
 
   // called on start of the request
   this.set_request_time = function() {};
 
   // called on request response
   this.update_request_time = function() {};
 */
   // set state
   this.set_busy = function(a, message)
   {
     if (this.req)
       rcmail.hide_message(this.req);
 
     return rcmail.set_busy(a, message);
   };
 
   // displays error message
   this.display_message = function(label, type)
   {
     return rcmail.display_message(this.t(label), type);
   };
 
   this.http_error = function(request, status, err)
   {
     rcmail.http_error(request, status, err);
   };
 
+  // check if specified/current folder/view is writable
+  this.is_writable = function(folder)
+  {
+    if (!folder)
+      folder = this.env.folder;
+
+    if (!folder)
+      return false;
+
+    var all_folders = $.extend({}, this.env.folders, this.search_results);
+
+    if (!all_folders[folder] || all_folders[folder].readonly || all_folders[folder].virtual)
+      return false;
+
+    return true;
+  };
+
   // folders list request
-  this.folder_list = function()
+  this.folder_list = function(params)
   {
+    if (!params)
+      params = {}
+
+    params.permissions = 1;
+
     this.req = this.set_busy(true, 'loading');
-    this.request('folder_list', {}, 'folder_list_response');
+    this.request('folder_list', this.list_params = params, 'folder_list_response');
   };
 
   // folder list response handler
   this.folder_list_response = function(response)
   {
     if (!this.response(response))
       return;
 
     var first, body, rows = [],
-      elem = $('#files-folder-list'),
-      searchbox = $('#foldersearch'),
+      list_selector = rcmail.env.folder_list_selector || '#files-folder-list',
+      search_selector = rcmail.env.folder_search_selector || '#foldersearch',
+      elem = $(list_selector),
+      searchbox = $(search_selector),
       list = $('<ul class="treelist listing folderlist"></ul>'),
-      collections = !rcmail.env.action.match(/^(preview|show)$/) ? ['audio', 'video', 'image', 'document'] : [];
+      collections = ['audio', 'video', 'image', 'document'];
 
     // try parent window if the list element does not exist
     // i.e. called from dialog in parent window
     if (!elem.length && window.parent && parent.rcmail) {
       body = window.parent.document.body;
-      elem = $('#files-folder-list', body);
-      searchbox = $('#foldersearch', body);
+      elem = $(list_selector, body);
+      searchbox = $(search_selector, body);
     }
 
+    if (elem.data('no-collections') == true)
+      collections = [];
+
     elem.html('');
 
     this.env.folders = this.folder_list_parse(response.result && response.result.list ? response.result.list : response.result);
 
     $.each(this.env.folders, function(i, f) {
       var row;
       if (row = file_api.folder_list_row(i, f)) {
         if (!first)
           first = i;
         rows.push(row);
       }
     });
 
     // add virtual collections
     $.each(collections, function(i, n) {
       var row = $('<li class="mailbox collection ' + n + '"></li>');
 
       row.attr('id', 'rcmli' + rcmail.html_identifier_encode('folder-collection-' + n))
         .append($('<a class="name"></a>').text(rcmail.gettext('kolab_files.collection_' + n)))
 
       rows.push(row);
     });
 
     list.append(rows).appendTo(elem)
       .on('click', 'a.subscription', function(e) {
         return file_api.folder_list_subscription_button_click(this);
       });
 
     if (rcmail.folder_list) {
       rcmail.folder_list.reset();
       this.search_results_widget = null;
     }
 
     // init treelist widget
     rcmail.folder_list = new rcube_treelist_widget(list, {
         selectable: true,
         id_prefix: 'rcmli',
         parent_focus: true,
         searchbox: searchbox,
         id_encode: rcmail.html_identifier_encode,
         id_decode: rcmail.html_identifier_decode,
         check_droptarget: function(node) {
           return !node.virtual
             && node.id != file_api.env.folder
+            && $.inArray('readonly', node.classes) == -1
             && $.inArray('collection', node.classes) == -1;
         }
     });
 
     rcmail.folder_list
       .addEventListener('collapse', function(node) { file_api.folder_collapsed(node); })
       .addEventListener('expand', function(node) { file_api.folder_collapsed(node); })
       .addEventListener('beforeselect', function(node) { return !rcmail.busy; })
       .addEventListener('search', function(search) { file_api.folder_search(search); })
       .addEventListener('select', function(node) {
         if (file_api.search_results_widget)
           file_api.search_results_widget.select();
         file_api.folder_select(node.id);
       });
 
     // select first folder?
     if (response.result.auth_errors) { }
     else if (this.env.folder)
       rcmail.folder_list.select(this.env.folder);
     else if (this.env.collection)
       rcmail.folder_list.select('folder-collection-' + this.env.collection);
     else if (first)
       rcmail.folder_list.select(first);
 
     rcmail.enable_command('files-create', true);
 
     // add tree icons
 //    this.folder_list_tree(this.env.folders);
 
     // handle authentication errors on external sources
     this.folder_list_auth_errors(response.result);
   };
 
   this.folder_select = function(folder)
   {
     if (rcmail.busy)
       return;
 
     var is_collection = folder.match(/^folder-collection-(.*)$/),
       collection = RegExp.$1 || null;
 
     if (is_collection)
       folder = null;
 
     // search-reset can re-select the same folder, skip
     if (this.env.folder == folder && this.env.collection == collection)
       return;
 
     this.env.folder = folder;
     this.env.collection = collection;
 
     rcmail.enable_command('files-list', true);
-    rcmail.enable_command('files-folder-delete', 'folder-rename', 'files-upload', !is_collection);
+    rcmail.enable_command('files-folder-delete', 'folder-rename', !is_collection);
+    rcmail.enable_command('files-upload', !is_collection && this.is_writable());
     rcmail.command('files-list', is_collection ? {collection: collection} : {folder: folder});
 
     this.quota();
   };
 
   this.folder_unselect = function()
   {
     rcmail.folder_list.select();
     this.env.folder = null;
     this.env.collection = null;
     rcmail.enable_command('files-folder-delete', 'files-upload', false);
   };
 
   this.folder_collapsed = function(node)
   {
     var prefname = 'kolab_files_collapsed_folders',
       old = rcmail.env[prefname],
       entry = '&' + urlencode(node.id) + '&';
 
     if (node.collapsed) {
       rcmail.env[prefname] = rcmail.env[prefname] + entry;
 
       // select the folder if one of its childs is currently selected
       // don't select if it's virtual (#1488346)
       if (!node.virtual && this.env.folder && this.env.folder.startsWith(node.id + '/')) {
         rcmail.folder_list.select(node.id);
       }
     }
     else {
       rcmail.env[prefname] = rcmail.env[prefname].replace(entry, '');
     }
 
     if (old !== rcmail.env[prefname] && (!rcmail.file_list || !rcmail.file_list.drag_active))
       rcmail.command('save-pref', {name: prefname, value: rcmail.env[prefname]});
   };
 
   this.folder_list_row = function(i, folder, parent)
   {
-    var toggle, sublist, collapsed, parent, parent_name,
-      row = $('<li class="mailbox"></li>'),
+    var toggle, sublist, collapsed, parent, parent_name, classes = ['mailbox'],
+      row = $('<li>'),
       id = 'rcmli' + rcmail.html_identifier_encode(i);
 
-    row.attr('id', id).append($('<a>').text(folder.name));
+    row.attr('id', id).append($('<a class="name">').text(folder.name));
 
     if (folder.virtual)
-      row.addClass('virtual');
-    else if (folder.subscribed !== undefined)
-      row.append(this.folder_list_subscription_button(folder.subscribed));
+      classes.push('virtual');
+    else {
+      if (folder.subscribed !== undefined)
+        row.append(this.folder_list_subscription_button(folder.subscribed));
+
+      if (folder.readonly)
+        classes.push('readonly');
+    }
+
+    row.addClass(classes.join(' '));
 
     folder.ref = row;
 
     if (folder.depth) {
       // find parent folder
       parent_name = i.replace(/\/[^/]+$/, '');
       if (!parent)
         parent = $(this.env.folders[parent_name].ref);
 
       toggle = $('div.treetoggle', parent);
       sublist = $('> ul', parent);
 
       if (!toggle.length) {
         collapsed = rcmail.env.kolab_files_collapsed_folders.indexOf('&' + urlencode(parent_name) + '&') > -1;
 
         toggle = $('<div>').attr('class', 'treetoggle' + (collapsed ? ' collapsed' : ' expanded'))
           .html('&nbsp;').appendTo(parent);
 
         sublist = $('<ul>').attr({role: 'group'}).appendTo(parent);
         if (collapsed)
           sublist.hide();
       }
 
       sublist.append(row);
     }
     else {
       return row;
     }
   };
 
   // create subscription button element
   this.folder_list_subscription_button = function(subscribed)
   {
     return $('<a>').attr({
         title: rcmail.gettext('kolab_files.listpermanent'),
         class: 'subscription' + (subscribed ? ' subscribed' : ''),
         'aria-checked': subscribed,
         role: 'checkbox'
     });
   };
 
   // subscription button handler
   this.folder_list_subscription_button_click = function(elem)
   {
     var folder = $(elem).parent('li').prop('id').replace(/^rcmli/, ''),
       selected = $(elem).hasClass('subscribed');
 
     folder = folder.replace(/--xsR$/, ''); // this might be a search result
     folder = rcmail.html_identifier_decode(folder);
     file_api['folder_' + (selected ? 'unsubscribe' : 'subscribe')](folder);
     return false;
   };
 
   // sets subscription button status
   this.folder_list_subscription_state = function(elem, status)
   {
     $(elem).children('a.subscription')
       .prop('aria-checked', status)[status ? 'addClass' : 'removeClass']('subscribed');
   };
 
   // Folder searching handler (for unsubscribed folders)
   this.folder_search = function(search)
   {
     // hide search results
     if (this.search_results_widget) {
       this.search_results_container.hide();
       this.search_results_widget.reset();
     }
     this.search_results = {};
 
     // send search request to the server
     if (search.query && search.execute) {
       // cancel previous search request
       if (this.listsearch_request) {
         this.listsearch_request.abort();
         this.listsearch_request = null;
       }
 
-      var params = {search: search.query, unsubscribed: 1};
+      var params = $.extend({search: search.query, unsubscribed: 1}, this.list_params);
 
       this.req = this.set_busy(true, rcmail.gettext('searching'));
       this.listsearch_request = this.request('folder_list', params, 'folder_search_response');
     }
     else if (!search.query) {
       if (this.listsearch_request) {
         this.listsearch_request.abort();
         this.listsearch_request = null;
       }
 
       // any subscription changed, make sure the newly added records
       // are listed before collections not after
       if (this.folder_subscribe) {
         var r, last, move = [], rows = $(rcmail.folder_list.container).children('li');
 
         if (rows.length && !$(rows[rows.length-1]).hasClass('collection')) {
           // collect all folders to move
           while (rows.length--) {
             r = $(rows[rows.length]);
             if (r.hasClass('collection'))
               last = r;
             else if (last)
               break;
             else
               move.push(r);
           }
 
           if (last)
             $.each(move, function() {
               this.remove();
               last.before(this);
             });
         }
       }
     }
   };
 
   // folder search response handler
   this.folder_search_response = function(response)
   {
     if (!this.response(response))
       return;
 
     var folders = response.result && response.result.list ? response.result.list : response.result;
 
     if (!folders.length)
       return;
 
     folders = this.folder_list_parse(folders, 10000, false);
 
     if (!this.search_results_widget) {
       var list = rcmail.folder_list.container,
         title = rcmail.gettext('kolab_files.additionalfolders'),
         list_id = list.attr('id') || '0';
 
       this.search_results_container = $('<div class="searchresults"></div>')
           .append($('<h2 class="boxtitle" id="st:' + list_id + '"></h2>').text(title))
           .insertAfter(list);
 
       this.search_results_widget = new rcube_treelist_widget('<ul>', {
           id_prefix: 'rcmli',
           id_encode: rcmail.html_identifier_encode,
           id_decode: rcmail.html_identifier_decode,
           selectable: true
       });
 
       this.search_results_widget
         .addEventListener('beforeselect', function(node) { return !rcmail.busy; })
         .addEventListener('select', function(node) {
           rcmail.folder_list.select();
           file_api.folder_select(node.id);
         });
 
       this.search_results_widget.container
         // copy classes from main list
         .addClass(list.attr('class')).attr('aria-labelledby', 'st:' + list_id)
         .appendTo(this.search_results_container)
         .on('click', 'a.subscription', function(e) {
           return file_api.folder_list_subscription_button_click(this);
         });
     }
 
     // add results to the list
     $.each(folders, function(i, folder) {
       var node, separator = file_api.env.directory_separator,
         path = i.split(separator),
+        classes = ['mailbox'],
         html = [$('<a>').text(folder.name)];
 
-      // add subscription button
-      if (!folder.virtual)
+      if (!folder.virtual) {
+        // add subscription button
         html.push(file_api.folder_list_subscription_button(false));
 
+        if (folder.readonly)
+          classes.push('readonly');
+      }
+
       path.pop();
 
       file_api.search_results_widget.insert({
           id: i,
-          classes: ['mailbox'],
+          classes: classes,
           text: folder.name,
           html: html,
           collapsed: false,
           virtual: folder.virtual
         }, path.length ? path.join(separator) : null);
     });
 
     this.search_results = folders;
     this.search_results_container.show();
   };
 
   // folder subscribe request
   this.folder_subscribe = function(folder)
   {
     this.env.folder_subscribe = folder;
     this.req = this.set_busy(true, 'foldersubscribing');
     this.request('folder_subscribe', {folder: folder}, 'folder_subscribe_response');
   }
 
   // folder subscribe response handler
   this.folder_subscribe_response = function(response)
   {
     if (!this.response(response))
       return;
 
     this.display_message('foldersubscribed', 'confirmation');
 
     var item, node = rcmail.folder_list.get_item(this.env.folder_subscribe);
 
     if (this.search_results && this.search_results[this.env.folder_subscribe]) {
       item = this.search_results_widget.get_item(this.env.folder_subscribe);
       this.folder_list_subscription_state(item, true);
       if (item = $(item).attr('id'))
         this.folder_list_subscription_state($('#' + item.replace(/--xsR$/, '')), true);
     }
 
     // search result, move from search to main list widget
     if (!node && this.search_results && this.search_results[this.env.folder_subscribe]) {
       var i, html, dir, folder, separator = this.env.directory_separator,
         path = this.env.folder_subscribe.split(separator);
 
       // add all folders in a path to the main list if needed
       // including the subscribed folder
       for (i=0; i<path.length; i++) {
         dir = path.slice(0, i + 1).join(separator);
         node = rcmail.folder_list.get_node(dir);
 
         if (!node) {
           node = this.search_results_widget.get_node(dir);
           if (!node) {
             // sanity check
             return;
           }
 
           if (i == path.length - 1) {
             item = this.search_results_widget.get_item(dir);
             this.folder_list_subscription_state(item, true);
           }
 
           folder = this.search_results[dir];
           html = [$('<a>').text(folder.name)];
           if (!folder.virtual)
             html.push(this.folder_list_subscription_button(true));
 
           node.html = html;
           delete node.children;
 
           rcmail.folder_list.insert(node, i > 0 ? path.slice(0, i).join(separator) : null);
           // we're in search result, so there will be two records,
           // add subscription button to the visible one, it was not cloned
           if (!folder.virtual) {
             node = rcmail.folder_list.get_item(dir);
             $(node).append(file_api.folder_list_subscription_button(true));
           }
 
           this.env.folders[dir] = folder;
         }
       }
 
       // now remove them from the search widget
       while (path.length) {
         dir = path.join(separator);
         node = this.search_results_widget.get_item(dir);
 
         if ($('ul[role="group"] > li', node).length)
           break;
 
         this.search_results_widget.remove(dir);
 
         path.pop();
       }
 
       node = null;
     }
 
     if (node)
       this.folder_list_subscription_state(node, true);
 
     this.env.folders[this.env.folder_subscribe].subscribed = true;
   };
 
   // folder unsubscribe request
   this.folder_unsubscribe = function(folder)
   {
     this.env.folder_subscribe = folder;
     this.req = this.set_busy(true, 'folderunsubscribing');
     this.request('folder_unsubscribe', {folder: folder}, 'folder_unsubscribe_response');
   }
 
   // folder unsubscribe response handler
   this.folder_unsubscribe_response = function(response)
   {
     if (!this.response(response))
       return;
 
     this.display_message('folderunsubscribed', 'confirmation');
 
     var folder = this.env.folders[this.env.folder_subscribe],
       node = rcmail.folder_list.get_item(this.env.folder_subscribe);
 
     if (this.search_results && this.search_results[this.env.folder_subscribe]) {
       item = this.search_results_widget.get_item(this.env.folder_subscribe);
 
       if (item) {
         this.folder_list_subscription_state(item, false);
         item = $('#' + $(item).attr('id').replace(/--xsR$/, ''));
       }
       else
         item = $('#rcmli' + rcmail.html_identifier_encode(this.env.folder_subscribe), rcmail.folder_list.container);
 
       this.folder_list_subscription_state(item, false);
     }
 
     this.folder_list_subscription_state(node, false);
 
     folder.subscribed = false;
   };
 
   // folder create request
   this.folder_create = function(folder)
   {
     this.req = this.set_busy(true, 'kolab_files.foldercreating');
     this.request('folder_create', {folder: folder}, 'folder_create_response');
   };
 
   // folder create response handler
   this.folder_create_response = function(response)
   {
     if (!this.response(response))
       return;
 
     this.display_message('kolab_files.foldercreatenotice', 'confirmation');
 
     // refresh folders list
     this.folder_list();
   };
 
   // folder rename request
   this.folder_rename = function(folder, new_name)
   {
     if (folder == new_name)
       return;
 
     this.env.folder_rename = new_name;
     this.req = this.set_busy(true, 'kolab_files.folderupdating');
     this.request('folder_move', {folder: folder, 'new': new_name}, 'folder_rename_response');
   };
 
   // folder create response handler
   this.folder_rename_response = function(response)
   {
     if (!this.response(response))
       return;
 
     this.display_message('kolab_files.folderupdatenotice', 'confirmation');
 
     // refresh folders and files list
     this.env.folder = this.env.folder_rename;
     this.folder_list();
   };
 
   // folder mount (external storage) request
   this.folder_mount = function(data)
   {
     this.req = this.set_busy(true, 'kolab_files.foldermounting');
     this.request('folder_create', data, 'folder_mount_response');
   };
 
   // folder create response handler
   this.folder_mount_response = function(response)
   {
     if (!this.response(response))
       return;
 
     this.display_message('kolab_files.foldermountnotice', 'confirmation');
 
     // refresh folders list
     this.folder_list();
   };
 
   // folder delete request
   this.folder_delete = function(folder)
   {
     this.req = this.set_busy(true, 'kolab_files.folderdeleting');
     this.request('folder_delete', {folder: folder}, 'folder_delete_response');
   };
 
   // folder delete response handler
   this.folder_delete_response = function(response)
   {
     if (!this.response(response))
       return;
 
     this.env.folder = null;
     rcmail.enable_command('files-folder-delete', 'folder-rename', 'files-list', false);
     this.display_message('kolab_files.folderdeletenotice', 'confirmation');
 
     // refresh folders list
     this.folder_list();
     this.quota();
   };
 
   // quota request
   this.quota = function()
   {
     if (rcmail.env.files_quota)
       this.request('quota', {folder: this.env.folder}, 'quota_response');
   };
 
   // quota response handler
   this.quota_response = function(response)
   {
     if (!this.response(response))
       return;
 
     rcmail.files_set_quota(response.result);
   };
 
   this.file_list = function(params)
   {
     if (!rcmail.gui_objects.filelist)
       return;
 
     if (!params)
       params = {};
 
     // reset all pending list requests
     for (i in this.requests) {
       this.requests[i].abort();
       rcmail.hide_message(i);
       delete this.requests[i];
     }
 
     if (params.all_folders) {
       params.collection = null;
       params.folder = null;
       this.folder_unselect();
     }
 
     if (params.collection == undefined)
       params.collection = this.env.collection;
     if (params.folder == undefined)
       params.folder = this.env.folder;
     if (params.sort == undefined)
       params.sort = this.env.sort_col;
     if (params.reverse == undefined)
       params.reverse = this.env.sort_reverse;
     if (params.search == undefined)
       params.search = this.env.search;
 
     this.env.folder = params.folder;
     this.env.collection = params.collection;
     this.env.sort_col = params.sort;
     this.env.sort_reverse = params.reverse;
 
     rcmail.enable_command(rcmail.env.file_commands, false);
     rcmail.enable_command(rcmail.env.file_commands_all, false);
 
     // empty the list
     this.env.file_list = [];
     rcmail.file_list.clear(true);
 
     // request
     if (params.collection || params.all_folders)
       this.file_list_loop(params);
     else if (this.env.folder) {
       params.req_id = this.set_busy(true, 'loading');
       this.requests[params.req_id] = this.request('file_list', params, 'file_list_response');
     }
   };
 
   // file list response handler
   this.file_list_response = function(response)
   {
     if (response.req_id)
       rcmail.hide_message(response.req_id);
 
     if (!this.response(response))
       return;
 
     var i = 0, list = [], table = $('#filelist');
 
     $.each(response.result, function(key, data) {
       var row = file_api.file_list_row(key, data, ++i);
       rcmail.file_list.insert_row(row);
       data.row = row;
       data.filename = key;
       list.push(data);
     });
 
     this.env.file_list = list;
     rcmail.file_list.resize();
   };
 
   // call file_list request for every folder (used for search and virt. collections)
   this.file_list_loop = function(params)
   {
     var i, folders = [], limit = Math.max(this.env.search_threads || 1, 1);
 
     if (params.collection) {
       if (!params.search)
         params.search = {};
       params.search['class'] = params.collection;
       delete params['collection'];
     }
 
     delete params['all_folders'];
 
     $.each(this.env.folders, function(i, f) {
       if (!f.virtual)
         folders.push(i);
     });
 
     this.env.folders_loop = folders;
     this.env.folders_loop_params = params;
     this.env.folders_loop_lock = false;
 
     for (i=0; i<folders.length && i<limit; i++) {
       params.req_id = this.set_busy(true, 'loading');
       params.folder = folders.shift();
       this.requests[params.req_id] = this.request('file_list', params, 'file_list_loop_response');
     }
   };
 
   // file list response handler for loop'ed request
   this.file_list_loop_response = function(response)
   {
     var i, folders = this.env.folders_loop,
       params = this.env.folders_loop_params,
       limit = Math.max(this.env.search_threads || 1, 1),
       valid = this.response(response);
 
     if (response.req_id)
       rcmail.hide_message(response.req_id);
 
     for (i=0; i<folders.length && i<limit; i++) {
       params.req_id = this.set_busy(true, 'loading');
       params.folder = folders.shift();
       this.requests[params.req_id] = this.request('file_list', params, 'file_list_loop_response');
     }
 
     rcmail.file_list.resize();
 
     if (!valid)
       return;
 
     this.file_list_loop_result_add(response.result);
   };
 
   // add files from list request to the table (with sorting)
   this.file_list_loop_result_add = function(result)
   {
     // chack if result (hash-array) is empty
     if (!object_is_empty(result))
       return;
 
     if (this.env.folders_loop_lock) {
       setTimeout(function() { file_api.file_list_loop_result_add(result); }, 100);
       return;
     }
 
     // lock table, other list responses will wait
     this.env.folders_loop_lock = true;
 
     var n, i, len, elem, list = [], rows = [],
       index = this.env.file_list.length,
       table = rcmail.file_list;
 
     for (n=0, len=index; n<len; n++) {
       elem = this.env.file_list[n];
       for (i in result) {
         if (this.sort_compare(elem, result[i]) < 0)
           break;
 
         var row = this.file_list_row(i, result[i], ++index);
         table.insert_row(row, elem.row);
         result[i].row = row;
         result[i].filename = i;
         list.push(result[i]);
         delete result[i];
       }
 
       list.push(elem);
     }
 
     // add the rest of rows
     $.each(result, function(key, data) {
       var row = file_api.file_list_row(key, data, ++index);
       table.insert_row(row);
       result[key].row = row;
       result[key].filename = key;
       list.push(result[key]);
     });
 
     this.env.file_list = list;
     this.env.folders_loop_lock = false;
   };
 
   // sort files list (without API request)
   this.file_list_sort = function(col, reverse)
   {
     var n, len, list = this.env.file_list,
       table = $('#filelist'), tbody = $('<tbody>');
 
     this.env.sort_col = col;
     this.env.sort_reverse = reverse;
 
     if (!list || !list.length)
       return;
 
     // sort the list
     list.sort(function (a, b) {
       return file_api.sort_compare(a, b);
     });
 
     // add rows to the new body
     for (n=0, len=list.length; n<len; n++) {
       tbody.append(list[n].row);
     }
 
     // replace table bodies
     $('tbody', table).replaceWith(tbody);
   };
 
   this.file_list_row = function(file, data, index)
   {
     var c, col, row = '';
 
-    for (c in rcmail.env.coltypes) {
-      c = rcmail.env.coltypes[c];
+    for (c in rcmail.env.file_coltypes) {
+      c = rcmail.env.file_coltypes[c];
       if (c == 'name')
         col = '<td class="name filename ' + this.file_type_class(data.type) + '">'
           + '<span>' + escapeHTML(data.name) + '</span></td>';
       else if (c == 'mtime')
         col = '<td class="mtime">' + data.mtime + '</td>';
       else if (c == 'size')
         col = '<td class="size">' + this.file_size(data.size) + '</td>';
       else if (c == 'options')
         col = '<td class="options"><span></span></td>';
       else
         col = '<td class="' + c + '"></td>';
 
       row += col;
     }
 
     row = $('<tr>')
       .html(row)
       .attr({id: 'rcmrow' + index, 'data-file': file, 'data-type': data.type});
 
     $('td.options > span', row).click(function(e) {
       kolab_files_file_edit_dialog(file);
     });
 
     // collection (or search) lists files from all folders
     // display file name with full path as title
     if (!this.env.folder)
       $('td.name span', row).attr('title', file);
 
     return row.get(0);
   };
 
   this.file_search = function(value, all_folders)
   {
     if (value) {
       this.env.search = {name: value};
       rcmail.command('files-list', {search: this.env.search, all_folders: all_folders});
     }
     else
       this.search_reset();
   };
 
   this.file_search_reset = function()
   {
     if (this.env.search) {
       this.env.search = null;
       rcmail.command('files-list');
     }
   };
 
   this.file_get = function(file, params)
   {
     if (!params)
       params = {};
 
     params.token = this.env.token;
     params.file = file;
 
     rcmail.redirect(this.env.url + this.url('file_get', params));
   };
 
   // file(s) delete request
   this.file_delete = function(files)
   {
     this.req = this.set_busy(true, 'kolab_files.filedeleting');
     this.request('file_delete', {file: files}, 'file_delete_response');
   };
 
   // file(s) delete response handler
   this.file_delete_response = function(response)
   {
     if (!this.response(response))
       return;
 
     var rco, dir, self = this;
 
     this.display_message('kolab_files.filedeletenotice', 'confirmation');
 
     if (rcmail.env.file) {
       rco = rcmail.opener();
       dir = this.file_path(rcmail.env.file);
 
       // check if opener window contains files list, if not we can just close current window
       if (rco && rco.file_list && (opener.file_api.env.folder == dir || !opener.file_api.env.folder))
         self = opener.file_api;
       else
         window.close();
     }
 
     // @TODO: consider list modification "in-place" instead of full reload
     self.file_list();
     self.quota();
 
     if (rcmail.env.file)
       window.close();
   };
 
   // file(s) move request
   this.file_move = function(files, folder)
   {
     if (!files || !files.length || !folder)
       return;
 
     var count = 0, list = {};
 
     $.each(files, function(i, v) {
       var name = folder + file_api.env.directory_separator + file_api.file_name(v);
 
       if (name != v) {
         list[v] = name;
         count++;
       }
     });
 
     if (!count)
       return;
 
     this.req = this.set_busy(true, 'kolab_files.filemoving');
     this.request('file_move', {file: list}, 'file_move_response');
   };
 
   // file(s) move response handler
   this.file_move_response = function(response)
   {
     if (!this.response(response))
       return;
 
     if (response.result && response.result.already_exist && response.result.already_exist.length)
       this.file_move_ask_user(response.result.already_exist, true);
     else {
       this.display_message('kolab_files.filemovenotice', 'confirmation');
       this.file_list();
     }
   };
 
   // file(s) copy request
   this.file_copy = function(files, folder)
   {
     if (!files || !files.length || !folder)
       return;
 
     var count = 0, list = {};
 
     $.each(files, function(i, v) {
       var name = folder + file_api.env.directory_separator + file_api.file_name(v);
 
       if (name != v) {
         list[v] = name;
         count++;
       }
     });
 
     if (!count)
       return;
 
     this.req = this.set_busy(true, 'kolab_files.filecopying');
     this.request('file_copy', {file: list}, 'file_copy_response');
   };
 
   // file(s) copy response handler
   this.file_copy_response = function(response)
   {
     if (!this.response(response))
       return;
 
     if (response.result && response.result.already_exist && response.result.already_exist.length)
       this.file_move_ask_user(response.result.already_exist);
     else {
       this.display_message('kolab_files.filecopynotice', 'confirmation');
       this.quota();
     }
   };
 
   // when file move/copy operation returns file-exists error
   // this displays a dialog where user can decide to skip
   // or overwrite destination file(s)
   this.file_move_ask_user = function(list, move)
   {
     var file = list[0], buttons = {},
       text = rcmail.gettext('kolab_files.filemoveconfirm').replace('$file', file.dst)
       dialog = $('<div></div>');
 
     buttons[rcmail.gettext('kolab_files.fileoverwrite')] = function() {
       var file = list.shift(), f = {},
         action = move ? 'file_move' : 'file_copy';
 
       f[file.src] = file.dst;
       file_api.file_move_ask_list = list;
       file_api.file_move_ask_mode = move;
       dialog.dialog('destroy').remove();
       file_api.req = file_api.set_busy(true, move ? 'kolab_files.filemoving' : 'kolab_files.filecopying');
       file_api.request(action, {file: f, overwrite: 1}, 'file_move_ask_user_response');
     };
 
     if (list.length > 1)
       buttons[rcmail.gettext('kolab_files.fileoverwriteall')] = function() {
         var f = {}, action = move ? 'file_move' : 'file_copy';
 
         $.each(list, function() { f[this.src] = this.dst; });
         dialog.dialog('destroy').remove();
         file_api.req = file_api.set_busy(true, move ? 'kolab_files.filemoving' : 'kolab_files.filecopying');
         file_api.request(action, {file: f, overwrite: 1}, action + '_response');
       };
 
     var skip_func = function() {
       list.shift();
       dialog.dialog('destroy').remove();
 
       if (list.length)
         file_api.file_move_ask_user(list, move);
       else if (move)
         file_api.file_list();
     };
 
     buttons[rcmail.gettext('kolab_files.fileskip')] = skip_func;
 
     if (list.length > 1)
       buttons[rcmail.gettext('kolab_files.fileskipall')] = function() {
       dialog.dialog('destroy').remove();
         if (move)
           file_api.file_list();
       };
 
     // open jquery UI dialog
     kolab_dialog_show(dialog.html(text), {
       close: skip_func,
       buttons: buttons,
       minWidth: 400,
       width: 400
     });
   };
 
   // file move (with overwrite) response handler
   this.file_move_ask_user_response = function(response)
   {
     var move = this.file_move_ask_mode, list = this.file_move_ask_list;
 
     this.response(response);
 
     if (list && list.length)
       this.file_move_ask_user(list, mode);
     else {
       this.display_message('kolab_files.file' + (move ? 'move' : 'copy') + 'notice', 'confirmation');
       if (move)
         this.file_list();
     }
   };
 
   // file(s) create request
   this.file_create = function(file, type)
   {
     this.req = this.set_busy(true, 'kolab_files.filecreating');
     this.request('file_create', {file: file, 'content-type': type, content: ''}, 'file_create_response');
   };
 
   // file(s) create response handler
   this.file_create_response = function(response)
   {
     if (!this.response(response))
       return;
 
     // @TODO: we could update metadata instead
     this.file_list();
 
     // @TODO: open the file for editing if editable
   };
 
   // file(s) rename request
   this.file_rename = function(oldfile, newfile)
   {
     this.req = this.set_busy(true, 'kolab_files.fileupdating');
     this.request('file_move', {file: oldfile, 'new': newfile}, 'file_rename_response');
   };
 
   // file(s) move response handler
   this.file_rename_response = function(response)
   {
     if (!this.response(response))
       return;
 
     // @TODO: we could update metadata instead
     this.file_list();
   };
 
   // file upload request
   this.file_upload = function(form)
   {
     var form = $(form),
       field = $('input[type=file]', form).get(0),
       files = field.files ? field.files.length : field.value ? 1 : 0;
 
     if (!files || !this.file_upload_size_check(field.files))
       return;
 
     // submit form and read server response
     this.file_upload_form(form, 'file_upload', function(event) {
       var doc, response;
       try {
         doc = this.contentDocument ? this.contentDocument : this.contentWindow.document;
         response = doc.body.innerHTML;
         // response may be wrapped in <pre> tag
         if (response.slice(0, 5).toLowerCase() == '<pre>' && response.slice(-6).toLowerCase() == '</pre>') {
           response = doc.body.firstChild.firstChild.nodeValue;
         }
         response = eval('(' + response + ')');
       }
       catch (err) {
         response = {status: 'ERROR'};
       }
 
       file_api.file_upload_progress_stop(event.data.ts);
 
       // refresh the list on upload success
       file_api.file_upload_response(response);
     });
   };
 
   // refresh the list on upload success
   this.file_upload_response = function(response)
   {
     if (this.response_parse(response)) {
        this.file_list();
        this.quota();
     }
   };
 
   // check upload max size
   this.file_upload_size_check = function(files)
   {
     var i, size = 0, maxsize = rcmail.env.files_max_upload;
 
     if (maxsize && files) {
       for (i=0; i < files.length; i++)
         size += files[i].size || files[i].fileSize;
 
       if (size > maxsize) {
         alert(rcmail.get_label('kolab_files.uploadsizeerror').replace('$size', kolab_files_file_size(maxsize)));
         return false;
       }
     }
 
     return true;
   };
 
   // post the given form to a hidden iframe
   this.file_upload_form = function(form, action, onload)
   {
     var ts = new Date().getTime(),
       frame_name = 'fileupload' + ts;
 
     // upload progress support
     if (rcmail.env.files_progress_name) {
       var fname = rcmail.env.files_progress_name,
         field = $('input[name='+fname+']', form);
 
       if (!field.length) {
         field = $('<input>').attr({type: 'hidden', name: fname});
         field.prependTo(form);
       }
 
       field.val(ts);
       this.file_upload_progress(ts, true);
     }
 
     rcmail.display_progress({name: ts});
 
     // have to do it this way for IE
     // otherwise the form will be posted to a new window
     if (document.all) {
       var html = '<iframe id="'+frame_name+'" name="'+frame_name+'"'
         + ' src="' + rcmail.assets_path('program/resources/blank.gif') + '"'
         + ' style="width:0;height:0;visibility:hidden;"></iframe>';
       document.body.insertAdjacentHTML('BeforeEnd', html);
     }
     // for standards-compliant browsers
     else
       $('<iframe>')
         .attr({name: frame_name, id: frame_name})
         .css({border: 'none', width: 0, height: 0, visibility: 'hidden'})
         .appendTo(document.body);
 
     // handle upload errors, parsing iframe content in onload
     $('#'+frame_name).on('load', {ts:ts}, onload);
 
     $(form).attr({
       target: frame_name,
       action: this.env.url + this.url(action, {folder: this.env.folder, token: this.env.token}),
       method: 'POST'
     }).attr(form.encoding ? 'encoding' : 'enctype', 'multipart/form-data')
       .submit();
   };
 
   // handler when files are dropped to a designated area.
   // compose a multipart form data and submit it to the server
   this.file_drop = function(e)
   {
     var files = e.target.files || e.dataTransfer.files;
 
     if (!files || !files.length || !this.file_upload_size_check(files))
       return;
 
     // prepare multipart form data composition
     var ts = new Date().getTime(),
       formdata = window.FormData ? new FormData() : null,
       fieldname = 'file[]',
       boundary = '------multipartformboundary' + (new Date).getTime(),
       dashdash = '--', crlf = '\r\n',
       multipart = dashdash + boundary + crlf;
 
     // inline function to submit the files to the server
     var submit_data = function() {
       var multiple = files.length > 1;
 
       rcmail.display_progress({name: ts});
       if (rcmail.env.files_progress_name)
         file_api.file_upload_progress(ts, true);
 
       // complete multipart content and post request
       multipart += dashdash + boundary + dashdash + crlf;
 
       $.ajax({
         type: 'POST',
         dataType: 'json',
         url: file_api.env.url + file_api.url('file_upload', {folder: file_api.env.folder}),
         contentType: formdata ? false : 'multipart/form-data; boundary=' + boundary,
         processData: false,
         timeout: 0, // disable default timeout set in ajaxSetup()
         data: formdata || multipart,
         headers: {'X-Session-Token': file_api.env.token},
         success: function(data) {
           file_api.file_upload_progress_stop(ts);
           file_api.file_upload_response(data);
         },
         error: function(o, status, err) {
           file_api.file_upload_progress_stop(ts);
           rcmail.http_error(o, status, err);
         },
         xhr: function() {
           var xhr = jQuery.ajaxSettings.xhr();
           if (!formdata && xhr.sendAsBinary)
             xhr.send = xhr.sendAsBinary;
           return xhr;
         }
       });
     };
 
     // upload progress supported (and handler exists)
     // add progress ID to the request - need to be added before files
     if (rcmail.env.files_progress_name) {
       if (formdata)
         formdata.append(rcmail.env.files_progress_name, ts);
       else
         multipart += 'Content-Disposition: form-data; name="' + rcmail.env.files_progress_name + '"'
           + crlf + crlf + ts + crlf + dashdash + boundary + crlf;
     }
 
     // get contents of all dropped files
     var f, j, i = 0, last = files.length - 1;
     for (j = 0; j <= last && (f = files[i]); i++) {
       if (!f.name) f.name = f.fileName;
       if (!f.size) f.size = f.fileSize;
       if (!f.type) f.type = 'application/octet-stream';
 
       // file name contains non-ASCII characters, do UTF8-binary string conversion.
       if (!formdata && /[^\x20-\x7E]/.test(f.name))
         f.name_bin = unescape(encodeURIComponent(f.name));
 
       // do it the easy way with FormData (FF 4+, Chrome 5+, Safari 5+)
       if (formdata) {
         formdata.append(fieldname, f);
         if (j == last)
           return submit_data();
       }
       // use FileReader supporetd by Firefox 3.6
       else if (window.FileReader) {
         var reader = new FileReader();
 
         // closure to pass file properties to async callback function
         reader.onload = (function(file, j) {
           return function(e) {
             multipart += 'Content-Disposition: form-data; name="' + fieldname + '"';
             multipart += '; filename="' + (f.name_bin || file.name) + '"' + crlf;
             multipart += 'Content-Length: ' + file.size + crlf;
             multipart += 'Content-Type: ' + file.type + crlf + crlf;
             multipart += reader.result + crlf;
             multipart += dashdash + boundary + crlf;
 
             if (j == last)  // we're done, submit the data
               return submit_data();
           }
         })(f,j);
         reader.readAsBinaryString(f);
       }
 
       j++;
     }
   };
 
   // upload progress requests
   this.file_upload_progress = function(id, init)
   {
     if (init && id)
       this.uploads[id] = this.env.folder;
 
     setTimeout(function() {
       if (id && file_api.uploads[id])
         file_api.request('upload_progress', {id: id}, 'file_upload_progress_response');
     }, rcmail.env.files_progress_time * 1000);
   };
 
   // upload progress response
   this.file_upload_progress_response = function(response)
   {
     if (!this.response(response))
       return;
 
     var param = response.result;
 
     if (!param.id || !this.uploads[param.id])
       return;
 
     if (param.total) {
       param.name = param.id;
 
       if (!param.done)
         param.text = kolab_files_progress_str(param);
 
       rcmail.display_progress(param);
     }
 
     if (!param.done && param.total)
       this.file_upload_progress(param.id);
     else
       delete this.uploads[param.id];
   };
 
   this.file_upload_progress_stop = function(id)
   {
     if (id) {
       delete this.uploads[id];
       rcmail.display_progress({name: id});
     }
   };
 
   // open file in new window, using file API viewer
   this.file_open = function(file, viewer)
   {
     var href = '?' + $.param({_task: 'files', _action: 'open', file: file, viewer: viewer || 0});
     rcmail.open_window(href, false, true);
   };
 
   // save file
   this.file_save = function(file, content)
   {
     rcmail.enable_command('files-save', false);
     // because we currently can edit only text files
     // and we do not expect them to be very big, we save
     // file in a very simple way, no upload progress, etc.
     this.req = this.set_busy(true, 'saving');
     this.request('file_update', {file: file, content: content, info: 1}, 'file_save_response');
   };
 
   // file save response handler
   this.file_save_response = function(response)
   {
     rcmail.enable_command('files-save', true);
 
     if (!this.response(response))
       return;
 
     // update file properties table
     var table = $('#fileinfobox table'), file = response.result;
 
     if (file) {
       $('td.filetype', table).text(file.type);
       $('td.filesize', table).text(this.file_size(file.size));
       $('td.filemtime', table).text(file.mtime);
     }
   };
 
   // handle auth errors on folder list
   this.folder_list_auth_errors = function(result)
   {
     if (result && result.auth_errors) {
       if (!this.auth_errors)
         this.auth_errors = {};
 
       $.extend(this.auth_errors, result.auth_errors);
     }
 
     // ask for password to the first storage on the list
     $.each(this.auth_errors || [], function(i, v) {
       file_api.folder_list_auth_dialog(i, v);
       return false;
     });
   };
 
   // create dialog for user credentials of external storage
   this.folder_list_auth_dialog = function(label, driver)
   {
     var args = {width: 400, height: 300, buttons: {}},
       dialog = $('#files-folder-auth-dialog'),
       content = this.folder_list_auth_form(driver);
 
     dialog.find('table.propform').remove();
     $('.auth-options', dialog).before(content);
 
     args.buttons[this.t('kolab_files.save')] = function() {
       var data = {folder: label, list: 1};
 
       $('input', dialog).each(function() {
         data[this.name] = this.type == 'checkbox' && !this.checked ? '' : this.value;
       });
 
       file_api.open_dialog = this;
       file_api.req = file_api.set_busy(true, 'kolab_files.authenticating');
       file_api.request('folder_auth', data, 'folder_auth_response');
     };
 
     args.buttons[this.t('kolab_files.cancel')] = function() {
       delete file_api.auth_errors[label];
       kolab_dialog_close(this);
       // go to the next one
       file_api.folder_list_auth_errors();
     };
 
     args.title = this.t('kolab_files.folderauthtitle').replace('$title', label);
 
     // show dialog window
     kolab_dialog_show(dialog, args, function() {
       // focus first empty input
       $('input', dialog).each(function() {
         if (!this.value) {
           this.focus();
           return false;
         }
       });
     });
   };
 
   // folder_auth handler
   this.folder_auth_response = function(response)
   {
     if (!this.response(response))
       return;
 
     var folders, found,
       folder = response.result.folder,
       id = 'rcmli' + rcmail.html_identifier_encode(folder),
       parent = $('#' + id);
 
     // try parent window if the folder element does not exist
     if (!parent.length && window.parent && window.parent.rcmail) {
       parent = $('#' + id, window.parent.document.body);
     }
 
     delete this.auth_errors[folder];
     kolab_dialog_close(this.open_dialog);
 
     // go to the next one
     this.folder_list_auth_errors();
 
     // parse result
     folders = this.folder_list_parse(response.result.list);
     delete folders[folder]; // remove root added in folder_list_parse()
 
     // add folders from the external source to the list
     $.each(folders, function(i, f) {
       file_api.folder_list_row(i, f, parent.get(0));
       found = true;
     });
 
     // reset folders list widget
     if (found)
       rcmail.folder_list.reset(true);
 
     // add tree icons
 //    this.folder_list_tree(folders);
 
     $.extend(this.env.folders, folders);
   };
 
   // returns content of the external storage authentication form
   this.folder_list_auth_form = function(driver)
   {
     var rows = [];
 
     $.each(driver.form, function(fi, fv) {
       var id = 'authinput' + fi,
         attrs = {type: fi.match(/pass/) ? 'password' : 'text', size: 25, name: fi, id: id},
         input = $('<input>').attr(attrs);
 
       if (driver.form_values && driver.form_values[fi])
         input.attr({value: driver.form_values[fi]});
 
       rows.push($('<tr>')
         .append($('<td class="title">').append($('<label>').attr('for', id).text(fv)))
         .append($('<td>').append(input))
       );
     });
 
     return $('<table class="propform">').append(rows);
   };
 };
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index 20ddae80..611af95c 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -1,1263 +1,1307 @@
 <?php
 
 /**
  * Kolab files storage engine
  *
  * @version @package_version@
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 class kolab_files_engine
 {
     private $plugin;
     private $rc;
     private $timeout = 600;
     private $sort_cols = array('name', 'mtime', 'size');
 
     const API_VERSION = 2;
 
 
     /**
      * Class constructor
      */
     public function __construct($plugin, $url)
     {
         $this->url     = rcube_utils::resolve_url($url);
         $this->plugin  = $plugin;
         $this->rc      = $plugin->rc;
         $this->timeout = $this->rc->config->get('session_lifetime') * 60;
     }
 
     /**
      * User interface initialization
      */
     public function ui()
     {
         $this->plugin->add_texts('localization/');
 
+        $templates = array();
+
         // set templates of Files UI and widgets
         if ($this->rc->task == 'mail') {
-            if ($this->rc->action == 'compose') {
-                $template = 'compose_plugin';
+            if (in_array($this->rc->action, array('', 'show', 'compose'))) {
+                $templates[] = 'compose_plugin';
             }
-            else if (in_array($this->rc->action, array('show', 'preview', 'get'))) {
-                $template = 'message_plugin';
+            if (in_array($this->rc->action, array('show', 'preview', 'get'))) {
+                $templates[] = 'message_plugin';
 
                 if ($this->rc->action == 'get') {
                     // add "Save as" button into attachment toolbar
                     $this->plugin->add_button(array(
                         'id'         => 'saveas',
                         'name'       => 'saveas',
                         'type'       => 'link',
                         'onclick'    => 'kolab_directory_selector_dialog()',
                         'class'      => 'button buttonPas saveas',
                         'classact'   => 'button saveas',
                         'label'      => 'kolab_files.save',
                         'title'      => 'kolab_files.saveto',
                         ), 'toolbar');
                 }
                 else {
                     // add "Save as" button into attachment menu
                     $this->plugin->add_button(array(
                         'id'         => 'attachmenusaveas',
                         'name'       => 'attachmenusaveas',
                         'type'       => 'link',
                         'wrapper'    => 'li',
                         'onclick'    => 'return false',
                         'class'      => 'icon active saveas',
                         'classact'   => 'icon active saveas',
                         'innerclass' => 'icon active saveas',
                         'label'      => 'kolab_files.saveto',
                         ), 'attachmentmenu');
                 }
             }
 
+            $list_widget = true;
+        }
+        else if (!$this->rc->action && in_array($this->rc->task, array('calendar', 'tasks'))) {
+            $list_widget = true;
+            $templates[] = 'compose_plugin';
+        }
+        else if ($this->rc->task == 'files') {
+            $templates[] = 'files';
+
+            // get list of external sources
+            $this->get_external_storage_drivers();
+        }
+
+        if ($list_widget) {
             $this->folder_list_env();
 
             $this->plugin->add_label('save', 'cancel', 'saveto',
                 'saveall', 'fromcloud', 'attachsel', 'selectfiles', 'attaching',
                 'collection_audio', 'collection_video', 'collection_image', 'collection_document',
                 'folderauthtitle', 'authenticating'
             );
         }
-        else if ($this->rc->task == 'files') {
-            $template = 'files';
-
-            // get list of external sources
-            $this->get_external_storage_drivers();
-        }
 
         // add taskbar button
         if (empty($_REQUEST['framed'])) {
             $this->plugin->add_button(array(
                 'command'    => 'files',
                 'class'      => 'button-files',
                 'classsel'   => 'button-files button-selected',
                 'innerclass' => 'button-inner',
                 'label'      => 'kolab_files.files',
                 ), 'taskbar');
         }
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/style.css');
 
-        if (!empty($template)) {
+        if (!empty($templates)) {
             $collapsed_folders = (string) $this->rc->config->get('kolab_files_collapsed_folders');
 
             $this->plugin->include_script($this->url . '/js/files_api.js');
             $this->plugin->include_script('kolab_files.js');
             $this->rc->output->include_script('treelist.js');
             $this->rc->output->set_env('files_url', $this->url . '/api/');
             $this->rc->output->set_env('files_token', $this->get_api_token());
             $this->rc->output->set_env('kolab_files_collapsed_folders', $collapsed_folders);
 
             // register template objects for dialogs (and main interface)
             $this->rc->output->add_handlers(array(
                 'folder-create-form' => array($this, 'folder_create_form'),
                 'folder-edit-form'   => array($this, 'folder_edit_form'),
                 'folder-mount-form'  => array($this, 'folder_mount_form'),
                 'folder-auth-options'=> array($this, 'folder_auth_options'),
                 'file-search-form'   => array($this, 'file_search_form'),
                 'file-edit-form'     => array($this, 'file_edit_form'),
                 'file-create-form'   => array($this, 'file_create_form'),
                 'filelist'           => array($this, 'file_list'),
                 'filequotadisplay'   => array($this, 'quota_display'),
             ));
 
             if ($this->rc->task != 'files') {
-                // add dialog content at the end of page body
-                $this->rc->output->add_footer(
-                    $this->rc->output->parse('kolab_files.' . $template, false, false));
+                // add dialog(s) content at the end of page body
+                foreach ($templates as $template) {
+                    $this->rc->output->add_footer(
+                        $this->rc->output->parse('kolab_files.' . $template, false, false));
+                }
             }
         }
     }
 
     /**
      * Engine actions handler
      */
     public function actions()
     {
         if ($this->rc->task == 'files' && $this->rc->action) {
             $action = $this->rc->action;
         }
         else if ($this->rc->task != 'files' && $_POST['act']) {
             $action = $_POST['act'];
         }
         else {
             $action = 'index';
         }
 
         $method = 'action_' . str_replace('-', '_', $action);
 
         if (method_exists($this, $method)) {
             $this->plugin->add_texts('localization/');
             $this->{$method}();
         }
     }
 
     /**
      * Template object for folder creation form
      */
     public function folder_create_form($attrib)
     {
         $attrib['name'] = 'folder-create-form';
         if (empty($attrib['id'])) {
             $attrib['id'] = 'folder-create-form';
         }
 
         $input_name    = new html_inputfield(array('id' => 'folder-name', 'name' => 'name', 'size' => 30));
         $select_parent = new html_select(array('id' => 'folder-parent', 'name' => 'parent'));
         $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
 
         $table->add('title', html::label('folder-name', rcube::Q($this->plugin->gettext('foldername'))));
         $table->add(null, $input_name->show());
         $table->add('title', html::label('folder-parent', rcube::Q($this->plugin->gettext('folderinside'))));
         $table->add(null, $select_parent->show());
 
         $out = $table->show();
 
         // add form tag around text field
         if (empty($attrib['form'])) {
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
         $this->plugin->add_label('foldercreating', 'foldercreatenotice', 'create', 'foldercreate', 'cancel');
         $this->rc->output->add_gui_object('folder-create-form', $attrib['id']);
 
         return $out;
     }
 
     /**
      * Template object for folder editing form
      */
     public function folder_edit_form($attrib)
     {
         $attrib['name'] = 'folder-edit-form';
         if (empty($attrib['id'])) {
             $attrib['id'] = 'folder-edit-form';
         }
 
         $input_name    = new html_inputfield(array('id' => 'folder-edit-name', 'name' => 'name', 'size' => 30));
         $select_parent = new html_select(array('id' => 'folder-edit-parent', 'name' => 'parent'));
         $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
 
         $table->add('title', html::label('folder-name', rcube::Q($this->plugin->gettext('foldername'))));
         $table->add(null, $input_name->show());
         $table->add('title', html::label('folder-parent', rcube::Q($this->plugin->gettext('folderinside'))));
         $table->add(null, $select_parent->show());
 
         $out = $table->show();
 
         // add form tag around text field
         if (empty($attrib['form'])) {
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
         $this->plugin->add_label('folderupdating', 'folderupdatenotice', 'save', 'folderedit', 'cancel');
         $this->rc->output->add_gui_object('folder-edit-form', $attrib['id']);
 
         return $out;
     }
 
     /**
      * Template object for folder mounting form
      */
     public function folder_mount_form($attrib)
     {
         $sources = $this->rc->output->get_env('external_sources');
 
         if (empty($sources) || !is_array($sources)) {
             return '';
         }
 
         $attrib['name'] = 'folder-mount-form';
         if (empty($attrib['id'])) {
             $attrib['id'] = 'folder-mount-form';
         }
 
         // build form content
         $table        = new html_table(array('cols' => 2, 'class' => 'propform'));
         $input_name   = new html_inputfield(array('id' => 'folder-mount-name', 'name' => 'name', 'size' => 30));
         $input_driver = new html_radiobutton(array('name' => 'driver', 'size' => 30));
 
         $table->add('title', html::label('folder-mount-name', rcube::Q($this->plugin->gettext('name'))));
         $table->add(null, $input_name->show());
 
         foreach ($sources as $key => $source) {
             $id    = 'source-' . $key;
             $form  = new html_table(array('cols' => 2, 'class' => 'propform driverform'));
 
             foreach ((array) $source['form'] as $idx => $label) {
                 $iid = $id . '-' . $idx;
                 $type  = stripos($idx, 'pass') !== false ? 'html_passwordfield' : 'html_inputfield';
                 $input = new $type(array('size' => 30));
 
                 $form->add('title', html::label($iid, rcube::Q($label)));
                 $form->add(null, $input->show('', array(
                         'id'   => $iid,
                         'name' => $key . '[' . $idx . ']'
                 )));
             }
 
             $row = $input_driver->show(null, array('value' => $key))
                 . html::img(array('src' => $source['image'], 'alt' => $key, 'title' => $source['name']))
                 . html::div(null, html::span('name', rcube::Q($source['name']))
                     . html::br()
                     . html::span('description', rcube::Q($source['description']))
                     . $form->show()
                 );
 
             $table->add(array('id' => $id, 'colspan' => 2, 'class' => 'source'), $row);
         }
 
         $out = $table->show() . $this->folder_auth_options(array('suffix' => '-form'));
 
         // add form tag around text field
         if (empty($attrib['form'])) {
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
         $this->plugin->add_label('foldermounting', 'foldermountnotice', 'foldermount',
             'save', 'cancel', 'folderauthtitle', 'authenticating'
         );
         $this->rc->output->add_gui_object('folder-mount-form', $attrib['id']);
 
         return $out;
     }
 
     /**
      * Template object for folder authentication options
      */
     public function folder_auth_options($attrib)
     {
         $checkbox = new html_checkbox(array(
             'name'  => 'store_passwords',
             'value' => '1',
             'id'    => 'auth-pass-checkbox' . $attrib['suffix'],
         ));
 
         return html::div('auth-options', $checkbox->show(). '&nbsp;'
             . html::label('auth-pass-checkbox' . $attrib['suffix'], $this->plugin->gettext('storepasswords'))
             . html::span('description', $this->plugin->gettext('storepasswordsdesc'))
         );
     }
 
     /**
      * Template object for file_edit form
      */
     public function file_edit_form($attrib)
     {
         $attrib['name'] = 'file-edit-form';
         if (empty($attrib['id'])) {
             $attrib['id'] = 'file-edit-form';
         }
 
         $input_name = new html_inputfield(array('id' => 'file-edit-name', 'name' => 'name', 'size' => 30));
         $table      = new html_table(array('cols' => 2, 'class' => 'propform'));
 
         $table->add('title', html::label('file-edit-name', rcube::Q($this->plugin->gettext('filename'))));
         $table->add(null, $input_name->show());
 
         $out = $table->show();
 
         // add form tag around text field
         if (empty($attrib['form'])) {
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
         $this->plugin->add_label('save', 'cancel', 'fileupdating', 'fileedit');
         $this->rc->output->add_gui_object('file-edit-form', $attrib['id']);
 
         return $out;
     }
 
     /**
      * Template object for file_create form
      */
     public function file_create_form($attrib)
     {
         $attrib['name'] = 'file-create-form';
         if (empty($attrib['id'])) {
             $attrib['id'] = 'file-create-form';
         }
 
         $input_name    = new html_inputfield(array('id' => 'file-create-name', 'name' => 'name', 'size' => 30));
         $select_parent = new html_select(array('id' => 'file-create-parent', 'name' => 'parent'));
         $select_type   = new html_select(array('id' => 'file-create-type', 'name' => 'type'));
         $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
 
         // @TODO: get this list from Chwala API
         $types = array(
             'application/vnd.oasis.opendocument.text' => 'odt',
             'text/plain' => 'txt',
             'text/html'  => 'html',
         );
         foreach (array_keys($types) as $type) {
             list ($app, $label) = explode('/', $type);
             $label = preg_replace('/[^a-z]/', '', $label);
             $select_type->add($this->plugin->gettext('type.' . $label), $type);
         }
 
         $table->add('title', html::label('file-create-name', rcube::Q($this->plugin->gettext('filename'))));
         $table->add(null, $input_name->show());
         $table->add('title', html::label('file-create-type', rcube::Q($this->plugin->gettext('type'))));
         $table->add(null, $select_type->show());
         $table->add('title', html::label('folder-parent', rcube::Q($this->plugin->gettext('folderinside'))));
         $table->add(null, $select_parent->show());
 
         $out = $table->show();
 
         // add form tag around text field
         if (empty($attrib['form'])) {
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
         $this->plugin->add_label('create', 'cancel', 'filecreating', 'createfile');
         $this->rc->output->add_gui_object('file-create-form', $attrib['id']);
         $this->rc->output->set_env('file_extensions', $types);
 
         return $out;
     }
 
     /**
      * Template object for file search form in "From cloud" dialog
      */
     public function file_search_form($attrib)
     {
         $attrib['name'] = '_q';
 
         if (empty($attrib['id'])) {
             $attrib['id'] = 'filesearchbox';
         }
         if ($attrib['type'] == 'search' && !$this->rc->output->browser->khtml) {
             unset($attrib['type'], $attrib['results']);
         }
 
         $input_q = new html_inputfield($attrib);
         $out = $input_q->show();
 
         // add some labels to client
         $this->rc->output->add_label('searching');
         $this->rc->output->add_gui_object('filesearchbox', $attrib['id']);
 
         // add form tag around text field
         if (empty($attrib['form'])) {
             $out = $this->rc->output->form_tag(array(
                     'action'   => '?_task=files',
                     'name'     => "filesearchform",
                     'onsubmit' => rcmail_output::JS_OBJECT_NAME . ".command('files-search'); return false",
                 ), $out);
         }
 
         return $out;
     }
 
     /**
      * Template object for files list
      */
     public function file_list($attrib)
     {
         // define list of cols to be displayed based on parameter or config
         if (empty($attrib['columns'])) {
             $list_cols     = $this->rc->config->get('kolab_files_list_cols');
             $dont_override = $this->rc->config->get('dont_override');
             $a_show_cols = is_array($list_cols) ? $list_cols : array('name');
             $this->rc->output->set_env('col_movable', !in_array('kolab_files_list_cols', (array)$dont_override));
         }
         else {
             $columns     = str_replace(array("'", '"'), '', $attrib['columns']);
             $a_show_cols = preg_split('/[\s,;]+/', $columns);
         }
 
         // make sure 'name' and 'options' column is present
         if (!in_array('name', $a_show_cols)) {
             array_unshift($a_show_cols, 'name');
         }
         if (!in_array('options', $a_show_cols)) {
             array_unshift($a_show_cols, 'options');
         }
 
         $attrib['columns'] = $a_show_cols;
 
         // save some variables for use in ajax list
         $_SESSION['kolab_files_list_attrib'] = $attrib;
 
         // For list in dialog(s) remove all option-like columns
         if ($this->rc->task != 'files') {
             $a_show_cols = array_intersect($a_show_cols, $this->sort_cols);
         }
 
         // set default sort col/order to session
         if (!isset($_SESSION['kolab_files_sort_col']))
             $_SESSION['kolab_files_sort_col'] = $this->rc->config->get('kolab_files_sort_col') ?: 'name';
         if (!isset($_SESSION['kolab_files_sort_order']))
             $_SESSION['kolab_files_sort_order'] = strtoupper($this->rc->config->get('kolab_files_sort_order') ?: 'asc');
 
         // set client env
         $this->rc->output->add_gui_object('filelist', $attrib['id']);
         $this->rc->output->set_env('sort_col', $_SESSION['kolab_files_sort_col']);
         $this->rc->output->set_env('sort_order', $_SESSION['kolab_files_sort_order']);
-        $this->rc->output->set_env('coltypes', $a_show_cols);
+        $this->rc->output->set_env('file_coltypes', $a_show_cols);
         $this->rc->output->set_env('search_threads', $this->rc->config->get('kolab_files_search_threads'));
 
         $this->rc->output->include_script('list.js');
 
         // attach css rules for mimetype icons
         $this->plugin->include_stylesheet($this->url . '/skins/default/images/mimetypes/style.css');
 
         $thead = '';
         foreach ($this->file_list_head($attrib, $a_show_cols) as $cell) {
             $thead .= html::tag('th', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
         }
 
         return html::tag('table', $attrib,
             html::tag('thead', null, html::tag('tr', null, $thead)) . html::tag('tbody', null, ''),
             array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
     }
 
     /**
      * Creates <THEAD> for message list table
      */
     protected function file_list_head($attrib, $a_show_cols)
     {
         $skin_path = $_SESSION['skin_path'];
 //        $image_tag = html::img(array('src' => "%s%s", 'alt' => "%s"));
 
         // check to see if we have some settings for sorting
         $sort_col   = $_SESSION['kolab_files_sort_col'];
         $sort_order = $_SESSION['kolab_files_sort_order'];
 
         $dont_override  = (array)$this->rc->config->get('dont_override');
         $disabled_sort  = in_array('message_sort_col', $dont_override);
         $disabled_order = in_array('message_sort_order', $dont_override);
 
         $this->rc->output->set_env('disabled_sort_col', $disabled_sort);
         $this->rc->output->set_env('disabled_sort_order', $disabled_order);
 
         // define sortable columns
         if ($disabled_sort)
             $a_sort_cols = $sort_col && !$disabled_order ? array($sort_col) : array();
         else
             $a_sort_cols = $this->sort_cols;
 
         if (!empty($attrib['optionsmenuicon'])) {
             $onclick = 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('menu-open', 'filelistmenu', this, event)";
             $inner   = $this->rc->gettext('listoptions');
 
             if (is_string($attrib['optionsmenuicon']) && $attrib['optionsmenuicon'] != 'true') {
                 $inner = html::img(array('src' => $skin_path . $attrib['optionsmenuicon'], 'alt' => $this->rc->gettext('listoptions')));
             }
 
             $list_menu = html::a(array(
                 'href'     => '#list-options',
                 'onclick'  => $onclick,
                 'class'    => 'listmenu',
                 'id'       => 'listmenulink',
                 'title'    => $this->rc->gettext('listoptions'),
                 'tabindex' => '0',
             ), $inner);
         }
         else {
             $list_menu = '';
         }
 
         $cells = array();
 
         foreach ($a_show_cols as $col) {
             // get column name
             switch ($col) {
 /*
             case 'status':
                 $col_name = '<span class="' . $col .'">&nbsp;</span>';
                 break;
 */
             case 'options':
                 $col_name = $list_menu;
                 break;
             default:
                 $col_name = rcube::Q($this->plugin->gettext($col));
             }
 
             // 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('files-sort','$col',this)",
                         'title'   => $this->plugin->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;
     }
 
     /**
      * Update files list object
      */
     protected function file_list_update($prefs)
     {
         $attrib = $_SESSION['kolab_files_list_attrib'];
 
         if (!empty($prefs['kolab_files_list_cols'])) {
             $attrib['columns'] = $prefs['kolab_files_list_cols'];
             $_SESSION['kolab_files_list_attrib'] = $attrib;
         }
 
         $a_show_cols = $attrib['columns'];
         $head        = '';
 
         foreach ($this->file_list_head($attrib, $a_show_cols) as $cell) {
             $head .= html::tag('td', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
         }
 
         $head = html::tag('tr', null, $head);
 
-        $this->rc->output->set_env('coltypes', $a_show_cols);
+        $this->rc->output->set_env('file_coltypes', $a_show_cols);
         $this->rc->output->command('files_list_update', $head);
     }
 
     /**
      * Template object for file info box
      */
     public function file_info_box($attrib)
     {
         // print_r($this->file_data, true);
         $table = new html_table(array('cols' => 2, 'class' => $attrib['class']));
 
         // file name
         $table->add('label', $this->plugin->gettext('name').':');
         $table->add('data filename', $this->file_data['name']);
 
         // file type
         // @TODO: human-readable type name
         $table->add('label', $this->plugin->gettext('type').':');
         $table->add('data filetype', $this->file_data['type']);
 
         // file size
         $table->add('label', $this->plugin->gettext('size').':');
         $table->add('data filesize', $this->rc->show_bytes($this->file_data['size']));
 
         // file modification time
         $table->add('label', $this->plugin->gettext('mtime').':');
         $table->add('data filemtime', $this->file_data['mtime']);
 
         // @TODO: for images: width, height, color depth, etc.
         // @TODO: for text files: count of characters, lines, words
 
         return $table->show();
     }
 
     /**
      * Template object for file preview frame
      */
     public function file_preview_frame($attrib)
     {
         if (empty($attrib['id'])) {
             $attrib['id'] = 'filepreviewframe';
         }
 
         if ($frame = $this->file_data['viewer']['frame']) {
             return $frame;
         }
 
         if ($href = $this->file_data['viewer']['href']) {
             // file href attribute must be an absolute URL (Bug #2063)
             if (!empty($href)) {
                 if (!preg_match('|^https?://|', $href)) {
                     $href = $this->url . '/api/' . $href;
                 }
             }
         }
         else {
             $token = $this->get_api_token();
             $href  = $this->url . '/api/?method=file_get'
                 . '&file=' . urlencode($this->file_data['filename'])
                 . '&token=' . urlencode($token);
         }
 
         $this->rc->output->add_gui_object('preview_frame', $attrib['id']);
 
         $attrib['allowfullscreen'] = true;
         $attrib['src']             = $href;
         $attrib['onload']          = 'kolab_files_frame_load(this)';
 
         return html::iframe($attrib);
     }
 
     /**
      * Template object for quota display
      */
     public function quota_display($attrib)
     {
         if (!$attrib['id']) {
             $attrib['id'] = 'rcmquotadisplay';
         }
 
         $quota_type = !empty($attrib['display']) ? $attrib['display'] : 'text';
 
         $this->rc->output->add_gui_object('quotadisplay', $attrib['id']);
         $this->rc->output->set_env('quota_type', $quota_type);
 
         // get quota
         $token   = $this->get_api_token();
         $request = $this->get_request(array('method' => 'quota'), $token);
 
         // send request to the API
         try {
             $response = $request->send();
             $status   = $response->getStatus();
             $body     = @json_decode($response->getBody(), true);
 
             if ($status == 200 && $body['status'] == 'OK') {
                 $quota = $body['result'];
             }
             else {
                 throw new Exception($body['reason']);
             }
         }
         catch (Exception $e) {
             rcube::raise_error($e, true, false);
             $quota = array('total' => 0, 'percent' => 0);
         }
 
         $quota = rcube_output::json_serialize($quota);
 
         $this->rc->output->add_script(rcmail_output::JS_OBJECT_NAME . ".files_set_quota($quota);", 'docready');
 
         return html::span($attrib, '');
     }
 
     /**
      * Get API token for current user session, authenticate if needed
      */
     public function get_api_token()
     {
         $token = $_SESSION['kolab_files_token'];
         $time  = $_SESSION['kolab_files_time'];
 
         if ($token && time() - $this->timeout < $time) {
             if (time() - $time <= $this->timeout / 2) {
                 return $token;
             }
         }
 
         $request = $this->get_request(array('method' => 'ping'), $token);
 
         try {
             $url = $request->getUrl();
 
             // Send ping request
             if ($token) {
                 $url->setQueryVariables(array('method' => 'ping'));
                 $request->setUrl($url);
                 $response = $request->send();
                 $status   = $response->getStatus();
 
                 if ($status == 200 && ($body = json_decode($response->getBody(), true))) {
                     if ($body['status'] == 'OK') {
                         $_SESSION['kolab_files_time']  = time();
                         return $token;
                     }
                 }
             }
 
             // Go with authenticate request
             $url->setQueryVariables(array('method' => 'authenticate', 'version' => self::API_VERSION));
             $request->setUrl($url);
             $request->setAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION['password']));
             $response = $request->send();
             $status   = $response->getStatus();
 
             if ($status == 200 && ($body = json_decode($response->getBody(), true))) {
                 $token = $body['result']['token'];
 
                 if ($token) {
                     $_SESSION['kolab_files_token'] = $token;
                     $_SESSION['kolab_files_time']  = time();
                     $_SESSION['kolab_files_caps']  = $body['result']['capabilities'];
                 }
             }
             else {
                 throw new Exception(sprintf("Authenticate error (Status: %d)", $status));
             }
         }
         catch (Exception $e) {
             rcube::raise_error($e, true, false);
         }
 
         return $token;
     }
 
     /**
      * Initialize HTTP_Request object
      */
     protected function get_request($get = null, $token = null)
     {
         $url = $this->url . '/api/';
 
         if (!$this->request) {
             $config = array(
                 'store_body'       => true,
                 'follow_redirects' => true,
             );
 
             $this->request = libkolab::http_request($url, 'GET', $config);
         }
         else {
             // cleanup
             try {
                 $this->request->setBody('');
                 $this->request->setUrl($url);
                 $this->request->setMethod(HTTP_Request2::METHOD_GET);
             }
             catch (Exception $e) {
                 rcube::raise_error($e, true, true);
             }
         }
 
         if ($token) {
             $this->request->setHeader('X-Session-Token', $token);
         }
 
         if (!empty($get)) {
             $url = $this->request->getUrl();
             $url->setQueryVariables($get);
             $this->request->setUrl($url);
         }
 
         // some HTTP server configurations require this header
         $this->request->setHeader('accept', "application/json,text/javascript,*/*");
 
         return $this->request;
     }
 
     /**
      * Handler for main files interface (Files task)
      */
     protected function action_index()
     {
         $this->plugin->add_label(
             'uploading', 'attaching', 'searching', 'uploadsizeerror',
             'filedeleting', 'filedeletenotice', 'filedeleteconfirm',
             'filemoving', 'filemovenotice', 'filemoveconfirm', 'filecopying', 'filecopynotice',
             'fileskip', 'fileskipall', 'fileoverwrite', 'fileoverwriteall'
         );
 
         $this->folder_list_env();
 
         $this->rc->output->add_label('uploadprogress', 'GB', 'MB', 'KB', 'B');
         $this->rc->output->set_pagetitle($this->plugin->gettext('files'));
         $this->rc->output->set_env('file_mimetypes', $this->get_mimetypes());
         $this->rc->output->set_env('files_quota', $_SESSION['kolab_files_caps']['QUOTA']);
         $this->rc->output->set_env('files_max_upload', $_SESSION['kolab_files_caps']['MAX_UPLOAD']);
         $this->rc->output->set_env('files_progress_name', $_SESSION['kolab_files_caps']['PROGRESS_NAME']);
         $this->rc->output->set_env('files_progress_time', $_SESSION['kolab_files_caps']['PROGRESS_TIME']);
         $this->rc->output->send('kolab_files.files');
     }
 
     /**
      * Handler for preferences save action
      */
     protected function action_prefs()
     {
         $dont_override = (array)$this->rc->config->get('dont_override');
         $prefs = array();
         $opts  = array(
             'kolab_files_sort_col' => true,
             'kolab_files_sort_order' => true,
             'kolab_files_list_cols' => false,
         );
 
         foreach ($opts as $o => $sess) {
             if (isset($_POST[$o]) && !in_array($o, $dont_override)) {
                 $prefs[$o] = rcube_utils::get_input_value($o, rcube_utils::INPUT_POST);
                 if ($sess) {
                     $_SESSION[$o] = $prefs[$o];
                 }
 
                 if ($o == 'kolab_files_list_cols') {
                     $update_list = true;
                 }
             }
         }
 
         // save preference values
         if (!empty($prefs)) {
             $this->rc->user->save_prefs($prefs);
         }
 
         if (!empty($update_list)) {
             $this->file_list_update($prefs);
         }
 
         $this->rc->output->send();
     }
 
     /**
      * Handler for file open action
      */
     protected function action_open()
     {
         $file   = rcube_utils::get_input_value('file', rcube_utils::INPUT_GET);
         $viewer = intval($_GET['viewer']);
 
         // get file info
         $token   = $this->get_api_token();
         $request = $this->get_request(array(
             'method' => 'file_info',
             'file'   => $file,
             'viewer' => $viewer,
             ), $token);
 
         // send request to the API
         try {
             $response = $request->send();
             $status   = $response->getStatus();
             $body     = @json_decode($response->getBody(), true);
 
             if ($status == 200 && $body['status'] == 'OK') {
                 $this->file_data = $body['result'];
             }
             else {
                 throw new Exception($body['reason']);
             }
         }
         catch (Exception $e) {
             rcube::raise_error(array(
                 'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
                 'message' => $e->getMessage()),
                 true, true);
         }
 
         $this->file_data['filename'] = $file;
 
         $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice');
 
         // register template objects for dialogs (and main interface)
         $this->rc->output->add_handlers(array(
             'fileinfobox'      => array($this, 'file_info_box'),
             'filepreviewframe' => array($this, 'file_preview_frame'),
         ));
 
         $placeholder = $this->rc->output->asset_url('program/resources/blank.gif');
 
         // this one is for styling purpose
         $this->rc->output->set_env('extwin', true);
         $this->rc->output->set_env('file', $file);
         $this->rc->output->set_env('file_data', $this->file_data);
         $this->rc->output->set_env('photo_placeholder', $placeholder);
         $this->rc->output->set_pagetitle(rcube::Q($file));
         $this->rc->output->send('kolab_files.' . ($viewer & 4 ? 'docedit' : 'filepreview'));
     }
 
     /**
      * Handler for "save all attachments into cloud" action
      */
     protected function action_save_file()
     {
 //        $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_POST);
         $uid    = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
         $dest   = rcube_utils::get_input_value('dest', rcube_utils::INPUT_POST);
         $id     = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
         $name   = rcube_utils::get_input_value('name', rcube_utils::INPUT_POST);
 
         $temp_dir = unslashify($this->rc->config->get('temp_dir'));
         $message  = new rcube_message($uid);
         $request  = $this->get_request();
         $url      = $request->getUrl();
         $files    = array();
         $errors   = array();
         $attachments = array();
 
         $request->setMethod(HTTP_Request2::METHOD_POST);
         $request->setHeader('X-Session-Token', $this->get_api_token());
         $url->setQueryVariables(array('method' => 'file_upload', 'folder' => $dest));
         $request->setUrl($url);
 
         foreach ($message->attachments as $attach_prop) {
             if (empty($id) || $id == $attach_prop->mime_id) {
                 $filename = strlen($name) ? $name : rcmail_attachment_name($attach_prop, true);
                 $attachments[$filename] = $attach_prop;
             }
         }
 
         // @TODO: handle error
         // @TODO: implement file upload using file URI instead of body upload
 
         foreach ($attachments as $attach_name => $attach_prop) {
             $path = tempnam($temp_dir, 'rcmAttmnt');
 
             // save attachment to file
             if ($fp = fopen($path, 'w+')) {
                 $message->get_part_body($attach_prop->mime_id, false, 0, $fp);
             }
             else {
                 $errors[] = true;
                 rcube::raise_error(array(
                     'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
                     'message' => "Unable to save attachment into file $path"),
                     true, false);
                 continue;
             }
 
             fclose($fp);
 
             // send request to the API
             try {
                 $request->setBody('');
                 $request->addUpload('file[]', $path, $attach_name, $attach_prop->mimetype);
                 $response = $request->send();
                 $status   = $response->getStatus();
                 $body     = @json_decode($response->getBody(), true);
 
                 if ($status == 200 && $body['status'] == 'OK') {
                     $files[] = $attach_name;
                 }
                 else {
                     throw new Exception($body['reason']);
                 }
             }
             catch (Exception $e) {
                 unlink($path);
                 $errors[] = $e->getMessage();
                 rcube::raise_error(array(
                     'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
                     'message' => $e->getMessage()),
                     true, false);
                 continue;
             }
 
             // clean up
             unlink($path);
             $request->setBody('');
         }
 
         if ($count = count($files)) {
             $msg = $this->plugin->gettext(array('name' => 'saveallnotice', 'vars' => array('n' => $count)));
             $this->rc->output->show_message($msg, 'confirmation');
         }
         if ($count = count($errors)) {
             $msg = $this->plugin->gettext(array('name' => 'saveallerror', 'vars' => array('n' => $count)));
             $this->rc->output->show_message($msg, 'error');
         }
 
         // @TODO: update quota indicator, make this optional in case files aren't stored in IMAP
 
         $this->rc->output->send();
     }
 
     /**
      * Handler for "add attachments from the cloud" action
      */
     protected function action_attach_file()
     {
-        $files      = rcube_utils::get_input_value('files', rcube_utils::INPUT_POST);
-        $uploadid   = rcube_utils::get_input_value('uploadid', rcube_utils::INPUT_POST);
-        $COMPOSE_ID = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
-        $COMPOSE    = null;
-        $errors     = array();
+        $files       = rcube_utils::get_input_value('files', rcube_utils::INPUT_POST);
+        $uploadid    = rcube_utils::get_input_value('uploadid', rcube_utils::INPUT_POST);
+        $COMPOSE_ID  = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
+        $COMPOSE     = null;
+        $errors      = array();
+        $attachments = array();
 
-        if ($COMPOSE_ID && $_SESSION['compose_data_'.$COMPOSE_ID]) {
-            $COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];
-        }
+        if ($this->rc->task == 'mail') {
+            if ($COMPOSE_ID && $_SESSION['compose_data_'.$COMPOSE_ID]) {
+                $COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];
+            }
 
-        if (!$COMPOSE) {
-            die("Invalid session var!");
-        }
+            if (!$COMPOSE) {
+                die("Invalid session var!");
+            }
 
-        // attachment upload action
-        if (!is_array($COMPOSE['attachments'])) {
-            $COMPOSE['attachments'] = array();
+            // attachment upload action
+            if (!is_array($COMPOSE['attachments'])) {
+                $COMPOSE['attachments'] = array();
+            }
         }
 
         // clear all stored output properties (like scripts and env vars)
         $this->rc->output->reset();
 
         $temp_dir = unslashify($this->rc->config->get('temp_dir'));
         $request  = $this->get_request();
         $url      = $request->getUrl();
 
         // Use observer object to store HTTP response into a file
         require_once $this->plugin->home . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'kolab_files_observer.php';
         $observer = new kolab_files_observer();
 
         $request->setHeader('X-Session-Token', $this->get_api_token());
 
         // download files from the API and attach them
         foreach ($files as $file) {
             // decode filename
             $file = urldecode($file);
 
             // get file information
             try {
                 $url->setQueryVariables(array('method' => 'file_info', 'file' => $file));
                 $request->setUrl($url);
                 $response = $request->send();
                 $status   = $response->getStatus();
                 $body     = @json_decode($response->getBody(), true);
 
                 if ($status == 200 && $body['status'] == 'OK') {
                     $file_params = $body['result'];
                 }
                 else {
                     throw new Exception($body['reason']);
                 }
             }
             catch (Exception $e) {
                 $errors[] = $e->getMessage();
                 rcube::raise_error(array(
                     'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
                     'message' => $e->getMessage()),
                     true, false);
                 continue;
             }
 
             // set location of downloaded file
             $path = tempnam($temp_dir, 'rcmAttmnt');
             $observer->set_file($path);
 
             // download file
             try {
                 $url->setQueryVariables(array('method' => 'file_get', 'file' => $file));
                 $request->setUrl($url);
                 $request->attach($observer);
                 $response = $request->send();
                 $status   = $response->getStatus();
                 $response->getBody(); // returns nothing
                 $request->detach($observer);
 
                 if ($status != 200 || !file_exists($path)) {
                     throw new Exception("Unable to save file");
                 }
             }
             catch (Exception $e) {
                 $errors[] = $e->getMessage();
                 rcube::raise_error(array(
                     'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
                     'message' => $e->getMessage()),
                     true, false);
                 continue;
             }
 
             $attachment = array(
-                'path' => $path,
-                'size' => $file_params['size'],
-                'name' => $file_params['name'],
+                'path'     => $path,
+                'size'     => $file_params['size'],
+                'name'     => $file_params['name'],
                 'mimetype' => $file_params['type'],
-                'group' => $COMPOSE_ID,
+                'group'    => $COMPOSE_ID,
             );
 
+            if ($this->rc->task != 'mail') {
+                $attachments[] = $attachment;
+                continue;
+            }
+
             $attachment = $this->rc->plugins->exec_hook('attachment_save', $attachment);
 
             if ($attachment['status'] && !$attachment['abort']) {
                 $id = $attachment['id'];
 
                 // store new attachment in session
                 unset($attachment['data'], $attachment['status'], $attachment['abort']);
                 $COMPOSE['attachments'][$id] = $attachment;
 
                 if (($icon = $COMPOSE['deleteicon']) && is_file($icon)) {
                     $button = html::img(array(
                         'src' => $icon,
                         'alt' => $this->rc->gettext('delete')
                     ));
                 }
                 else {
                     $button = rcube::Q($this->rc->gettext('delete'));
                 }
 
                 $content = html::a(array(
                     'href' => "#delete",
                     'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", rcmail_output::JS_OBJECT_NAME, $id),
                     'title' => $this->rc->gettext('delete'),
                     'class' => 'delete',
                 ), $button);
 
                 $content .= rcube::Q($attachment['name']);
 
                 $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
                     'html'      => $content,
                     'name'      => $attachment['name'],
                     'mimetype'  => $attachment['mimetype'],
                     'classname' => rcmail_filetype2classname($attachment['mimetype'], $attachment['name']),
                     'complete'  => true), $uploadid);
             }
             else if ($attachment['error']) {
                 $errors[] = $attachment['error'];
             }
             else {
                 $errors[] = $this->plugin->gettext('attacherror');
             }
         }
 
         if (!empty($errors)) {
             $this->rc->output->command('display_message', $this->plugin->gettext('attacherror'), 'error');
             $this->rc->output->command('remove_from_attachment_list', $uploadid);
         }
+        else if ($this->rc->task == 'calendar' || $this->rc->task == 'tasks') {
+            // for uploads in events/tasks we'll use its standard upload handler,
+            // for this we have to fake $_FILES and some other POST args
+            foreach ($attachments as $attach) {
+                $_FILES['_attachments']['tmp_name'][] = $attachment['path'];
+                $_FILES['_attachments']['name'][]     = $attachment['name'];
+                $_FILES['_attachments']['size'][]     = $attachment['size'];
+                $_FILES['_attachments']['type'][]     = $attachment['mimetype'];
+                $_FILES['_attachments']['error'][]    = null;
+            }
+
+            $_GET['_uploadid'] = $uploadid;
+            $_GET['_id']       = $COMPOSE_ID;
+
+            switch ($this->rc->task) {
+            case 'tasks':
+                libcalendaring::get_instance()->attachment_upload(tasklist::SESSION_KEY);
+                break;
+
+            case 'calendar':
+                libcalendaring::get_instance()->attachment_upload(calendar::SESSION_KEY, 'cal-');
+                break;
+            }
+        }
 
         // send html page with JS calls as response
         $this->rc->output->command('auto_save_start', false);
         $this->rc->output->send();
     }
 
     /**
      * Returns mimetypes supported by File API viewers
      */
     protected function get_mimetypes()
     {
         $token   = $this->get_api_token();
         $request = $this->get_request(array('method' => 'mimetypes'), $token);
 
         // send request to the API
         try {
             $response = $request->send();
             $status   = $response->getStatus();
             $body     = @json_decode($response->getBody(), true);
 
             if ($status == 200 && $body['status'] == 'OK') {
                 $mimetypes = $body['result'];
             }
             else {
                 throw new Exception($body['reason']);
             }
         }
         catch (Exception $e) {
             rcube::raise_error(array(
                 'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
                 'message' => $e->getMessage()),
                 true, false);
         }
 
         return $mimetypes;
     }
 
     /**
      * Get list of available external storage drivers
      */
     protected function get_external_storage_drivers()
     {
         // first get configured sources from Chwala
         $token   = $this->get_api_token();
         $request = $this->get_request(array('method' => 'folder_types'), $token);
 
         // send request to the API
         try {
             $response = $request->send();
             $status   = $response->getStatus();
             $body     = @json_decode($response->getBody(), true);
 
             if ($status == 200 && $body['status'] == 'OK') {
                 $sources = $body['result'];
             }
             else {
                 throw new Exception($body['reason']);
             }
         }
         catch (Exception $e) {
             rcube::raise_error($e, true, false);
             return;
         }
 
         $this->rc->output->set_env('external_sources', $sources);
     }
 
     /**
      * Registers translation labels for folder lists in UI
      */
     protected function folder_list_env()
     {
         // folder list and actions
         $this->plugin->add_label(
             'folderdeleting', 'folderdeleteconfirm', 'folderdeletenotice',
             'collection_audio', 'collection_video', 'collection_image', 'collection_document',
             'additionalfolders', 'listpermanent'
         );
         $this->rc->output->add_label('foldersubscribing', 'foldersubscribed',
             'folderunsubscribing', 'folderunsubscribed', 'searching'
         );
 
         $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
     }
 }
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 1bbbf3f5..1a5db7b8 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -1,510 +1,528 @@
 /* Taskbar button */
 #taskbar a.button-files span.button-inner {
   background: url(images/buttons.png) 0 0 no-repeat;
   height: 22px;
 }
 
 #taskbar a.button-files:hover span.button-inner,
 #taskbar a.button-files.button-selected span.button-inner {
   background: url(images/buttons.png) 0 -26px no-repeat;
   height: 22px;
 }
 
 /* Attachment toolbar button */
 .toolbar a.button.saveas {
   background: url(images/buttons.png) center -277px no-repeat;
 }
 
 /* Files main interface */
 #filestoolbar {
   position: absolute;
   height: 40px;
   left: 0;
   top: -6px;
   z-index: 10;
 }
 
 #filestoolbar a.button {
   background-image: url(images/buttons.png);
 }
 
 #filestoolbar a.button.upload {
   background-position: center -52px;
 }
 
 #filestoolbar a.button.get {
   background-position: center -93px;
 }
 
 #filestoolbar a.button.export {
   background-position: 0 -93px;
   min-width: 50px;
 }
 
 #filestoolbar a.button.open {
   background-position: center -131px;
 }
 
 #filestoolbar a.button.delete {
   background-image: url(../../../../skins/larry/images/buttons.png);
 }
 
 #filestoolbar a.button.create,
 #filestoolbar a.button.edit {
   background-position: center -173px;
 }
 
 #filestoolbar a.button.save {
   background-position: center -213px;
 }
 
 #filestoolbar a.button.print {
   background-image: url(../../../../skins/larry/images/buttons.png);
   background-position: center -810px;
   background-repeat: no-repeat;
 }
 
 #filestoolbar form {
   display: inline;
 }
 
 #filestoolbar > label {
   line-height: 42px;
   vertical-align: top;
   color: #555;
   text-shadow: 0 1px 1px #eee;
 }
 
 #document-title {
   width: 200px;
 }
 
 #collaborators {
   position: absolute;
   right: 0;
   top: -6px;
 }
 
 #collaborators #members img.photo {
   width: 32px;
   height: 32px;
   overflow: hidden;
   background: url(../../../../skins/larry/images/contactpic_32px.png) center center no-repeat #fff;
   border-radius: 5px;
   border: solid 3px #eee;
   margin-left: 5px;
 }
 
 #quicksearchbar #filesearchmenulink {
   position: absolute;
   top: 5px;
   left: 6px;
 }
 
 #folderlistbox,
 #fileinfobox {
   position: absolute;
   top: 42px;
   left: 0;
   width: 220px;
   bottom: 0;
 }
 
 #filelistcontainer,
 #filecontent {
   position: absolute;
   top: 42px;
   left: 232px;
   right: 0;
   bottom: 0;
   overflow: auto;
 }
 
 #filecontent.docedit {
   left: 0;
 }
 
 #filelistbox {
   overflow: auto;
   top: 0;
   left: 0;
   position: absolute;
   width: 100%;
 }
 
 #filecontent {
   overflow: hidden;
 }
 
 #filecontent iframe {
   width: 100%;
   height: 100%;
   margin: 0;
   border: 0;
 }
 
 #folderlistbox .scroller {
   top: 34px;
 }
 
 #folderlistbox .boxtitle a.iconbutton.search {
   background-position: -2px -317px;
   cursor: pointer;
   position: absolute;
   right: 8px;
   top: 8px;
   width: 16px;
 }
 
 .folderlist li.mailbox.collection a.name {
   background: url(images/folders.png) 5px 0 no-repeat;
 }
 .folderlist li.mailbox.collection.audio a.name {
   background-position: 5px -96px;
 }
 .folderlist li.mailbox.collection.video a.name {
   background-position: 5px -144px;
 }
 .folderlist li.mailbox.collection.document a.name {
   background-position: 5px 0;
 }
 .folderlist li.mailbox.collection.image a.name {
   background-position: 5px -48px;
 }
 .folderlist li.mailbox.collection.audio.selected a.name {
   background-position: 5px -119px;
 }
 .folderlist li.mailbox.collection.video.selected a.name {
   background-position: 5px -167px;
 }
 .folderlist li.mailbox.collection.document.selected a.name {
   backgroundposition: 5px -24px;
 }
 .folderlist li.mailbox.collection.image.selected a.name {
   background-position: 5px -72px;
 }
 
 #files-folder-list li a.subscription {
   display: inline-block;
   position: absolute;
   top: 5px;
   right: 5px;
   height: 16px;
   width: 16px;
   padding: 0;
   background: url(images/listicons.png) -16px -148px no-repeat;
   overflow: hidden;
   cursor: pointer;
 }
 
 #files-folder-list li a.subscription.subscribed {
   background-position: -16px -110px;
 }
 
 #files-folder-list .searchresults .boxtitle {
   border-radius: 0;
   padding: 2px 8px;
 }
 
 #files-folder-list .searchresults {
   margin-top: 8px;
 }
 
+#files-folder-list li.readonly {
+  background-image: url(images/listicons.png);
+  background-position: right -1000px;
+  background-repeat: no-repeat;
+}
+
+#files-folder-list li.readonly {
+  background-position: 88% -14px;
+}
+
+#files-folder-list li.readonly a {
+  padding-right: 40px;
+}
+
+#files-folder-list li.readonly a.subscription {
+  padding-right: 0;
+}
+
 .filelist thead tr th {
   padding: 0;
 }
 
 .filelist tbody tr td {
   padding: 2px 7px;
   height: 18px;
   line-height: 18px;
 }
 
 .filelist tr > .size {
   width: 80px;
   text-align: right;
 }
 
 .filelist thead tr > .size {
   text-align: left;
 }
 
 .filelist tr > .mtime {
   width: 125px;
 }
 
 .filelist tr > .options {
   width: 32px;
   cursor: pointer;
 }
 
 .filelist thead tr th.filename,
 .filelist tbody tr td.filename {
   width: 99%;
   white-space: nowrap;
 }
 
 .filelist thead tr th.sortedASC a,
 .filelist thead tr th.sortedDESC a {
   color: #004458;
   text-decoration: underline;
   background-image: url(../../../../skins/larry/images/listicons.png);
   background-position: right -912px;
   background-repeat: no-repeat;
 }
 
 .filelist thead tr th.sortedASC a {
   background-position: right -944px;
 }
 
 .filelist img {
   vertical-align: middle;
   display: inline-block;
 }
 
 .filelist tr > .options a.listmenu,
 .filelist tr > .flag span.flagged,
 .filelist tr > .flag span.unflagged,
 .filelist tr > .flag span.unflagged:hover {
   display: inline-block;
   vertical-align: middle;
   height: 18px;
   width: 20px;
   padding: 0;
   background: url(../../../../skins/larry/images/listicons.png) -100px 0 no-repeat;
 }
 
 .filelist thead tr th.options {
   padding: 0;
   border-left: none;
 }
 
 .filelist thead tr th.options .listmenu {
   background-position: 3px -970px;
   cursor: pointer;
   width: 24px;
   height: 20px;
   padding: 4px 4px 5px;
   text-indent: -5000px;
 }
 
 .filelist thead tr th.options .listmenu:focus {
   outline: none;
   background-color: rgba(73,180,210,0.7);
 }
 
 .filelist thead tr th:first-child {
   border-radius: 4px 0 0 0;
 }
 
 .filelist tbody tr td.options:hover span {
   width: 26px;
   height: 18px;
   background: url(../../../../skins/larry/images/buttons.png) -5px -417px no-repeat;
   display: block;
 }
 
 .filelist td.filename {
   padding: 0 4px;
 }
 
 .filelist tbody td.filename span {
   background: url(images/unknown.png) 0 0 no-repeat;
   padding: 1px 0 3px 20px;
   height: 16px;
 }
 
 /*
 .filelist tbody td.filename span input {
   padding: 0 2px;
   height: 18px;
 }
 */
 
 #fileinfobox table {
   table-layout: fixed;
 }
 
 #fileinfobox table td.label {
   width: 60px;
   font-weight: bold;
   padding-right: 0;
 }
 
 #fileinfobox table td.data {
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
 #fileinfobox table td.data.filename {
   font-weight: bold;
 }
 
 #fileinfobox table tr:first-child td {
   border-top: 0;
 }
 
 #filelistcontainer.droptarget.hover,
 #filelistcontainer.droptarget.active {
 	border-color: #019bc6;
 	box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
 	-webkit-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
 }
 
 #filelistcontainer.droptarget.hover {
 	background-color: #d9ecf4;
 	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 }
 
 #filelistcontainer.droptarget.hover #filelist tbody td {
 	background-color: #d9ecf4;
 }
 
 
 /* plugin dialogs */
 
 #files-dialog,
 #files-compose-dialog,
 #files-file-edit-dialog,
 #files-file-create-dialog,
 #files-folder-mount-dialog,
 #files-folder-auth-dialog,
 #files-folder-create-dialog,
 #files-folder-edit-dialog {
   display: none;
 }
 
 #files-compose-dialog #folderlistbox {
   right: auto;
   width: 190px;
   top: 45px;
   bottom: 5px;
   box-shadow: none;
 }
 
 #files-dialog #folderlistbox {
   top: 35px;
   bottom: 5px;
   left: 0;
   right: 0;
   width: auto;
   box-shadow: none;
 }
 
 #files-dialog #folderlistbox .scroller {
   top: 0;
 }
 
 #files-dialog .listsearchbox {
   display: block;
   position: absolute;
   top: 0;
   left: 0;
   right: 0;
   background-color: #fff;
 }
 
 #files-dialog.saveas #folderlistbox {
   bottom: 40px;
 }
 
 #files-compose-dialog #filelistcontainer {
   position: absolute;
   top: 45px;
   bottom: 5px;
   left: 200px;
   right: 0;
   box-shadow: none;
 }
 
 #files-compose-dialog #searchmenulink {
   width: 15px;
 }
 
 #files-compose-dialog .searchbox input {
   background-color: white;
 }
 
 #files-compose-dialog #quicksearchbar {
   top: 10px;
   right: 5px;
 }
 
 #files-compose-dialog #searchreset {
   cursor: pointer;
 }
 
 a.filesaveall {
   display: inline-block;
   margin-top: .5em;
   padding: 3px 5px 4px 5px;
 }
 
 #file-save-as {
   height: 25px;
   white-space: nowrap;
   position: absolute;
   bottom: 8px;
   left: 5px;
   right: 5px;
   text-align: center;
 }
 
 #file-save-as input {
   width: 200px;
 }
 
 ul.toolbarmenu li span.saveas {
   background: url(images/buttons.png) -5px -253px no-repeat;
 }
 
 table.propform td.source.selected {
   background-color: #c7e3ef;
 }
 
 table.propform td.source div {
   display: inline-block;
   padding-left: 3px;
   vertical-align: middle;
 }
 
 table.propform td.source .name {
   font-weight: bold;
 }
 
 table.propform td.source .description {
   font-size: 9px;
   color: #666;
 }
 
 table.propform td.source img {
   vertical-align: middle;
   background-color: #e0e0e0;
   border-radius: 3px;
   margin: 3px;
   background-image: -moz-linear-gradient(center top, #888, #333);
   background-image: -webkit-linear-gradient(top, #888, #333);
   background-image: -ms-linear-gradient(top, #888, #333);
 }
 
 table.propform td.source table.propform td {
   border-bottom: 0;
   padding: 2px 10px;
   background-color: inherit;
 }
 
 .auth-options {
   margin-top: 5px;
 }
 
 .auth-options .description {
   color: #666;
   display: block;
   margin: 3px 0 0 25px;
 }
 
 .auth-options input,
 .auth-options label {
   vertical-align: middle;
 }
diff --git a/plugins/kolab_files/skins/larry/templates/message_plugin.html b/plugins/kolab_files/skins/larry/templates/message_plugin.html
index 1192a309..df8452b0 100644
--- a/plugins/kolab_files/skins/larry/templates/message_plugin.html
+++ b/plugins/kolab_files/skins/larry/templates/message_plugin.html
@@ -1,35 +1,35 @@
 <div id="files-dialog" class="uidialog" data-editable="true" role="dialog" aria-labelledby="aria-label-filesavedialog" aria-hidden="true">
     <h3 id="aria-label-filesavedialog" class="voice"><roundcube:label name="kolab_files.arialabelfilesavedialog" /></h3>
     <div class="listsearchbox">
         <div class="searchbox" role="search" aria-labelledby="aria-label-foldersearchform">
             <h4 id="aria-label-foldersearchform" class="voice"><roundcube:label name="arialabelfoldersearchform" /></h4>
             <label for="foldersearch" class="voice"><roundcube:label name="arialabelsearchterms" /></label>
             <input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='findfolders' />" />
             <a class="iconbutton searchicon"></a>
             <roundcube:button command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
         </div>
     </div>
     <div id="folderlistbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-folderlist">
         <h3 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h3>
-        <div id="files-folder-list" class="scroller withfooter"></div>
+        <div id="files-folder-list" class="scroller withfooter" data-no-collections="true"></div>
         <div id="folderlist-footer" class="boxfooter">
             <roundcube:button command="folder-create" name="foldercreatelink" id="foldercreatelink" type="link" title="createfolder" class="listbutton add" classAct="listbutton add" innerClass="inner" content="+" />
         </div>
     </div>
     <div id="file-save-as">
         <label for="file-save-as-input"><roundcube:label name="kolab_files.saveas" /></label>
         <input id="file-save-as-input" type="text" value="">
     </div>
 </div>
 
 <div id="files-folder-create-dialog" role="dialog" aria-labelledby="aria-label-foldercreateform" aria-hidden="true">
     <h3 id="aria-label-foldercreateform" class="voice"><roundcube:label name="kolab_files.arialabelfoldercreateform" /></h3>
     <roundcube:object name="folder-create-form" />
 </div>
 
 <div id="files-folder-auth-dialog" role="dialog" aria-labelledby="aria-label-folderauthform" aria-hidden="true">
     <h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
     <roundcube:object name="folder-auth-options">
 </div>
 
 <script src="plugins/kolab_files/skins/larry/ui.js" type="text/javascript"></script>
diff --git a/plugins/kolab_files/skins/larry/ui.js b/plugins/kolab_files/skins/larry/ui.js
index b3b7047c..a15f6fdf 100644
--- a/plugins/kolab_files/skins/larry/ui.js
+++ b/plugins/kolab_files/skins/larry/ui.js
@@ -1,98 +1,98 @@
 function kolab_files_ui_init()
 {
   if (rcmail.env.action == 'open') {
     var filesviewsplit = new rcube_splitter({ id:'filesopensplitter', p1:'#fileinfobox', p2:'#filecontent',
       orientation:'v', relative:true, start:226, min:150, size:12 }).init();
 
     rcmail.addEventListener('enable-command', kolab_files_enable_command);
 
     if ($('#exportmenu').length)
       rcmail.gui_object('exportmenu', 'exportmenu');
   }
   else
     var filesviewsplit = new rcube_splitter({ id:'filesviewsplitter', p1:'#folderlistbox', p2:'#filelistcontainer',
       orientation:'v', relative:true, start:226, min:150, size:12 }).init();
 
   $(document).ready(function() {
     rcmail.addEventListener('menu-open', kolab_files_show_listoptions);
     rcmail.addEventListener('menu-save', kolab_files_save_listoptions);
     rcmail.addEventListener('menu-close', kolab_files_show_listoptions);
     rcmail.addEventListener('setquota', kolab_files_update_quota);
 
     var menu = $('#dragfilemenu');
     if (menu.length) {
       rcmail.gui_object('file_dragmenu', 'dragfilemenu');
       UI.add_popup('dragfilemenu', {sticky: 1});
     }
 
     menu = $('#filesearchmenu');
     if (menu.length) {
       rcmail.gui_object('file_searchmenu', 'filesearchmenu');
     }
 
     UI.folder_search_init($('#folderlistbox'));
   });
 
   kolab_files_upload_input('#filestoolbar a.upload');
 };
 
 function kolab_files_enable_command(p)
 {
   if (p.command == 'files-save') {
     var toolbar = $('#filestoolbar');
     $('a.button.edit', toolbar).hide();
     $('a.button.save', toolbar).show();
   }
 };
 
 function kolab_files_update_quota(p)
 {
     return UI.update_quota(p);
 };
 
 function kolab_files_show_listoptions(p)
 {
   if (!p || p.name != 'filelistmenu') {
     return;
   }
 
   var $dialog = $('#listoptions');
 
   // close the dialog
   if ($dialog.is(':visible')) {
     $dialog.dialog('close');
     return;
   }
 
   // set form values
   $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
   $('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
   $('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
 
   // set checkboxes
   $('input[name="list_col[]"]').each(function() {
-    $(this).prop('checked', $.inArray(this.value, rcmail.env.coltypes) != -1);
+    $(this).prop('checked', $.inArray(this.value, rcmail.env.file_coltypes) != -1);
   });
 
   $dialog.dialog({
     modal: true,
     resizable: false,
     closeOnEscape: true,
     close: function() { rcmail.file_list.focus(); },
     title: null,
     minWidth: 400,
     width: $dialog.width()+20
   }).show();
 };
 
 function kolab_files_save_listoptions()
 {
   $('#listoptions').dialog('close');
 
   var sort = $('input[name="sort_col"]:checked').val(),
     ord = $('input[name="sort_ord"]:checked').val(),
     cols = $('input[name="list_col[]"]:checked')
       .map(function(){ return this.value; }).get();
 
   kolab_files_set_list_options(cols, sort, ord);
 };
diff --git a/plugins/kolab_notes/kolab_notes.php b/plugins/kolab_notes/kolab_notes.php
index 20341359..bbac42dc 100644
--- a/plugins/kolab_notes/kolab_notes.php
+++ b/plugins/kolab_notes/kolab_notes.php
@@ -1,1426 +1,1423 @@
 <?php
 
 /**
  * Kolab notes module
  *
  * Adds simple notes management features to the web client
  *
  * @version @package_version@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * Copyright (C) 2014-2015, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 class kolab_notes extends rcube_plugin
 {
     public $task = '?(?!login|logout).*';
     public $allowed_prefs = array('kolab_notes_sort_col');
     public $rc;
 
     private $ui;
     private $lists;
     private $folders;
     private $cache = array();
     private $message_notes = array();
     private $bonnie_api = false;
 
     /**
      * Required startup method of a Roundcube plugin
      */
     public function init()
     {
         $this->require_plugin('libkolab');
 
         $this->rc = rcube::get_instance();
 
         $this->register_task('notes');
 
         // load plugin configuration
         $this->load_config();
 
         // proceed initialization in startup hook
         $this->add_hook('startup', array($this, 'startup'));
     }
 
     /**
      * Startup hook
      */
     public function startup($args)
     {
         // the notes module can be enabled/disabled by the kolab_auth plugin
         if ($this->rc->config->get('kolab_notes_disabled', false) || !$this->rc->config->get('kolab_notes_enabled', true)) {
             return;
         }
 
         // load localizations
         $this->add_texts('localization/', $args['task'] == 'notes' && (!$args['action'] || $args['action'] == 'dialog-ui'));
         $this->rc->load_language($_SESSION['language'], array('notes.notes' => $this->gettext('navtitle')));  // add label for task title
 
         if ($args['task'] == 'notes') {
             $this->add_hook('storage_init', array($this, 'storage_init'));
 
             // register task actions
             $this->register_action('index', array($this, 'notes_view'));
             $this->register_action('fetch', array($this, 'notes_fetch'));
             $this->register_action('get',   array($this, 'note_record'));
             $this->register_action('action', array($this, 'note_action'));
             $this->register_action('list',  array($this, 'list_action'));
             $this->register_action('dialog-ui', array($this, 'dialog_view'));
         }
         else if ($args['task'] == 'mail') {
             $this->add_hook('storage_init', array($this, 'storage_init'));
             $this->add_hook('message_compose', array($this, 'mail_message_compose'));
 
             if (in_array($args['action'], array('show', 'preview', 'print'))) {
                 $this->add_hook('message_load', array($this, 'mail_message_load'));
                 $this->add_hook('template_object_messagebody', array($this, 'mail_messagebody_html'));
             }
 
             // add 'Append note' item to message menu
             if ($this->api->output->type == 'html' && $_REQUEST['_rel'] != 'note') {
                 $this->api->add_content(html::tag('li', null, 
                     $this->api->output->button(array(
                       'command'  => 'append-kolab-note',
                       'label'    => 'kolab_notes.appendnote',
                       'type'     => 'link',
                       'classact' => 'icon appendnote active',
                       'class'    => 'icon appendnote',
                       'innerclass' => 'icon note',
                     ))),
                     'messagemenu');
 
                 $this->api->output->add_label('kolab_notes.appendnote', 'kolab_notes.editnote', 'kolab_notes.deletenotesconfirm', 'kolab_notes.entertitle', 'save', 'delete', 'cancel', 'close');
                 $this->include_script('notes_mail.js');
             }
         }
 
         if (!$this->rc->output->ajax_call && (!$this->rc->output->env['framed'] || in_array($args['action'], array('folder-acl','dialog-ui')))) {
             $this->load_ui();
         }
 
         // get configuration for the Bonnie API
         $this->bonnie_api = libkolab::get_bonnie_api();
 
         // notes use fully encoded identifiers
         kolab_storage::$encode_ids = true;
     }
 
     /**
      * Hook into IMAP FETCH HEADER.FIELDS command and request MESSAGE-ID
      */
     public function storage_init($p)
     {
         $p['fetch_headers'] = trim($p['fetch_headers'] . ' MESSAGE-ID');
         return $p;
     }
 
     /**
      * Load and initialize UI class
      */
     private function load_ui()
     {
         require_once($this->home . '/kolab_notes_ui.php');
         $this->ui = new kolab_notes_ui($this);
         $this->ui->init();
     }
 
     /**
      * Read available calendars for the current user and store them internally
      */
     private function _read_lists($force = false)
     {
         // already read sources
         if (isset($this->lists) && !$force)
             return $this->lists;
 
         // get all folders that have type "task"
         $folders = kolab_storage::sort_folders(kolab_storage::get_folders('note'));
         $this->lists = $this->folders = array();
 
         // find default folder
         $default_index = 0;
         foreach ($folders as $i => $folder) {
             if ($folder->default)
                 $default_index = $i;
         }
 
         // put default folder on top of the list
         if ($default_index > 0) {
             $default_folder = $folders[$default_index];
             unset($folders[$default_index]);
             array_unshift($folders, $default_folder);
         }
 
         foreach ($folders as $folder) {
             $item = $this->folder_props($folder);
             $this->lists[$item['id']] = $item;
             $this->folders[$item['id']] = $folder;
             $this->folders[$folder->name] = $folder;
         }
     }
 
     /**
      * Get a list of available folders from this source
      */
     public function get_lists(&$tree = null)
     {
         $this->_read_lists();
 
         // attempt to create a default folder for this user
         if (empty($this->lists)) {
             $folder = array('name' => 'Notes', 'type' => 'note', 'default' => true, 'subscribed' => true);
             if (kolab_storage::folder_update($folder)) {
                 $this->_read_lists(true);
             }
         }
 
         $folders = array();
         foreach ($this->lists as $id => $list) {
             if (!empty($this->folders[$id])) {
                 $folders[] = $this->folders[$id];
             }
         }
 
         // include virtual folders for a full folder tree
         if (!is_null($tree)) {
             $folders = kolab_storage::folder_hierarchy($folders, $tree);
         }
 
         $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
 
         $lists = array();
         foreach ($folders as $folder) {
             $list_id = $folder->id;
             $imap_path = explode($delim, $folder->name);
 
             // find parent
             do {
               array_pop($imap_path);
               $parent_id = kolab_storage::folder_id(join($delim, $imap_path));
             }
             while (count($imap_path) > 1 && !$this->folders[$parent_id]);
 
             // restore "real" parent ID
             if ($parent_id && !$this->folders[$parent_id]) {
                 $parent_id = kolab_storage::folder_id($folder->get_parent());
             }
 
             $fullname = $folder->get_name();
             $listname = $folder->get_foldername();
 
             // special handling for virtual folders
             if ($folder instanceof kolab_storage_folder_user) {
                 $lists[$list_id] = array(
                     'id'       => $list_id,
                     'name'     => $fullname,
                     'listname' => $listname,
                     'title'    => $folder->get_title(),
                     'virtual'  => true,
                     'editable' => false,
                     'rights'   => 'l',
                     'group'    => 'other virtual',
                     'class'    => 'user',
                     'parent'   => $parent_id,
                 );
             }
             else if ($folder->virtual) {
                 $lists[$list_id] = array(
                     'id'       => $list_id,
                     'name'     => kolab_storage::object_name($fullname),
                     'listname' => $listname,
                     'virtual'  => true,
                     'editable' => false,
                     'rights'   => 'l',
                     'group'    => $folder->get_namespace(),
                     'parent'   => $parent_id,
                 );
             }
             else {
                 if (!$this->lists[$list_id]) {
                     $this->lists[$list_id] = $this->folder_props($folder);
                     $this->folders[$list_id] = $folder;
                 }
                 $this->lists[$list_id]['parent'] = $parent_id;
                 $lists[$list_id] = $this->lists[$list_id];
             }
         }
 
         return $lists;
     }
 
     /**
      * Search for shared or otherwise not listed folders the user has access
      *
      * @param string Search string
      * @param string Section/source to search
      * @return array List of notes folders
      */
     protected function search_lists($query, $source)
     {
         if (!kolab_storage::setup()) {
             return array();
         }
 
         $this->search_more_results = false;
         $this->lists = $this->folders = array();
 
         // find unsubscribed IMAP folders that have "event" type
         if ($source == 'folders') {
             foreach ((array)kolab_storage::search_folders('note', $query, array('other')) as $folder) {
                 $this->folders[$folder->id] = $folder;
                 $this->lists[$folder->id] = $this->folder_props($folder);
             }
         }
         // search other user's namespace via LDAP
         else if ($source == 'users') {
             $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
             foreach (kolab_storage::search_users($query, 0, array(), $limit * 10) as $user) {
                 $folders = array();
                 // search for note folders shared by this user
                 foreach (kolab_storage::list_user_folders($user, 'note', false) as $foldername) {
                     $folders[] = new kolab_storage_folder($foldername, 'note');
                 }
 
                 if (count($folders)) {
                     $userfolder = new kolab_storage_folder_user($user['kolabtargetfolder'], '', $user);
                     $this->folders[$userfolder->id] = $userfolder;
                     $this->lists[$userfolder->id] = $this->folder_props($userfolder);
 
                     foreach ($folders as $folder) {
                         $this->folders[$folder->id] = $folder;
                         $this->lists[$folder->id] = $this->folder_props($folder);
                         $count++;
                     }
                 }
 
                 if ($count >= $limit) {
                     $this->search_more_results = true;
                     break;
                 }
             }
 
         }
 
         return $this->get_lists();
     }
 
     /**
      * Derive list properties from the given kolab_storage_folder object
      */
     protected function folder_props($folder)
     {
         if ($folder->get_namespace() == 'personal') {
             $norename = false;
             $editable = true;
             $rights = 'lrswikxtea';
             $alarms = true;
         }
         else {
             $alarms = false;
             $rights = 'lr';
             $editable = false;
             if (($myrights = $folder->get_myrights()) && !PEAR::isError($myrights)) {
                 $rights = $myrights;
                 if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false)
                     $editable = strpos($rights, 'i');
             }
             $info = $folder->get_folder_info();
             $norename = $readonly || $info['norename'] || $info['protected'];
         }
 
         $list_id = $folder->id;
         return array(
             'id' => $list_id,
             'name' => $folder->get_name(),
             'listname' => $folder->get_foldername(),
             'editname' => $folder->get_foldername(),
             'editable' => $editable,
             'rights'   => $rights,
             'norename' => $norename,
             'parentfolder' => $folder->get_parent(),
             'subscribed' => (bool)$folder->is_subscribed(),
             'default'  => $folder->default,
             'group'    => $folder->default ? 'default' : $folder->get_namespace(),
             'class'    => trim($folder->get_namespace() . ($folder->default ? ' default' : '')),
         );
     }
 
     /**
      * Get the kolab_calendar instance for the given calendar ID
      *
      * @param string List identifier (encoded imap folder name)
      * @return object kolab_storage_folder Object nor null if list doesn't exist
      */
     public function get_folder($id)
     {
         // create list and folder instance if necesary
         if (!$this->lists[$id]) {
             $folder = kolab_storage::get_folder(kolab_storage::id_decode($id));
             if ($folder->type) {
                 $this->folders[$id] = $folder;
                 $this->lists[$id] = $this->folder_props($folder);
             }
         }
 
         return $this->folders[$id];
     }
 
     /*******  UI functions  ********/
 
     /**
      * Render main view of the tasklist task
      */
     public function notes_view()
     {
         $this->ui->init();
         $this->ui->init_templates();
         $this->rc->output->set_pagetitle($this->gettext('navtitle'));
         $this->rc->output->send('kolab_notes.notes');
     }
 
     /**
      * Deliver a rediced UI for inline (dialog)
      */
     public function dialog_view()
     {
         // resolve message reference
         if ($msgref = rcube_utils::get_input_value('_msg', rcube_utils::INPUT_GPC, true)) {
             $storage = $this->rc->get_storage();
             list($uid, $folder) = explode('-', $msgref, 2);
             if ($message = $storage->get_message_headers($msgref)) {
                 $this->rc->output->set_env('kolab_notes_template', array(
                     '_from_mail' => true,
                     'title' => $message->get('subject'),
                     'links' => array(kolab_storage_config::get_message_reference(
                         kolab_storage_config::get_message_uri($message, $folder),
                         'note'
                     )),
                 ));
             }
         }
 
         $this->ui->init_templates();
         $this->rc->output->send('kolab_notes.dialogview');
     }
 
     /**
      * Handler to retrieve note records for the given list and/or search query
      */
     public function notes_fetch()
     {
         $search = rcube_utils::get_input_value('_q', rcube_utils::INPUT_GPC, true);
         $list   = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC);
 
         $data = $this->notes_data($this->list_notes($list, $search), $tags);
 
         $this->rc->output->command('plugin.data_ready', array(
                 'list'   => $list,
                 'search' => $search,
                 'data'   => $data,
                 'tags'   => array_values($tags)
         ));
     }
 
     /**
      * Convert the given note records for delivery to the client
      */
     protected function notes_data($records, &$tags)
     {
         $config = kolab_storage_config::get_instance();
         $tags   = $config->apply_tags($records);
 
         foreach ($records as $i => $rec) {
             unset($records[$i]['description']);
             $this->_client_encode($records[$i]);
         }
 
         return $records;
     }
 
     /**
      * Read note records for the given list from the storage backend
      */
     protected function list_notes($list_id, $search = null)
     {
         $results = array();
 
         // query Kolab storage
         $query = array();
 
         // full text search (only works with cache enabled)
         if (strlen($search)) {
             $words = array_filter(rcube_utils::normalize_string(mb_strtolower($search), true));
             foreach ($words as $word) {
                 if (strlen($word) > 2) {  // only words > 3 chars are stored in DB
                     $query[] = array('words', '~', $word);
                 }
             }
         }
 
         $this->_read_lists();
         if ($folder = $this->get_folder($list_id)) {
             foreach ($folder->select($query) as $record) {
                 // post-filter search results
                 if (strlen($search)) {
                     $matches = 0;
                     $contents = mb_strtolower(
                         $record['title'] .
                         ($this->is_html($record) ? strip_tags($record['description']) : $record['description'])
                     );
                     foreach ($words as $word) {
                         if (mb_strpos($contents, $word) !== false) {
                             $matches++;
                         }
                     }
 
                     // skip records not matching all search words
                     if ($matches < count($words)) {
                         continue;
                     }
                 }
                 $record['list'] = $list_id;
                 $results[] = $record;
             }
         }
 
         return $results;
     }
 
     /**
      * Handler for delivering a full note record to the client
      */
     public function note_record()
     {
         $data = $this->get_note(array(
             'uid'  => rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC),
             'list' => rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC),
         ));
 
         // encode for client use
         if (is_array($data)) {
             $this->_client_encode($data, true);
         }
 
         $this->rc->output->command('plugin.render_note', $data);
     }
 
     /**
      * Get the full note record identified by the given UID + Lolder identifier
      */
     public function get_note($note)
     {
         if (is_array($note)) {
             $uid = $note['uid'] ?: $note['id'];
             $list_id = $note['list'];
         }
         else {
             $uid = $note;
         }
 
         // deliver from in-memory cache
         $key = $list_id . ':' . $uid;
         if ($this->cache[$key]) {
             return $this->cache[$key];
         }
 
         $result = false;
 
         $this->_read_lists();
         if ($list_id) {
             if ($folder = $this->get_folder($list_id)) {
                 $result = $folder->get_object($uid);
             }
         }
         // iterate over all calendar folders and search for the event ID
         else {
             foreach ($this->folders as $list_id => $folder) {
                 if ($result = $folder->get_object($uid)) {
                     $result['list'] = $list_id;
                     break;
                 }
             }
         }
 
         if ($result) {
             // get note tags
             $result['tags'] = $this->get_tags($result['uid']);
         }
 
         return $result;
     }
 
     /**
      * Helper method to encode the given note record for use in the client
      */
     private function _client_encode(&$note, $resolve = false)
     {
         foreach ($note as $key => $prop) {
             if ($key[0] == '_' || $key == 'x-custom') {
                 unset($note[$key]);
             }
         }
 
         foreach (array('created','changed') as $key) {
             if (is_object($note[$key]) && $note[$key] instanceof DateTime) {
                 $note[$key.'_'] = $note[$key]->format('U');
                 $note[$key] = $this->rc->format_date($note[$key]);
             }
         }
 
         // clean HTML contents
         if (!empty($note['description']) && $this->is_html($note)) {
             $note['html'] = $this->_wash_html($note['description']);
         }
 
         // resolve message links
         $note['links'] = array_map(function($link) {
                 return kolab_storage_config::get_message_reference($link, 'note') ?: array('uri' => $link);
             }, $this->get_links($note['uid']));
 
         return $note;
     }
 
     /**
      * Handler for client-initiated actions on a single note record
      */
     public function note_action()
     {
         $action = rcube_utils::get_input_value('_do', rcube_utils::INPUT_POST);
         $note   = rcube_utils::get_input_value('_data', rcube_utils::INPUT_POST, true);
 
         $success = $silent = false;
         switch ($action) {
             case 'new':
-                $temp_id = $rec['tempid'];
-
             case 'edit':
                 if ($success = $this->save_note($note)) {
                     $refresh = $this->get_note($note);
-                    $refresh['tempid'] = $temp_id;
                 }
                 break;
 
             case 'move':
                 $uids = explode(',', $note['uid']);
                 foreach ($uids as $uid) {
                     $note['uid'] = $uid;
                     if (!($success = $this->move_note($note, $note['to']))) {
                         $refresh = $this->get_note($note);
                         break;
                     }
                 }
                 break;
 
             case 'delete':
                 $uids = explode(',', $note['uid']);
                 foreach ($uids as $uid) {
                     $note['uid'] = $uid;
                     if (!($success = $this->delete_note($note))) {
                         $refresh = $this->get_note($note);
                         break;
                     }
                 }
                 break;
 
             case 'changelog':
                 $data = $this->get_changelog($note);
                 if (is_array($data) && !empty($data)) {
                     $rcmail = $this->rc;
                     $dtformat = $rcmail->config->get('date_format') . ' ' . $this->rc->config->get('time_format');
                     array_walk($data, function(&$change) use ($lib, $rcmail, $dtformat) {
                       if ($change['date']) {
                           $dt = rcube_utils::anytodatetime($change['date']);
                           if ($dt instanceof DateTime) {
                               $change['date'] = $rcmail->format_date($dt, $dtformat);
                           }
                       }
                     });
                     $this->rc->output->command('plugin.note_render_changelog', $data);
                 }
                 else {
                     $this->rc->output->command('plugin.note_render_changelog', false);
                 }
                 $silent = true;
                 break;
 
             case 'diff':
                 $silent = true;
                 $data = $this->get_diff($note, $note['rev1'], $note['rev2']);
                 if (is_array($data)) {
                     $this->rc->output->command('plugin.note_show_diff', $data);
                 }
                 else {
                     $this->rc->output->command('display_message', $this->gettext('objectdiffnotavailable'), 'error');
                 }
                 break;
 
             case 'show':
                 if ($rec = $this->get_revison($note, $note['rev'])) {
                     $this->rc->output->command('plugin.note_show_revision', $this->_client_encode($rec));
                 }
                 else {
                     $this->rc->output->command('display_message', $this->gettext('objectnotfound'), 'error');
                 }
                 $silent = true;
                 break;
 
             case 'restore':
                 if ($this->restore_revision($note, $note['rev'])) {
                     $refresh = $this->get_note($note);
                     $this->rc->output->command('display_message', $this->gettext(array('name' => 'objectrestoresuccess', 'vars' => array('rev' => $note['rev']))), 'confirmation');
                     $this->rc->output->command('plugin.close_history_dialog');
                 }
                 else {
                     $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
                 }
                 $silent = true;
                 break;
         }
 
         // show confirmation/error message
         if ($success) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
         }
         else if (!$silent) {
             $this->rc->output->show_message('errorsaving', 'error');
         }
 
         // unlock client
         $this->rc->output->command('plugin.unlock_saving');
 
         if ($refresh) {
             $this->rc->output->command('plugin.update_note', $this->_client_encode($refresh));
         }
     }
 
     /**
      * Update an note record with the given data
      *
      * @param array Hash array with note properties (id, list)
      * @return boolean True on success, False on error
      */
     private function save_note(&$note)
     {
         $this->_read_lists();
 
         $list_id = $note['list'];
         if (!$list_id || !($folder = $this->get_folder($list_id)))
             return false;
 
         // moved from another folder
         if ($note['_fromlist'] && ($fromfolder = $this->get_folder($note['_fromlist']))) {
             if (!$fromfolder->move($note['uid'], $folder->name))
                 return false;
 
             unset($note['_fromlist']);
         }
 
         // load previous version of this record to merge
         if ($note['uid']) {
             $old = $folder->get_object($note['uid']);
             if (!$old || PEAR::isError($old))
                 return false;
 
             // merge existing properties if the update isn't complete
             if (!isset($note['title']) || !isset($note['description']))
                 $note += $old;
         }
 
         // generate new note object from input
         $object = $this->_write_preprocess($note, $old);
 
         // email links and tags are handled separately
         $links = $object['links'];
         $tags  = $object['tags'];
 
         unset($object['links']);
         unset($object['tags']);
 
         $saved = $folder->save($object, 'note', $note['uid']);
 
         if (!$saved) {
             rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Error saving note object to Kolab server"),
                 true, false);
             $saved = false;
         }
         else {
             // save links in configuration.relation object
             $this->save_links($object['uid'], $links);
             // save tags in configuration.relation object
             $this->save_tags($object['uid'], $tags);
 
             $note         = $object;
             $note['list'] = $list_id;
             $note['tags'] = (array) $tags;
 
             // cache this in memory for later read
             $key = $list_id . ':' . $note['uid'];
             $this->cache[$key] = $note;
         }
 
         return $saved;
     }
 
     /**
      * Move the given note to another folder
      */
     function move_note($note, $list_id)
     {
         $this->_read_lists();
 
         $tofolder   = $this->get_folder($list_id);
         $fromfolder = $this->get_folder($note['list']);
 
         if ($fromfolder && $tofolder) {
             return $fromfolder->move($note['uid'], $tofolder->name);
         }
 
         return false;
     }
 
     /**
      * Remove a single note record from the backend
      *
      * @param array   Hash array with note properties (id, list)
      * @param boolean Remove record irreversible (mark as deleted otherwise)
      * @return boolean True on success, False on error
      */
     public function delete_note($note, $force = true)
     {
         $this->_read_lists();
 
         $list_id = $note['list'];
         if (!$list_id || !($folder = $this->get_folder($list_id))) {
             return false;
         }
 
         $status = $folder->delete($note['uid'], $force);
 
         if ($status) {
             $this->save_links($note['uid'], null);
             $this->save_tags($note['uid'], null);
         }
 
         return $status;
     }
 
     /**
      * Provide a list of revisions for the given object
      *
      * @param array  $note Hash array with note properties
      * @return array List of changes, each as a hash array
      */
     public function get_changelog($note)
     {
         if (empty($this->bonnie_api)) {
             return false;
         }
 
         list($uid, $mailbox, $msguid) = $this->_resolve_note_identity($note);
 
         $result = $uid && $mailbox ? $this->bonnie_api->changelog('note', $uid, $mailbox, $msguid) : null;
         if (is_array($result) && $result['uid'] == $uid) {
             return $result['changes'];
         }
 
         return false;
     }
 
     /**
      * Return full data of a specific revision of a note record
      *
      * @param mixed  $note UID string or hash array with note properties
      * @param mixed  $rev Revision number
      *
      * @return array Note object as hash array
      */
     public function get_revison($note, $rev)
     {
         if (empty($this->bonnie_api)) {
             return false;
         }
 
         list($uid, $mailbox, $msguid) = $this->_resolve_note_identity($note);
 
         // call Bonnie API
         $result = $this->bonnie_api->get('note', $uid, $rev, $mailbox, $msguid);
         if (is_array($result) && $result['uid'] == $uid && !empty($result['xml'])) {
             $format = kolab_format::factory('note');
             $format->load($result['xml']);
             $rec = $format->to_array();
 
             if ($format->is_valid()) {
                 $rec['rev'] = $result['rev'];
                 return $rec;
             }
         }
 
         return false;
     }
 
     /**
      * Get a list of property changes beteen two revisions of a note object
      *
      * @param array  $$note Hash array with note properties
      * @param mixed  $rev   Revisions: "from:to"
      *
      * @return array List of property changes, each as a hash array
      */
     public function get_diff($note, $rev1, $rev2)
     {
         if (empty($this->bonnie_api)) {
             return false;
         }
 
         list($uid, $mailbox, $msguid) = $this->_resolve_note_identity($note);
 
         // call Bonnie API
         $result = $this->bonnie_api->diff('note', $uid, $rev1, $rev2, $mailbox, $msguid);
         if (is_array($result) && $result['uid'] == $uid) {
             $result['rev1'] = $rev1;
             $result['rev2'] = $rev2;
 
             // convert some properties, similar to self::_client_encode()
             $keymap = array(
                 'summary'  => 'title',
                 'lastmodified-date' => 'changed',
             );
 
             // map kolab object properties to keys and values the client expects
             array_walk($result['changes'], function(&$change, $i) use ($keymap) {
                 if (array_key_exists($change['property'], $keymap)) {
                     $change['property'] = $keymap[$change['property']];
                 }
 
                 if ($change['property'] == 'created' || $change['property'] == 'changed') {
                     if ($old_ = rcube_utils::anytodatetime($change['old'])) {
                         $change['old_'] = $this->rc->format_date($old_);
                     }
                     if ($new_ = rcube_utils::anytodatetime($change['new'])) {
                         $change['new_'] = $this->rc->format_date($new_);
                     }
                 }
 
                 // compute a nice diff of note contents
                 if ($change['property'] == 'description') {
                     $change['diff_'] = libkolab::html_diff($change['old'], $change['new']);
                     if (!empty($change['diff_'])) {
                         unset($change['old'], $change['new']);
                         $change['diff_'] = preg_replace(array('!^.*<body[^>]*>!Uims','!</body>.*$!Uims'), '', $change['diff_']);
                         $change['diff_'] = preg_replace("!</(p|li|span)>\n!", '</\\1>', $change['diff_']);
                     }
                 }
             });
 
             return $result;
         }
 
         return false;
     }
 
     /**
      * Command the backend to restore a certain revision of a note.
      * This shall replace the current object with an older version.
      *
      * @param array  $note Hash array with note properties (id, list)
      * @param mixed  $rev Revision number
      *
      * @return boolean True on success, False on failure
      */
     public function restore_revision($note, $rev)
     {
         if (empty($this->bonnie_api)) {
             return false;
         }
 
         list($uid, $mailbox, $msguid) = $this->_resolve_note_identity($note);
 
         $folder = $this->get_folder($note['list']);
         $success = false;
 
         if ($folder && ($raw_msg = $this->bonnie_api->rawdata('note', $uid, $rev, $mailbox))) {
             $imap = $this->rc->get_storage();
 
             // insert $raw_msg as new message
             if ($imap->save_message($folder->name, $raw_msg, null, false)) {
                 $success = true;
 
                 // delete old revision from imap and cache
                 $imap->delete_message($msguid, $folder->name);
                 $folder->cache->set($msguid, false);
                 $this->cache = array();
             }
         }
 
         return $success;
     }
 
     /**
      * Helper method to resolved the given note identifier into uid and mailbox
      *
      * @return array (uid,mailbox,msguid) tuple
      */
     private function _resolve_note_identity($note)
     {
         $mailbox = $msguid = null;
 
         if (!is_array($note)) {
             $note = $this->get_note($note);
         }
 
         if (is_array($note)) {
             $uid = $note['uid'] ?: $note['id'];
             $list = $note['list'];
         }
         else {
             return array(null, $mailbox, $msguid);
         }
 
         if ($folder = $this->get_folder($list)) {
             $mailbox = $folder->get_mailbox_id();
 
             // get object from storage in order to get the real object uid an msguid
             if ($rec = $folder->get_object($uid)) {
                 $msguid = $rec['_msguid'];
                 $uid = $rec['uid'];
             }
         }
 
         return array($uid, $mailbox, $msguid);
     }
 
 
     /**
      * Handler for client requests to list (aka folder) actions
      */
     public function list_action()
     {
         $action  = rcube_utils::get_input_value('_do', rcube_utils::INPUT_GPC);
         $list    = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC, true);
         $success = $update_cmd = false;
 
         if (empty($action)) {
             $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
         }
 
         switch ($action) {
             case 'form-new':
             case 'form-edit':
                 $this->_read_lists();
                 echo $this->ui->list_editform($action, $this->lists[$list['id']], $this->folders[$list['id']]);
                 exit;
 
             case 'new':
                 $list['type'] = 'note';
                 $list['subscribed'] = true;
                 $folder = kolab_storage::folder_update($list);
 
                 if ($folder === false) {
                     $save_error = $this->gettext(kolab_storage::$last_error);
                 }
                 else {
                     $success = true;
                     $update_cmd = 'plugin.update_list';
                     $list['id'] = kolab_storage::folder_id($folder);
                     $list['_reload'] = true;
                 }
                 break;
 
             case 'edit':
                 $this->_read_lists();
                 $oldparent = $this->lists[$list['id']]['parentfolder'];
                 $newfolder = kolab_storage::folder_update($list);
 
                 if ($newfolder === false) {
                   $save_error = $this->gettext(kolab_storage::$last_error);
                 }
                 else {
                     $success = true;
                     $update_cmd = 'plugin.update_list';
                     $list['newid'] = kolab_storage::folder_id($newfolder);
                     $list['_reload'] = $list['parent'] != $oldparent;
 
                     // compose the new display name
                     $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
                     $path_imap = explode($delim, $newfolder);
                     $list['name'] = kolab_storage::object_name($newfolder);
                     $list['editname'] = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
                     $list['listname'] = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_imap)) . '&raquo; ' . $list['editname'];
                 }
                 break;
 
             case 'delete':
                 $this->_read_lists();
                 $folder = $this->get_folder($list['id']);
                 if ($folder && kolab_storage::folder_delete($folder->name)) {
                     $success = true;
                     $update_cmd = 'plugin.destroy_list';
                 }
                 else {
                     $save_error = $this->gettext(kolab_storage::$last_error);
                 }
                 break;
 
             case 'search':
                 $this->load_ui();
                 $results = array();
                 foreach ((array)$this->search_lists(rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC), rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC)) as $id => $prop) {
                     $editname = $prop['editname'];
                     unset($prop['editname']);  // force full name to be displayed
 
                     // let the UI generate HTML and CSS representation for this calendar
                     $html = $this->ui->folder_list_item($id, $prop, $jsenv, true);
                     $prop += (array)$jsenv[$id];
                     $prop['editname'] = $editname;
                     $prop['html'] = $html;
 
                     $results[] = $prop;
                 }
                 // report more results available
                 if ($this->driver->search_more_results) {
                     $this->rc->output->show_message('autocompletemore', 'info');
                 }
 
                 $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
                 return;
 
             case 'subscribe':
                 $success = false;
                 if ($list['id'] && ($folder = $this->get_folder($list['id']))) {
                     if (isset($list['permanent']))
                         $success |= $folder->subscribe(intval($list['permanent']));
                     if (isset($list['active']))
                         $success |= $folder->activate(intval($list['active']));
 
                     // apply to child folders, too
                     if ($list['recursive']) {
                         foreach ((array)kolab_storage::list_folders($folder->name, '*', 'node') as $subfolder) {
                             if (isset($list['permanent']))
                                 ($list['permanent'] ? kolab_storage::folder_subscribe($subfolder) : kolab_storage::folder_unsubscribe($subfolder));
                             if (isset($list['active']))
                                 ($list['active'] ? kolab_storage::folder_activate($subfolder) : kolab_storage::folder_deactivate($subfolder));
                         }
                     }
                 }
                 break;
         }
 
         $this->rc->output->command('plugin.unlock_saving');
 
         if ($success) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
 
             if ($update_cmd) {
                 $this->rc->output->command($update_cmd, $list);
             }
         }
         else {
             $error_msg = $this->gettext('errorsaving') . ($save_error ? ': ' . $save_error :'');
             $this->rc->output->show_message($error_msg, 'error');
         }
     }
 
     /**
      * Hook to add note attachments to message compose if the according parameter is present.
      * This completes the 'send note by mail' feature.
      */
     public function mail_message_compose($args)
     {
         if (!empty($args['param']['with_notes'])) {
             $uids = explode(',', $args['param']['with_notes']);
             $list = $args['param']['notes_list'];
 
             foreach ($uids as $uid) {
                 if ($note = $this->get_note(array('uid' => $uid, 'list' => $list))) {
                     $args['attachments'][] = array(
                         'name'     => abbreviate_string($note['title'], 50, ''),
                         'mimetype' => 'message/rfc822',
                         'data'     => $this->note2message($note),
                     );
 
                     if (empty($args['param']['subject'])) {
                         $args['param']['subject'] = $note['title'];
                     }
                 }
             }
 
             unset($args['param']['with_notes'], $args['param']['notes_list']);
         }
 
         return $args;
     }
 
     /**
      * Lookup backend storage and find notes associated with the given message
      */
     public function mail_message_load($p)
     {
         if (!$p['object']->headers->others['x-kolab-type']) {
             $this->message_notes = $this->get_message_notes($p['object']->headers, $p['object']->folder);
         }
     }
 
     /**
      * Handler for 'messagebody_html' hook
      */
     public function mail_messagebody_html($args)
     {
         $html = '';
         foreach ($this->message_notes as $note) {
             $html .= html::a(array(
                 'href' => $this->rc->url(array('task' => 'notes', '_list' => $note['list'], '_id' => $note['uid'])),
                 'class' => 'kolabnotesref',
                 'rel' => $note['uid'] . '@' . $note['list'],
                 'target' => '_blank',
             ), rcube::Q($note['title']));
         }
 
         // prepend note links to message body
         if ($html) {
             $this->load_ui();
             $args['content'] = html::div('kolabmessagenotes', $html) . $args['content'];
         }
 
         return $args;
     }
 
     /**
      * Determine whether the given note is HTML formatted
      */
     private function is_html($note)
     {
         // check for opening and closing <html> or <body> tags
         return (preg_match('/<(html|body)(\s+[a-z]|>)/', $note['description'], $m) && strpos($note['description'], '</'.$m[1].'>') > 0);
     }
 
     /**
      * Build an RFC 822 message from the given note
      */
     private function note2message($note)
     {
         $message = new Mail_mime("\r\n");
 
         $message->setParam('text_encoding', '8bit');
         $message->setParam('html_encoding', 'quoted-printable');
         $message->setParam('head_encoding', 'quoted-printable');
         $message->setParam('head_charset', RCUBE_CHARSET);
         $message->setParam('html_charset', RCUBE_CHARSET);
         $message->setParam('text_charset', RCUBE_CHARSET);
 
         $message->headers(array(
             'Subject' => $note['title'],
             'Date' => $note['changed']->format('r'),
         ));
 
         if ($this->is_html($note)) {
             $message->setHTMLBody($note['description']);
 
             // add a plain text version of the note content as an alternative part.
             $h2t = new rcube_html2text($note['description'], false, true, 0, RCUBE_CHARSET);
             $plain_part = rcube_mime::wordwrap($h2t->get_text(), $this->rc->config->get('line_length', 72), "\r\n", false, RCUBE_CHARSET);
             $plain_part = trim(wordwrap($plain_part, 998, "\r\n", true));
 
             // make sure all line endings are CRLF
             $plain_part = preg_replace('/\r?\n/', "\r\n", $plain_part);
 
             $message->setTXTBody($plain_part);
         }
         else {
             $message->setTXTBody($note['description']);
         }
 
         return $message->getMessage();
     }
 
     private function save_links($uid, $links)
     {
         if (empty($links)) {
             $links = array();
         }
         $config = kolab_storage_config::get_instance();
         $remove = array_diff($config->get_object_links($uid), $links);
         return $config->save_object_links($uid, $links, $remove);
     }
 
     /**
      * Find messages assigned to specified note
      */
     private function get_links($uid)
     {
         $config = kolab_storage_config::get_instance();
         return $config->get_object_links($uid);
     }
 
     /**
      * Get note tags
      */
     private function get_tags($uid)
     {
         $config = kolab_storage_config::get_instance();
         $tags   = $config->get_tags($uid);
         $tags   = array_map(function($v) { return $v['name']; }, $tags);
 
         return $tags;
     }
 
     /**
      * Find notes assigned to specified message
      */
     private function get_message_notes($message, $folder)
     {
         $config = kolab_storage_config::get_instance();
         $result = $config->get_message_relations($message, $folder, 'note');
 
         foreach ($result as $idx => $note) {
             $result[$idx]['list'] = kolab_storage::folder_id($note['_mailbox']);
         }
 
         return $result;
     }
 
     /**
      * Update note tags
      */
     private function save_tags($uid, $tags)
     {
         $config = kolab_storage_config::get_instance();
         $config->save_tags($uid, $tags);
     }
 
     /**
      * Process the given note data (submitted by the client) before saving it
      */
     private function _write_preprocess($note, $old = array())
     {
         $object = $note;
 
         // TODO: handle attachments
 
         // convert link references into simple URIs
         if (array_key_exists('links', $note)) {
             $object['links'] = array_map(function($link){ return is_array($link) ? $link['uri'] : strval($link); }, $note['links']);
         }
         else {
             $object['links'] = $old['links'];
         }
 
         // clean up HTML content
         $object['description'] = $this->_wash_html($note['description']);
         $is_html = true;
 
         // try to be smart and convert to plain-text if no real formatting is detected
         if (preg_match('!<body><(?:p|pre)>(.*)</(?:p|pre)></body>!Uims', $object['description'], $m)) {
             if (!preg_match('!<(a|b|i|strong|em|p|span|div|pre|li)(\s+[a-z]|>)!im', $m[1], $n) || !strpos($m[1], '</'.$n[1].'>')) {
                 // $converter = new rcube_html2text($m[1], false, true, 0);
                 // $object['description'] = rtrim($converter->get_text());
                 $object['description'] = html_entity_decode(preg_replace('!<br(\s+/)>!', "\n", $m[1]));
                 $is_html = false;
             }
         }
 
         // Add proper HTML header, otherwise Kontact renders it as plain text
         if ($is_html) {
             $object['description'] = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">'."\n" .
                 str_replace('<head>', '<head><meta name="qrichtext" content="1" />', $object['description']);
         }
 
         // copy meta data (starting with _) from old object
         foreach ((array)$old as $key => $val) {
             if (!isset($object[$key]) && $key[0] == '_')
                 $object[$key] = $val;
         }
 
         // make list of categories unique
         if (is_array($object['tags'])) {
             $object['tags'] = array_unique(array_filter($object['tags']));
         }
 
         unset($object['list'], $object['tempid'], $object['created'], $object['changed'], $object['created_'], $object['changed_']);
         return $object;
     }
 
     /**
      * Sanity checks/cleanups HTML content
      */
     private function _wash_html($html)
     {
         // Add header with charset spec., washtml cannot work without that
         $html = '<html><head>'
             . '<meta http-equiv="Content-Type" content="text/html; charset='.RCUBE_CHARSET.'" />'
             . '</head><body>' . $html . '</body></html>';
 
         // clean HTML with washtml by Frederic Motte
         $wash_opts = array(
             'show_washed'   => false,
             'allow_remote'  => 1,
             'charset'       => RCUBE_CHARSET,
             'html_elements' => array('html', 'head', 'meta', 'body', 'link'),
             'html_attribs'  => array('rel', 'type', 'name', 'http-equiv'),
         );
 
         // initialize HTML washer
         $washer = new rcube_washtml($wash_opts);
 
         $washer->add_callback('form', array($this, '_washtml_callback'));
         $washer->add_callback('a',    array($this, '_washtml_callback'));
 
         // Remove non-UTF8 characters
         $html = rcube_charset::clean($html);
 
         $html = $washer->wash($html);
 
         // remove unwanted comments (produced by washtml)
         $html = preg_replace('/<!--[^>]+-->/', '', $html);
 
         return $html;
     }
 
     /**
      * Callback function for washtml cleaning class
      */
     public function _washtml_callback($tagname, $attrib, $content, $washtml)
     {
         switch ($tagname) {
         case 'form':
             $out = html::div('form', $content);
             break;
 
         case 'a':
             // strip temporary link tags from plain-text markup
             $attrib = html::parse_attrib_string($attrib);
             if (!empty($attrib['class']) && strpos($attrib['class'], 'x-templink') !== false) {
                 // remove link entirely
                 if (strpos($attrib['href'], html_entity_decode($content)) !== false) {
                     $out = $content;
                     break;
                 }
                 $attrib['class'] = trim(str_replace('x-templink', '', $attrib['class']));
             }
             $out = html::a($attrib, $content);
             break;
 
         default:
             $out = '';
         }
 
         return $out;
     }
 
 }
 
diff --git a/plugins/libcalendaring/libvcalendar.php b/plugins/libcalendaring/libvcalendar.php
index 782ff898..938ccd07 100644
--- a/plugins/libcalendaring/libvcalendar.php
+++ b/plugins/libcalendaring/libvcalendar.php
@@ -1,1400 +1,1402 @@
 <?php
 
 /**
  * iCalendar functions for the libcalendaring plugin
  *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * Copyright (C) 2013-2015, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 use \Sabre\VObject;
 use \Sabre\VObject\DateTimeParser;
 
 /**
  * Class to parse and build vCalendar (iCalendar) files
  *
  * Uses the Sabre VObject library, version 3.x.
  *
  */
 class libvcalendar implements Iterator
 {
     private $timezone;
     private $attach_uri = null;
     private $prodid = '-//Roundcube libcalendaring//Sabre//Sabre VObject//EN';
     private $type_component_map = array('event' => 'VEVENT', 'task' => 'VTODO');
     private $attendee_keymap = array(
         'name'   => 'CN',
         'status' => 'PARTSTAT',
         'role'   => 'ROLE',
         'cutype' => 'CUTYPE',
         'rsvp'   => 'RSVP',
         'delegated-from'  => 'DELEGATED-FROM',
         'delegated-to'    => 'DELEGATED-TO',
         'schedule-status' => 'SCHEDULE-STATUS',
     );
     private $iteratorkey = 0;
     private $charset;
     private $forward_exceptions;
     private $vhead;
     private $fp;
     private $vtimezones = array();
 
     public $method;
     public $agent = '';
     public $objects = array();
     public $freebusy = array();
 
 
     /**
      * Default constructor
      */
     function __construct($tz = null)
     {
         $this->timezone = $tz;
         $this->prodid = '-//Roundcube libcalendaring ' . RCUBE_VERSION . '//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN';
     }
 
     /**
      * Setter for timezone information
      */
     public function set_timezone($tz)
     {
         $this->timezone = $tz;
     }
 
     /**
      * Setter for URI template for attachment links
      */
     public function set_attach_uri($uri)
     {
         $this->attach_uri = $uri;
     }
 
     /**
      * Setter for a custom PRODID attribute
      */
     public function set_prodid($prodid)
     {
         $this->prodid = $prodid;
     }
 
     /**
      * Setter for a user-agent string to tweak input/output accordingly
      */
     public function set_agent($agent)
     {
         $this->agent = $agent;
     }
 
     /**
      * Free resources by clearing member vars
      */
     public function reset()
     {
         $this->vhead = '';
         $this->method = '';
         $this->objects = array();
         $this->freebusy = array();
         $this->vtimezones = array();
         $this->iteratorkey = 0;
 
         if ($this->fp) {
             fclose($this->fp);
             $this->fp = null;
         }
     }
 
     /**
     * Import events from iCalendar format
     *
     * @param  string vCalendar input
     * @param  string Input charset (from envelope)
     * @param  boolean True if parsing exceptions should be forwarded to the caller
     * @return array List of events extracted from the input
     */
     public function import($vcal, $charset = 'UTF-8', $forward_exceptions = false, $memcheck = true)
     {
         // TODO: convert charset to UTF-8 if other
 
         try {
             // estimate the memory usage and try to avoid fatal errors when allowed memory gets exhausted
             if ($memcheck) {
                 $count = substr_count($vcal, 'BEGIN:VEVENT') + substr_count($vcal, 'BEGIN:VTODO');
                 $expected_memory = $count * 70*1024;  // assume ~ 70K per event (empirically determined)
 
                 if (!rcube_utils::mem_check($expected_memory)) {
                     throw new Exception("iCal file too big");
                 }
             }
 
             $vobject = VObject\Reader::read($vcal, VObject\Reader::OPTION_FORGIVING | VObject\Reader::OPTION_IGNORE_INVALID_LINES);
             if ($vobject)
                 return $this->import_from_vobject($vobject);
         }
         catch (Exception $e) {
             if ($forward_exceptions) {
                 throw $e;
             }
             else {
                 rcube::raise_error(array(
                     'code' => 600, 'type' => 'php',
                     'file' => __FILE__, 'line' => __LINE__,
                     'message' => "iCal data parse error: " . $e->getMessage()),
                     true, false);
             }
         }
 
         return array();
     }
 
     /**
     * Read iCalendar events from a file
     *
     * @param  string File path to read from
     * @param  string Input charset (from envelope)
     * @param  boolean True if parsing exceptions should be forwarded to the caller
     * @return array List of events extracted from the file
     */
     public function import_from_file($filepath, $charset = 'UTF-8', $forward_exceptions = false)
     {
         if ($this->fopen($filepath, $charset, $forward_exceptions)) {
             while ($this->_parse_next(false)) {
                 // nop
             }
 
             fclose($this->fp);
             $this->fp = null;
         }
 
         return $this->objects;
     }
 
     /**
      * Open a file to read iCalendar events sequentially
      *
      * @param  string File path to read from
      * @param  string Input charset (from envelope)
      * @param  boolean True if parsing exceptions should be forwarded to the caller
      * @return boolean True if file contents are considered valid
      */
     public function fopen($filepath, $charset = 'UTF-8', $forward_exceptions = false)
     {
         $this->reset();
 
         // just to be sure...
         @ini_set('auto_detect_line_endings', true);
 
         $this->charset = $charset;
         $this->forward_exceptions = $forward_exceptions;
         $this->fp = fopen($filepath, 'r');
 
         // check file content first
         $begin = fread($this->fp, 1024);
         if (!preg_match('/BEGIN:VCALENDAR/i', $begin)) {
             return false;
         }
 
         fseek($this->fp, 0);
         return $this->_parse_next();
     }
 
     /**
      * Parse the next event/todo/freebusy object from the input file
      */
     private function _parse_next($reset = true)
     {
         if ($reset) {
             $this->iteratorkey = 0;
             $this->objects = array();
             $this->freebusy = array();
         }
 
         $next = $this->_next_component();
         $buffer = $next;
 
         // load the next component(s) too, as they could contain recurrence exceptions
         while (preg_match('/(RRULE|RECURRENCE-ID)[:;]/i', $next)) {
             $next = $this->_next_component();
             $buffer .= $next;
         }
 
         // parse the vevent block surrounded with the vcalendar heading
         if (strlen($buffer) && preg_match('/BEGIN:(VEVENT|VTODO|VFREEBUSY)/i', $buffer)) {
             try {
                 $this->import($this->vhead . $buffer . "END:VCALENDAR", $this->charset, true, false);
             }
             catch (Exception $e) {
                 if ($this->forward_exceptions) {
                     throw new VObject\ParseException($e->getMessage() . " in\n" . $buffer);
                 }
                 else {
                     // write the failing section to error log
                     rcube::raise_error(array(
                         'code' => 600, 'type' => 'php',
                         'file' => __FILE__, 'line' => __LINE__,
                         'message' => $e->getMessage() . " in\n" . $buffer),
                         true, false);
                 }
 
                 // advance to next
                 return $this->_parse_next($reset);
             }
 
             return count($this->objects) > 0;
         }
 
         return false;
     }
 
     /**
      * Helper method to read the next calendar component from the file
      */
     private function _next_component()
     {
         $buffer = '';
         $vcalendar_head = false;
         while (($line = fgets($this->fp, 1024)) !== false) {
             // ignore END:VCALENDAR lines
             if (preg_match('/END:VCALENDAR/i', $line)) {
                 continue;
             }
             // read vcalendar header (with timezone defintion)
             if (preg_match('/BEGIN:VCALENDAR/i', $line)) {
                 $this->vhead = '';
                 $vcalendar_head = true;
             }
 
             // end of VCALENDAR header part
             if ($vcalendar_head && preg_match('/BEGIN:(VEVENT|VTODO|VFREEBUSY)/i', $line)) {
                 $vcalendar_head = false;
             }
 
             if ($vcalendar_head) {
                 $this->vhead .= $line;
             }
             else {
                 $buffer .= $line;
                 if (preg_match('/END:(VEVENT|VTODO|VFREEBUSY)/i', $line)) {
                     break;
                 }
             }
         }
 
         return $buffer;
     }
 
     /**
      * Import objects from an already parsed Sabre\VObject\Component object
      *
      * @param object Sabre\VObject\Component to read from
      * @return array List of events extracted from the file
      */
     public function import_from_vobject($vobject)
     {
         $seen = array();
         $exceptions = array();
 
         if ($vobject->name == 'VCALENDAR') {
             $this->method = strval($vobject->METHOD);
             $this->agent  = strval($vobject->PRODID);
 
             foreach ($vobject->getComponents() as $ve) {
                 if ($ve->name == 'VEVENT' || $ve->name == 'VTODO') {
                     // convert to hash array representation
                     $object = $this->_to_array($ve);
 
                     // temporarily store this as exception
                     if ($object['recurrence_date']) {
                         $exceptions[] = $object;
                     }
                     else if (!$seen[$object['uid']]++) {
                         $this->objects[] = $object;
                     }
                 }
                 else if ($ve->name == 'VFREEBUSY') {
                     $this->objects[] = $this->_parse_freebusy($ve);
                 }
             }
 
             // add exceptions to the according master events
             foreach ($exceptions as $exception) {
                 $uid = $exception['uid'];
 
                 // make this exception the master
                 if (!$seen[$uid]++) {
                     $this->objects[] = $exception;
                 }
                 else {
                     foreach ($this->objects as $i => $object) {
                         // add as exception to existing entry with a matching UID
                         if ($object['uid'] == $uid) {
                             $this->objects[$i]['exceptions'][] = $exception;
 
                             if (!empty($object['recurrence'])) {
                                 $this->objects[$i]['recurrence']['EXCEPTIONS'] = &$this->objects[$i]['exceptions'];
                             }
                             break;
                         }
                     }
                 }
             }
         }
 
         return $this->objects;
     }
 
     /**
      * Getter for free-busy periods
      */
     public function get_busy_periods()
     {
         $out = array();
         foreach ((array)$this->freebusy['periods'] as $period) {
             if ($period[2] != 'FREE') {
                 $out[] = $period;
             }
         }
 
         return $out;
     }
 
     /**
      * Helper method to determine whether the connected client is an Apple device
      */
     private function is_apple()
     {
         return stripos($this->agent, 'Apple') !== false
             || stripos($this->agent, 'Mac OS X') !== false
             || stripos($this->agent, 'iOS/') !== false;
     }
 
     /**
      * Convert the given VEvent object to a libkolab compatible array representation
      *
      * @param object Vevent object to convert
      * @return array Hash array with object properties
      */
     private function _to_array($ve)
     {
         $event = array(
             'uid'     => self::convert_string($ve->UID),
             'title'   => self::convert_string($ve->SUMMARY),
             '_type'   => $ve->name == 'VTODO' ? 'task' : 'event',
             // set defaults
             'priority' => 0,
             'attendees' => array(),
             'x-custom' => array(),
         );
 
         // Catch possible exceptions when date is invalid (Bug #2144)
         // We can skip these fields, they aren't critical
         foreach (array('CREATED' => 'created', 'LAST-MODIFIED' => 'changed', 'DTSTAMP' => 'changed') as $attr => $field) {
             try {
                 if (!$event[$field] && $ve->{$attr}) {
                     $event[$field] = $ve->{$attr}->getDateTime();
                 }
             } catch (Exception $e) {}
         }
 
         // map other attributes to internal fields
         foreach ($ve->children as $prop) {
             if (!($prop instanceof VObject\Property))
                 continue;
 
             $value = strval($prop);
 
             switch ($prop->name) {
             case 'DTSTART':
             case 'DTEND':
             case 'DUE':
                 $propmap = array('DTSTART' => 'start', 'DTEND' => 'end', 'DUE' => 'due');
                 $event[$propmap[$prop->name]] =  self::convert_datetime($prop);
                 break;
 
             case 'TRANSP':
                 $event['free_busy'] = strval($prop) == 'TRANSPARENT' ? 'free' : 'busy';
                 break;
 
             case 'STATUS':
                 if ($value == 'TENTATIVE')
                     $event['free_busy'] = 'tentative';
                 else if ($value == 'CANCELLED')
                     $event['cancelled'] = true;
                 else if ($value == 'COMPLETED')
                     $event['complete'] = 100;
 
                 $event['status'] = $value;
                 break;
 
             case 'COMPLETED':
                 if (self::convert_datetime($prop)) {
                     $event['status'] = 'COMPLETED';
                     $event['complete'] = 100;
                 }
                 break;
 
             case 'PRIORITY':
                 if (is_numeric($value))
                     $event['priority'] = $value;
                 break;
 
             case 'RRULE':
                 $params = is_array($event['recurrence']) ? $event['recurrence'] : array();
                 // parse recurrence rule attributes
                 foreach ($prop->getParts() as $k => $v) {
                     $params[strtoupper($k)] = is_array($v) ? implode(',', $v) : $v;
                 }
                 if ($params['UNTIL'])
                     $params['UNTIL'] = date_create($params['UNTIL']);
                 if (!$params['INTERVAL'])
                     $params['INTERVAL'] = 1;
 
                 $event['recurrence'] = array_filter($params);
                 break;
 
             case 'EXDATE':
                 if (!empty($value)) {
                     $exdates = array_map(function($_) { return is_array($_) ? $_[0] : $_; }, self::convert_datetime($prop, true));
                     $event['recurrence']['EXDATE'] = array_merge((array)$event['recurrence']['EXDATE'], $exdates);
                 }
                 break;
 
             case 'RDATE':
                 if (!empty($value)) {
                     $rdates = array_map(function($_) { return is_array($_) ? $_[0] : $_; }, self::convert_datetime($prop, true));
                     $event['recurrence']['RDATE'] = array_merge((array)$event['recurrence']['RDATE'], $rdates);
                 }
                 break;
 
             case 'RECURRENCE-ID':
                 $event['recurrence_date'] = self::convert_datetime($prop);
                 if ($prop->offsetGet('RANGE') == 'THISANDFUTURE' || $prop->offsetGet('THISANDFUTURE') !== null) {
                     $event['thisandfuture'] = true;
                 }
                 break;
 
             case 'RELATED-TO':
                 $reltype = $prop->offsetGet('RELTYPE');
                 if ($reltype == 'PARENT' || $reltype === null) {
                     $event['parent_id'] = $value;
                 }
                 break;
 
             case 'SEQUENCE':
                 $event['sequence'] = intval($value);
                 break;
 
             case 'PERCENT-COMPLETE':
                 $event['complete'] = intval($value);
                 break;
 
             case 'LOCATION':
             case 'DESCRIPTION':
             case 'URL':
             case 'COMMENT':
                 $event[strtolower($prop->name)] = self::convert_string($prop);
                 break;
 
             case 'CATEGORY':
             case 'CATEGORIES':
                 $event['categories'] = array_merge((array)$event['categories'], $prop->getParts());
                 break;
 
             case 'CLASS':
             case 'X-CALENDARSERVER-ACCESS':
                 $event['sensitivity'] = strtolower($value);
                 break;
 
             case 'X-MICROSOFT-CDO-BUSYSTATUS':
                 if ($value == 'OOF')
                     $event['free_busy'] = 'outofoffice';
                 else if (in_array($value, array('FREE', 'BUSY', 'TENTATIVE')))
                     $event['free_busy'] = strtolower($value);
                 break;
 
             case 'ATTENDEE':
             case 'ORGANIZER':
                 $params = array('RSVP' => false);
                 foreach ($prop->parameters() as $pname => $pvalue) {
                     switch ($pname) {
                         case 'RSVP': $params[$pname] = strtolower($pvalue) == 'true'; break;
                         case 'CN':   $params[$pname] = self::unescape($pvalue); break;
                         default:     $params[$pname] = strval($pvalue); break;
                     }
                 }
                 $attendee = self::map_keys($params, array_flip($this->attendee_keymap));
                 $attendee['email'] = preg_replace('!^mailto:!i', '', $value);
 
                 if ($prop->name == 'ORGANIZER') {
                     $attendee['role'] = 'ORGANIZER';
                     $attendee['status'] = 'ACCEPTED';
                     $event['organizer'] = $attendee;
                 }
                 else if ($attendee['email'] != $event['organizer']['email']) {
                     $event['attendees'][] = $attendee;
                 }
                 break;
 
             case 'ATTACH':
                 $params = self::parameters_array($prop);
                 if (substr($value, 0, 4) == 'http' && !strpos($value, ':attachment:')) {
                     $event['links'][] = $value;
                 }
                 else if (strlen($value) && strtoupper($params['VALUE']) == 'BINARY') {
                     $attachment = self::map_keys($params, array('FMTTYPE' => 'mimetype', 'X-LABEL' => 'name', 'X-APPLE-FILENAME' => 'name'));
                     $attachment['data'] = $value;
                     $attachment['size'] = strlen($value);
                     $event['attachments'][] = $attachment;
                 }
                 break;
 
             default:
                 if (substr($prop->name, 0, 2) == 'X-')
                     $event['x-custom'][] = array($prop->name, strval($value));
                 break;
             }
         }
 
         // check DURATION property if no end date is set
         if (empty($event['end']) && $ve->DURATION) {
             try {
                 $duration = new DateInterval(strval($ve->DURATION));
                 $end = clone $event['start'];
                 $end->add($duration);
                 $event['end'] = $end;
             }
             catch (\Exception $e) {
                 trigger_error(strval($e), E_USER_WARNING);
             }
         }
 
         // validate event dates
         if ($event['_type'] == 'event') {
+            $event['allday'] = false;
+
             // check for all-day dates
             if ($event['start']->_dateonly) {
                 $event['allday'] = true;
             }
 
             // all-day events may lack the DTEND property
             if ($event['allday'] && empty($event['end'])) {
                 $event['end'] = clone $event['start'];
             }
             // shift end-date by one day (except Thunderbird)
             else if ($event['allday'] && is_object($event['end'])) {
                 $event['end']->sub(new \DateInterval('PT23H'));
             }
 
             // sanity-check and fix end date
             if (!empty($event['end']) && $event['end'] < $event['start']) {
                 $event['end'] = clone $event['start'];
             }
         }
 
         // make organizer part of the attendees list for compatibility reasons
         if (!empty($event['organizer']) && is_array($event['attendees']) && $event['_type'] == 'event') {
             array_unshift($event['attendees'], $event['organizer']);
         }
 
         // find alarms
         foreach ($ve->select('VALARM') as $valarm) {
             $action  = 'DISPLAY';
             $trigger = null;
             $alarm   = array();
 
             foreach ($valarm->children as $prop) {
                 $value = strval($prop);
 
                 switch ($prop->name) {
                 case 'TRIGGER':
                     foreach ($prop->parameters as $param) {
                         if ($param->name == 'VALUE' && $param->getValue() == 'DATE-TIME') {
                             $trigger = '@' . $prop->getDateTime()->format('U');
                             $alarm['trigger'] = $prop->getDateTime();
                         }
                         else if ($param->name == 'RELATED') {
                             $alarm['related'] = $param->getValue();
                         }
                     }
                     if (!$trigger && ($values = libcalendaring::parse_alarm_value($value))) {
                         $trigger = $values[2];
                     }
 
                     if (!$alarm['trigger']) {
                         $alarm['trigger'] = rtrim(preg_replace('/([A-Z])0[WDHMS]/', '\\1', $value), 'T');
                         // if all 0-values have been stripped, assume 'at time'
                         if ($alarm['trigger'] == 'P')
                             $alarm['trigger'] = 'PT0S';
                     }
                     break;
 
                 case 'ACTION':
                     $action = $alarm['action'] = strtoupper($value);
                     break;
 
                 case 'SUMMARY':
                 case 'DESCRIPTION':
                 case 'DURATION':
                     $alarm[strtolower($prop->name)] = self::convert_string($prop);
                     break;
 
                 case 'REPEAT':
                     $alarm['repeat'] = intval($value);
                     break;
 
                 case 'ATTENDEE':
                     $alarm['attendees'][] = preg_replace('!^mailto:!i', '', $value);
                     break;
 
                 case 'ATTACH':
                     $params = self::parameters_array($prop);
                     if (strlen($value) && (preg_match('/^[a-z]+:/', $value) || strtoupper($params['VALUE']) == 'URI')) {
                         // we only support URI-type of attachments here
                         $alarm['uri'] = $value;
                     }
                     break;
                 }
             }
 
             if ($action != 'NONE') {
                 if ($trigger && !$event['alarms']) // store first alarm in legacy property
                     $event['alarms'] = $trigger . ':' . $action;
 
                 if ($alarm['trigger'])
                     $event['valarms'][] = $alarm;
             }
         }
 
         // assign current timezone to event start/end
         if ($event['start'] instanceof DateTime) {
             if ($this->timezone)
                 $event['start']->setTimezone($this->timezone);
         }
         else {
             unset($event['start']);
         }
 
         if ($event['end'] instanceof DateTime) {
             if ($this->timezone)
                 $event['end']->setTimezone($this->timezone);
         }
         else {
             unset($event['end']);
         }
 
         // some iTip CANCEL messages only contain the start date
         if (!$event['end'] && $event['start'] && $this->method == 'CANCEL') {
             $event['end'] = clone $event['start'];
         }
 
         // minimal validation
         if (empty($event['uid']) || ($event['_type'] == 'event' && empty($event['start']) != empty($event['end']))) {
             throw new VObject\ParseException('Object validation failed: missing mandatory object properties');
         }
 
         return $event;
     }
 
     /**
      * Parse the given vfreebusy component into an array representation
      */
     private function _parse_freebusy($ve)
     {
         $this->freebusy = array('_type' => 'freebusy', 'periods' => array());
         $seen = array();
 
         foreach ($ve->children as $prop) {
             if (!($prop instanceof VObject\Property))
                 continue;
 
             $value = strval($prop);
 
             switch ($prop->name) {
             case 'CREATED':
             case 'LAST-MODIFIED':
             case 'DTSTAMP':
             case 'DTSTART':
             case 'DTEND':
                 $propmap = array('DTSTART' => 'start', 'DTEND' => 'end', 'CREATED' => 'created', 'LAST-MODIFIED' => 'changed', 'DTSTAMP' => 'changed');
                 $this->freebusy[$propmap[$prop->name]] = self::convert_datetime($prop);
                 break;
 
             case 'ORGANIZER':
                 $this->freebusy['organizer'] = preg_replace('!^mailto:!i', '', $value);
                 break;
 
             case 'FREEBUSY':
                 // The freebusy component can hold more than 1 value, separated by commas.
                 $periods = explode(',', $value);
                 $fbtype = strval($prop['FBTYPE']) ?: 'BUSY';
 
                 // skip dupes
                 if ($seen[$value.':'.$fbtype]++)
                     continue;
 
                 foreach ($periods as $period) {
                     // Every period is formatted as [start]/[end]. The start is an
                     // absolute UTC time, the end may be an absolute UTC time, or
                     // duration (relative) value.
                     list($busyStart, $busyEnd) = explode('/', $period);
 
                     $busyStart = DateTimeParser::parse($busyStart);
                     $busyEnd = DateTimeParser::parse($busyEnd);
                     if ($busyEnd instanceof \DateInterval) {
                         $tmp = clone $busyStart;
                         $tmp->add($busyEnd);
                         $busyEnd = $tmp;
                     }
 
                     if ($busyEnd && $busyEnd > $busyStart)
                         $this->freebusy['periods'][] = array($busyStart, $busyEnd, $fbtype);
                 }
                 break;
 
             case 'COMMENT':
                 $this->freebusy['comment'] = $value;
             }
         }
 
         return $this->freebusy;
     }
 
     /**
      *
      */
     public static function convert_string($prop)
     {
         return strval($prop);
     }
 
     /**
      *
      */
     public static function unescape($prop)
     {
         return str_replace('\,', ',', strval($prop));
     }
 
     /**
      * Helper method to correctly interpret an all-day date value
      */
     public static function convert_datetime($prop, $as_array = false)
     {
         if (empty($prop)) {
             return $as_array ? array() : null;
         }
 
         else if ($prop instanceof VObject\Property\iCalendar\DateTime) {
             if (count($prop->getDateTimes()) > 1) {
                 $dt = array();
                 $dateonly = !$prop->hasTime();
                 foreach ($prop->getDateTimes() as $item) {
                     $item->_dateonly = $dateonly;
                     $dt[] = $item;
                 }
             }
             else {
                 $dt = $prop->getDateTime();
                 if (!$prop->hasTime()) {
                     $dt->_dateonly = true;
                 }
             }
         }
         else if ($prop instanceof VObject\Property\iCalendar\Period) {
             $dt = array();
             foreach ($prop->getParts() as $val) {
                 try {
                     list($start, $end) = explode('/', $val);
                     $start = DateTimeParser::parseDateTime($start);
 
                     // This is a duration value.
                     if ($end[0] === 'P') {
                         $dur = DateTimeParser::parseDuration($end);
                         $end = clone $start;
                         $end->add($dur);
                     }
                     else {
                         $end = DateTimeParser::parseDateTime($end);
                     }
                     $dt[] = array($start, $end);
                 }
                 catch (Exception $e) {
                     // ignore single date parse errors
                 }
             }
         }
         else if ($prop instanceof \DateTime) {
             $dt = $prop;
         }
 
         // force return value to array if requested
         if ($as_array && !is_array($dt)) {
             $dt = empty($dt) ? array() : array($dt);
         }
 
         return $dt;
     }
 
 
     /**
      * Create a Sabre\VObject\Property instance from a PHP DateTime object
      *
      * @param object  VObject\Document parent node to create property for
      * @param string  Property name
      * @param object  DateTime
      * @param boolean Set as UTC date
      * @param boolean Set as VALUE=DATE property
      */
     public function datetime_prop($cal, $name, $dt, $utc = false, $dateonly = null, $set_type = false)
     {
         if ($utc) {
             $dt->setTimeZone(new \DateTimeZone('UTC'));
             $is_utc = true;
         }
         else {
             $is_utc = ($tz = $dt->getTimezone()) && in_array($tz->getName(), array('UTC','GMT','Z'));
         }
         $is_dateonly = $dateonly === null ? (bool)$dt->_dateonly : (bool)$dateonly;
         $vdt = $cal->createProperty($name, $dt, null, $is_dateonly ? 'DATE' : 'DATE-TIME');
 
         if ($is_dateonly) {
             $vdt['VALUE'] = 'DATE';
         }
         else if ($set_type) {
             $vdt['VALUE'] = 'DATE-TIME';
         }
 
         // register timezone for VTIMEZONE block
         if (!$is_utc && !$dateonly && $tz && ($tzname = $tz->getName())) {
             $ts = $dt->format('U');
             if (is_array($this->vtimezones[$tzname])) {
                 $this->vtimezones[$tzname][0] = min($this->vtimezones[$tzname][0], $ts);
                 $this->vtimezones[$tzname][1] = max($this->vtimezones[$tzname][1], $ts);
             }
             else {
                 $this->vtimezones[$tzname] = array($ts, $ts);
             }
         }
 
         return $vdt;
     }
 
     /**
      * Copy values from one hash array to another using a key-map
      */
     public static function map_keys($values, $map)
     {
         $out = array();
         foreach ($map as $from => $to) {
             if (isset($values[$from]))
                 $out[$to] = is_array($values[$from]) ? join(',', $values[$from]) : $values[$from];
         }
         return $out;
     }
 
     /**
      *
      */
     private static function parameters_array($prop)
     {
         $params = array();
         foreach ($prop->parameters() as $name => $value) {
             $params[strtoupper($name)] = strval($value);
         }
         return $params;
     }
 
 
     /**
      * Export events to iCalendar format
      *
      * @param  array   Events as array
      * @param  string  VCalendar method to advertise
      * @param  boolean Directly send data to stdout instead of returning
      * @param  callable Callback function to fetch attachment contents, false if no attachment export
      * @param  boolean Add VTIMEZONE block with timezone definitions for the included events
      * @return string  Events in iCalendar format (http://tools.ietf.org/html/rfc5545)
      */
     public function export($objects, $method = null, $write = false, $get_attachment = false, $with_timezones = true)
     {
         $this->method = $method;
 
         // encapsulate in VCALENDAR container
         $vcal = new VObject\Component\VCalendar();
         $vcal->VERSION = '2.0';
         $vcal->PRODID = $this->prodid;
         $vcal->CALSCALE = 'GREGORIAN';
 
         if (!empty($method)) {
             $vcal->METHOD = $method;
         }
 
         // write vcalendar header
         if ($write) {
             echo preg_replace('/END:VCALENDAR[\r\n]*$/m', '', $vcal->serialize());
         }
 
         foreach ($objects as $object) {
             $this->_to_ical($object, !$write?$vcal:false, $get_attachment);
         }
 
         // include timezone information
         if ($with_timezones || !empty($method)) {
             foreach ($this->vtimezones as $tzid => $range) {
                 $vt = self::get_vtimezone($tzid, $range[0], $range[1], $vcal);
                 if (empty($vt)) {
                     continue;  // no timezone information found
                 }
 
                 if ($write) {
                     echo $vt->serialize();
                 }
                 else {
                     $vcal->add($vt);
                 }
             }
         }
 
         if ($write) {
             echo "END:VCALENDAR\r\n";
             return true;
         }
         else {
             return $vcal->serialize();
         }
     }
 
     /**
      * Build a valid iCal format block from the given event
      *
      * @param  array    Hash array with event/task properties from libkolab
      * @param  object   VCalendar object to append event to or false for directly sending data to stdout
      * @param  callable Callback function to fetch attachment contents, false if no attachment export
      * @param  object   RECURRENCE-ID property when serializing a recurrence exception
      */
     private function _to_ical($event, $vcal, $get_attachment, $recurrence_id = null)
     {
         $type = $event['_type'] ?: 'event';
 
         $cal = $vcal ?: new VObject\Component\VCalendar();
         $ve = $cal->create($this->type_component_map[$type]);
         $ve->UID = $event['uid'];
 
         // set DTSTAMP according to RFC 5545, 3.8.7.2.
         $dtstamp = !empty($event['changed']) && !empty($this->method) ? $event['changed'] : new DateTime('now', new \DateTimeZone('UTC'));
         $ve->add($this->datetime_prop($cal, 'DTSTAMP', $dtstamp, true));
 
         // all-day events end the next day
         if ($event['allday'] && !empty($event['end'])) {
             $event['end'] = clone $event['end'];
             $event['end']->add(new \DateInterval('P1D'));
             $event['end']->_dateonly = true;
         }
         if (!empty($event['created']))
             $ve->add($this->datetime_prop($cal, 'CREATED', $event['created'], true));
         if (!empty($event['changed']))
             $ve->add($this->datetime_prop($cal, 'LAST-MODIFIED', $event['changed'], true));
         if (!empty($event['start']))
             $ve->add($this->datetime_prop($cal, 'DTSTART', $event['start'], false, (bool)$event['allday']));
         if (!empty($event['end']))
             $ve->add($this->datetime_prop($cal, 'DTEND',   $event['end'], false, (bool)$event['allday']));
         if (!empty($event['due']))
             $ve->add($this->datetime_prop($cal, 'DUE',   $event['due'], false));
 
         // we're exporting a recurrence instance only
         if (!$recurrence_id && $event['recurrence_date'] && $event['recurrence_date'] instanceof DateTime) {
             $recurrence_id = $this->datetime_prop($cal, 'RECURRENCE-ID', $event['recurrence_date'], false, (bool)$event['allday']);
             if ($event['thisandfuture'])
                 $recurrence_id->add('RANGE', 'THISANDFUTURE');
         }
 
         if ($recurrence_id) {
             $ve->add($recurrence_id);
         }
 
         $ve->add('SUMMARY', $event['title']);
 
         if ($event['location'])
             $ve->add($this->is_apple() ? new vobject_location_property($cal, 'LOCATION', $event['location']) : $cal->create('LOCATION', $event['location']));
         if ($event['description'])
             $ve->add('DESCRIPTION', strtr($event['description'], array("\r\n" => "\n", "\r" => "\n"))); // normalize line endings
 
         if (isset($event['sequence']))
             $ve->add('SEQUENCE', $event['sequence']);
 
         if ($event['recurrence'] && !$recurrence_id) {
             $exdates = $rdates = null;
             if (isset($event['recurrence']['EXDATE'])) {
                 $exdates = $event['recurrence']['EXDATE'];
                 unset($event['recurrence']['EXDATE']);  // don't serialize EXDATEs into RRULE value
             }
             if (isset($event['recurrence']['RDATE'])) {
                 $rdates = $event['recurrence']['RDATE'];
                 unset($event['recurrence']['RDATE']);  // don't serialize RDATEs into RRULE value
             }
 
             if ($event['recurrence']['FREQ']) {
                 $ve->add('RRULE', libcalendaring::to_rrule($event['recurrence'], (bool)$event['allday']));
             }
 
             // add EXDATEs each one per line (for Thunderbird Lightning)
             if (is_array($exdates)) {
                 foreach ($exdates as $ex) {
                     if ($ex instanceof \DateTime) {
                         $exd = clone $event['start'];
                         $exd->setDate($ex->format('Y'), $ex->format('n'), $ex->format('j'));
                         $exd->setTimeZone(new \DateTimeZone('UTC'));
                         $ve->add($this->datetime_prop($cal, 'EXDATE', $exd, true));
                     }
                 }
             }
             // add RDATEs
             if (!empty($rdates)) {
                 foreach ((array)$rdates as $rdate) {
                     $ve->add($this->datetime_prop($cal, 'RDATE', $rdate));
                 }
             }
         }
 
         if ($event['categories']) {
             $cat = $cal->create('CATEGORIES');
             $cat->setParts((array)$event['categories']);
             $ve->add($cat);
         }
 
         if (!empty($event['free_busy'])) {
             $ve->add('TRANSP', $event['free_busy'] == 'free' ? 'TRANSPARENT' : 'OPAQUE');
 
             // for Outlook clients we provide the X-MICROSOFT-CDO-BUSYSTATUS property
             if (stripos($this->agent, 'outlook') !== false) {
                 $ve->add('X-MICROSOFT-CDO-BUSYSTATUS', $event['free_busy'] == 'outofoffice' ? 'OOF' : strtoupper($event['free_busy']));
             }
         }
 
         if ($event['priority'])
           $ve->add('PRIORITY', $event['priority']);
 
         if ($event['cancelled'])
             $ve->add('STATUS', 'CANCELLED');
         else if ($event['free_busy'] == 'tentative')
             $ve->add('STATUS', 'TENTATIVE');
         else if ($event['complete'] == 100)
             $ve->add('STATUS', 'COMPLETED');
         else if (!empty($event['status']))
             $ve->add('STATUS', $event['status']);
 
         if (!empty($event['sensitivity']))
             $ve->add('CLASS', strtoupper($event['sensitivity']));
 
         if (!empty($event['complete'])) {
             $ve->add('PERCENT-COMPLETE', intval($event['complete']));
         }
 
         // Apple iCal and BusyCal required the COMPLETED date to be set in order to consider a task complete
         if ($event['status'] == 'COMPLETED' || $event['complete'] == 100) {
             $ve->add($this->datetime_prop($cal, 'COMPLETED', $event['changed'] ?: new DateTime('now - 1 hour'), true));
         }
 
         if ($event['valarms']) {
             foreach ($event['valarms'] as $alarm) {
                 $va = $cal->createComponent('VALARM');
                 $va->action = $alarm['action'];
                 if ($alarm['trigger'] instanceof DateTime) {
                     $va->add($this->datetime_prop($cal, 'TRIGGER', $alarm['trigger'], true, null, true));
                 }
                 else {
                     $alarm_props = array();
                     if (strtoupper($alarm['related']) == 'END') {
                         $alarm_props['RELATED'] = 'END';
                     }
                     $va->add('TRIGGER', $alarm['trigger'], $alarm_props);
                 }
 
                 if ($alarm['action'] == 'EMAIL') {
                     foreach ((array)$alarm['attendees'] as $attendee) {
                         $va->add('ATTENDEE', 'mailto:' . $attendee);
                     }
                 }
                 if ($alarm['description']) {
                     $va->add('DESCRIPTION', $alarm['description'] ?: $event['title']);
                 }
                 if ($alarm['summary']) {
                     $va->add('SUMMARY', $alarm['summary']);
                 }
                 if ($alarm['duration']) {
                     $va->add('DURATION', $alarm['duration']);
                     $va->add('REPEAT', intval($alarm['repeat']));
                 }
                 if ($alarm['uri']) {
                     $va->add('ATTACH', $alarm['uri'], array('VALUE' => 'URI'));
                 }
                 $ve->add($va);
             }
         }
         // legacy support
         else if ($event['alarms']) {
             $va = $cal->createComponent('VALARM');
             list($trigger, $va->action) = explode(':', $event['alarms']);
             $val = libcalendaring::parse_alarm_value($trigger);
             if ($val[3])
                 $va->add('TRIGGER', $val[3]);
             else if ($val[0] instanceof DateTime)
                 $va->add($this->datetime_prop($cal, 'TRIGGER', $val[0], true, null, true));
             $ve->add($va);
         }
 
         foreach ((array)$event['attendees'] as $attendee) {
             if ($attendee['role'] == 'ORGANIZER') {
                 if (empty($event['organizer']))
                     $event['organizer'] = $attendee;
             }
             else if (!empty($attendee['email'])) {
                 if (isset($attendee['rsvp']))
                     $attendee['rsvp'] = $attendee['rsvp'] ? 'TRUE' : null;
                 $ve->add('ATTENDEE', 'mailto:' . $attendee['email'],
                     array_filter(self::map_keys($attendee, $this->attendee_keymap)));
             }
         }
 
         if ($event['organizer']) {
             $ve->add('ORGANIZER', 'mailto:' . $event['organizer']['email'],
                 array_filter(self::map_keys($event['organizer'], array('name' => 'CN', 'schedule-status' => 'SCHEDULE-STATUS'))));
         }
 
         foreach ((array)$event['url'] as $url) {
             if (!empty($url)) {
                 $ve->add('URL', $url);
             }
         }
 
         if (!empty($event['parent_id'])) {
             $ve->add('RELATED-TO', $event['parent_id'], array('RELTYPE' => 'PARENT'));
         }
 
         if ($event['comment'])
             $ve->add('COMMENT', $event['comment']);
 
         $memory_limit = parse_bytes(ini_get('memory_limit'));
 
         // export attachments
         if (!empty($event['attachments'])) {
             foreach ((array)$event['attachments'] as $attach) {
                 // check available memory and skip attachment export if we can't buffer it
                 // @todo: use rcube_utils::mem_check()
                 if (is_callable($get_attachment) && $memory_limit > 0 && ($memory_used = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024)
                     && $attach['size'] && $memory_used + $attach['size'] * 3 > $memory_limit) {
                     continue;
                 }
                 // embed attachments using the given callback function
                 if (is_callable($get_attachment) && ($data = call_user_func($get_attachment, $attach['id'], $event))) {
                     // embed attachments for iCal
                     $ve->add('ATTACH',
                         $data,
                         array_filter(array('VALUE' => 'BINARY', 'ENCODING' => 'BASE64', 'FMTTYPE' => $attach['mimetype'], 'X-LABEL' => $attach['name'])));
                     unset($data);  // attempt to free memory
                 }
                 // list attachments as absolute URIs
                 else if (!empty($this->attach_uri)) {
                     $ve->add('ATTACH',
                         strtr($this->attach_uri, array(
                             '{{id}}'       => urlencode($attach['id']),
                             '{{name}}'     => urlencode($attach['name']),
                             '{{mimetype}}' => urlencode($attach['mimetype']),
                         )),
                         array('FMTTYPE' => $attach['mimetype'], 'VALUE' => 'URI'));
                 }
             }
         }
 
         foreach ((array)$event['links'] as $uri) {
             $ve->add('ATTACH', $uri);
         }
 
         // add custom properties
         foreach ((array)$event['x-custom'] as $prop) {
             $ve->add($prop[0], $prop[1]);
         }
 
         // append to vcalendar container
         if ($vcal) {
             $vcal->add($ve);
         }
         else {   // serialize and send to stdout
             echo $ve->serialize();
         }
 
         // append recurrence exceptions
         if (is_array($event['recurrence']) && $event['recurrence']['EXCEPTIONS']) {
             foreach ($event['recurrence']['EXCEPTIONS'] as $ex) {
                 $exdate = $ex['recurrence_date'] ?: $ex['start'];
                 $recurrence_id = $this->datetime_prop($cal, 'RECURRENCE-ID', $exdate, false, (bool)$event['allday']);
                 if ($ex['thisandfuture'])
                     $recurrence_id->add('RANGE', 'THISANDFUTURE');
                 $this->_to_ical($ex, $vcal, $get_attachment, $recurrence_id);
             }
         }
     }
 
     /**
      * Returns a VTIMEZONE component for a Olson timezone identifier
      * with daylight transitions covering the given date range.
      *
      * @param string Timezone ID as used in PHP's Date functions
      * @param integer Unix timestamp with first date/time in this timezone
      * @param integer Unix timestap with last date/time in this timezone
      *
      * @return mixed A Sabre\VObject\Component object representing a VTIMEZONE definition
      *               or false if no timezone information is available
      */
     public static function get_vtimezone($tzid, $from = 0, $to = 0, $cal = null)
     {
         if (!$from) $from = time();
         if (!$to)   $to = $from;
         if (!$cal)  $cal = new VObject\Component\VCalendar();
 
         if (is_string($tzid)) {
             try {
                 $tz = new \DateTimeZone($tzid);
             }
             catch (\Exception $e) {
                 return false;
             }
         }
         else if (is_a($tzid, '\\DateTimeZone')) {
             $tz = $tzid;
         }
 
         if (!is_a($tz, '\\DateTimeZone')) {
             return false;
         }
 
         $year = 86400 * 360;
         $transitions = $tz->getTransitions($from - $year, $to + $year);
 
         $vt = $cal->createComponent('VTIMEZONE');
         $vt->TZID = $tz->getName();
 
         $std = null; $dst = null;
         foreach ($transitions as $i => $trans) {
             $cmp = null;
 
             if ($i == 0) {
                 $tzfrom = $trans['offset'] / 3600;
                 continue;
             }
 
             if ($trans['isdst']) {
                 $t_dst = $trans['ts'];
                 $dst = $cal->createComponent('DAYLIGHT');
                 $cmp = $dst;
             }
             else {
                 $t_std = $trans['ts'];
                 $std = $cal->createComponent('STANDARD');
                 $cmp = $std;
             }
 
             if ($cmp) {
                 $dt = new DateTime($trans['time']);
                 $offset = $trans['offset'] / 3600;
 
                 $cmp->DTSTART = $dt->format('Ymd\THis');
                 $cmp->TZOFFSETFROM = sprintf('%+03d%02d', floor($tzfrom), ($tzfrom - floor($tzfrom)) * 60);
                 $cmp->TZOFFSETTO   = sprintf('%+03d%02d', floor($offset), ($offset - floor($offset)) * 60);
 
                 if (!empty($trans['abbr'])) {
                     $cmp->TZNAME = $trans['abbr'];
                 }
 
                 $tzfrom = $offset;
                 $vt->add($cmp);
             }
 
             // we covered the entire date range
             if ($std && $dst && min($t_std, $t_dst) < $from && max($t_std, $t_dst) > $to) {
                 break;
             }
         }
 
         // add X-MICROSOFT-CDO-TZID if available
         $microsoftExchangeMap = array_flip(VObject\TimeZoneUtil::$microsoftExchangeMap);
         if (array_key_exists($tz->getName(), $microsoftExchangeMap)) {
             $vt->add('X-MICROSOFT-CDO-TZID', $microsoftExchangeMap[$tz->getName()]);
         }
 
         return $vt;
     }
 
 
     /*** Implement PHP 5 Iterator interface to make foreach work ***/
 
     function current()
     {
         return $this->objects[$this->iteratorkey];
     }
 
     function key()
     {
         return $this->iteratorkey;
     }
 
     function next()
     {
         $this->iteratorkey++;
 
         // read next chunk if we're reading from a file
         if (!$this->objects[$this->iteratorkey] && $this->fp) {
             $this->_parse_next(true);
         }
 
         return $this->valid();
     }
 
     function rewind()
     {
         $this->iteratorkey = 0;
     }
 
     function valid()
     {
         return !empty($this->objects[$this->iteratorkey]);
     }
 
 }
 
 
 /**
  * Override Sabre\VObject\Property\Text that quotes commas in the location property
  * because Apple clients treat that property as list.
  */
 class vobject_location_property extends VObject\Property\Text
 {
     /**
      * List of properties that are considered 'structured'.
      *
      * @var array
      */
     protected $structuredValues = array(
         // vCard
         'N',
         'ADR',
         'ORG',
         'GENDER',
         'LOCATION',
         // iCalendar
         'REQUEST-STATUS',
     );
 }
diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css
index 9a0d716a..a8748ede 100644
--- a/plugins/tasklist/skins/larry/tasklist.css
+++ b/plugins/tasklist/skins/larry/tasklist.css
@@ -1,1510 +1,1511 @@
 /**
  * Roundcube Taklist plugin styles for skin "Larry"
  *
  * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
  * Screendesign by FLINT / Büro für Gestaltung, bueroflint.com
  *
  * The contents are subject to the Creative Commons Attribution-ShareAlike
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
  */
 
 #taskbar a.button-tasklist span.button-inner {
 	background-image: url(buttons.png);
 	background-position: 0 0;
 }
 
 #taskbar a.button-tasklist:hover span.button-inner,
 #taskbar a.button-tasklist.button-selected span.button-inner {
 	background-position: 0 -26px;
 }
 
 ul.toolbarmenu li span.icon.taskadd,
 #attachmentmenu li a.tasklistlink span.icon.taskadd {
 	background-image: url(buttons.png);
 	background-position: -4px -90px;
 }
 
+#taskedit.uidialog,
 .tasklistview div.uidialog {
 	display: none;
 }
 
 .tasklistview #mainscreen {
 	min-width: 1000px !important;
 	min-height: 520px !important;
 }
 
 .tasklistview #header {
 	min-width: 1020px !important;
 }
 
 #sidebar {
 	position: absolute;
 	top: 0;
 	left: 0;
 	bottom: 0;
 	width: 240px;
 }
 
 .tasklistview #searchmenulink {
 	width: 15px;
 }
 
 #tagsbox {
 	position: absolute;
 	top: 42px;
 	left: 0;
 	width: 100%;
 	height: 242px;
 }
 
 #tasklistsbox {
 	position: absolute;
 	top: 300px;
 	left: 0;
 	width: 100%;
 	bottom: 0px;
 }
 
 #tasklistsbox .boxtitle a.iconbutton.search {
 	position: absolute;
 	top: 8px;
 	right: 8px;
 	width: 16px;
 	cursor: pointer;
 	background-position: -2px -317px;
 }
 
 #tasklistsbox .listsearchbox {
 	display: none;
 }
 
 #tasklistsbox .listsearchbox.expanded {
 	display: block;
 }
 
 #tasklistsbox .scroller {
 	top: 34px;
 }
 
 #tasklistsbox .listsearchbox.expanded + .scroller {
 	top: 68px;
 }
 
 
 #taskselector {
 	margin: -1px 40px 0 0;
 	padding: 0;
 }
 
 #taskselector li {
 	display: inline-block;
 	position: relative;
 	font-size: 90%;
 	padding-right: 0.3em;
 }
 
 .tagcloud li,
 #taskselector li a {
 	display: inline-block;
 	color: #004458;
 	min-width: 3.5em;
 	padding: 0.2em 0.6em 0.2em 0.6em;
 	text-align: center;
 	text-decoration: none;
 	border: 1px solid #eee;
 	border-color: transparent;
 }
 
 .webkit .tagcloud li,
 .webkit #taskselector li a {
 	padding-bottom: 0.25em;
 }
 
 
 #taskselector li:first-child {
 	border-top: 0;
 	border-radius: 4px 4px 0 0;
 }
 
 #taskselector li:last-child {
 	border-bottom: 0;
 	border-radius: 0 0 4px 4px;
 }
 
 #taskselector li.overdue a {
 	color: #b72a2a;
 	font-weight: bold;
 }
 
 #taskselector li.inactive a {
 	color: #97b3bf;
 }
 
 .tagcloud li.selected,
 #taskselector li.selected a {
 	color: #fff;
 	background: #005d76;
 	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
 	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
 	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
 	background: linear-gradient(top, #005d76 0%, #004558 100%);
 	box-shadow: inset 0 1px 1px 0 #003645;
 	-o-box-shadow: inset 0 1px 1px 0 #003645;
 	-webkit-box-shadow: inset 0 1px 1px 0 #003645;
 	-moz-box-shadow: inset 0 1px 1px 0 #003645;
 	border-color: #003645;
 	border-radius: 10px;
 	text-shadow: none;
 }
 
 #taskselector li .count {
 	display: none;
 	position: absolute;
 	top: -18px;
 	right: 5px;
 	min-width: 1.8em;
 	padding: 2px 4px;
 	background: #004558;
 	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
 	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
 	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
 	background: linear-gradient(top, #005d76 0%, #004558 100%);
 	box-shadow: 0 1px 2px 0 rgba(24,24,24,0.6);
 	color: #fff;
 	border-radius: 3px;
 	text-align: center;
 	font-weight: bold;
 	font-size: 80%;
 	text-shadow: none;
 }
 
 #taskselector li .count:after {
 	content: "";
 	position: absolute;
 	bottom: -5px;
 	left: 50%;
 	margin-left: -5px;
 	border-style: solid;
 	border-width: 5px 5px 0;
 	border-color: #004558 transparent;
 	/* reduce the damage in FF3.0 */
 	display: block; 
 	width: 0;
 }
 
 #taskselector li.overdue .count {
 	background: #ff3800;
 }
 
 #taskselector li.overdue .count:after {
 	border-color: #ff3800 transparent;
 }
 
 .tagcloud {
 	padding: 0;
 	margin: 6px;
 	list-style: none;
 }
 
 .tagcloud li {
 	display: inline-block;
 	color: #004458;
 	padding-right: 0.2em;
 	margin-right: 0.3em;
 	margin-bottom: 0.4em;
 	min-width: 1.2em;
 	cursor: pointer;
 }
 
 .tagcloud li.inactive {
 	color: #89b3be;
 	padding-right: 0.6em;
 	font-size: 80%;
 /*	display: none; */
 }
 
 .tagcloud li .count {
 	position: relative;
 	top: -1px;
 	margin-left: 5px;
 	padding: 0.15em 0.5em;
 	font-size: 80%;
 	font-weight: bold;
 	color: #59838e;
 	background: #c7e3ef;
 	box-shadow: inset 0 1px 1px 0 #b0ccd7;
 	-o-box-shadow: inset 0 1px 1px 0 #b0ccd7;
 	-webkit-box-shadow: inset 0 1px 1px 0 #b0ccd7;
 	-moz-box-shadow: inset 0 1px 1px 0 #b0ccd7;
 	border-color: #b0ccd7;
 	border-radius: 8px;
 }
 
 .tag-draghelper .tag .count,
 .tagcloud li.inactive .count {
 	display: none;
 }
 
 #tasklistsbox .treelist li {
 	margin: 0;
 	display: block;
 	position: relative;
 }
 
 #tasklistsbox .treelist li div.tasklist {
 	margin: 0;
 	height: 20px;
 	padding: 6px 8px 2px 6px;
 	position: relative;
 	white-space: nowrap;
 }
 
 #tasklistsbox .treelist li.virtual > div.tasklist {
 	height: 14px;
 }
 
 #tasklistsbox .treelist ul li > div.tasklist {
 	margin-left: 16px;
 }
 
 #tasklistsbox .treelist ul ul li > div.tasklist {
 	margin-left: 32px;
 }
 
 #tasklistsbox .treelist ul ul ul li > div.tasklist {
 	margin-left: 48px;
 }
 
 #tasklistsbox .treelist li label {
 	display: block;
 }
 
 #tasklistsbox .treelist li span.listname {
 	display: block;
 	position: absolute;
 	top: 7px;
 	left: 38px;
 	right: 40px;
 	cursor: default;
 	padding: 0px 30px 2px 2px;
 	color: #004458;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	background: url(sprites.png) right 20px no-repeat;
 }
 
 .quickview-active #tasklistsbox .treelist li input,
 .quickview-active #tasklistsbox .treelist li span.listname {
 	opacity: 0.35;
 }
 
 .quickview-active #tasklistsbox .treelist div.focusview span.listname {
 	opacity: 1.0;
 }
 
 #tasklistsbox .treelist div span.actions {
 	display: inline-block;
 	position: absolute;
 	top: 2px;
 	right: 2px;
 	padding: 5px 20px 0 6px;
 	min-width: 40px;
 	height: 19px;
 	text-align: right;
 }
 
 #tasklistsbox .treelist div:hover span.actions {
 	top: 1px;
 	right: 1px;
 	border: 1px solid #c6c6c6;
 	border-radius: 4px;
 	background: #f7f7f7;
 	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
 	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
 	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
 	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
 }
 
 #tasklistsbox .treelist div a.remove,
 #tasklistsbox .treelist div a.quickview,
 #tasklistsbox .treelist div a.subscribed {
 	display: inline-block;
 	width: 16px;
 	height: 16px;
 	padding: 0;
 	margin-right: 4px;
 	background: url(sprites.png) -200px 0 no-repeat;
 	overflow: hidden;
 	text-indent: -5000px;
 	cursor: pointer;
 }
 
 #tasklistsbox .treelist div a.subscribed {
 	position: absolute;
 	top: 5px;
 	right: 4px;
 	margin: 0;
 }
 
 #tasklistsbox .treelist div a.subscribed:focus,
 #tasklistsbox .treelist div:hover a.subscribed {
 	background-position: -2px -215px;
 }
 
 #tasklistsbox .treelist div.subscribed a.subscribed {
 	background-position: -20px -215px;
 }
 
 #tasklistsbox .treelist div a.quickview:focus,
 #tasklistsbox .treelist div:hover a.quickview {
 	background-position: -20px -101px;
 	background-color: transparent !important;
 }
 
 #tasklistsbox .treelist div a.remove:focus,
 #tasklistsbox .treelist div:hover a.remove {
 	background-position: -2px -371px;
 	background-color: transparent !important;
 }
 
 #tasklistsbox .treelist div.focusview a.quickview {
 	background-position: -2px -101px;
 }
 
 #tasklistsbox .searchresults .treelist div a.remove,
 #tasklistsbox .searchresults .treelist div a.quickview {
 	display: none;
 }
 
 #tasklistsbox .treelist div a.remove:focus,
 #tasklistsbox .treelist div a.quickview:focus,
 #tasklistsbox .treelist div a.subscribed:focus {
 	border-radius: 3px;
 	outline: 2px solid rgba(30,150,192, 0.5);
 }
 
 #tasklistsbox .treelist li.selected > div > span.listname {
 	font-weight: bold;
 }
 
 #tasklistsbox .treelist .readonly > span.listname {
 	background-position: right -142px;
 }
 
 #tasklistsbox .treelist .user > span.listname {
 	background-position: right -160px;
 }
 
 #tasklistsbox .treelist .virtual > span.listname {
 	color: #aaa;
 	top: 4px;
 	left: 20px;
 	right: 5px;
 }
 
 #tasklistsbox .treelist.flat li span.calname {
 	left: 24px;
 	right: 22px;
 }
 
 #tasklistsbox .treelist li input {
 	position: absolute;
 	top: 5px;
 	left: 18px;
 }
 
 #tasklistsbox .treelist li .treetoggle {
 	top: 8px;
 }
 
 #tasklistsbox .treelist li.virtual > .treetoggle {
 	top: 6px;
 }
 
 #tasklistsbox .searchresults {
 	background: #b0ccd7;
 	margin-top: 8px;
 }
 
 #tasklistsbox .searchresults .boxtitle {
 	background: none;
 	padding: 2px 8px 2px 8px;
 }
 
 #tasklistsbox .searchresults .listing li {
 	background-color: #c7e3ef;
 }
 
 #mainview-right {
 	position: absolute;
 	top: 0;
 	left: 256px;
 	right: 0;
 	bottom: 0;
 }
 
 #taskstoolbar {
 	position: absolute;
 	top: -6px;
 	left: 0;
 	width: 100%;
 	height: 40px;
 	white-space: nowrap;
 }
 
 #taskstoolbar a.button.newtask {
 	background-image: url(buttons.png);
 	background-position: center -53px;
 }
 
 #quickaddbox {
 	position: absolute;
 	top: 2px;
 	left: 0;
 	width: 60%;
 	height: 32px;
 	white-space: nowrap;
 }
 
 #quickaddinput {
 	width: 85%;
 	margin: 0;
 	padding: 3px 8px;
 	height: 18px;
 	background: #f1f1f1;
 	background: rgba(255, 255, 255, 0.7);
 	border-color: #a3a3a3;
 	font-weight: bold;
 }
 
 #quickaddbox .button {
 	margin-left: 5px;
 	padding: 3px 10px;
 	font-weight: bold;
 }
 
 #tasksview {
 	position: absolute;
 	top: 42px;
 	left: 0;
 	right: 0;
 	bottom: 0;
 	background: rgba(255, 255, 255, 0.2);
 	overflow: visible;
 }
 
 .quickview-active #tasksview {
 	background-image: url('images/focusview.png');
 	background-position: center;
 	background-repeat: no-repeat;
 }
 
 #message.statusbar {
 	border-top: 1px solid #c3c3c3;
 }
 
 #tasksview .scroller {
 	position: absolute;
 	left: 0;
 	top: 35px;
 	width: 100%;
 	bottom: 0;
 	overflow: auto;
 }
 
 #tasksview .buttonbar {
 	color: #777;
 	background: #eee;
 	background: -moz-linear-gradient(top, #eee 0%, #dfdfdf 100%);
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eee), color-stop(100%,#dfdfdf));
 	background: -o-linear-gradient(top, #eee 0%, #dfdfdf 100%);
 	background: -ms-linear-gradient(top, #eee 0%, #dfdfdf 100%);
 	background: linear-gradient(top, #eee 0%, #dfdfdf 100%);
 	border-bottom: 1px solid #ccc;
 	position: relative;
 	line-height: 13px;
 	height: 20px;
 }
 
 #tasksview .buttonbar .buttonbar-right {
 	position: absolute;
 	top: 6px;
 	right: 8px;
 }
 
 .buttonbar-right .listmenu {
 	display: inline-block;
 	cursor: pointer;
 }
 
 .buttonbar-right a.iconbutton {
 	padding: 0;
 	background-image: url(sprites.png);
 	background-position: 0 -238px;
 }
 
 .buttonbar-right a.iconbutton.sorting {
 	background-position: -18px -347px;
 }
 
 #thelist {
 	padding: 0;
 	margin: 1em;
 	list-style: none;
 }
 
 #listmessagebox {
 	display: none;
 	font-size: 14px;
 	color: #666;
 	margin: 1.5em;
 	text-shadow: 0px 1px 1px #fff;
 	text-align:center;
 }
 
 .taskitem {
 	position: relative;
 	display: block;
 	margin-bottom: 3px;
 }
 
 .taskitem.dragging {
 	opacity: 0.5;
 }
 
 .taskitem .childtasks {
 	position: relative;
 	padding: 0;
 	margin: 3px 0 0 20px;
 	list-style: none;
 }
 
 .taskitem .childtoggle {
 	display: none;
 	position: absolute;
 	top: 4px;
 	left: -5px;
 	padding: 2px;
 	font-size: 10px;
 	color: #727272;
 	cursor: pointer;
 	
 	width: 14px;
 	height: 14px;
 	background: url(sprites.png) -2px -80px no-repeat;
 	text-indent: -1000px;
 	overflow: hidden;
 }
 
 .taskitem .childtoggle.collapsed {
 	background-position: -18px -81px;
 }
 
 .taskhead {
 	position: relative;
 	margin-left: 14px;
 	padding: 4px 5px 3px 5px;
 	border: 1px solid #fff;
 	border-radius: 5px;
 	background: #fff;
 	-webkit-box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.5);
 	-moz-box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.5);
 	box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.5);
 	padding-right: 26em;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	cursor: default;
 	outline: none;
 }
 
 .taskhead:focus,
 .taskhead.droptarget {
 	border-color: #4787b1;
 	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 }
 
 .taskhead .complete {
 	margin: -1px 1em 0 0;
 }
 
 .taskhead .title {
 	font-size: 12px;
 }
 
 .taskhead .flagged,
 .taskshow.status-flagged h2:after {
 	display: inline-block;
 	width: 16px;
 	height: 16px;
 	background: url(sprites.png) 1000px -3px no-repeat;
 	margin: -3px 1em 0 0;
 	vertical-align: middle;
 	cursor: pointer;
 }
 
 .taskhead .flagged:focus,
 .taskhead:hover .flagged {
 	background-position: -2px -3px;
 }
 
 .taskhead.flagged .flagged,
 .taskshow.status-flagged h2:after {
 	background-position: -2px -23px;
 }
 
 .taskhead .tags {
 	display: block;
 	position: absolute;
 	top: 3px;
 	right: 10em;
 	max-width: 14em;
 	height: 16px;
 	overflow: hidden;
 	padding-top: 1px;
 	text-align: right;
 }
 
 .tag-draghelper .tag,
 .taskhead .tags .tag {
 	font-size: 85%;
 	background: #d9ecf4;
 	border: 1px solid #c2dae5;
 	border-radius: 4px;
 	padding: 1px 7px;
 	margin-right: 3px;
 }
 
 .tag-draghelper li.tag {
 	list-style: none;
 	font-size: 100%;
 }
 
 .taskhead .date {
 	position: absolute;
 	top: 4px;
 	right: 30px;
 	text-align: right;
 	cursor: pointer;
 }
 
 .taskhead.nodate .date {
 	color: #ddd;
 }
 
 .taskhead.overdue .date {
 	color: #d00;
 }
 
 .taskhead.nodate:hover .date {
 	color: #999;
 }
 
 .taskhead .date input {
 	padding: 1px 2px;
 	border: 1px solid #ddd;
 	-webkit-box-shadow: none;
 	-moz-box-shadow: none;
 	box-shadow: none;
 	outline: none;
 	text-align: right;
 	width: 6em;
 	font-size: 11px;
 }
 
 .taskhead .actions {
 	display: block;
 	position: absolute;
 	top: 3px;
 	right: 6px;
 	width: 18px;
 	height: 18px;
 	background: url(sprites.png) 1000px -80px no-repeat;
 	text-indent: -5000px;
 	overflow: hidden;
 	cursor: pointer;
 }
 
 .taskhead .actions:focus,
 .taskhead:hover .actions {
 	background-position: 0 -80px;
 }
 
 .taskhead.complete {
 	opacity: 0.6;
 }
 
 .taskhead.complete .title {
 	text-decoration: line-through;
 }
 
 .taskhead .progressbar {
 	position: absolute;
 	bottom: 1px;
 	left: 6px;
 	right: 6px;
 	height: 2px;
 }
 
 .taskhead.complete .progressbar {
 	display: none;
 }
 
 .taskhead .progressvalue {
 	height: 1px;
 	background: rgba(1, 124, 180, 0.2);
 	border-top: 1px solid #219de6;
 }
 
 ul.toolbarmenu li span.add,
 ul.toolbarmenu li span.expand,
 ul.toolbarmenu li span.collapse,
 ul.toolbarmenu li span.history,
 ul.toolbarmenu.iconized .selected span.icon {
 	background-image: url(sprites.png);
 }
 
 ul.toolbarmenu li span.add {
 	background-position: 0 -302px;
 }
 
 ul.toolbarmenu li span.expand {
 	background-position: 0 -258px;
 }
 
 ul.toolbarmenu li span.collapse {
 	background-position: 0 -280px;
 }
 
 ul.toolbarmenu li span.delete {
 	background-position: 0 -1508px;
 }
 
 ul.toolbarmenu li span.history {
 	background-position: 0 -408px;
 }
 
 ul.toolbarmenu.iconized .selected span.icon {
 	background-position: 0 -324px;
 }
 
 ul.toolbarmenu .sortcol.by-auto a {
 	font-style: italic;
 }
 
 .taskitem-draghelper {
 /*
 	width: 32px;
 	height: 26px;
 */
 	background: #444;
 	border: 1px solid #555;
 	border-radius: 4px;
 	box-shadow: 0 2px 6px 0 #333;
 	-moz-box-shadow: 0 2px 6px 0 #333;
 	-webkit-box-shadow: 0 2px 6px 0 #333;
 	-o-box-shadow: 0 2px 6px 0 #333;
 	z-index: 5000;
 	padding: 2px 10px;
 	font-size: 20px;
 	color: #ccc;
 	opacity: 0.92;
 	filter: alpha(opacity=90);
 	text-shadow: 0px 1px 1px #333;
 }
 
 #rootdroppable {
 	display: none;
 	position: absolute;
 	top: 2px;
 	left: 1em;
 	right: 1em;
 	height: 5px;
 	background: #ddd;
 	border-radius: 3px;
 }
 
 #rootdroppable.droptarget {
 	background: #4787b1;
 	box-shadow: 0 0 2px 1px rgba(71,135,177, 0.9);
 	-moz-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.9);
 	-webkit-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.9);
 	-o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.9);
 	
 }
 
 /*** task edit form ***/
 
 #taskedit,
 #taskshow,
 #taskdiff {
 	display: none;
 }
 
 #taskedit {
 	position: relative;
 	top: -1.5em;
 	padding: 0.5em 0.1em;
 	margin: 0 -0.2em;
 }
 
 .taskshow h2 {
 	margin-top: -0.5em;
 }
 
 #taskdiff h2 {
 	font-size: 18px;
 	margin: -0.3em 0 0.4em 0;
 }
 
 .taskshow.status-completed h2 {
 	text-decoration: line-through;
 }
 
 .taskshow.status-flagged h2:after {
 	content: " ";
 	position: relative;
 	margin-left: 0.6em;
 	top: 1px;
 	cursor: default;
 }
 
 .taskshow label {
 	color: #999;
 }
 
 .taskshow.status-cancelled {
 	background: url(images/badge_cancelled.png) top right no-repeat;
 }
 
 .task-parent-title {
 	position: relative;
 	top: -0.6em;
 }
 
 a.morelink {
 	font-size: 90%;
 	color: #0069a6;
 	text-decoration: none;
 	outline: none;
 }
 
 a.morelink:hover {
 	text-decoration: underline;
 }
 
 #taskedit .ui-tabs-panel {
 	min-height: 24em;
 }
 
 #taskeditform input.text,
 #taskeditform textarea {
 	width: 97%;
 }
 
-#taskeditform .formbuttons {
+#taskeditform .buttons {
 	margin: 0.5em 0;
 }
 
 #taskedit .border-after {
 	padding-bottom: 0.8em;
 	margin-bottom: 0.8em;
 	border-bottom: 2px solid #fafafa;
 }
 
 #taskedit .edit-attendees-table {
 	width: 100%;
 	margin-top: 0.5em;
 }
 
 #taskedit .edit-attendees-table tbody td {
 	padding: 5px 7px 6px;
 }
 
 #taskedit .edit-attendees-table tbody tr:last-child td {
 	border-bottom: 0;
 }
 
 #taskedit .edit-attendees-table th.role,
 #taskedit .edit-attendees-table td.role {
 	width: 9em;
 }
 
 #taskedit .edit-attendees-table th.availability,
 #taskedit .edit-attendees-table td.availability,
 #taskedit .edit-attendees-table th.confirmstate,
 #taskedit .edit-attendees-table td.confirmstate {
 	width: 6em;
 }
 
 #taskedit .edit-attendees-table th.options,
 #taskedit .edit-attendees-table td.options {
 	width: 24px;
 	padding: 2px 4px;
 	text-align: right;
 }
 
 #taskedit .edit-attendees-table th.invite,
 #taskedit .edit-attendees-table td.invite {
 	width: 48px;
 	padding: 2px;
 }
 
 #taskedit .edit-attendees-table th.invite label {
 	display: inline-block;
 	position: relative;
 	top: 4px;
 	width: 24px;
 	height: 18px;
 	min-width: 24px;
 	padding: 0;
 	overflow: hidden;
 	text-indent: -5000px;
 	white-space: nowrap;
 	background: url(images/sendinvitation.png) 1px 0 no-repeat;
 }
 
 #taskedit .edit-attendees-table th.name,
 #taskedit .edit-attendees-table td.name {
 	width: auto;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
 #taskedit .edit-attendees-table td.name .attendee-name {
 	display: block;
 	position: relative;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	padding: 5px 7px 6px 4px;
 	margin: -5px -7px -6px;
 }
 
 #taskedit .edit-attendees-table td.name select {
 	width: 100%;
 }
 
 #taskedit .edit-attendees-table a.deletelink {
 	display: inline-block;
 	width: 17px;
 	height: 17px;
 	padding: 0;
 	overflow: hidden;
 	text-indent: 1000px;
 }
 
 #taskedit .edit-attendees-table a.expandlink {
 	position: absolute;
 	top: 4px;
 	right: 6px;
 	width: 16px;
 	height: 16px;
 }
 
 #edit-attendees-form {
 	position: relative;
 	margin-top: 15px;
 }
 
 #edit-attendees-form .attendees-invitebox {
 	text-align: right;
 	margin: 0;
 }
 
 #edit-attendees-form .attendees-invitebox label {
 	padding-right: 3px;
 }
 
 #taskedit-attachments {
 	margin: 0.6em 0;
 }
 
 #taskedit-attachments ul li {
 	display: block;
 	color: #333;
 	font-weight: bold;
 	padding: 3px 4px 3px 30px;
 	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
 	line-height: 20px;
 }
 
 #taskedit-attachments ul li a.file {
 	padding: 0;
 }
 
 #taskedit-attachments-form {
 	margin-top: 1em;
 	padding-top: 0.8em;
 	border-top: 2px solid #fafafa;
 }
 
 div.form-section {
 	position: relative;
 	margin-top: 0.2em;
 	margin-bottom: 0.5em;
 }
 
 .form-section label {
 	display: inline-block;
 	min-width: 7em;
 	padding-right: 0.5em;
 	margin-bottom: 0.3em;
 }
 
 .tasklistview div.form-section span.task-text + label {
 	margin-left: 2em;
 }
 
 label.block {
 	display: block;
 	margin-bottom: 0.3em;
 }
 
 .task-description {
 	margin-bottom: 1em;
 }
 
 .taskshow .task-text-old,
 .taskshow .task-text-new,
 .taskshow .task-text-diff {
 	padding: 2px;
 }
 
 .taskshow .task-text-diff del,
 .taskshow .task-text-diff ins {
 	text-decoration: none;
 	color: inherit;
 }
 
 .taskshow .task-text-old,
 .taskshow .task-text-diff del {
 	background-color: #fdd;
 	/* text-decoration: line-through; */
 }
 
 .taskshow .task-text-new,
 .taskshow .task-text-diff ins {
 	background-color: #dfd;
 }
 
 .tasklistview .taskshow label span.index {
 	vertical-align: inherit;
 	margin-left: 0.6em;
 }
 
 #taskedit-completeness-slider {
 	display: inline-block;
 	margin-left: 2em;
 	width: 30em;
 	height: 0.8em;
 	border: 1px solid #ccc;
 }
 
 #taskedit-tagline {
 	width: 97%;
 }
 
 #taskedit .droptarget {
 	background-image: url(../../../../skins/larry/images/filedrop.png) !important;
 	background-position: center bottom !important;
 	background-repeat: no-repeat !important;
 }
 
 #taskedit .droptarget.hover,
 #taskedit .droptarget.active {
 	border-color: #019bc6;
 	box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
 	-moz-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
 	-webkit-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
 	-o-box-shadow: 0 0 3px 2px rgba(71,135,177, 0.5);
 }
 
 #taskedit .droptarget.hover {
 	background-color: #d9ecf4;
 	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 	-o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
 }
 
 #task-links {
 	margin-top: 0;
 	margin-bottom: 0.2em;
 }
 
 #task-links label {
 	vertical-align: top;
 	margin-top: 0.3em;
 }
 
 #task-links .attachmentslist {
 	display: inline-block;
 }
 
 #task-links .attachmentslist li {
 	display: inline-block;
 	margin-right: 1em;
 }
 
 #taskedit-links .attachmentslist li.message.eml,
 #task-links .attachmentslist li.message.eml {
 	background-image: url(sprites.png);
 	background-position: -2px -388px;
 }
 
 #taskedit-links .attachmentslist li.message a.messagelink,
 #task-links .attachmentslist li.message a.messagelink {
 	padding: 0 0 0 24px;
 }
 
 #taskedit-links .attachmentslist li.deleted a.messagelink,
 #taskedit-links .attachmentslist li.deleted a.messagelink:hover {
 	text-decoration: line-through;
 }
 
 #taskedit-links label {
 	float: left;
 	margin-top: 0.3em;
 }
 
 #taskedit-links .task-text {
 	margin-left: 8em;
 	min-height: 22px;
 }
 
 #taskedit-links .attachmentslist li a.delete {
 	top: 0;
 	background-position: -6px -378px;
 }
 
 #task-attachments .attachmentslist li {
 	float: left;
 	margin-right: 1em;
 }
 
 #task-attachments .attachmentslist li a {
 	outline: none;
 }
 
 .task-attendees span.attendee {
 	padding-right: 18px;
 	margin-right: 0.5em;
 	background: url(images/attendee-status.png) right 0 no-repeat;
 }
 
 .task-attendees span.attendee a.mailtolink {
 	text-decoration: none;
 	white-space: nowrap;
 	outline: none;
 }
 
 .task-attendees span.attendee a.mailtolink:hover {
 	text-decoration: underline;
 }
 
 .task-attendees span.completed {
 	background-position: right -20px;
 }
 
 .task-attendees span.declined {
 	background-position: right -40px;
 }
 
 .task-attendees span.tentative {
 	background-position: right -60px;
 }
 
 .task-attendees span.delegated {
 	background-position: right -180px;
 }
 
 .task-attendees span.in-process {
 	background-position: right -200px;
 }
 
 .task-attendees span.accepted {
 	background-position: right -220px;
 }
 
 .task-attendees span.organizer {
 	background-position: right 100px;
 }
 
 #all-task-attendees span.attendee {
 	display: block;
 	margin-bottom: 0.4em;
 	padding-bottom: 0.3em;
 	border-bottom: 1px solid #ddd;
 }
 
 .tasklistview .uidialog .tabbed {
 	min-width: 600px;
 }
 
 .tasklistview .uidialog .propform fieldset.ui-tabs-panel {
 	min-height: 290px;
 }
 
 .tasklistview .uidialog .propform #taskedit-tasklistame {
 	width: 20em;
 }
 
 .task-dialog-message {
 	margin-top: 0.5em;
 	padding: 0.8em;
 	border: 1px solid #ffdf0e;
 	background-color: #fef893;
 }
 
 .task-dialog-message .message,
 .task-update-confirm .message {
 	margin-bottom: 0.5em;
 }
 
 /* Invitation UI in mail */
 
 .messagelist tbody .attachment span.ical {
 	display: inline-block;
 	vertical-align: middle;
 	height: 18px;
 	width: 20px;
 	padding: 0;
 	background: url(images/ical-attachment.png) 2px 1px no-repeat;
 }
 
 div.tasklist-invitebox {
 	min-height: 20px;
 	margin: 5px 8px;
 	padding: 3px 6px 6px 34px;
 	border: 1px solid #ffdf0e;
 	background: url(images/tasklist.png) 6px 5px no-repeat #fef893;
 }
 
 div.tasklist-invitebox td {
 	padding: 2px;
 }
 
 div.tasklist-invitebox td.ititle {
 	font-weight: bold;
 	padding-right: 0.5em;
 }
 
 div.tasklist-invitebox td.label {
 	color: #666;
 	padding-right: 1em;
 }
 
 #task-rsvp .rsvp-buttons,
 #task-rsvp .itip-reply-controls,
 div.tasklist-invitebox .itip-buttons div {
 	margin-top: 0.5em;
 }
 
 #task-rsvp .itip-reply-controls a,
 #task-rsvp .itip-reply-controls label {
 	color: #333;
 }
 
 #task-rsvp input.button,
 div.tasklist-invitebox input.button {
 	font-weight: bold;
 	margin-right: 0.5em;
 }
 
 div.tasklist-invitebox .folder-select {
 	font-weight: 10px;
 	margin-left: 1em;
 }
 
 div.tasklist-invitebox .rsvp-status {
 	padding-left: 2px;
 }
 
 div.tasklist-invitebox .rsvp-status.loading {
 	color: #666;
 	padding: 1px 0 2px 24px;
 	background: url(images/loading_blue.gif) top left no-repeat;
 }
 
 div.tasklist-invitebox .rsvp-status.hint {
 	color: #666;
 	text-shadow: none;
 	font-style: italic;
 }
 
 #task-partstat .changersvp,
 .tasklistview .edit-attendees-table td.confirmstate span,
 div.tasklist-invitebox .rsvp-status.declined,
 div.tasklist-invitebox .rsvp-status.tentative,
 div.tasklist-invitebox .rsvp-status.accepted,
 div.tasklist-invitebox .rsvp-status.delegated,
 div.tasklist-invitebox .rsvp-status.in-process,
 div.tasklist-invitebox .rsvp-status.completed,
 div.tasklist-invitebox .rsvp-status.needs-action {
 	padding: 0 0 1px 22px;
 	background: url(images/attendee-status.png) 2px -20px no-repeat;
 }
 
 #task-partstat .changersvp.declined,
 div.tasklist-invitebox .rsvp-status.declined,
 .tasklistview .edit-attendees-table td.confirmstate span.declined {
 	background-position: 2px -40px;
 }
 
 #task-partstat .changersvp.tentative,
 div.tasklist-invitebox .rsvp-status.tentative,
 .tasklistview .edit-attendees-table td.confirmstate span.tentative {
 	background-position: 2px -60px;
 }
 
 #task-partstat .changersvp.delegated,
 div.tasklist-invitebox .rsvp-status.delegated,
 .tasklistview .edit-attendees-table td.confirmstate span.delegated {
 	background-position: 2px -180px;
 }
 
 #task-partstat .changersvp.needs-action,
 div.tasklist-invitebox .rsvp-status.needs-action,
 .tasklistview .edit-attendees-table td.confirmstate span.needs-action {
 	background-position: 2px 0;
 }
 
 #task-partstat .changersvp.in-process,
 div.tasklist-invitebox .rsvp-status.in-process,
 .tasklistview .edit-attendees-table td.confirmstate span.in-process {
 	background-position: 2px -200px;
 }
 
 #task-partstat .changersvp.accepted,
 div.tasklist-invitebox .rsvp-status.accepted,
 .tasklistview .edit-attendees-table td.confirmstate span.accepted {
 	background-position: 2px -220px;
 }
 
 div.messagetasklinks {
 	position: relative;
 	margin: 8px 8px;
 	padding: 4px 8px 4px 30px;
 	border: 1px solid #dfdfdf;
 	background: #fafafa;
 	border-radius: 4px;
 }
 
 div.messagetasklinks::before {
 	content: " ";
 	position: absolute;
 	top: 4px;
 	left: 8px;
 	width: 18px;
 	height: 18px;
 	background: url(buttons.png) -6px -115px no-repeat;
 }
 
 div.messagetasklinks ul.tasklist {
 	margin: 0;
 	padding: 0;
 	list-style: none;
 }
 
 div.messagetasklinks .messagetaskref {
 	display: block;
 	margin-bottom: 2px;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
 div.messagetasklinks a.messagetasklink {
 	position: relative;
 	display: inline-block;
 	color: #333;
 	font-weight: bold;
 	padding: 3px 0 2px 2px;
 	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
 	vertical-align: middle;
 }
 
 div.messagetasklinks .messagetaskref.complete a.messagetasklink {
 	text-decoration: line-through;
 	text-shadow: none;
 	color: #666;
 }
 
 div.messagetasklinks .messagetaskref input.complete {
 	vertical-align: middle;
 }
 
 
 .tasklist.attachmentwin #attachmenttoolbar {
 	position: relative;
 	top: -6px;
 	height: 40px;
 }
 
 .tasklist.attachmentwin #attachmentcontainer {
 	position: absolute;
 	top: 0;
 	left: 232px;
 	right: 0;
 	bottom: 0;
 }
 
 .tasklist.attachmentwin #attachmentframe {
 	width: 100%;
 	height: 100%;
 	border: 0;
 	background-color: #fff;
 	border-radius: 4px;
 }
 
 .tasklist.attachmentwin #partheader {
 	position: absolute;
 	top: 0;
 	left: 0;
 	width: 220px;
 	bottom: 0;
 }
 
 .tasklist.attachmentwin #partheader table {
 	table-layout: fixed;
 	overflow: hidden;
 }
 
 .tasklist.attachmentwin #partheader table td {
 	color: #666;
 	padding: 4px 6px;
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
 
 .tasklist.attachmentwin #partheader table td.header {
 	font-weight: bold;
 }
 
 .tasklist.attachmentwin #partheader table td.title {
 	width: 60px;
 	padding-right: 0;
 }
 
 
 /** Special hacks for IE7 **/
 /** They need to be in this file to also affect the task-create dialog embedded in mail view **/
 
 html.ie7 #taskedit-completeness-slider {
 	display: inline;
 }
diff --git a/plugins/tasklist/tasklist_base.js b/plugins/tasklist/tasklist_base.js
index 2deb2d4e..1ecaa290 100644
--- a/plugins/tasklist/tasklist_base.js
+++ b/plugins/tasklist/tasklist_base.js
@@ -1,150 +1,150 @@
 /**
  * Client scripts for the Tasklist plugin
  *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
  * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * @licend  The above is the entire license notice
  * for the JavaScript code in this file.
  */
  
 function rcube_tasklist(settings)
 {
     /* private vars */
     var ui_loaded = false;
     var me = this;
     var mywin = window;
 
     /*  public members  */
     this.ui = null;
 
     /* public methods */
     this.create_from_mail = create_from_mail;
     this.mail2taskdialog = mail2task_dialog;
     this.save_to_tasklist = save_to_tasklist;
 
 
     /**
      * Open a new task dialog prefilled with contents from the currently selected mail message
      */
     function create_from_mail(uid)
     {
         if (uid || (uid = rcmail.get_single_uid())) {
             // load calendar UI (scripts and edit dialog template)
             if (!ui_loaded) {
                 $.when(
                     $.getScript(rcmail.assets_path('plugins/tasklist/tasklist.js')),
-                    $.get(rcmail.url('tasks/inlineui'), function(html){ $(document.body).append(html); }, 'html')
+                    $.get(rcmail.url('tasks/inlineui'), function(html) { $(document.body).append(html); }, 'html')
                 ).then(function() {
                     // register attachments form
                     // rcmail.gui_object('attachmentlist', 'attachmentlist');
 
                     ui_loaded = true;
                     me.ui = new rcube_tasklist_ui($.extend(rcmail.env.tasklist_settings, settings));
                     create_from_mail(uid);  // start over
                 });
+
                 return;
             }
-            else {
-                // get message contents for task dialog
-                var lock = rcmail.set_busy(true, 'loading');
-                rcmail.http_post('tasks/mail2task', {
-                    '_mbox': rcmail.env.mailbox,
-                    '_uid': uid
-                }, lock);
-            }
+
+            // get message contents for task dialog
+            var lock = rcmail.set_busy(true, 'loading');
+            rcmail.http_post('tasks/mail2task', {
+                '_mbox': rcmail.env.mailbox,
+                '_uid': uid
+            }, lock);
         }
     }
 
     /**
      * Callback function to put the given task properties into the dialog
      */
     function mail2task_dialog(prop)
     {
         this.ui.edit_task(null, 'new', prop);
         rcmail.addEventListener('responseaftertask', refresh_mailview);
     }
 
     /**
      * Reload the mail view/preview to update the tasks listing
      */
     function refresh_mailview(e)
     {
         var win = rcmail.env.contentframe ? rcmail.get_frame_window(rcmail.env.contentframe) : mywin;
         if (win && e.response.action == 'task') {
             win.location.reload();
         }
     }
 
     // handler for attachment-save-tasklist commands
     function save_to_tasklist()
     {
       // TODO: show dialog to select the tasklist for importing
       if (this.selected_attachment && window.rcube_libcalendaring) {
         rcmail.http_post('tasks/mailimportattach', {
             _uid: rcmail.env.uid,
             _mbox: rcmail.env.mailbox,
             _part: this.selected_attachment
             // _list: $('#tasklist-attachment-saveto').val(),
           }, rcmail.set_busy(true, 'itip.savingdata'));
       }
     }
 
     // register event handlers on linked task items in message view
     // the checkbox allows to mark a task as complete 
     if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
         $('div.messagetasklinks input.complete').click(function(e) {
             var $this = $(this);
             $(this).closest('.messagetaskref').toggleClass('complete');
 
             // submit change to server
             rcmail.http_post('tasks/task', {
                 action: 'complete',
                 t: { id:this.value, list:$this.attr('data-list') },
                 complete: this.checked?1:0
             }, rcmail.set_busy(true, 'tasklist.savingdata'));
         });
     }
 }
 
 /* tasklist plugin initialization (for email task) */
 window.rcmail && rcmail.env.task == 'mail' && rcmail.addEventListener('init', function(evt) {
     var tasks = new rcube_tasklist(rcmail.env.libcal_settings);
 
     rcmail.register_command('tasklist-create-from-mail', function() { tasks.create_from_mail(); });
     rcmail.register_command('attachment-save-task', function() { tasks.save_to_tasklist(); });
     rcmail.addEventListener('plugin.mail2taskdialog', function(p) { tasks.mail2taskdialog(p); });
     rcmail.addEventListener('plugin.unlock_saving', function(p) { tasks.ui && tasks.ui.unlock_saving(); });
 
     if (rcmail.env.action != 'show')
         rcmail.env.message_commands.push('tasklist-create-from-mail');
     else
         rcmail.enable_command('tasklist-create-from-mail', true);
 
     rcmail.addEventListener('beforemenu-open', function(p) {
         if (p.menu == 'attachmentmenu') {
             tasks.selected_attachment = p.id;
             var mimetype = rcmail.env.attachments[p.id],
                 is_ics = mimetype == 'text/calendar' || mimetype == 'text/x-vcalendar' || mimetype == 'application/ics';
 
             rcmail.enable_command('attachment-save-task', is_ics);
         }
     });
 });
diff --git a/plugins/tasklist/tasklist_ui.php b/plugins/tasklist/tasklist_ui.php
index 2a18713f..c67710b8 100644
--- a/plugins/tasklist/tasklist_ui.php
+++ b/plugins/tasklist/tasklist_ui.php
@@ -1,541 +1,541 @@
 <?php
 /**
  * User Interface class for the Tasklist plugin
  *
  * @version @package_version@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * Copyright (C) 2012-2015, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 
 class tasklist_ui
 {
     private $rc;
     private $plugin;
     private $ready = false;
     private $gui_objects = array();
 
     function __construct($plugin)
     {
         $this->plugin = $plugin;
         $this->rc     = $plugin->rc;
     }
 
     /**
      * Calendar UI initialization and requests handlers
      */
     public function init()
     {
         if ($this->ready) {
             return;
         }
 
         // add taskbar button
         $this->plugin->add_button(array(
             'command'    => 'tasks',
             'class'      => 'button-tasklist',
             'classsel'   => 'button-tasklist button-selected',
             'innerclass' => 'button-inner',
             'label'      => 'tasklist.navtitle',
         ), 'taskbar');
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/tasklist.css');
 
         if ($this->rc->task == 'mail' || $this->rc->task == 'tasks') {
             jqueryui::tagedit();
 
             $this->plugin->include_script('tasklist_base.js');
 
             // copy config to client
             $this->rc->output->set_env('tasklist_settings', $this->load_settings());
 
             // initialize attendees autocompletion
             $this->rc->autocomplete_init();
         }
 
         $this->ready = true;
     }
 
     /**
      *
      */
     function load_settings()
     {
         $settings = array();
 
         $settings['invite_shared'] = (int)$this->rc->config->get('calendar_allow_invite_shared', 0);
         $settings['itip_notify']   = (int)$this->rc->config->get('calendar_itip_send_option', 3);
         $settings['sort_col']      = $this->rc->config->get('tasklist_sort_col', '');
         $settings['sort_order']    = $this->rc->config->get('tasklist_sort_order', 'asc');
 
         // get user identity to create default attendee
         foreach ($this->rc->user->list_emails() as $rec) {
             if (!$identity)
                 $identity = $rec;
 
             $identity['emails'][] = $rec['email'];
             $settings['identities'][$rec['identity_id']] = $rec['email'];
         }
 
         $identity['emails'][] = $this->rc->user->get_username();
         $settings['identity'] = array(
             'name'   => $identity['name'],
             'email'  => strtolower($identity['email']),
             'emails' => ';' . strtolower(join(';', $identity['emails']))
         );
 
         if ($list = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC)) {
             $settings['selected_list'] = $list;
         }
         if ($list && ($id = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC))) {
             $settings['selected_id'] = $id;
 
             // check if the referenced task is completed
             $task = $this->plugin->driver->get_task(array('id' => $id, 'list' => $list));
             if ($task && $this->plugin->driver->is_complete($task)) {
                 $settings['selected_filter'] = 'complete';
             }
         }
         else if ($filter = rcube_utils::get_input_value('_filter', rcube_utils::INPUT_GPC)) {
             $settings['selected_filter'] = $filter;
         }
 
         return $settings;
     }
 
     /**
      * Render a HTML select box for user identity selection
      */
     function identity_select($attrib = array())
     {
         $attrib['name'] = 'identity';
         $select         = new html_select($attrib);
         $identities     = $this->rc->user->list_emails();
 
         foreach ($identities as $ident) {
             $select->add(format_email_recipient($ident['email'], $ident['name']), $ident['identity_id']);
         }
 
         return $select->show(null);
     }
 
     /**
     * Register handler methods for the template engine
     */
     public function init_templates()
     {
         $this->plugin->register_handler('plugin.tasklists', array($this, 'tasklists'));
         $this->plugin->register_handler('plugin.tasklist_select', array($this, 'tasklist_select'));
         $this->plugin->register_handler('plugin.status_select', array($this, 'status_select'));
         $this->plugin->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));
         $this->plugin->register_handler('plugin.quickaddform', array($this, 'quickadd_form'));
         $this->plugin->register_handler('plugin.tasks', array($this, 'tasks_resultview'));
         $this->plugin->register_handler('plugin.tagslist', array($this, 'tagslist'));
         $this->plugin->register_handler('plugin.tags_editline', array($this, 'tags_editline'));
         $this->plugin->register_handler('plugin.alarm_select', array($this, 'alarm_select'));
         $this->plugin->register_handler('plugin.recurrence_form', array($this->plugin->lib, 'recurrence_form'));
         $this->plugin->register_handler('plugin.attachments_form', array($this, 'attachments_form'));
         $this->plugin->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
         $this->plugin->register_handler('plugin.filedroparea', array($this, 'file_drop_area'));
         $this->plugin->register_handler('plugin.attendees_list', array($this, 'attendees_list'));
         $this->plugin->register_handler('plugin.attendees_form', array($this, 'attendees_form'));
         $this->plugin->register_handler('plugin.identity_select', array($this, 'identity_select'));
         $this->plugin->register_handler('plugin.edit_attendees_notify', array($this, 'edit_attendees_notify'));
         $this->plugin->register_handler('plugin.task_rsvp_buttons', array($this->plugin->itip, 'itip_rsvp_buttons'));
         $this->plugin->register_handler('plugin.object_changelog_table', array('libkolab', 'object_changelog_table'));
 
         jqueryui::tagedit();
 
         $this->plugin->include_script('tasklist.js');
         $this->rc->output->include_script('treelist.js');
 
         // include kolab folderlist widget if available
         if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
             $this->plugin->api->include_script('libkolab/js/folderlist.js');
             $this->plugin->api->include_script('libkolab/js/audittrail.js');
         }
     }
 
     /**
      *
      */
     public function tasklists($attrib = array())
     {
         $tree = true;
         $jsenv = array();
         $lists = $this->plugin->driver->get_lists($tree);
 
         // walk folder tree
         if (is_object($tree)) {
             $html = $this->list_tree_html($tree, $lists, $jsenv, $attrib);
         }
         else {
             // fall-back to flat folder listing
             $attrib['class'] .= ' flat';
 
             $html = '';
             foreach ((array)$lists as $id => $prop) {
                 if ($attrib['activeonly'] && !$prop['active'])
                   continue;
 
                 $html .= html::tag('li', array(
                         'id' => 'rcmlitasklist' . rcube_utils::html_identifier($id),
                         'class' => $prop['group'],
                     ),
                     $this->tasklist_list_item($id, $prop, $jsenv, $attrib['activeonly'])
                 );
             }
         }
 
         $this->rc->output->set_env('tasklists', $jsenv);
         $this->register_gui_object('tasklistslist', $attrib['id']);
 
         return html::tag('ul', $attrib, $html, html::$common_attrib);
     }
 
     /**
      * Return html for a structured list <ul> for the folder tree
      */
     public function list_tree_html($node, $data, &$jsenv, $attrib)
     {
         $out = '';
         foreach ($node->children as $folder) {
             $id = $folder->id;
             $prop = $data[$id];
             $is_collapsed = false; // TODO: determine this somehow?
 
             $content = $this->tasklist_list_item($id, $prop, $jsenv, $attrib['activeonly']);
 
             if (!empty($folder->children)) {
                 $content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
                     $this->list_tree_html($folder, $data, $jsenv, $attrib));
             }
 
             if (strlen($content)) {
                 $out .= html::tag('li', array(
                       'id' => 'rcmlitasklist' . rcube_utils::html_identifier($id),
                       'class' => $prop['group'] . ($prop['virtual'] ? ' virtual' : ''),
                     ),
                     $content);
             }
         }
 
         return $out;
     }
 
     /**
      * Helper method to build a tasklist item (HTML content and js data)
      */
     public function tasklist_list_item($id, $prop, &$jsenv, $activeonly = false)
     {
         // enrich list properties with settings from the driver
         if (!$prop['virtual']) {
             unset($prop['user_id']);
             $prop['alarms']      = $this->plugin->driver->alarms;
             $prop['undelete']    = $this->plugin->driver->undelete;
             $prop['sortable']    = $this->plugin->driver->sortable;
             $prop['attachments'] = $this->plugin->driver->attachments;
             $prop['attendees']   = $this->plugin->driver->attendees;
             $prop['caldavurl']   = $this->plugin->driver->tasklist_caldav_url($prop);
             $jsenv[$id] = $prop;
         }
 
         $classes = array('tasklist');
         $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
           html_entity_decode($prop['name'], ENT_COMPAT, RCUBE_CHARSET) : '');
 
         if ($prop['virtual'])
             $classes[] = 'virtual';
         else if (!$prop['editable'])
             $classes[] = 'readonly';
         if ($prop['subscribed'])
             $classes[] = 'subscribed';
         if ($prop['class'])
             $classes[] = $prop['class'];
 
         if (!$activeonly || $prop['active']) {
             $label_id = 'tl:' . $id;
             return html::div(join(' ', $classes),
                 html::span(array('class' => 'listname', 'title' => $title, 'id' => $label_id), $prop['listname'] ?: $prop['name']) .
                   ($prop['virtual'] ? '' :
                       html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id)) .
                       html::span('actions', 
                           ($prop['removable'] ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') : '') .
                           html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->plugin->gettext('focusview'), 'role' => 'checkbox', 'aria-checked' => 'false'), ' ') .
                           (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('tasklistsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '')
                       )
                 )
             );
         }
 
         return '';
     }
 
     /**
      * Render HTML form for task status selector
      */
     function status_select($attrib = array())
     {
         $attrib['name'] = 'status';
         $select = new html_select($attrib);
         $select->add('---', '');
         $select->add($this->plugin->gettext('status-needs-action'), 'NEEDS-ACTION');
         $select->add($this->plugin->gettext('status-in-process'),   'IN-PROCESS');
         $select->add($this->plugin->gettext('status-completed'),    'COMPLETED');
         $select->add($this->plugin->gettext('status-cancelled'),    'CANCELLED');
 
         return $select->show(null);
     }
 
     /**
      * Render a HTML select box for list selection
      */
     function tasklist_select($attrib = array())
     {
         $attrib['name']       = 'list';
         $attrib['is_escaped'] = true;
         $select = new html_select($attrib);
         $default = null;
 
         foreach ((array)$this->plugin->driver->get_lists() as $id => $prop) {
             if ($prop['editable'] || strpos($prop['rights'], 'i') !== false) {
                 $select->add($prop['name'], $id);
                 if (!$default || $prop['default'])
                     $default = $id;
             }
         }
 
         return $select->show($default);
     }
 
 
     function tasklist_editform($action, $list = array())
     {
         $fields = array(
             'name' => array(
                 'id' => 'taskedit-tasklistame',
                 'label' => $this->plugin->gettext('listname'),
                 'value' => html::tag('input', array('id' => 'taskedit-tasklistame', 'name' => 'name', 'type' => 'text', 'class' => 'text', 'size' => 40)),
             ),
 /*
             'color' => array(
                 'id' => 'taskedit-color',
                 'label' => $this->plugin->gettext('color'),
                 'value' => html::tag('input', array('id' => 'taskedit-color', 'name' => 'color', 'type' => 'text', 'class' => 'text colorpicker', 'size' => 6)),
             ),
 */
             'showalarms' => array(
                 'id' => 'taskedit-showalarms',
                 'label' => $this->plugin->gettext('showalarms'),
                 'value' => html::tag('input', array('id' => 'taskedit-showalarms', 'name' => 'color', 'type' => 'checkbox')),
             ),
         );
 
         return html::tag('form', array('action' => "#", 'method' => "post", 'id' => 'tasklisteditform'),
             $this->plugin->driver->tasklist_edit_form($action, $list, $fields)
         );
     }
 
     /**
      * Render HTML form for alarm configuration
      */
     function alarm_select($attrib = array())
     {
         $attrib['_type'] = 'task';
         return $this->plugin->lib->alarm_select($attrib, $this->plugin->driver->alarm_types, $this->plugin->driver->alarm_absolute);
     }
 
     /**
      *
      */
     function quickadd_form($attrib)
     {
         $attrib += array('action' => $this->rc->url('add'), 'method' => 'post', 'id' => 'quickaddform');
 
         $label = html::label(array('for' => 'quickaddinput', 'class' => 'voice'), $this->plugin->gettext('quickaddinput'));
         $input = new html_inputfield(array('name' => 'text', 'id' => 'quickaddinput'));
         $button = html::tag('input', array('type' => 'submit', 'value' => '+', 'title' => $this->plugin->gettext('createtask'), 'class' => 'button mainaction'));
 
         $this->register_gui_object('quickaddform', $attrib['id']);
         return html::tag('form', $attrib, $label . $input->show() . $button);
     }
 
     /**
      * The result view
      */
     function tasks_resultview($attrib)
     {
         $attrib += array('id' => 'rcmtaskslist');
 
         $this->register_gui_object('resultlist', $attrib['id']);
 
         unset($attrib['name']);
         return html::tag('ul', $attrib, '');
     }
 
     /**
      * Container for a tags cloud
      */
     function tagslist($attrib)
     {
         $attrib += array('id' => 'rcmtasktagslist');
         unset($attrib['name']);
 
         $this->register_gui_object('tagslist', $attrib['id']);
         return html::tag('ul', $attrib, '');
     }
 
     /**
      * Interactive UI element to add/remove tags
      */
     function tags_editline($attrib)
     {
         $attrib += array('id' => 'rcmtasktagsedit');
         $this->register_gui_object('edittagline', $attrib['id']);
 
         $input = new html_inputfield(array('name' => 'tags[]', 'class' => 'tag', 'size' => $attrib['size'], 'tabindex' => $attrib['tabindex']));
         unset($attrib['tabindex']);
         return html::div($attrib, $input->show(''));
     }
 
     /**
      * Generate HTML element for attachments list
      */
     function attachments_list($attrib = array())
     {
         if (!$attrib['id'])
             $attrib['id'] = 'rcmtaskattachmentlist';
 
         $this->register_gui_object('attachmentlist', $attrib['id']);
 
         return html::tag('ul', $attrib, '', html::$common_attrib);
     }
 
     /**
      * Generate the form for event attachments upload
      */
     function attachments_form($attrib = array())
     {
         // add ID if not given
         if (!$attrib['id'])
             $attrib['id'] = 'rcmtaskuploadform';
 
         // Get max filesize, enable upload progress bar
         $max_filesize = $this->rc->upload_init();
 
         $button = new html_inputfield(array('type' => 'button'));
         $input = new html_inputfield(array(
             'type' => 'file',
             'name' => '_attachments[]',
             'multiple' => 'multiple',
             'size' => $attrib['attachmentfieldsize'],
         ));
 
         return html::div($attrib,
             html::div(null, $input->show()) .
-            html::div('formbuttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction',
+            html::div('buttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction',
                 'onclick' => rcmail_output::JS_OBJECT_NAME . ".upload_file(this.form)"))) .
             html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
         );
     }
 
     /**
      * Register UI object for HTML5 drag & drop file upload
      */
     function file_drop_area($attrib = array())
     {
         if ($attrib['id']) {
             $this->register_gui_object('filedrop', $attrib['id']);
             $this->rc->output->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
         }
     }
 
     /**
      *
      */
     function attendees_list($attrib = array())
     {
         // add "noreply" checkbox to attendees table only
         $invitations = strpos($attrib['id'], 'attend') !== false;
 
         $invite = new html_checkbox(array('value' => 1, 'id' => 'edit-attendees-invite'));
         $table  = new html_table(array('cols' => 4 + intval($invitations), 'border' => 0, 'cellpadding' => 0, 'class' => 'rectable'));
 
 //      $table->add_header('role', $this->plugin->gettext('role'));
         $table->add_header('name', $this->plugin->gettext($attrib['coltitle'] ?: 'attendee'));
         $table->add_header('confirmstate', $this->plugin->gettext('confirmstate'));
         if ($invitations) {
             $table->add_header(array('class' => 'invite', 'title' => $this->plugin->gettext('sendinvitations')),
                 $invite->show(1) . html::label('edit-attendees-invite', $this->plugin->gettext('sendinvitations')));
         }
         $table->add_header('options', '');
 
         // hide invite column if disabled by config
         $itip_notify = (int)$this->rc->config->get('calendar_itip_send_option', 3);
         if ($invitations && !($itip_notify & 2)) {
             $css = sprintf('#%s td.invite, #%s th.invite { display:none !important }', $attrib['id'], $attrib['id']);
             $this->rc->output->add_footer(html::tag('style', array('type' => 'text/css'), $css));
         }
 
         return $table->show($attrib);
     }
 
     /**
      *
      */
     function attendees_form($attrib = array())
     {
         $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => 30));
         $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment',
             'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('itipcommenttitle')));
 
         return html::div($attrib,
             html::div(null, $input->show() . " " .
                 html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-add', 'value' => $this->plugin->gettext('addattendee')))
                 // . " " . html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-schedule', 'value' => $this->plugin->gettext('scheduletime').'...'))
                 ) .
             html::p('attendees-commentbox', html::label(null, $this->plugin->gettext('itipcomment') . $textarea->show()))
         );
     }
 
     /**
      *
      */
     function edit_attendees_notify($attrib = array())
     {
         $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1));
         return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->plugin->gettext('sendnotifications')));
     }
 
     /**
      * Wrapper for rcube_output_html::add_gui_object()
      */
     function register_gui_object($name, $id)
     {
         $this->gui_objects[$name] = $id;
         $this->rc->output->add_gui_object($name, $id);
     }
 
     /**
      * Getter for registered gui objects.
      * (for manual registration when loading the inline UI)
      */
     function get_gui_objects()
     {
         return $this->gui_objects;
     }
 }