diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index 2af79ef9..fa12d9f6 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -1,1493 +1,1493 @@
 /**
  * Client scripts for the Kolab Notes plugin
  *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
  * Copyright (C) 2014-2017, 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_kolab_notes_ui(settings)
 {
     /*  private vars  */
     var ui_loading = false;
     var saving_lock;
     var search_query;
     var folder_drop_target;
     var notebookslist;
     var noteslist;
     var notesdata = {};
     var taglist;
     var search_request;
     var search_query;
     var render_no_focus;
     var me = this;
 
     /*  public members  */
     this.selected_list = null;
     this.selected_note = null;
     this.notebooks = rcmail.env.kolab_notebooks || {};
     this.list_set_sort = list_set_sort;
     this.settings = settings;
 
     /**
      * initialize the notes UI
      */
     function init()
     {
         // register button commands
         rcmail.register_command('createnote', function(){
             warn_unsaved_changes(function(){ edit_note(null, 'new'); });
         }, false);
         rcmail.register_command('list-create', function(){ list_edit_dialog(null); }, true);
         rcmail.register_command('list-edit', function(){ list_edit_dialog(me.selected_list); }, false);
         rcmail.register_command('list-delete', function(){ list_delete(me.selected_list); }, false);
         rcmail.register_command('list-remove', function(){ list_remove(me.selected_list); }, false);
         rcmail.register_command('list-sort', list_set_sort, true);
         rcmail.register_command('save', save_note, true);
         rcmail.register_command('delete', delete_notes, false);
         rcmail.register_command('search', quicksearch, true);
         rcmail.register_command('reset-search', reset_search, true);
         rcmail.register_command('sendnote', send_note, false);
         rcmail.register_command('print', print_note, false);
         rcmail.register_command('history', show_history_dialog, false);
 
         // register server callbacks
         rcmail.addEventListener('plugin.data_ready', data_ready);
         rcmail.addEventListener('plugin.render_note', render_note);
         rcmail.addEventListener('plugin.update_note', update_note);
         rcmail.addEventListener('plugin.update_list', list_update);
         rcmail.addEventListener('plugin.destroy_list', list_destroy);
         rcmail.addEventListener('plugin.unlock_saving', function() {
             if (saving_lock) {
                 rcmail.set_busy(false, null, saving_lock);
             }
             if (rcmail.gui_objects.noteseditform) {
                 rcmail.lock_form(rcmail.gui_objects.noteseditform, false);
             }
         });
 
         rcmail.addEventListener('plugin.close_history_dialog', close_history_dialog);
         rcmail.addEventListener('plugin.note_render_changelog', render_changelog);
         rcmail.addEventListener('plugin.note_show_revision', render_revision);
         rcmail.addEventListener('plugin.note_show_diff', show_diff);
 
         // initialize folder selectors
         if (settings.selected_list && !me.notebooks[settings.selected_list]) {
             settings.selected_list = null;
         }
         for (var id in me.notebooks) {
             if (me.notebooks[id].editable && !settings.selected_list) {
                 settings.selected_list = id;
             }
         }
 
         var widget_class = window.kolab_folderlist || rcube_treelist_widget;
         notebookslist = new widget_class(rcmail.gui_objects.notebooks, {
           id_prefix: 'rcmliknb',
           save_state: true,
           selectable: true,
           keyboard: true,
           searchbox: '#notebooksearch',
           search_action: 'notes/list',
           search_sources: [ 'folders', 'users' ],
           search_title: rcmail.gettext('listsearchresults','kolab_notes'),
           check_droptarget: function(node) {
               var list = me.notebooks[node.id];
               return !node.virtual && list.editable && node.id != me.selected_list;
           }
         });
         notebookslist.addEventListener('select', function(node) {
             var id = node.id;
             if (me.notebooks[id] && id != me.selected_list) {
                 warn_unsaved_changes(function(){
                     rcmail.enable_command('createnote', has_permission(me.notebooks[id], 'i'));
                     rcmail.enable_command('list-edit', has_permission(me.notebooks[id], 'a'));
                     rcmail.enable_command('list-delete', has_permission(me.notebooks[id], 'xa'));
                     rcmail.enable_command('list-remove', !me.notebooks[id]['default']);
                     fetch_notes(id);  // sets me.selected_list
                     rcmail.triggerEvent('show-list', {title: me.notebooks[id].listname}); // Elastic
                 },
                 function(){
                     // restore previous selection
                     notebookslist.select(me.selected_list);
                 });
             }
 
             // unfocus clicked list item
             $(notebookslist.get_item(id)).find('a.listname').first().blur();
         });
         notebookslist.addEventListener('subscribe', function(p) {
             var list;
             if ((list = me.notebooks[p.id])) {
                 list.subscribed = p.subscribed || false;
                 rcmail.http_post('list', { _do:'subscribe', _list:{ id:p.id, permanent:list.subscribed?1:0 } });
             }
         });
         notebookslist.addEventListener('remove', function(p) {
             if (me.notebooks[p.id] && !me.notebooks[p.id]['default']) {
                 list_remove(p.id);
             }
         });
         notebookslist.addEventListener('insert-item', function(p) {
             var list = p.data;
             if (list && list.id && !list.virtual) {
                 me.notebooks[list.id] = list;
                 if (list.subscribed)
                     rcmail.http_post('list', { _do:'subscribe', _list:{ id:p.id, permanent:1 } });
             }
         });
         notebookslist.addEventListener('click-item', function(p) {
             // avoid link execution
             return false;
         });
         notebookslist.addEventListener('search-complete', function(data) {
             if (data.length)
                 rcmail.display_message(rcmail.gettext('nrnotebooksfound','kolab_notes').replace('$nr', data.length), 'voice');
             else
                 rcmail.display_message(rcmail.gettext('nonotebooksfound','kolab_notes'), 'notice');
         });
 
         // Make Elastic checkboxes pretty
         if (window.UI && UI.pretty_checkbox) {
             notebookslist.addEventListener('add-item', function(prop) {
                 UI.pretty_checkbox($(prop.li).find('input'));
             });
         }
 
         $(rcmail.gui_objects.notebooks).on('click', 'div.folder > a.listname', function(e) {
             var id = String($(this).closest('li').attr('id')).replace(/^rcmliknb/, '');
             notebookslist.select(id);
             e.preventDefault();
             return false;
         });
 
         // register dbl-click handler to open list edit dialog
         $(rcmail.gui_objects.notebooks).on('dblclick', 'li:not(.virtual) a', function(e) {
             var id = String($(this).closest('li').attr('id')).replace(/^rcmliknb/, '');
             if (me.notebooks[id] && has_permission(me.notebooks[id], 'a')) {
                 list_edit_dialog(id);
             }
 
             // clear text selection (from dbl-clicking)
             var sel = window.getSelection ? window.getSelection() : document.selection;
             if (sel && sel.removeAllRanges) {
                 sel.removeAllRanges();
             }
             else if (sel && sel.empty) {
                 sel.empty();
             }
 
             e.preventDefault();
             return false;
         });
 
         // initialize notes list widget
         if (rcmail.gui_objects.noteslist) {
             rcmail.noteslist = noteslist = new rcube_list_widget(rcmail.gui_objects.noteslist,
                 { multiselect:true, draggable:true, keyboard:true });
             noteslist.addEventListener('select', function(list) {
                 render_no_focus = rcube_event._last_keyboard_event && $(list.list).has(rcube_event._last_keyboard_event.target);
                 var selection_changed = list.selection.length != 1 || !me.selected_note || list.selection[0] != me.selected_note.id;
                 selection_changed && warn_unsaved_changes(function(){
                     var note;
                     if (!list.multi_selecting && noteslist.selection.length == 1 && (note = notesdata[noteslist.selection[0]])) {
                         edit_note(note.uid, 'edit');
                     }
                     else {
                         reset_view(true);
                     }
                 },
                 function(){
                     // TODO: previous restore selection
                     list.select(me.selected_note.id);
                 });
 
                 rcmail.enable_command('delete', me.notebooks[me.selected_list] && has_permission(me.notebooks[me.selected_list], 'td') && list.selection.length > 0);
                 rcmail.enable_command('sendnote', list.selection.length > 0);
                 rcmail.enable_command('print', 'history', list.selection.length == 1);
             })
             .addEventListener('dragstart', function(e) {
                 folder_drop_target = null;
                 notebookslist.drag_start();
             })
             .addEventListener('dragmove', function(e) {
                 folder_drop_target = notebookslist.intersects(rcube_event.get_mouse_pos(e), true);
             })
             .addEventListener('dragend', function(e) {
                 notebookslist.drag_end();
 
                 // move dragged notes to this folder
                 if (folder_drop_target) {
                     noteslist.draglayer.hide();
 
                     // check unsaved changes first
                     var new_folder_id = folder_drop_target;
                     warn_unsaved_changes(
                         // ok
                         function() {
                             move_notes(new_folder_id);
                             reset_view();
                             noteslist.clear_selection();
                         },
                         // nok
                         undefined,
                         // beforesave
                         function(savedata) {
                             savedata.list = new_folder_id;
 
                             // remove from list and thus avoid being moved (again)
                             var id = me.selected_note.id;
                             noteslist.remove_row(id);
                             delete notesdata[id];
                         }
                     );
                 }
                 folder_drop_target = null;
             })
             .init().focus();
         }
 
         if (settings.sort_col) {
             $('#notessortmenu a.by-' + settings.sort_col).addClass('selected');
         }
 
         init_editor();
 
         if (settings.selected_list) {
             notebookslist.select(settings.selected_list)
         }
 
         rcmail.addEventListener('kolab-tags-search', filter_notes)
             .addEventListener('kolab-tags-drop-data', function(e) { return notesdata[e.id]; })
             .addEventListener('kolab-tags-drop', function(e) {
                 if ($(e.list).is('#kolabnoteslist')) {
                     return;
                 }
 
                 var rec = notesdata[e.id];
 
                 if (rec && rec.id && e.tag) {
                     savedata = me.selected_note && rec.uid == me.selected_note.uid ? get_save_data() : $.extend({}, rec);
 
                     if (savedata.id)   delete savedata.id;
                     if (savedata.html) delete savedata.html;
 
                     if (!savedata.tags)
                         savedata.tags = [];
                     savedata.tags.push(e.tag);
 
                     rcmail.lock_form(rcmail.gui_objects.noteseditform, true);
                     saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
                     rcmail.http_post('action', { _data: savedata, _do: 'edit' }, true);
                 }
             });
 
         rcmail.triggerEvent('kolab-notes-init');
     }
     this.init = init;
 
     /**
      *
      */
     function init_dialog()
     {
         rcmail.register_command('save', save_note, true);
         rcmail.addEventListener('plugin.render_note', render_note);
         rcmail.addEventListener('plugin.update_note', function(data){
             data.id = rcmail.html_identifier_encode(data.uid);
             notesdata[data.id] = data;
             render_note(data);
         });
         rcmail.addEventListener('plugin.unlock_saving', function(){
             if (saving_lock) {
                 rcmail.set_busy(false, null, saving_lock);
             }
             if (rcmail.gui_objects.noteseditform) {
                 rcmail.lock_form(rcmail.gui_objects.noteseditform, false);
             }
             if (rcmail.is_framed()) {
                 parent.$(parent.kolab_note_dialog_element).dialog('destroy');
             }
         });
 
         var id, callback = function() {
             if (settings.selected_uid) {
                 me.selected_list = settings.selected_list;
                 edit_note(settings.selected_uid);
             }
             else {
                 me.selected_note = $.extend({
                     list: me.selected_list,
                     uid: null,
                     title: rcmail.gettext('newnote','kolab_notes'),
                     description: '',
                     tags: [],
                     created: rcmail.gettext('now', 'kolab_notes'),
                     changed: rcmail.gettext('now', 'kolab_notes')
                 }, rcmail.env.kolab_notes_template || {});
                 render_note(me.selected_note);
             }
         };
 
         for (id in me.notebooks) {
             if (me.notebooks[id].editable) {
                 me.selected_list = id;
                 break;
             }
         }
 
         init_editor(callback);
     }
     this.init_dialog = init_dialog;
 
     /**
      * Initialize TinyMCE editor
      */
     function init_editor(callback)
     {
         if (callback) {
             rcmail.addEventListener('editor-load', callback);
         }
 
         // initialize HTML editor
         var config = $.extend(rcmail.env.editor_config, {disabled_plugins: ['image', 'media']});
         rcmail.editor_init(config, 'notecontent');
 
         // register click handler for message links
         $(rcmail.gui_objects.notesattachmentslist).on('click', 'li a.messagelink', function() {
             rcmail.open_window(this.href);
             return false;
         });
     }
 
     /**
      * Quote HTML entities
      */
     function Q(str)
     {
         return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
     }
 
     /**
      * Check permissions on the given list object
      */
     function has_permission(list, perm)
     {
         // multiple chars means "either of"
         if (String(perm).length > 1) {
             for (var i=0; i < perm.length; i++) {
                 if (has_permission(list, perm[i])) {
                     return true;
                 }
             }
         }
 
         if (list.rights && String(list.rights).indexOf(perm) >= 0) {
             return true;
         }
 
         return (perm == 'i' && list.editable);
     }
 
     /**
      * 
      */
     function edit_note(uid, action)
     {
         if (!uid) {
             me.selected_note = null;
             if (noteslist)
                 noteslist.clear_selection();
 
             me.selected_note = {
                 list: me.selected_list,
                 uid: null,
                 title: rcmail.gettext('newnote','kolab_notes'),
                 description: '',
                 tags: [],
                 created: rcmail.gettext('now', 'kolab_notes'),
                 changed: rcmail.gettext('now', 'kolab_notes')
             }
             render_note(me.selected_note);
         }
         else {
             ui_loading = rcmail.set_busy(true, 'loading');
             rcmail.http_request('get', { _list:me.selected_list, _id:uid }, true);
         }
     }
 
     /**
      * 
      */
     function list_edit_dialog(id)
     {
         var list = me.notebooks[id] || { name:'', editable:true, rights: 'riwta' },
             title = rcmail.gettext((list.id ? 'editlist' : 'newnotebook'), 'kolab_notes'),
             params = {_do: (list.id ? 'form-edit' : 'form-new'), _list: {id: list.id}, _framed: 1},
             $dialog = $('<iframe>').attr('src', rcmail.url('list', params)).on('load', function() {
                 $(this).contents().find('#noteslist-name')
                     .prop('disabled', !has_permission(list, 'a'))
                     .val(list.editname || list.name)
                     .select();
             }),
             save_func = function() {
                 var data,
                     form = $dialog.contents().find('#noteslistpropform'),
                     name = form.find('#noteslist-name');
 
                 // form is not loaded
                 if (!form || !form.length)
                     return false;
 
                 // do some input validation
                 if (!name.val() || name.val().length < 2) {
                     rcmail.alert_dialog(rcmail.gettext('invalidlistproperties', 'kolab_notes'), function() {
                         name.select();
                     });
 
                     return false;
                 }
 
                 // post data to server
                 data = form.serializeJSON();
                 if (list.id)
                     data.id = list.id;
 
                 saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
                 rcmail.http_post('list', { _do: (list.id ? 'edit' : 'new'), _list: data });
                 return true;
             };
 
         rcmail.simple_dialog($dialog, title, save_func, {
             width: 600,
             height: 400
         });
     }
 
     /**
      * Callback from server after changing list properties
      */
     function list_update(prop)
     {
         if (prop._reload) {
             rcmail.redirect(rcmail.url('', { _list: (prop.newid || prop.id) }));
         }
         else if (prop.newid && prop.newid != prop.id) {
             var book = $.extend({}, me.notebooks[prop.id]);
             book.id = prop.newid;
             book.name = prop.name;
             book.listname = prop.listname;
             book.editname = prop.editname || prop.name;
 
             me.notebooks[prop.newid] = book;
             delete me.notebooks[prop.id];
 
             // update treelist item
             var li = $(notebookslist.get_item(prop.id));
             $('.listname', li).html(prop.listname);
             notebookslist.update(prop.id, { id:book.id, html:li.html() });
 
             // link all loaded note records to the new list id
             if (me.selected_list == prop.id) {
                 me.selected_list = prop.newid;
                 for (var k in notesdata) {
                     if (notesdata[k].list == prop.id) {
                         notesdata[k].list = book.id;
                     }
                 }
                 notebookslist.select(prop.newid);
             }
         }
     }
 
     /**
      * 
      */
     function list_delete(id)
     {
         var list = me.notebooks[id];
         if (list) {
             rcmail.confirm_dialog(rcmail.gettext('kolab_notes.deletenotebookconfirm'), 'delete', function() {
                 saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
                 rcmail.http_post('list', { _do: 'delete', _list: { id: list.id } });
             });
         }
     }
 
     /**
      * 
      */
     function list_remove(id)
     {
         if (me.notebooks[id]) {
             list_destroy(me.notebooks[id]);
             rcmail.http_post('list', { _do:'subscribe', _list:{ id:id, permanent:0, recursive:1 } });
         }
     }
 
     /**
      * Callback from server on list delete command
      */
     function list_destroy(prop)
     {
         if (!me.notebooks[prop.id]) {
             return;
         }
 
         notebookslist.remove(prop.id);
         delete me.notebooks[prop.id];
 
         if (me.selected_list == prop.id) {
             for (id in me.notebooks) {
                 if (me.notebooks[id]) {
                     notebookslist.select(id);
                     break;
                 }
             }
         }
     }
 
     /**
      * Change notes list sort order
      */
     function list_set_sort(col)
     {
         if (settings.sort_col != col) {
             settings.sort_col = col;
             $('#notessortmenu a').removeClass('selected').filter('.by-' + col).addClass('selected');
             rcmail.save_pref({ name: 'kolab_notes_sort_col', value: col });
 
             // re-sort table in DOM
             $(noteslist.tbody).children().sortElements(function(la, lb){
                 var a_id = String(la.id).replace(/^rcmrow/, ''),
                     b_id = String(lb.id).replace(/^rcmrow/, ''),
                     a = notesdata[a_id],
                     b = notesdata[b_id];
 
                 if (!a || !b) {
                     return 0;
                 }
                 else if (settings.sort_col == 'title') {
                     return String(a.title).toLowerCase() > String(b.title).toLowerCase() ? 1 : -1;
                 }
                 else {
                     return b.changed_ - a.changed_;
                 }
             });
         }
     }
 
     /**
      * Execute search
      */
     function quicksearch()
     {
         var q;
         if (rcmail.gui_objects.qsearchbox && (q = rcmail.gui_objects.qsearchbox.value)) {
             var id = 'search-'+q;
 
             // ignore if query didn't change
             if (search_request == id)
                 return;
 
             warn_unsaved_changes(function(){
                 search_request = id;
                 search_query = q;
 
                 fetch_notes();
             },
             function(){
                 reset_search();
             });
         }
         else {  // empty search input equals reset
             reset_search();
         }
     }
 
     /**
      * Reset search and get back to normal listing
      */
     function reset_search()
     {
         $(rcmail.gui_objects.qsearchbox).val('');
 
         if (search_request) {
             search_request = search_query = null;
             fetch_notes();
         }
     }
 
     /**
      * 
      */
     function fetch_notes(id)
     {
         if (rcmail.busy)
             return;
 
         if (id && id != me.selected_list) {
             me.selected_list = id;
         }
 
         ui_loading = rcmail.set_busy(true, 'loading');
         rcmail.http_request('fetch', { _list:me.selected_list, _q:search_query }, true);
 
         reset_view();
         noteslist.clear(true);
         notesdata = {};
         update_state();
     }
 
     /**
      * Filter notes by tag
      */
     function filter_notes(tags)
     {
         var id, note, tr, match;
         for (id in noteslist.rows) {
             tr = noteslist.rows[id].obj;
             note = notesdata[id];
             match = note.tags && note.tags.length;
             for (var i=0; match && note && i < tags.length; i++) {
                 if ($.inArray(tags[i], note.tags) < 0)
                     match = false;
             }
 
             if (match || !tags.length) {
                 $(tr).show();
             }
             else {
                 $(tr).hide();
             }
 
             if (me.selected_note && me.selected_note.uid == note.uid && !match) {
                 warn_unsaved_changes(function(){
                     me.selected_note = null;
                     noteslist.clear_selection();
                 }, function(){
                     filter_notes(tags);
                 });
             }
         }
     }
 
     /**
      * 
      */
     function data_ready(data)
     {
         data.data.sort(function(a,b){
             if (settings.sort_col == 'title') {
                 return String(a.title).toLowerCase() > String(b.title).toLowerCase() ? 1 : -1;
             }
             else {
                 return b.changed_ - a.changed_;
             }
         });
 
         var i, id, rec;
         for (i=0; data.data && i < data.data.length; i++) {
             rec = data.data[i];
             rec.id = rcmail.html_identifier_encode(rec.uid);
             noteslist.insert_row({
                 id: 'rcmrow' + rec.id,
                 cols: [
                     { className:'title', innerHTML:Q(rec.title) },
                     { className:'date',  innerHTML:Q(rec.changed || '') }
                 ]
             });
 
             notesdata[rec.id] = rec;
         }
 
         update_taglist();
         rcmail.set_busy(false, 'loading', ui_loading);
 
         rcmail.triggerEvent('listupdate', {list: noteslist, rowcount:noteslist.rowcount});
 
         if (settings.selected_uid) {
             noteslist.select(rcmail.html_identifier_encode(settings.selected_uid));
             delete settings.selected_uid;
         }
         else if (me.selected_note && notesdata[me.selected_note.id]) {
             noteslist.select(me.selected_note.id);
         }
         else if (!data.data.length) {
             rcmail.display_message(rcmail.gettext('norecordsfound','kolab_notes'), 'notice');
         }
     }
 
     /**
      *
      */
     function render_note(data, container, temp, retry)
     {
         rcmail.set_busy(false, 'loading', ui_loading);
 
         if (!data) {
             rcmail.display_message(rcmail.get_label('recordnotfound', 'kolab_notes'), 'error');
             return;
         }
 
         if (!container) {
             container = rcmail.gui_containers['notedetailview'];
         }
 
         // for Elastic
         rcmail.triggerEvent('show-content', {
             mode: data.uid ? 'edit' : 'add',
             title: rcmail.gettext(data.uid ? 'editnote' : 'newnote', 'kolab_notes'),
             obj: $('#notedetailsbox').parent(),
             scrollElement: $('#notedetailsbox')
         });
 
         var list = me.notebooks[data.list] || me.notebooks[me.selected_list] || { rights: 'lrs', editable: false };
             content = $('#notecontent').val(data.description),
             readonly = data.readonly || !(list.editable || !data.uid && has_permission(list,'i')),
             attachmentslist = gui_object('notesattachmentslist', container).html(''),
             titlecontainer = rcmail.gui_objects.noteviewtitle || container,
             is_html = false;
 
         // tag-edit line
         var tagline = $('.tagline', titlecontainer);
         if (window.kolab_tags_input) {
             tagline.parent('.form-group').show();
             taglist = kolab_tags_input(tagline, data.tags, readonly);
         }
         else {
             tagline.parent('.form-group').hide();
         }
 
         $('.notetitle', titlecontainer).val(data.title).prop('disabled', readonly).show();
         $('.dates .notecreated', titlecontainer).text(data.created || '');
         $('.dates .notechanged', titlecontainer).text(data.changed || '');
         if (data.created || data.changed) {
             $('.dates', titlecontainer).show();
         }
 
         if (data.links) {
             $.each(data.links, function(i, link) {
                 var li = $('<li>').addClass('link')
                     .addClass('message eml')
                     .append($('<a>')
                         .attr('href', link.mailurl)
-                        .addClass('messagelink')
+                        .addClass('messagelink filename')
                         .text(link.subject || link.uri)
                     )
                     .appendTo(attachmentslist);
 
                 if (!readonly && !data._from_mail) {
                     $('<a>').attr({
                             href: '#delete',
                             title: rcmail.gettext('removelink', 'kolab_notes'),
                             label: rcmail.gettext('delete'),
                             'class': 'delete'
                         })
                         .click({ uri:link.uri }, function(e) {
                             remove_link(this, e.data.uri);
                             return false;
                         })
                         .appendTo(li);
                 }
             });
         }
 
         if (!data.list)
             data.list = list.id;
 
         data.readonly = readonly;
 
         if (!temp) {
             $(rcmail.gui_objects.notebooks).filter('select').val(list.id);
             me.selected_note = data;
             me.selected_note.id = rcmail.html_identifier_encode(data.uid);
             rcmail.enable_command('save', !readonly);
         }
 
         var html = data.html || data.description;
 
         // convert plain text to HTML and make URLs clickable
         if (html != '' && (!data.html || !html.match(/<(html|body)/))) {
             html = text2html(html);
         }
 
         if (!readonly) {
             gui_object('notesdetailview', container).hide();
             gui_object('noteseditform', container).show();
 
             rcmail.editor.set_content(html);
 
             // read possibly re-formatted content back from editor for later comparison
             me.selected_note.description = rcmail.editor.get_content().replace(/^\s*(<p><\/p>\n*)?/, '');
             is_html = true;
         }
         else {
             gui_object('noteseditform', container).hide();
             gui_object('notesdetailview', container).html(html).show();
         }
 
         // notify subscribers
         rcmail.triggerEvent('kolab_notes_render', { data:data, readonly:readonly, html:is_html });
         if (rcmail.is_framed())
             parent.rcmail.triggerEvent('kolab_notes_render', { data:data, readonly:readonly, html:is_html });
 
         // Trigger resize (needed for proper editor resizing)
         $(window).resize();
 
         // Elastic
         $(container).parents('.watermark').addClass('formcontainer');
         $('#notedetailsbox').parent().trigger('loaded');
 
         if (!readonly)
             $('.notetitle', titlecontainer).focus().select();
     }
 
     /**
      *
      */
     function gui_object(name, container)
     {
         var elem = rcmail.gui_objects[name], selector = elem;
         if (elem && elem.className && container) {
             selector = '.' + String(elem.className).split(' ').join('.');
         }
         else if (elem && elem.id) {
             selector = '#' + elem.id;
         }
 
         return $(selector, container);
     }
 
     /**
      * Convert the given plain text to HTML contents to be displayed in editor
      */
     function text2html(str)
     {
         // simple link parser (similar to rcube_string_replacer class in PHP)
         var utf_domain = '[^?&@"\'/\\(\\)\\s\\r\\t\\n]+\\.([^\x00-\x2f\x3b-\x40\x5b-\x60\x7b-\x7f]{2,}|xn--[a-z0-9]{2,})',
             url1 = '.:;,', url2 = 'a-z0-9%=#@+?&/_~\\[\\]-',
             link_pattern = new RegExp('([hf]t+ps?://|www.)('+utf_domain+'(['+url1+']?['+url2+']+)*)?', 'ig'),
             link_replace = function(matches, p1, p2) {
                 var url = (p1 == 'www.' ? 'http://' : '') + p1 + p2;
                 return '<a href="' + url + '" class="x-templink">' + p1 + p2 + '</a>';
             };
 
         return '<pre>' + Q(str).replace(link_pattern, link_replace) + '</pre>';
     }
 
     /**
      *
      */
     function show_history_dialog()
     {
         var dialog, rec = me.selected_note;
         if (!rec || !rec.uid || !window.libkolab_audittrail) {
             return false;
         }
 
         // render dialog
         $dialog = libkolab_audittrail.object_history_dialog({
             module: 'kolab_notes',
             container: '#notehistory',
             title: rcmail.gettext('libkolab.objectchangelog') + ' - ' + rec.title,
 
             // callback function for list actions
             listfunc: function(action, rev) {
                 var rec = $dialog.data('rec');
                 saving_lock = rcmail.set_busy(true, 'loading', saving_lock);
                 rcmail.http_post('action', { _do: action, _data: { uid: rec.uid, list:rec.list, rev: rev } }, saving_lock);
             },
 
             // callback function for comparing two object revisions
             comparefunc: function(rev1, rev2) {
                 var rec = $dialog.data('rec');
                 saving_lock = rcmail.set_busy(true, 'loading', saving_lock);
                 rcmail.http_post('action', { _do: 'diff', _data: { uid: rec.uid, list: rec.list, rev1: rev1, rev2: rev2 } }, saving_lock);
             }
         });
 
         $dialog.data('rec', rec);
 
         // fetch changelog data
         saving_lock = rcmail.set_busy(true, 'loading', saving_lock);
         rcmail.http_post('action', { _do: 'changelog', _data: { uid: rec.uid, list: rec.list } }, saving_lock);
     }
 
     /**
      *
      */
     function render_changelog(data)
     {
         var $dialog = $('#notehistory'),
             rec = $dialog.data('rec');
 
         if (data === false || !data.length || !rec) {
             // display 'unavailable' message
             $('<div class="notfound-message note-dialog-message warning">').text(rcmail.gettext('libkolab.objectchangelognotavailable'))
                 .insertBefore($dialog.find('.changelog-table').hide());
             return;
         }
 
         data.module = 'kolab_notes';
         libkolab_audittrail.render_changelog(data, rec, me.notebooks[rec.list]);
     }
 
     /**
      *
      */
     function render_revision(data)
     {
         data.readonly = true;
 
         // clone view and render data into a dialog
         var model = rcmail.gui_containers['notedetailview'],
             container = model.clone();
 
         container
             .removeAttr('id style class role')
             .find('.mce-container').remove();
 
         // reset custom styles
         container.children('div, form').removeAttr('id style');
 
         // open jquery UI dialog
         container.dialog({
             modal: false,
             resizable: true,
             closeOnEscape: true,
             title: data.title + ' @ ' + data.rev,
             close: function() {
                 container.dialog('destroy').remove();
             },
             buttons: [
                 {
                     text: rcmail.gettext('close'),
                     click: function() { container.dialog('close'); },
                     autofocus: true
                 }
             ],
             width: model.width(),
             height: model.height(),
             minWidth: 450,
             minHeight: 400
         })
         .show();
 
         render_note(data, container, true);
     }
 
     /**
      *
      */
     function show_diff(data)
     {
         var change_old, change_new,
             rec = me.selected_note,
             $dialog = $('#notediff').clone();
 
         $dialog.find('div.form-section, h2.note-title-new').hide().data('set', false);
 
         // always show title
         $('.note-title', $dialog).text(rec.title).removeClass('diff-text-old').show();
 
         // show each property change
         $.each(data.changes, function(i, change) {
             var prop = change.property, r2, html = false,
                 row = $('div.note-' + prop, $dialog).first();
 
             // special case: title
             if (prop == 'title') {
                 $('.note-title', $dialog).addClass('diff-text-old').text(change['old'] || '--');
                 $('.note-title-new', $dialog).text(change['new'] || '--').show();
             }
 
             // no display container for this property
             if (!row.length) {
                 return true;
             }
 
             if (change.diff_) {
                 row.children('.diff-text-diff').html(change.diff_);
                 row.children('.diff-text-old, .diff-text-new').hide();
             }
             else {
                 change_old = change.old_ || change['old'] || '--';
                 change_new = change.new_ || change['new'] || '--';
 
                 row.children('.diff-text-old')[html ? 'html' : 'text'](change_old).show();
                 row.children('.diff-text-new')[html ? 'html' : 'text'](change_new).show();
             }
 
             row.show().data('set', true);
         });
 
         // open jquery UI dialog
         rcmail.simple_dialog($dialog,
             rcmail.gettext('libkolab.objectdiff').replace('$rev1', data.rev1).replace('$rev2', data.rev2) + ' - ' + rec.title,
             null, {
                 cancel_label: 'close',
                 minWidth: 400,
                 width: 480
             }
         );
 
         // set dialog size according to content
         libkolab_audittrail.dialog_resize($dialog.get(0), $dialog.height(), rcmail.gui_containers.notedetailview.width() - 40);
     }
 
     // close the note history dialog
     function close_history_dialog()
     {
         $('#notehistory, #notediff').each(function(i, elem) {
             var $dialog = $(elem);
             if ($dialog.is(':ui-dialog'))
                 $dialog.dialog('close');
         });
     };
 
     /**
      *
      */
     function remove_link(elem, uri)
     {
         // remove the link item matching the given uri
         me.selected_note.links = $.grep(me.selected_note.links, function(link) { return link.uri != uri; });
         me.selected_note._links_removed = true
 
         // remove UI list item
         $(elem).hide().closest('li').addClass('deleted');
     }
 
     /**
      * Open a new window to print the currently selected note
      */
     function print_note()
     {
         var list = me.notebooks[me.selected_list],
             uid = me.selected_note ? me.selected_note.uid : 0;
 
         if (list && uid) {
             rcmail.open_window(rcmail.url('print', {_uid: uid, _list: list.id}), true, true);
         }
     }
 
     /**
      * Redirect to message compose screen with UIDs of notes to be appended
      */
     function send_note()
     {
         var uids = [];
         $.each(noteslist.selection, function() {
             if (rec = notesdata[this]) {
                 uids.push(rec.uid);
                 // TODO: check if rec.uid == me.selected_note.uid and unsaved changes
             }
         });
 
         if (uids.length) {
             rcmail.goto_url('mail/compose', { _with_notes: uids.join(','), _notes_list: me.selected_list }, true);
         }
     }
 
     /**
      * Display the given counts to each tag
      */
     function update_taglist(tags)
     {
         // compute counts first by iterating over all notes
         var counts = {};
         $.each(notesdata, function(id, rec) {
             for (var t, j=0; rec && rec.tags && j < rec.tags.length; j++) {
                 t = rec.tags[j];
                 if (typeof counts[t] == 'undefined')
                     counts[t] = 0;
                 counts[t]++;
             }
         });
 
         rcmail.triggerEvent('kolab-tags-counts', {counter: counts});
 
         if (tags && tags.length) {
             rcmail.triggerEvent('kolab-tags-refresh', {tags: tags});
         }
     }
 
     /**
      * Callback from server after saving a note record
      */
     function update_note(data)
     {
         data.id = rcmail.html_identifier_encode(data.uid);
 
         var row, is_new = (notesdata[data.id] == undefined && data.list == me.selected_list);
         notesdata[data.id] = data;
 
         if (is_new || me.selected_note && data.id == me.selected_note.id) {
             render_note(data);
             update_taglist(data.tags || []);
         }
         else if (data.tags) {
             update_taglist(data.tags);
         }
 
         // add list item on top
         if (is_new) {
             noteslist.insert_row({
                 id: 'rcmrow' + data.id,
                 cols: [
                     { className:'title', innerHTML:Q(data.title) },
                     { className:'date',  innerHTML:Q(data.changed || '') }
                 ]
             }, true);
 
             noteslist.select(data.id);
         }
         // update list item
         else if (row = noteslist.rows[data.id]) {
             $('.title', row.obj).text(data.title);
             $('.date', row.obj).text(data.changed || '');
             // TODO: move to top
         }
     }
 
     /**
      * 
      */
     function reset_view(list)
     {
         close_history_dialog();
         me.selected_note = null;
         $('.notetitle', rcmail.gui_objects.noteviewtitle).val('').hide();
         $('.dates', rcmail.gui_objects.noteviewtitle).hide();
         $('.tagline', rcmail.gui_objects.noteviewtitle).parent('.form-group').hide();
         $(rcmail.gui_objects.noteseditform).hide().parents('.watermark').removeClass('formcontainer');
         $(rcmail.gui_objects.notesdetailview).hide();
         $(rcmail.gui_objects.notesattachmentslist).html('');
         rcmail.enable_command('save', false);
 
         if (!list) {
             rcmail.triggerEvent('show-list', {force: true});
         }
     }
 
     /**
      * Collect data from the edit form and submit it to the server
      */
     function save_note(beforesave)
     {
         if (!me.selected_note) {
             return false;
         }
 
         var savedata = get_save_data();
 
         // run savedata through the given callback function
         if (typeof beforesave == 'function') {
             beforesave(savedata);
         }
 
         // add reference to old list if changed
         if (me.selected_note.list && savedata.list != me.selected_note.list) {
             savedata._fromlist = me.selected_note.list;
         }
 
         // do some input validation
         if (savedata.title == '') {
             rcmail.alert_dialog(rcmail.gettext('entertitle', 'kolab_notes'), function() {;
                 $('.notetitle', rcmail.gui_objects.noteviewtitle).focus();
             });
 
             return false;
         }
 
         if (check_change_state(savedata)) {
             rcmail.lock_form(rcmail.gui_objects.noteseditform, true);
             saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
             rcmail.http_post('action', {_data: savedata, _do: savedata.uid ? 'edit' : 'new'}, true);
         }
         else {
             rcmail.display_message(rcmail.get_label('nochanges', 'kolab_notes'), 'notice');
         }
     }
 
     /**
      * Collect updated note properties from edit form for saving
      */
     function get_save_data()
     {
         var listselect = $('option:selected', rcmail.gui_objects.notebooks),
             savedata = {
                 title: $.trim($('.notetitle', rcmail.gui_objects.noteviewtitle).val()),
                 description: rcmail.editor.get_content().replace(/^\s*(<p><\/p>\n*)?/, ''),
                 list: listselect.length ? listselect.val() : me.selected_note.list || me.selected_list,
                 uid: me.selected_note.uid,
                 tags: taglist ? kolab_tags_input_value(taglist) : []
             };
 
         // copy links
         if ($.isArray(me.selected_note.links)) {
             savedata.links = me.selected_note.links;
         }
 
         return savedata;
     }
 
     /**
      * Check if the currently edited note record was changed
      */
     function check_change_state(data)
     {
         if (!me.selected_note || me.selected_note.readonly || !has_permission(me.notebooks[me.selected_note.list || me.selected_list], 'i')) {
             return false;
         }
 
         var savedata = data || get_save_data();
 
         return savedata.title != me.selected_note.title
             || savedata.description != me.selected_note.description
             || savedata.tags.join(',') != (me.selected_note.tags || []).join(',')
             || savedata.list != me.selected_note.list
             || me.selected_note._links_removed;
     }
 
     /**
      * Check for unsaved changes and warn the user
      */
     function warn_unsaved_changes(ok, nok, beforesave)
     {
         if (typeof ok != 'function')
             ok = function(){ };
         if (typeof nok != 'function')
             nok = function(){ };
 
         if (check_change_state()) {
             var dialog, buttons = [];
 
             buttons.push({
                 text: rcmail.gettext('save'),
                 'class': 'mainaction save',
                 click: function() {
                     save_note(beforesave);
                     dialog.dialog('close');
                     rcmail.busy = false;  // don't block next action
                     ok();
                 }
             });
 
             buttons.push({
                 text: rcmail.gettext('discard', 'kolab_notes'),
                 'class': 'discard',
                 click: function() {
                     dialog.dialog('close');
                     ok();
                 }
             });
 
             buttons.push({
                 text: rcmail.gettext('abort', 'kolab_notes'),
                 'class': 'cancel',
                 click: function() {
                     dialog.dialog('close');
                     nok();
                 }
             });
 
             var options = {
                 width: 460,
                 resizable: false,
                 closeOnEscape: false,
                 dialogClass: 'warning',
                 open: function(event, ui) {
                     $(this).parent().find('.ui-dialog-titlebar-close').hide();
                     setTimeout(function() {
                         dialog.parent().find('button:visible').first().focus();
                     }, 10);
                 },
                 close: function(event, ui) {
                     $(this).dialog('destroy').remove();
                 }
             };
 
             // open jquery UI dialog
             dialog = rcmail.show_popup_dialog(
                 rcmail.gettext('discardunsavedchanges', 'kolab_notes'),
                 rcmail.gettext('unsavedchanges', 'kolab_notes'),
                 buttons,
                 options
             );
 
             return false;
         }
 
         if (typeof ok == 'function') {
             ok();
         }
 
         return true;
     }
 
     /**
      *
      */
     function delete_notes()
     {
         if (!noteslist.selection.length) {
             return false;
         }
 
         rcmail.confirm_dialog(rcmail.gettext('kolab_notes.deletenotesconfirm'), 'delete', function() {
             var i, rec, id, uids = [];
             for (i=0; i < noteslist.selection.length; i++) {
                 id = noteslist.selection[i];
                 rec = notesdata[id];
                 if (rec) {
                     noteslist.remove_row(id);
                     uids.push(rec.uid);
                     delete notesdata[id];
                 }
             }
 
             saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
             rcmail.http_post('action', { _data: { uid: uids.join(','), list: me.selected_list }, _do: 'delete' }, true);
 
             reset_view();
             update_taglist();
             noteslist.clear_selection();
         });
     }
 
     /**
      *
      */
     function move_notes(list_id)
     {
         var rec, id, uids = [];
         for (var i=0; i < noteslist.selection.length; i++) {
             id = noteslist.selection[i];
             rec = notesdata[id];
             if (rec) {
                 noteslist.remove_row(id);
                 uids.push(rec.uid);
                 delete notesdata[id];
             }
         }
 
         if (uids.length) {
             saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
             rcmail.http_post('action', { _data: { uid: uids.join(','), list: me.selected_list, to: list_id }, _do: 'move' }, true);
         }
     }
 
     /**
      * update browser location to remember current view
      */
     function update_state()
     {
         var query = { _list: me.selected_list }
 
         if (settings.selected_uid) {
             query._id = settings.selected_uid;
         }
 
         if (window.history.replaceState) {
             window.history.replaceState({}, document.title, rcmail.url('', query));
         }
     }
 }
 
 
 // extend jQuery
 // from http://james.padolsey.com/javascript/sorting-elements-with-jquery/
 jQuery.fn.sortElements = (function(){
     var sort = [].sort;
 
     return function(comparator, getSortable) {
         getSortable = getSortable || function(){ return this };
 
         var last = null;
         return sort.call(this, comparator).each(function(i){
             // at this point the array is sorted, so we can just detach each one from wherever it is, and add it after the last
             var node = $(getSortable.call(this));
             var parent = node.parent();
             if (last) last.after(node);
             else      parent.prepend(node);
             last = node;
         });
     };
 })();
 
 
 // List options menu for Elastic
 function kolab_notes_options_menu()
 {
     var content = $('#options-menu'),
         width = content.width() + 25,
         dialog = content.clone(true);
 
     // set form values
     $('select[name="sort_col"]', dialog).val(kolabnotes.settings.sort_col || '');
     $('select[name="sort_ord"]', dialog).val(kolabnotes.settings.sort_order || 'ASC');
 
     // Fix id/for attributes
     $('select', dialog).each(function() { this.id = this.id + '-clone'; });
     $('label', dialog).each(function() { $(this).attr('for', $(this).attr('for') + '-clone'); });
 
     var save_func = function(e) {
         if (rcube_event.is_keyboard(e.originalEvent)) {
             $('#listmenulink').focus();
         }
 
         var col = $('select[name="sort_col"]', dialog).val(),
             ord = $('select[name="sort_ord"]', dialog).val();
 
         kolabnotes.list_set_sort(col, ord);
         return true;
     };
 
     dialog = rcmail.simple_dialog(dialog, rcmail.gettext('listoptionstitle'), save_func, {
         closeOnEscape: true,
         open: function(e) {
             setTimeout(function() { dialog.find('select').first().focus(); }, 100);
         },
         minWidth: 400,
         width: width
     });
 };
 
 
 /* Notes plugin UI initialization */
 var kolabnotes;
 window.rcmail && rcmail.addEventListener('init', function(evt) {
     if (rcmail.task == 'notes' && rcmail.env.action == 'print') {
         rcmail.print_dialog();
         return;
     }
 
     kolabnotes = new rcube_kolab_notes_ui(rcmail.env.kolab_notes_settings);
 
     if (rcmail.env.action == 'dialog-ui')
         kolabnotes.init_dialog();
     else
         kolabnotes.init();
 });
diff --git a/plugins/kolab_notes/skins/elastic/templates/dialogview.html b/plugins/kolab_notes/skins/elastic/templates/dialogview.html
index 7eb00f29..46ca4c31 100644
--- a/plugins/kolab_notes/skins/elastic/templates/dialogview.html
+++ b/plugins/kolab_notes/skins/elastic/templates/dialogview.html
@@ -1,29 +1,29 @@
 <roundcube:include file="includes/layout.html" />
 
 <div id="notedetailsbox" class="formcontent">
 	<roundcube:object name="plugin.notetitle" id="notedetailstitle" class="notetitle" />
 	<div class="notebookselect row form-group" style="display:none">
 		<label for="kolab-notebook" class="col-sm-2 col-form-label"><roundcube:label name="kolab_notes.savein" /></label>
 		<div class="col-sm-10">
 			<roundcube:object name="plugin.notebooks" id="kolab-notebook" type="select" class="form-control" />
 		</div>
 	</div>
 	<roundcube:object name="plugin.editform" id="noteform" class="noteform" />
 	<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
 	<div id="notereferences">
-		<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+		<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist linkslist" />
 	</div>
 </div>
 
 <script type="text/javascript">
 
 // UI startup
 $(document).ready(function(e) {
     rcmail.addEventListener('kolab_notes_render', function(p) {
         $('#notesdialogheader .notebookselect')[p.readonly ? 'hide' : 'show']();
     });
 });
 
 </script>
 
 <roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_notes/skins/elastic/templates/notes.html b/plugins/kolab_notes/skins/elastic/templates/notes.html
index 8df79a69..0ec63fdc 100644
--- a/plugins/kolab_notes/skins/elastic/templates/notes.html
+++ b/plugins/kolab_notes/skins/elastic/templates/notes.html
@@ -1,147 +1,147 @@
 <roundcube:include file="includes/layout.html" />
 <roundcube:include file="includes/menu.html" />
 
 <h1 class="voice"><roundcube:label name="kolab_notes.navtitle" /></h1>
 
 <!-- notebooks list -->
 <div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="arial-label-notebooks">
 	<div class="header">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-notebooks" class="header-title"><roundcube:label name="kolab_notes.lists" /></span>
 		<roundcube:button name="notebookactionsmenu" id="notesoptionsmenulink" type="link"
 			title="kolab_notes.listactions" class="button icon sidebar-menu" data-popup="notebookactions-menu"
 			innerClass="inner" label="actions" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="notebooksearch" wrapper="searchbar menu"
 		ariatag="h2" label="foldersearchform" label-domain="kolab_notes" buttontitle="findnotebooks" />
 	<div id="notebooks-content" class="scroller">
 		<roundcube:object name="plugin.notebooks" id="notebooks" class="listing treelist iconized" />
 	</div>
 </div>
 
 <!-- notes list -->
 <div id="layout-list" class="listbox selected" aria-labelledby="aria-label-noteslist">
 	<div class="header">
 		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="kolab_notes.notebooks" /></span></a>
 		<span id="aria-label-noteslist" class="header-title"><roundcube:label name="kolab_notes.notes" /></span>
 		<div id="listcontrols" class="toolbar menu" role="toolbar">
 			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
 				label="options" innerClass="inner" onclick="return kolab_notes_options_menu()" />
 		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 	</div>
 	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar menu"
 		label="notesearchform" label-domain="kolab_notes" buttontitle="kolab_notes.findnotes" ariatag="h2" />
 	<div class="scroller">
 		<h2 id="aria-label-noteslist" class="voice"><roundcube:label name="kolab_notes.notes" /></h2>
 		<roundcube:object name="plugin.listing" id="kolabnoteslist"
 			class="listing" summary="kolab_notes.arialabelnoteslist"
 			role="listbox" data-list="noteslist"
 			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="createnote" />
 	</div>
 </div>
 
 <!-- note details frame -->
 <div id="layout-content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
 		<div id="notestoolbar" class="toolbar menu">
 			<roundcube:button command="createnote" type="link" class="create disabled" classAct="create"
 				label="create" title="kolab_notes.createnote" innerclass="inner" data-fab="true" />
 			<roundcube:button command="print" type="link" class="print disabled" classAct="print" data-hidden="small"
 				label="print" title="print" innerClass="inner" />
 			<roundcube:button command="delete" type="link" class="delete disabled" classAct="delete"
 				title="delete" label="delete" innerClass="inner" />
 			<span class="spacer"></span>
 			<roundcube:button command="sendnote" type="link" class="send disabled" classAct="send"
 				label="kolab_notes.send" title="kolab_notes.sendnote" innerClass="inner" />
 			<roundcube:container name="toolbar" id="notestoolbar" />
 			<roundcube:if condition="config:kolab_bonnie_api" />
 				<roundcube:button command="history" type="link"
 					class="history note-history disabled" classAct="history note-history"
 					label="libkolab.objectchangelog" title="libkolab.showhistory" innerClass="inner" />
 			<roundcube:endif />
 		</div>
 	</div>
 	<!-- note content frame -->
 	<h2 id="aria-label-noteform" class="voice"><roundcube:label name="kolab_notes.arialabelnoteform" /></h2>
 	<div class="content scroller watermark" role="main" aria-labelledby="aria-label-noteform">
 		<div id="notedetailsbox" class="formcontent">
 			<roundcube:object name="plugin.notetitle" id="notedetailstitle" class="notetitle" />
 			<roundcube:object name="plugin.editform" id="noteform" class="noteform" />
 			<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
 			<h3 id="aria-label-messagereferences" class="voice"><roundcube:label name="kolab_notes.arialabelmessagereferences" /></h3>
 			<div id="notereferences" class="notereferences" role="region" aria-labelledby="aria-label-messagereferences">
-				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist linkslist" />
 			</div>
 			<roundcube:container name="notedetailview" id="notedetailsbox" />
 		</div>
 		<div class="formbuttons">
 			<roundcube:button command="save" class="btn btn-primary submit" label="save" id="btn-save-note" />
 		</div>
 	</div>
 </div>
 
 <!-- popups and dialogs -->
 <roundcube:if condition="config:kolab_bonnie_api" />
 <div id="notehistory" class="popupmenu" aria-hidden="true">
 	<roundcube:object name="plugin.object_changelog_table" class="records-table changelog-table" />
 	<div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
 </div>
 
 <div id="notediff" class="popupmenu" aria-hidden="true">
 	<h2 class="note-title">Note Title</h2>
 	<h2 class="note-title-new diff-text-new"></h2>
 	<div class="form-section note-tags">
 		<span class="diff-text-old"></span> &#8674; <span class="diff-text-new"></span>
 	</div>
 	<div class="form-section note-description">
 		<div class="diff-text-diff" style="white-space:pre-wrap"></div>
 		<div class="diff-text-old"></div>
 		<div class="diff-text-new"></div>
 	</div>
 	<div class="form-section notereferences">
 		<div class="diff-text-old"></div>
 		<div class="diff-text-new"></div>
 	</div>
 </div>
 <roundcube:endif />
 
 <div id="notebookactions-menu" class="popupmenu">
 	<h3 id="aria-label-actionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotesoptionsmenu" /></h3>
 	<ul class="menu listing" role="menu" aria-labelledby="aria-label-actionsmenu">
 		<roundcube:button type="link-menuitem" command="list-create" label="kolab_notes.addnotebook" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="list-edit" label="kolab_notes.editlist" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="list-delete" label="kolab_notes.deletelist" class="delete disabled" classAct="delete active" />
 		<roundcube:button type="link-menuitem" command="list-remove" label="kolab_notes.removelist" class="remove disabled" classAct="remove active" />
 		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
 	</ul>
 </div>
 
 <div id="options-menu" class="popupmenu propform" role="menu" aria-labelledby="aria-label-optionsmenu">
 	<h3 id="aria-label-optionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotessortmenu" /></h3>
 	<div class="form-group row">
 		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
 		<div class="col-sm-8">
 			<select id="listoptions-sortcol" name="sort_col" class="form-control">
 				<option value="changed"><roundcube:label name="kolab_notes.changed" /></option>
 				<option value="title"><roundcube:label name="kolab_notes.title" /></option>
 			</select>
 		</div>
 	</div>
 	<div class="form-group row">
 		<label for="listoptions-sortord" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
 		<div class="col-sm-8">
 			<select id="listoptions-sortord" name="sort_ord" class="form-control" disabled>
 				<option value="ASC"><roundcube:label name="asc" /></option>
 				<option value="DESC"><roundcube:label name="desc" /></option>
 			</select>
 		</div>
 	</div>
 </div>
 
 <roundcube:include file="includes/footer.html" />
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index 0cd41260..efde7685 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -1,1529 +1,1529 @@
 /**
  * Basic Javascript utilities for calendar-related plugins
  *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this page.
  *
  * 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/>.
  *
  * @licend  The above is the entire license notice
  * for the JavaScript code in this page.
  */
 
 function rcube_libcalendaring(settings)
 {
     // member vars
     this.settings = settings || {};
     this.alarm_ids = [];
     this.alarm_dialog = null;
     this.snooze_popup = null;
     this.dismiss_link = null;
     this.group2expand = {};
 
     // abort if env isn't set
     if (!settings || !settings.date_format)
       return;
 
     // private vars
     var me = this;
     var gmt_offset = (new Date().getTimezoneOffset() / -60) - (settings.timezone || 0) - (settings.dst || 0);
     var client_timezone = new Date().getTimezoneOffset();
     var color_map = {};
 
     // general datepicker settings
     this.datepicker_settings = {
         // translate from fullcalendar (MomentJS) format to datepicker format
         dateFormat: settings.date_format.replace(/M/g, 'm').replace(/mmmm/, 'MM').replace(/mmm/, 'M')
             .replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/DD/, 'dd')
             .replace(/Y/g, 'y').replace(/yyyy/, 'yy'),
         firstDay : settings.first_day,
         dayNamesMin: settings.days_short,
         monthNames: settings.months,
         monthNamesShort: settings.months,
         showWeek: settings.show_weekno >= 0,
         changeMonth: false,
         showOtherMonths: true,
         selectOtherMonths: true
     };
 
 
     /**
      * Quote html entities
      */
     var Q = this.quote_html = function(str)
     {
       return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
     };
 
     /**
      * Create a nice human-readable string for the date/time range
      */
     this.event_date_text = function(event, voice)
     {
       if (!event.start)
         return '';
       if (!event.end)
         event.end = event.start;
 
       // Support Moment.js objects
       var start = 'toDate' in event.start ? event.start.toDate() : event.start,
         end = event.end && 'toDate' in event.end ? event.end.toDate() : event.end;
 
       var fromto, duration = end.getTime() / 1000 - start.getTime() / 1000,
         until = voice ? ' ' + rcmail.gettext('until','libcalendaring') + ' ' : ' — ';
 
       if (event.allDay) {
         // fullcalendar end dates of all-day events are exclusive
         end = new Date(end.getTime() - 1000*60*60*24*1);
         duration = end.getTime() / 1000 - start.getTime() / 1000;
         fromto = this.format_datetime(start, 1, voice)
           + (duration > 86400 || start.getDay() != end.getDay() ? until + this.format_datetime(end, 1, voice) : '');
       }
       else if (duration < 86400 && start.getDay() == end.getDay()) {
         fromto = this.format_datetime(start, 0, voice)
           + (duration > 0 ? until + this.format_datetime(end, 2, voice) : '');
       }
       else {
         fromto = this.format_datetime(start, 0, voice)
           + (duration > 0 ? until + this.format_datetime(end, 0, voice) : '');
       }
 
       return fromto;
     };
 
     /**
      * Checks if the event/task has 'real' attendees, excluding the current user
      */
     this.has_attendees = function(event)
     {
         return !!(event.attendees && event.attendees.length && (event.attendees.length > 1 || String(event.attendees[0].email).toLowerCase() != settings.identity.email));
     };
 
     /**
      * Check if the current user is an attendee of this event/task
      */
     this.is_attendee = function(event, role, email)
     {
         var i, emails = email ? ';' + email.toLowerCase() : settings.identity.emails;
 
         for (i=0; event.attendees && i < event.attendees.length; i++) {
             if ((!role || event.attendees[i].role == role) && event.attendees[i].email && emails.indexOf(';'+event.attendees[i].email.toLowerCase()) >= 0) {
                 return event.attendees[i];
             }
         }
 
         return false;
     };
 
     /**
      * Checks if the current user is the organizer of the event/task
      */
     this.is_organizer = function(event, email)
     {
         return this.is_attendee(event, 'ORGANIZER', email) || !event.id;
     };
 
     /**
      * Check permissions on the given folder object
      */
     this.has_permission = function(folder, perm)
     {
         // multiple chars means "either of"
         if (String(perm).length > 1) {
             for (var i=0; i < perm.length; i++) {
                 if (this.has_permission(folder, perm[i])) {
                     return true;
                 }
             }
         }
 
         if (folder.rights && String(folder.rights).indexOf(perm) >= 0) {
             return true;
         }
 
         return (perm == 'i' && folder.editable) || (perm == 'v' && folder.editable);
     };
 
 
     /**
      * From time and date strings to a real date object
      */
     this.parse_datetime = function(time, date)
     {
         // we use the utility function from datepicker to parse dates
         var date = date ? $.datepicker.parseDate(this.datepicker_settings.dateFormat, date, this.datepicker_settings) : new Date();
 
         var time_arr = time.replace(/\s*[ap][.m]*/i, '').replace(/0([0-9])/g, '$1').split(/[:.]/);
         if (!isNaN(time_arr[0])) {
             date.setHours(time_arr[0]);
         if (time.match(/p[.m]*/i) && date.getHours() < 12)
             date.setHours(parseInt(time_arr[0]) + 12);
         else if (time.match(/a[.m]*/i) && date.getHours() == 12)
             date.setHours(0);
       }
       if (!isNaN(time_arr[1]))
             date.setMinutes(time_arr[1]);
 
       return date;
     }
 
     /**
      * Convert an ISO 8601 formatted date string from the server into a Date object.
      * Timezone information will be ignored, the server already provides dates in user's timezone.
      */
     this.parseISO8601 = function(s)
     {
         // already a Date object?
         if (s && s.getMonth) {
             return s;
         }
 
         // force d to be on check's YMD, for daylight savings purposes
         var fixDate = function(d, check) {
             if (+d) { // prevent infinite looping on invalid dates
                 while (d.getDate() != check.getDate()) {
                     d.setTime(+d + (d < check ? 1 : -1) * 3600000);
                 }
             }
         }
 
         // derived from http://delete.me.uk/2005/03/iso8601.html
         var m = s && s.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);
         if (!m) {
             return null;
         }
 
         var date = new Date(m[1], 0, 2),
             check = new Date(m[1], 0, 2, 9, 0);
         if (m[3]) {
             date.setMonth(m[3] - 1);
             check.setMonth(m[3] - 1);
         }
         if (m[5]) {
             date.setDate(m[5]);
             check.setDate(m[5]);
         }
         fixDate(date, check);
         if (m[7]) {
             date.setHours(m[7]);
         }
         if (m[8]) {
             date.setMinutes(m[8]);
         }
         if (m[10]) {
             date.setSeconds(m[10]);
         }
         if (m[12]) {
             date.setMilliseconds(Number("0." + m[12]) * 1000);
         }
         fixDate(date, check);
 
         return date;
     }
 
     /**
      * Turn the given date into an ISO 8601 date string understandable by PHPs strtotime()
      */
     this.date2ISO8601 = function(date)
     {
         if (!date)
             return null;
 
         if ('toDate' in date)
             return date.format('YYYY-MM-DD[T]HH:mm:ss'); // MomentJS
 
         var zeropad = function(num) { return (num < 10 ? '0' : '') + num; };
 
         return date.getFullYear() + '-' + zeropad(date.getMonth()+1) + '-' + zeropad(date.getDate())
             + 'T' + zeropad(date.getHours()) + ':' + zeropad(date.getMinutes()) + ':' + zeropad(date.getSeconds());
     };
 
     /**
      * Format the given date object according to user's prefs
      */
     this.format_datetime = function(date, mode, voice)
     {
         var res = '';
         if (!mode || mode == 1) {
           res += $.datepicker.formatDate(voice ? 'MM d yy' : this.datepicker_settings.dateFormat, date, this.datepicker_settings);
         }
         if (!mode) {
             res += voice ? ' ' + rcmail.gettext('at','libcalendaring') + ' ' : ' ';
         }
         if (!mode || mode == 2) {
             res += this.format_time(date, voice);
         }
 
         return res;
     }
 
     /**
      * Clone from fullcalendar.js
      */
     this.format_time = function(date, voice)
     {
         var zeroPad = function(n) { return (n < 10 ? '0' : '') + n; }
         var formatters = {
             s   : function(d) { return d.getSeconds() },
             ss  : function(d) { return zeroPad(d.getSeconds()) },
             m   : function(d) { return d.getMinutes() },
             mm  : function(d) { return zeroPad(d.getMinutes()) },
             h   : function(d) { return d.getHours() % 12 || 12 },
             hh  : function(d) { return zeroPad(d.getHours() % 12 || 12) },
             H   : function(d) { return d.getHours() },
             HH  : function(d) { return zeroPad(d.getHours()) },
             a   : function(d) { return d.getHours() < 12 ? 'am' : 'pm' },
             A   : function(d) { return d.getHours() < 12 ? 'AM' : 'PM' }
         };
 
         var i, i2, c, formatter, res = '',
           format = voice ? settings['time_format'].replace(':',' ').replace('HH','H').replace('hh','h').replace('mm','m').replace('ss','s') : settings['time_format'];
         for (i=0; i < format.length; i++) {
             c = format.charAt(i);
             for (i2=Math.min(i+2, format.length); i2 > i; i2--) {
                 if (formatter = formatters[format.substring(i, i2)]) {
                     res += formatter(date);
                     i = i2 - 1;
                     break;
                 }
             }
             if (i2 == i) {
                 res += c;
             }
         }
 
         return res;
     }
 
     /**
      * Convert the given Date object into a unix timestamp respecting browser's and user's timezone settings
      */
     this.date2unixtime = function(date)
     {
         var dt = date && 'toDate' in date ? date.toDate() : date,
             dst_offset = (client_timezone - dt.getTimezoneOffset()) * 60;  // adjust DST offset
 
         return Math.round(dt.getTime()/1000 + gmt_offset * 3600 + dst_offset);
     }
 
     /**
      * Turn a unix timestamp value into a Date object
      */
     this.fromunixtime = function(ts)
     {
         ts -= gmt_offset * 3600;
         var date = new Date(ts * 1000),
             dst_offset = (client_timezone - date.getTimezoneOffset()) * 60;
         if (dst_offset)  // adjust DST offset
             date.setTime((ts + 3600) * 1000);
         return date;
     }
 
     /**
      * Finds text color for specified background color
      */
     this.text_color = function(color)
     {
         var res = '#222';
 
         if (!color) {
             return res;
         }
 
         if (!color_map[color]) {
             color_map[color] = '#fff';
 
             // Convert 3-char to 6-char
             if (/^#?([a-f0-9]{1})([a-f0-9]{1})([a-f0-9]{1})$/i.test(color)) {
                 color = '#' + RegExp.$1 + RegExp.$1 + RegExp.$2 + RegExp.$2 + RegExp.$3 + RegExp.$3;
             }
 
             if (/^#?([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i.test(color)) {
                 // use information about brightness calculation found at
                 // http://javascriptrules.com/2009/08/05/css-color-brightness-contrast-using-javascript/
                 brightness = (parseInt(RegExp.$1, 16) * 299 + parseInt(RegExp.$2, 16) * 587 + parseInt(RegExp.$3, 16) * 114) / 1000;
                 if (brightness > 125) {
                     color_map[color] = res;
                 }
             }
         }
 
         return color_map[color];
     }
 
     /**
      * Simple plaintext to HTML converter, makig URLs clickable
      */
     this.text2html = function(str, maxlen, maxlines)
     {
         var html = Q(String(str));
 
         // limit visible text length
         if (maxlen) {
             var morelink = '<span>... <a href="#more" onclick="$(this).parent().hide().next().show();return false" class="morelink">'+rcmail.gettext('showmore','libcalendaring')+'</a></span><span style="display:none">',
                 lines = html.split(/\r?\n/),
                 words, out = '', len = 0;
 
             for (var i=0; i < lines.length; i++) {
                 len += lines[i].length;
                 if (maxlines && i == maxlines - 1) {
                     out += lines[i] + '\n' + morelink;
                     maxlen = html.length * 2;
                 }
                 else if (len > maxlen) {
                     len = out.length;
                     words = lines[i].split(' ');
                     for (var j=0; j < words.length; j++) {
                         len += words[j].length + 1;
                         out += words[j] + ' ';
                         if (len > maxlen) {
                             out += morelink;
                             maxlen = html.length * 2;
                             maxlines = 0;
                         }
                     }
                     out += '\n';
                 }
                 else
                     out += lines[i] + '\n';
             }
 
             if (maxlen > str.length)
                 out += '</span>';
 
             html = out;
         }
 
         // simple link parser (similar to rcube_string_replacer class in PHP)
         var utf_domain = '[^?&@"\'/\\(\\)\\s\\r\\t\\n]+\\.([^\x00-\x2f\x3b-\x40\x5b-\x60\x7b-\x7f]{2,}|xn--[a-z0-9]{2,})';
         var url1 = '.:;,', url2 = 'a-z0-9%=#@+?&/_~\\[\\]-';
         var link_pattern = new RegExp('([hf]t+ps?://)('+utf_domain+'(['+url1+']?['+url2+']+)*)', 'ig');
         var mailto_pattern = new RegExp('([^\\s\\n\\(\\);]+@'+utf_domain+')', 'ig');
         var link_replace = function(matches, p1, p2) {
           var title = '', text = p2;
           if (p2 && p2.length > 55) {
             text = p2.substr(0, 45) + '...' + p2.substr(-8);
             title = p1 + p2;
           }
           return '<a href="'+p1+p2+'" class="extlink" target="_blank" title="'+title+'">'+p1+text+'</a>'
         };
 
         return html
             .replace(link_pattern, link_replace)
             .replace(mailto_pattern, '<a href="mailto:$1">$1</a>')
             .replace(/(mailto:)([^"]+)"/g, '$1$2" onclick="rcmail.command(\'compose\', \'$2\');return false"')
             .replace(/\n/g, "<br/>");
     };
 
     this.init_alarms_edit = function(prefix, index)
     {
         var edit_type = $(prefix+' select.edit-alarm-type'),
           dom_id = edit_type.attr('id');
 
         // register events on alarm fields
         edit_type.change(function(){
             $(this).parent().find('span.edit-alarm-values')[(this.selectedIndex>0?'show':'hide')]();
         });
         $(prefix+' select.edit-alarm-offset').change(function(){
             var val = $(this).val(),
                 parent = $(this).parent(),
                 class_map = {'0': 'ontime', '@': 'ondate'};
 
             parent.find('.edit-alarm-date, .edit-alarm-time')[val === '@' ? 'show' : 'hide']();
             parent.find('.edit-alarm-value')[val === '@' || val === '0' ? 'hide' : 'show']();
             parent.find('.edit-alarm-related')[val === '@' ? 'hide' : 'show']();
             parent.removeClass('offset-ontime offset-ondate offset-default')
                 .addClass('offset-' + (class_map[val] || 'default'));
         });
 
         $(prefix+' .edit-alarm-date').removeClass('hasDatepicker').removeAttr('id').datepicker(this.datepicker_settings);
 
         if (rcmail.env.action != 'print')
             this.init_time_autocomplete($(prefix+' .edit-alarm-time')[0], {});
 
         // set a unique id attribute and set label reference accordingly
         if ((index || 0) > 0 && dom_id) {
             dom_id += ':' + (new Date().getTime());
             edit_type.attr('id', dom_id);
             $(prefix+' label:first').attr('for', dom_id);
         }
 
         // Elastic
         if (window.UI && UI.pretty_select) {
             $(prefix + ' select').each(function() { UI.pretty_select(this); });
         }
 
         if (index)
             return;
 
         $(prefix)
             .on('click', 'a.delete-alarm', function(e){
                 if ($(this).closest('.edit-alarm-item').siblings().length > 0) {
                     $(this).closest('.edit-alarm-item').remove();
                 }
                 return false;
             })
             .on('click', 'a.add-alarm', function(e) {
                 var orig = $(this).closest('.edit-alarm-item'),
                     i = orig.siblings().length + 1,
                     item = orig.clone(false)
                       .removeClass('first')
                       .appendTo(orig.parent());
 
                   me.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
                   $('select.edit-alarm-type, select.edit-alarm-offset', item).change();
                   return false;
             });
     }
 
     this.set_alarms_edit = function(prefix, valarms)
     {
         $(prefix + ' .edit-alarm-item:gt(0)').remove();
 
         var i, alarm, domnode, val, offset;
         for (i=0; i < valarms.length; i++) {
           alarm = valarms[i];
 
           if (!alarm.action)
               alarm.action = 'DISPLAY';
 
           domnode = $(prefix + ' .edit-alarm-item').eq(0);
 
           if (i > 0) {
             domnode = domnode.clone(false).removeClass('first').insertAfter(domnode);
             this.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
           }
 
           $('select.edit-alarm-type', domnode).val(alarm.action);
           $('select.edit-alarm-related', domnode).val(/END/i.test(alarm.related) ? 'end' : 'start');
 
           if (String(alarm.trigger).match(/@(\d+)/)) {
               var ondate = this.fromunixtime(parseInt(RegExp.$1));
               $('select.edit-alarm-offset', domnode).val('@');
               $('input.edit-alarm-value', domnode).val('');
               $('input.edit-alarm-date', domnode).val(this.format_datetime(ondate, 1));
               $('input.edit-alarm-time', domnode).val(this.format_datetime(ondate, 2));
           }
           else if (String(alarm.trigger).match(/^[-+]*0[MHDS]$/)) {
               $('input.edit-alarm-value', domnode).val('0');
               $('select.edit-alarm-offset', domnode).val('0');
           }
           else if (String(alarm.trigger).match(/([-+])(\d+)([MHDS])/)) {
               val = RegExp.$2; offset = ''+RegExp.$1+RegExp.$3;
               $('input.edit-alarm-value', domnode).val(val);
               $('select.edit-alarm-offset', domnode).val(offset);
           }
         }
 
         // set correct visibility by triggering onchange handlers
         $(prefix + ' select.edit-alarm-type, ' + prefix + ' select.edit-alarm-offset').change();
     };
 
     this.serialize_alarms = function(prefix)
     {
         var valarms = [];
 
         $(prefix + ' .edit-alarm-item').each(function(i, elem) {
             var val, offset, alarm = {
                     action: $('select.edit-alarm-type', elem).val(),
                     related: $('select.edit-alarm-related', elem).val()
                 };
 
             if (alarm.action) {
                 offset = $('select.edit-alarm-offset', elem).val();
                 if (offset == '@') {
                     alarm.trigger = '@' + me.date2unixtime(me.parse_datetime($('input.edit-alarm-time', elem).val(), $('input.edit-alarm-date', elem).val()));
                 }
                 else if (offset === '0') {
                     alarm.trigger = '0S';
                 }
                 else if (!isNaN((val = parseInt($('input.edit-alarm-value', elem).val()))) && val >= 0) {
                     alarm.trigger = offset[0] + val + offset[1];
                 }
 
                 valarms.push(alarm);
             }
         });
 
         return valarms;
     };
 
     // format time string
     var time_autocomplete_format = function(hour, minutes, start) {
         var time, diff, unit, duration = '', d = new Date();
 
         d.setHours(hour);
         d.setMinutes(minutes);
         time = me.format_time(d);
 
         if (start) {
             diff = Math.floor((d.getTime() - start.getTime()) / 60000);
             if (diff > 0) {
                 unit = 'm';
                 if (diff >= 60) {
                     unit = 'h';
                     diff = Math.round(diff / 3) / 20;
                 }
                 duration = ' (' + diff + unit + ')';
             }
         }
 
         return [time, duration];
     };
 
     var time_autocomplete_list = function(p, callback) {
         // Time completions
         var st, h, step = 15, result = [], now = new Date(),
             id = String(this.element.attr('id')),
             m = id.match(/^(.*)-(starttime|endtime)$/),
             start = (m && m[2] == 'endtime'
                 && (st = $('#' + m[1] + '-starttime').val())
                 && $('#' + m[1] + '-startdate').val() == $('#' + m[1] + '-enddate').val())
                 ? me.parse_datetime(st, '') : null,
             full = p.term - 1 > 0 || p.term.length > 1,
             hours = start ? start.getHours() : (full ? me.parse_datetime(p.term, '') : now).getHours(),
             minutes = hours * 60 + (full ? 0 : now.getMinutes()),
             min = Math.ceil(minutes / step) * step % 60,
             hour = Math.floor(Math.ceil(minutes / step) * step / 60);
 
         // list hours from 0:00 till now
         for (h = start ? start.getHours() : 0; h < hours; h++)
             result.push(time_autocomplete_format(h, 0, start));
 
         // list 15min steps for the next two hours
         for (; h < hour + 2 && h < 24; h++) {
             while (min < 60) {
                 result.push(time_autocomplete_format(h, min, start));
                 min += step;
             }
             min = 0;
         }
 
         // list the remaining hours till 23:00
         while (h < 24)
             result.push(time_autocomplete_format((h++), 0, start));
 
         return callback(result);
     };
 
     var time_autocomplete_open = function(event, ui) {
         // scroll to current time
         var $this = $(this),
             widget = $this.autocomplete('widget')
             menu = $this.data('ui-autocomplete').menu,
             amregex = /^(.+)(a[.m]*)/i,
             pmregex = /^(.+)(p[.m]*)/i,
             val = $(this).val().replace(amregex, '0:$1').replace(pmregex, '1:$1');
 
         widget.css('width', '10em');
 
         if (val === '')
             menu._scrollIntoView(widget.children('li:first'));
         else
             widget.children().each(function() {
                 var li = $(this),
                     html = li.children().first().html()
                         .replace(/\s+\(.+\)$/, '')
                         .replace(amregex, '0:$1')
                         .replace(pmregex, '1:$1');
 
                 if (html.indexOf(val) == 0)
                     menu._scrollIntoView(li);
             });
     };
 
     /**
      * Initializes time autocompletion
      */
     this.init_time_autocomplete = function(elem, props)
     {
         var default_props = {
                 delay: 100,
                 minLength: 1,
                 appendTo: props.container || $(elem).parents('form'),
                 source: time_autocomplete_list,
                 open: time_autocomplete_open,
                 // change: time_autocomplete_change,
                 select: function(event, ui) {
                     $(this).val(ui.item[0]).change();
                     return false;
                 }
             };
 
         $(elem).attr('autocomplete', "off")
             .autocomplete($.extend(default_props, props))
             .click(function() {  // show drop-down upon clicks
                 $(this).autocomplete('search', $(this).val() ? $(this).val().replace(/\D.*/, "") : " ");
             });
 
         $(elem).data('ui-autocomplete')._renderItem = function(ul, item) {
             return $('<li>')
                 .data('ui-autocomplete-item', item)
                 .append('<a>' + item[0] + item[1] + '</a>')
                 .appendTo(ul);
         };
     };
 
     /*****  Alarms handling  *****/
 
     /**
      * Display a notification for the given pending alarms
      */
     this.display_alarms = function(alarms)
     {
         // clear old alert first
         if (this.alarm_dialog)
             this.alarm_dialog.dialog('destroy').remove();
 
         var i, actions, adismiss, asnooze, alarm, html, type,
             audio_alarms = [], records = [], event_ids = [], buttons = [];
 
         for (i=0; i < alarms.length; i++) {
             alarm = alarms[i];
             alarm.start = this.parseISO8601(alarm.start);
             alarm.end = this.parseISO8601(alarm.end);
 
             if (alarm.action == 'AUDIO') {
                 audio_alarms.push(alarm);
                 continue;
             }
 
             event_ids.push(alarm.id);
 
             type = alarm.id.match(/^task/) ? 'type-task' : 'type-event';
 
             html = '<h3 class="event-title ' + type + '">' + Q(alarm.title) + '</h3>';
             html += '<div class="event-section">' + Q(alarm.location || '') + '</div>';
             html += '<div class="event-section">' + Q(this.event_date_text(alarm)) + '</div>';
 
             adismiss = $('<a href="#" class="alarm-action-dismiss"></a>')
                 .text(rcmail.gettext('dismiss','libcalendaring'))
                 .click(function(e) {
                     me.dismiss_link = $(this);
                     me.dismiss_alarm(me.dismiss_link.data('id'), 0, e);
                 });
             asnooze = $('<a href="#" class="alarm-action-snooze"></a>')
                 .text(rcmail.gettext('snooze','libcalendaring'))
                 .click(function(e) {
                     me.snooze_dropdown($(this), e);
                     e.stopPropagation();
                     return false;
                 });
 
             actions = $('<div>').addClass('alarm-actions').append(adismiss.data('id', alarm.id)).append(asnooze.data('id', alarm.id));
             records.push($('<div>').addClass('alarm-item').html(html).append(actions));
         }
 
         if (audio_alarms.length)
             this.audio_alarms(audio_alarms);
 
         if (!records.length)
             return;
 
         this.alarm_dialog = $('<div>').attr('id', 'alarm-display').append(records);
 
         buttons.push({
             text: rcmail.gettext('dismissall','libcalendaring'),
             click: function(e) {
                 // submit dismissed event_ids to server
                 me.dismiss_alarm(me.alarm_ids.join(','), 0, e);
                 $(this).dialog('close');
             },
             'class': 'delete'
         });
 
         buttons.push({
             text: rcmail.gettext('close'),
             click: function() {
                 $(this).dialog('close');
             },
             'class': 'cancel'
         });
 
         this.alarm_dialog.appendTo(document.body).dialog({
             modal: true,
             resizable: true,
             closeOnEscape: false,
             dialogClass: 'alarms',
             title: rcmail.gettext('alarmtitle','libcalendaring'),
             buttons: buttons,
             open: function() {
               setTimeout(function() {
                 me.alarm_dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus();
               }, 5);
             },
             close: function() {
               $('#alarm-snooze-dropdown').hide();
               $(this).dialog('destroy').remove();
               me.alarm_dialog = null;
               me.alarm_ids = null;
             },
             drag: function(event, ui) {
               $('#alarm-snooze-dropdown').hide();
             }
         });
 
         this.alarm_dialog.closest('div[role=dialog]').attr('role', 'alertdialog');
 
         this.alarm_ids = event_ids;
     };
 
     /**
      * Display a notification and play a sound for a set of alarms
      */
     this.audio_alarms = function(alarms)
     {
         var elem, txt = [],
             src = rcmail.assets_path('plugins/libcalendaring/alarm'),
             plugin = navigator.mimeTypes ? navigator.mimeTypes['audio/mp3'] : {};
 
         // first generate and display notification text
         $.each(alarms, function() { txt.push(this.title); });
 
         rcmail.display_message(rcmail.gettext('alarmtitle','libcalendaring') + ': ' + Q(txt.join(', ')), 'notice', 10000);
 
         // Internet Explorer does not support wav files,
         // support in other browsers depends on enabled plugins,
         // so we use wav as a fallback
 
         src += bw.ie || (plugin && plugin.enabledPlugin) ? '.mp3' : '.wav';
 
         // HTML5
         try {
             elem = $('<audio>').attr('src', src);
             elem.get(0).play();
         }
         // old method
         catch (e) {
             elem = $('<embed id="libcalsound" src="' + src + '" hidden=true autostart=true loop=false />');
             elem.appendTo($('body'));
             window.setTimeout("$('#libcalsound').remove()", 10000);
         }
     };
 
     /**
      * Show a drop-down menu with a selection of snooze times
      */
     this.snooze_dropdown = function(link, event)
     {
         if (!this.snooze_popup) {
             this.snooze_popup = $('#alarm-snooze-dropdown');
             // create popup if not found
             if (!this.snooze_popup.length) {
                 this.snooze_popup = $('<div>').attr('id', 'alarm-snooze-dropdown').addClass('popupmenu').appendTo(document.body);
                 this.snooze_popup.html(rcmail.env.snooze_select)
             }
             $('#alarm-snooze-dropdown a').click(function(e){
                 var time = String(this.href).replace(/.+#/, '');
                 me.dismiss_alarm($('#alarm-snooze-dropdown').data('id'), time, e);
                 return false;
             });
         }
 
         // hide visible popup
         if (this.snooze_popup.is(':visible') && this.snooze_popup.data('id') == link.data('id')) {
             rcmail.command('menu-close', 'alarm-snooze-dropdown', link.get(0), event);
             this.dismiss_link = null;
         }
         else {  // open popup below the clicked link
             rcmail.command('menu-open', 'alarm-snooze-dropdown', link.get(0), event);
             this.snooze_popup.data('id', link.data('id'));
             this.dismiss_link = link;
         }
     };
 
     /**
      * Dismiss or snooze alarms for the given event
      */
     this.dismiss_alarm = function(id, snooze, event)
     {
         rcmail.command('menu-close', 'alarm-snooze-dropdown', null, event);
         rcmail.http_post('utils/plugin.alarms', { action:'dismiss', data:{ id:id, snooze:snooze } });
 
         // remove dismissed alarm from list
         if (this.dismiss_link) {
             this.dismiss_link.closest('div.alarm-item').hide();
             var new_ids = jQuery.grep(this.alarm_ids, function(v){ return v != id; });
             if (new_ids.length)
                 this.alarm_ids = new_ids;
             else
                 this.alarm_dialog.dialog('close');
         }
 
         this.dismiss_link = null;
     };
 
 
     /*****  Recurrence form handling  *****/
 
     /**
      * Install event handlers on recurrence form elements
      */
     this.init_recurrence_edit = function(prefix)
     {
         // toggle recurrence frequency forms
         $('#edit-recurrence-frequency').change(function(e){
             var freq = $(this).val().toLowerCase();
             $('.recurrence-form').hide();
             if (freq) {
               $('#recurrence-form-'+freq).show();
               if (freq != 'rdate')
                 $('#recurrence-form-until').show();
             }
         });
         $('#recurrence-form-rdate input.button.add').click(function(e){
             var dt, dv = $('#edit-recurrence-rdate-input').val();
             if (dv && (dt = me.parse_datetime('12:00', dv))) {
                 me.add_rdate(dt);
                 me.sort_rdates();
                 $('#edit-recurrence-rdate-input').val('')
             }
             else {
                 $('#edit-recurrence-rdate-input').select();
             }
         });
         $('#edit-recurrence-rdates').on('click', 'a.delete', function(e){
             $(this).closest('li').remove();
             return false;
         });
 
         $('#edit-recurrence-enddate').datepicker(this.datepicker_settings).click(function(){ $("#edit-recurrence-repeat-until").prop('checked', true) });
         $('#edit-recurrence-repeat-times').change(function(e){ $('#edit-recurrence-repeat-count').prop('checked', true); });
         $('#edit-recurrence-rdate-input').datepicker(this.datepicker_settings);
     };
 
     /**
      * Set recurrence form according to the given event/task record
      */
     this.set_recurrence_edit = function(rec)
     {
         var date, recurrence = $('#edit-recurrence-frequency').val(rec.recurrence ? rec.recurrence.FREQ || (rec.recurrence.RDATE ? 'RDATE' : '') : '').change(),
             interval = $('.recurrence-form select.edit-recurrence-interval').val(rec.recurrence ? rec.recurrence.INTERVAL || 1 : 1),
             rrtimes = $('#edit-recurrence-repeat-times').val(rec.recurrence ? rec.recurrence.COUNT || 1 : 1),
             rrenddate = $('#edit-recurrence-enddate').val(rec.recurrence && rec.recurrence.UNTIL ? this.format_datetime(this.parseISO8601(rec.recurrence.UNTIL), 1) : '');
         $('.recurrence-form input.edit-recurrence-until:checked').prop('checked', false);
         $('#edit-recurrence-rdates').html('');
 
         var weekdays = ['SU','MO','TU','WE','TH','FR','SA'],
             rrepeat_id = '#edit-recurrence-repeat-forever';
         if      (rec.recurrence && rec.recurrence.COUNT) rrepeat_id = '#edit-recurrence-repeat-count';
         else if (rec.recurrence && rec.recurrence.UNTIL) rrepeat_id = '#edit-recurrence-repeat-until';
         $(rrepeat_id).prop('checked', true);
 
         if (rec.recurrence && rec.recurrence.BYDAY && rec.recurrence.FREQ == 'WEEKLY') {
             var wdays = rec.recurrence.BYDAY.split(',');
             $('input.edit-recurrence-weekly-byday').val(wdays);
         }
         if (rec.recurrence && rec.recurrence.BYMONTHDAY) {
             $('input.edit-recurrence-monthly-bymonthday').val(String(rec.recurrence.BYMONTHDAY).split(','));
             $('input.edit-recurrence-monthly-mode').val(['BYMONTHDAY']);
         }
         if (rec.recurrence && rec.recurrence.BYDAY && (rec.recurrence.FREQ == 'MONTHLY' || rec.recurrence.FREQ == 'YEARLY')) {
             var byday, section = rec.recurrence.FREQ.toLowerCase();
             if ((byday = String(rec.recurrence.BYDAY).match(/(-?[1-4])([A-Z]+)/))) {
                 $('#edit-recurrence-'+section+'-prefix').val(byday[1]);
                 $('#edit-recurrence-'+section+'-byday').val(byday[2]);
             }
             $('input.edit-recurrence-'+section+'-mode').val(['BYDAY']);
         }
         else if (rec.start) {
             date = 'toDate' in rec.start ? rec.start.toDate() : rec.start;
             $('#edit-recurrence-monthly-byday').val(weekdays[date.getDay()]);
         }
         if (rec.recurrence && rec.recurrence.BYMONTH) {
             $('input.edit-recurrence-yearly-bymonth').val(String(rec.recurrence.BYMONTH).split(','));
         }
         else if (rec.start) {
             date = 'toDate' in rec.start ? rec.start.toDate() : rec.start;
             $('input.edit-recurrence-yearly-bymonth').val([String(date.getMonth()+1)]);
         }
         if (rec.recurrence && rec.recurrence.RDATE) {
             $.each(rec.recurrence.RDATE, function(i,rdate){
                 me.add_rdate(me.parseISO8601(rdate));
             });
         }
     };
 
     /**
      * Gather recurrence settings from form
      */
     this.serialize_recurrence = function(timestr)
     {
         var recurrence = '',
             freq = $('#edit-recurrence-frequency').val();
 
         if (freq != '') {
             recurrence = {
                 FREQ: freq,
                 INTERVAL: $('#edit-recurrence-interval-'+freq.toLowerCase()).val()
             };
 
             var until = $('input.edit-recurrence-until:checked').val();
             if (until == 'count')
                 recurrence.COUNT = $('#edit-recurrence-repeat-times').val();
             else if (until == 'until')
                 recurrence.UNTIL = me.date2ISO8601(me.parse_datetime(timestr || '00:00', $('#edit-recurrence-enddate').val()));
 
             if (freq == 'WEEKLY') {
                 var byday = [];
                 $('input.edit-recurrence-weekly-byday:checked').each(function(){ byday.push(this.value); });
                 if (byday.length)
                     recurrence.BYDAY = byday.join(',');
             }
             else if (freq == 'MONTHLY') {
                 var mode = $('input.edit-recurrence-monthly-mode:checked').val(), bymonday = [];
                 if (mode == 'BYMONTHDAY') {
                     $('input.edit-recurrence-monthly-bymonthday:checked').each(function(){ bymonday.push(this.value); });
                     if (bymonday.length)
                         recurrence.BYMONTHDAY = bymonday.join(',');
                 }
                 else
                     recurrence.BYDAY = $('#edit-recurrence-monthly-prefix').val() + $('#edit-recurrence-monthly-byday').val();
             }
             else if (freq == 'YEARLY') {
                 var byday, bymonth = [];
                 $('input.edit-recurrence-yearly-bymonth:checked').each(function(){ bymonth.push(this.value); });
                 if (bymonth.length)
                     recurrence.BYMONTH = bymonth.join(',');
                 if ((byday = $('#edit-recurrence-yearly-byday').val()))
                     recurrence.BYDAY = $('#edit-recurrence-yearly-prefix').val() + byday;
             }
             else if (freq == 'RDATE') {
                 recurrence = { RDATE:[] };
                 // take selected but not yet added date into account
                 if ($('#edit-recurrence-rdate-input').val() != '') {
                     $('#recurrence-form-rdate input.button.add').click();
                 }
                 $('#edit-recurrence-rdates li').each(function(i, li){
                     recurrence.RDATE.push($(li).attr('data-value'));
                 });
             }
         }
 
         return recurrence;
     };
 
     // add the given date to the RDATE list
     this.add_rdate = function(date)
     {
         var li = $('<li>')
             .attr('data-value', this.date2ISO8601(date))
             .html('<span>' + Q(this.format_datetime(date, 1)) + '</span>')
             .appendTo('#edit-recurrence-rdates');
 
         $('<a>').attr({href: '#del', 'class': 'iconbutton delete icon button', title: rcmail.get_label('delete', 'libcalendaring')})
             .append($('<span class="inner">').text(rcmail.get_label('delete', 'libcalendaring')))
             .appendTo(li);
     };
 
     // re-sort the list items by their 'data-value' attribute
     this.sort_rdates = function()
     {
         var mylist = $('#edit-recurrence-rdates'),
             listitems = mylist.children('li').get();
         listitems.sort(function(a, b) {
             var compA = $(a).attr('data-value');
             var compB = $(b).attr('data-value');
             return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;
         })
         $.each(listitems, function(idx, item) { mylist.append(item); });
     };
 
 
     /*****  Attendee form handling  *****/
 
     // expand the given contact group into individual event/task attendees
     this.expand_attendee_group = function(e, add, remove)
     {
         var id = (e.data ? e.data.email : null) || $(e.target).attr('data-email'),
             role_select = $(e.target).closest('tr').find('select.edit-attendee-role option:selected');
 
         this.group2expand[id] = { link: e.target, data: $.extend({}, e.data || {}), adder: add, remover: remove }
 
         // copy group role from the according form element
         if (role_select.length) {
             this.group2expand[id].data.role = role_select.val();
         }
 
         // register callback handler
         if (!this._expand_attendee_listener) {
             this._expand_attendee_listener = this.expand_attendee_callback;
             rcmail.addEventListener('plugin.expand_attendee_callback', function(result) {
                 me._expand_attendee_listener(result);
             });
         }
 
         rcmail.http_post('libcal/plugin.expand_attendee_group', { id: id, data: e.data || {} }, rcmail.set_busy(true, 'loading'));
     };
 
     // callback from server to expand an attendee group
     this.expand_attendee_callback = function(result)
     {
         var attendee, id = result.id,
             data = this.group2expand[id],
             row = $(data.link).closest('tr');
 
         // replace group entry with all members returned by the server
         if (data && data.adder && result.members && result.members.length) {
             for (var i=0; i < result.members.length; i++) {
                 attendee = result.members[i];
                 attendee.role = data.data.role;
                 attendee.cutype = 'INDIVIDUAL';
                 attendee.status = 'NEEDS-ACTION';
                 data.adder(attendee, null, row);
             }
 
             if (data.remover) {
                 data.remover(data.link, id)
             }
             else {
                 row.remove();
             }
 
             delete this.group2expand[id];
         }
         else {
             rcmail.display_message(result.error || rcmail.gettext('expandattendeegroupnodata','libcalendaring'), 'error');
         }
     };
 
 
     // Render message reference links to the given container
     this.render_message_links = function(links, container, edit, plugin)
     {
-        var ul = $('<ul>').addClass('attachmentslist');
+        var ul = $('<ul>').addClass('attachmentslist linkslist');
 
         $.each(links, function(i, link) {
             if (!link.mailurl)
                 return true;  // continue
 
             var li = $('<li>').addClass('link')
                 .addClass('message eml')
                 .append($('<a>')
-                    .attr({href: link.mailurl, 'class': 'messagelink'})
+                    .attr({href: link.mailurl, 'class': 'messagelink filename'})
                     .text(link.subject || link.uri)
                 )
                 .appendTo(ul);
 
             // add icon to remove the link
             if (edit) {
                 $('<a>')
                     .attr({href: '#delete', title: rcmail.gettext('removelink', plugin), 'data-uri': link.uri, 'class': 'delete'})
                     .append($('<span class="inner">').text(rcmail.gettext('delete')))
                     .appendTo(li);
             }
         });
 
         container.empty().append(ul);
     }
 
     // resize and reposition (center) the dialog window
     this.dialog_resize = function(id, height, width)
     {
         var win = $(window), w = win.width(), h = win.height(),
             dialog = $('.ui-dialog:visible'),
             h_delta = dialog.find('.ui-dialog-titlebar').outerHeight() + dialog.find('.ui-dialog-buttonpane').outerHeight() + 30,
             w_delta = 50;
 
         $(id).dialog('option', {
             height: Math.min(h-20, height + h_delta),
             width: Math.min(w-20, width + w_delta)
         });
     };
 }
 
 //////  static methods
 
 // render HTML code for displaying an attendee record
 rcube_libcalendaring.attendee_html = function(data)
 {
     var name, tooltip = '', context = 'libcalendaring',
         dispname = data.name || data.email,
         status = data.role == 'ORGANIZER' ? 'ORGANIZER' : data.status;
 
     if (status)
         status = status.toLowerCase();
 
     if (data.email) {
         tooltip = data.email;
         name = $('<a>').attr({href: 'mailto:' + data.email, 'class': 'mailtolink', 'data-cutype': data.cutype})
 
         if (status)
             tooltip += ' (' + rcmail.gettext('status' + status, context) + ')';
     }
     else {
         name = $('<span>');
     }
 
     if (data['delegated-to'])
         tooltip = rcmail.gettext('libcalendaring.delegatedto') + ' ' + data['delegated-to'];
     else if (data['delegated-from'])
         tooltip = rcmail.gettext('libcalendaring.delegatedfrom') + ' ' + data['delegated-from'];
 
     return $('<span>').append(
             $('<span>').attr({'class': 'attendee ' + status, title: tooltip}).append(name.text(dispname))
         ).html();
 };
 
 /**
  *
  */
 rcube_libcalendaring.add_from_itip_mail = function(mime_id, task, status, dom_id)
 {
     // ask user to delete the declined event from the local calendar (#1670)
     var del = false;
     if (rcmail.env.rsvp_saved && status == 'declined') {
         del = confirm(rcmail.gettext('itip.declinedeleteconfirm'));
     }
 
     // open dialog for iTip delegation
     if (status == 'delegated') {
         rcube_libcalendaring.itip_delegate_dialog(function(data) {
             rcmail.http_post(task + '/itip-delegate', {
                 _uid: rcmail.env.uid,
                 _mbox: rcmail.env.mailbox,
                 _part: mime_id,
                 _to: data.to,
                 _rsvp: data.rsvp ? 1 : 0,
                 _comment: data.comment,
                 _folder: data.target
             }, rcmail.set_busy(true, 'itip.savingdata'));
         }, $('#rsvp-'+dom_id+' .folder-select'));
         return false;
     }
 
     var noreply = 0, comment = '';
     if (dom_id) {
       noreply = $('#noreply-'+dom_id+':checked').length ? 1 : 0;
       if (!noreply)
         comment = $('#reply-comment-'+dom_id).val();
     }
 
     rcmail.http_post(task + '/mailimportitip', {
         _uid: rcmail.env.uid,
         _mbox: rcmail.env.mailbox,
         _part: mime_id,
         _folder: $('#itip-saveto').val(),
         _status: status,
         _del: del?1:0,
         _noreply: noreply,
         _comment: comment
       }, rcmail.set_busy(true, 'itip.savingdata'));
 
     return false;
 };
 
 /**
  * Helper function to render the iTip delegation dialog
  * and trigger a callback function when submitted.
  */
 rcube_libcalendaring.itip_delegate_dialog = function(callback, selector)
 {
     // show dialog for entering the delegatee address and comment
     var dialog, buttons = [];
     var form = $('<form class="itip-dialog-form propform" action="javascript:void()">' +
         '<div class="form-section form-group">' +
             '<label for="itip-delegate-to">' + rcmail.gettext('itip.delegateto') + '</label>' +
             '<input type="text" id="itip-delegate-to" class="text" size="40" value="" />' +
         '</div>' +
         '<div class="form-section form-group form-check">' +
             '<label for="itip-delegate-rsvp">' + rcmail.gettext('itip.delegatersvpme') + '</label>' +
             '<input type="checkbox" id="itip-delegate-rsvp" value="1" />' +
         '</div>' +
         '<div class="form-section form-group">' +
             '<textarea id="itip-delegate-comment" class="itip-comment" cols="40" rows="8" placeholder="' +
                 rcmail.gettext('itip.itipcomment') + '"></textarea>' + 
         '</div>' +
     '</form>');
 
     if (selector && selector.length) {
         form.append(
             $('<div class="form-section form-group">')
                 .append($('<label for="itip-saveto">').text(rcmail.gettext('libcalendaring.savein')))
                 .append($('select', selector).clone(true))
         );
     }
 
     buttons.push({
         text: rcmail.gettext('itipdelegated', 'itip'),
         'class': 'save mainaction',
         click: function() {
             var doc = window.parent.document,
                 delegatee = String($('#itip-delegate-to', doc).val()).replace(/(^\s+)|(\s+$)/, '');
 
             if (delegatee != '' && rcube_check_email(delegatee, true)) {
                 callback({
                     to: delegatee,
                     rsvp: $('#itip-delegate-rsvp', doc).prop('checked'),
                     comment: $('#itip-delegate-comment', doc).val(),
                     target: $('#itip-saveto', doc).val()
                 });
 
                 setTimeout(function() { dialog.dialog("close"); }, 500);
             }
             else {
                 rcmail.alert_dialog(rcmail.gettext('itip.delegateinvalidaddress'));
                 $('#itip-delegate-to', doc).focus();
             }
         }
     });
 
     buttons.push({
         text: rcmail.gettext('cancel'),
         'class': 'cancel',
         click: function() {
             dialog.dialog('close');
         }
     });
 
     dialog = rcmail.show_popup_dialog(form, rcmail.gettext('delegateinvitation', 'itip'), buttons, {
         width: 460,
         open: function(event, ui) {
             $(this).parent().find('button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction');
             $(this).find('#itip-saveto').val('');
 
             // initialize autocompletion
             var ac_props, rcm = rcmail.is_framed() ? parent.rcmail : rcmail;
             if (rcmail.env.autocomplete_threads > 0) {
                 ac_props = {
                     threads: rcmail.env.autocomplete_threads,
                     sources: rcmail.env.autocomplete_sources
                 };
             }
             rcm.init_address_input_events($(this).find('#itip-delegate-to').focus(), ac_props);
             rcm.env.recipients_delimiter = '';
         },
         close: function(event, ui) {
             rcm = rcmail.is_framed() ? parent.rcmail : rcmail;
             rcm.ksearch_blur();
             $(this).remove();
         }
     });
 
     return dialog;
 };
 
 /**
  * Show a menu for selecting the RSVP reply mode
  */
 rcube_libcalendaring.itip_rsvp_recurring = function(btn, callback, event)
 {
     var list, menu = $('#itip-rsvp-menu'), action = btn.attr('rel');
 
     if (!menu.length) {
         menu = $('<div>').attr({'class': 'popupmenu', id: 'itip-rsvp-menu', 'aria-hidden': 'true'}).appendTo(document.body);
         list = $('<ul>').attr({'class': 'toolbarmenu menu', role: 'menu'}).appendTo(menu);
 
         $.each(['all','current'/*,'future'*/], function(i, mode) {
             var link = $('<a>').attr({'class': 'active', rel: mode})
                 .text(rcmail.get_label('rsvpmode' + mode))
                 .on('click', function() { callback(action, $(this).attr('rel')); });
 
             $('<li>').attr({role: 'menuitem'}).append(link).appendTo(list);
         });
     }
 
     rcmail.show_menu('itip-rsvp-menu', true, event);
 };
 
 /**
  *
  */
 rcube_libcalendaring.remove_from_itip = function(event, task, title)
 {
     rcmail.confirm_dialog(rcmail.gettext('itip.deleteobjectconfirm').replace('$title', title), 'delete', function() {
         rcmail.http_post(task + '/itip-remove', event, rcmail.set_busy(true, 'itip.savingdata'));
     });
 };
 
 /**
  *
  */
 rcube_libcalendaring.decline_attendee_reply = function(mime_id, task)
 {
     // show dialog for entering a comment and send to server
     var html = '<div class="itip-dialog-confirm-text">' + rcmail.gettext('itip.declineattendeeconfirm') + '</div>' +
         '<textarea id="itip-decline-comment" class="itip-comment" cols="40" rows="8"></textarea>';
 
     var dialog, buttons = [];
     buttons.push({
         text: rcmail.gettext('declineattendee', 'itip'),
         click: function() {
             rcmail.http_post(task + '/itip-decline-reply', {
                 _uid: rcmail.env.uid,
                 _mbox: rcmail.env.mailbox,
                 _part: mime_id,
                 _comment: $('#itip-decline-comment', window.parent.document).val()
             }, rcmail.set_busy(true, 'itip.savingdata'));
           dialog.dialog("close");
         }
     });
 
     buttons.push({
         text: rcmail.gettext('cancel', 'itip'),
         click: function() {
           dialog.dialog('close');
         }
     });
 
     dialog = rcmail.show_popup_dialog(html, rcmail.gettext('declineattendee', 'itip'), buttons, {
         width: 460,
         open: function() {
             $(this).parent().find('button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction');
             $('#itip-decline-comment').focus();
         }
     });
 
     return false;
 };
 
 /**
  *
  */
 rcube_libcalendaring.fetch_itip_object_status = function(p)
 {
   p.mbox = rcmail.env.mailbox;
   p.message_uid = rcmail.env.uid;
   rcmail.http_post(p.task + '/itip-status', { data: p });
 };
 
 /**
  *
  */
 rcube_libcalendaring.update_itip_object_status = function(p)
 {
   rcmail.env.rsvp_saved = p.saved;
   rcmail.env.itip_existing = p.existing;
 
   // hide all elements first
   $('#itip-buttons-'+p.id+' > div').hide();
   $('#rsvp-'+p.id+' .folder-select').remove();
 
   if (p.html) {
     // append/replace rsvp status display
     $('#loading-'+p.id).next('.rsvp-status').remove();
     $('#loading-'+p.id).hide().after(p.html);
   }
 
   // enable/disable rsvp buttons
   if (p.action == 'rsvp') {
     $('#rsvp-'+p.id+' input.button').prop('disabled', false)
       .filter('.'+String(p.status||'unknown').toLowerCase()).prop('disabled', p.latest);
   }
 
   // show rsvp/import buttons (with calendar selector)
   $('#'+p.action+'-'+p.id).show().find('input.button').last().after(p.select);
 
   // highlight date if date change detected
   if (p.rescheduled)
     $('.calendar-eventdetails td.date').addClass('modified');
 
   // show itip box appendix after replacing the given placeholders
   if (p.append && p.append.selector) {
     var elem = $(p.append.selector);
     if (p.append.replacements) {
       $.each(p.append.replacements, function(k, html) {
         elem.html(elem.html().replace(k, html));
       });
     }
     else if (p.append.html) {
       elem.html(p.append.html)
     }
     elem.show();
   }
 
   if (window.UI && UI.pretty_select) {
     $('#rsvp-'+p.id+' select').each(function() { UI.pretty_select(this); });
   }
 };
 
 /**
  * Callback from server after an iTip message has been processed
  */
 rcube_libcalendaring.itip_message_processed = function(metadata)
 {
   if (metadata.after_action) {
     setTimeout(function(){ rcube_libcalendaring.itip_after_action(metadata.after_action); }, 1200);
   }
   else {
     rcube_libcalendaring.fetch_itip_object_status(metadata);
   }
 };
 
 /**
  * After-action on iTip request message. Action types:
  *     0 - no action
  *     1 - move to Trash
  *     2 - delete the message
  *     3 - flag as deleted
  *     folder_name - move the message to the specified folder
  */
 rcube_libcalendaring.itip_after_action = function(action)
 {
   if (!action) {
     return;
   }
 
   var rc = rcmail.is_framed() ? parent.rcmail : rcmail;
 
   if (action === 2) {
     rc.permanently_remove_messages();
   }
   else if (action === 3) {
     rc.mark_message('delete');
   }
   else {
     rc.move_messages(action === 1 ? rc.env.trash_mailbox : action);
   }
 };
 
 /**
  * Open the calendar preview for the current iTip event
  */
 rcube_libcalendaring.open_itip_preview = function(url, msgref)
 {
   if (!rcmail.env.itip_existing)
     url += '&itip=' + escape(msgref);
 
   var win = rcmail.open_window(url);
 };
 
 
 // extend jQuery
 (function($){
   $.fn.serializeJSON = function(){
     var json = {};
     jQuery.map($(this).serializeArray(), function(n, i) {
       json[n['name']] = n['value'];
     });
     return json;
   };
 })(jQuery);
 
 
 /* libcalendaring plugin initialization */
 window.rcmail && rcmail.addEventListener('init', function(evt) {
   if (rcmail.env.libcal_settings) {
     var libcal = new rcube_libcalendaring(rcmail.env.libcal_settings);
     rcmail.addEventListener('plugin.display_alarms', function(alarms){ libcal.display_alarms(alarms); });
   }
 
   rcmail.addEventListener('plugin.update_itip_object_status', rcube_libcalendaring.update_itip_object_status)
     .addEventListener('plugin.fetch_itip_object_status', rcube_libcalendaring.fetch_itip_object_status)
     .addEventListener('plugin.itip_message_processed', rcube_libcalendaring.itip_message_processed);
 });
diff --git a/plugins/libkolab/skins/elastic/include/libcalendaring.less b/plugins/libkolab/skins/elastic/include/libcalendaring.less
index d0fff594..40a47e88 100644
--- a/plugins/libkolab/skins/elastic/include/libcalendaring.less
+++ b/plugins/libkolab/skins/elastic/include/libcalendaring.less
@@ -1,732 +1,717 @@
 /**
  * Kolab core library
  *
  * This file contains Elastic skin styles for libcalendaring plugin.
  *
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * Copyright (C) 2012-2018, 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/>.
  */
 
 .invitebox {
     & > i.icon {
         position: absolute;
         top: 0;
         padding-top: .5em;
     }
 
     & > span {
         padding-left: 2.5em;
     }
 
     td {
         padding: 2px;
         vertical-align: top;
 
         &.ititle {
             font-weight: bold;
             padding-right: 0.5em;
         }
 
         &.label {
             color: #666;
             padding-right: 1em;
         }
 
         &.sensitivity {
             font-weight: bold;
         }
 
         &.recurrence-id {
             text-transform: uppercase;
             font-style: italic;
         }
 
         &.date.modified {
             font-weight: bold;
             color: @color-error;
         }
 
         em {
             font-weight: bold;
         }
     }
 
     .itip-buttons {
         display: flex;
         flex-wrap: wrap;
 
         input.button {
             margin: 0 .25rem .25rem 0;
         }
     }
 
     .rsvp-buttons {
         width: 100%;
         padding-top: .25rem;
     }
 
     .itip-reply-controls {
         margin-top: .25rem;
         width: 100%;
         line-height: 2;
 
         & > label {
             display: inline;
 
             label {
                 line-height: 1;
                 margin-right: .25rem;
             }
         }
 
         a {
             margin-left: 1em;
             white-space: nowrap;
         }
     }
 
     .rsvp-status {
         margin: .5rem 0;
         width: 100%;
 
         &.hint {
             color: #666;
             font-style: italic;
         }
     }
 
     .folder-select {
         white-space: nowrap;
 
         select {
             display: initial;
             width: auto;
         }
     }
 }
 
 .rsvp-status {
     &:before {
         line-height: 1.1;
         color: lighten(@color-black, 25%);
         float: none;
         display: inline;
     }
 
     &.loading:before {
         &:extend(.font-icon-class);
         .animated-icon-class;
         content: @fa-var-circle-notch;
         line-height: 1;
     }
 
     &.declined:before {
         &:extend(.font-icon-class);
         content: @fa-var-ban;
         color: @color-error;
     }
 
     &.tentative:before {
         &:extend(.font-icon-class);
         content: @fa-var-check-circle;
         color: @color-warning;
     }
 
     &.accepted:before {
         &:extend(.font-icon-class);
         content: @fa-var-check-circle;
         color: @color-success;
     }
 
     &.delegated:before {
         &:extend(.font-icon-class);
         content: @fa-var-share;
     }
 
     &.needs-action:before {
         &:extend(.font-icon-class);
         content: @fa-var-question-circle;
     }
 }
 
 .attendee {
     &:before {
         &:extend(.font-icon-class);
         content: @fa-var-question-circle;
         display: inline;
         float: none;
         font-size: 1em;
         color: @color-black-shade-text;
     }
 
     &.req-participant:before {
         content: @fa-var-user;
     }
 
     &.opt-participant:before {
         .font-icon-regular(@fa-var-user);
     }
 
     &.non-participant:before {
         content: @fa-var-user;
         color: #ccc;
     }
 
     &.chair:before {
         content: @fa-var-user; // todo
         color: @color-warning;
     }
 
     &.completed:before,
     &.accepted:before {
         content: @fa-var-check-circle;
         color: @color-success;
     }
 
     &.declined:before {
         content: @fa-var-ban;
         color: @color-error;
     }
 
     &.tentative:before {
         content: @fa-var-check-circle;
         color: @color-warning;
     }
 
     &.delegated:before {
         content: @fa-var-share;
     }
 
     &.organizer:before {
         content: @fa-var-briefcase; // TODO: better icon
     }
 
     &.in-process:before {
         content: @fa-var-cog;
     }
 }
 
 .attendees-comentbox {
     label {
         display: inline;
     }
 }
 
 .edit-attendees-table {
     width: 100%;
 
     th, td {
         width: 1%;
         text-align: center;
     }
 
     td {
         border: 0;
         padding: 0 .3rem;
     }
 
     th {
         border-bottom: 1px solid #eee !important;
     }
 
     th.name, td.name, th.role, td.role {
         width: auto;
         text-align: left;
     }
 
     th.invite {
         input {
             display: none;
         }
 
         label {
             cursor: pointer;
         }
 
         label:before {
             &:extend(.font-icon-class);
             content: @fa-var-envelope;
             display: inline;
             float: none;
             margin-left: .25rem;
         }
 
     }
 
     td.invite {
         .custom-switch {
             margin-top: .15rem;
         }
     }
 
     td.name {
         span {
             line-height: 2.5;
             display: flex;
 
             & > :first-child {
                 .overflow-ellipsis;
                 // width and flex is required to make overflow working
                 flex: 1;
                 width: 1px;
                 white-space: nowrap;
             }
         }
     }
 
     td.availability,
     td.confirmstate {
         span {
             margin: 0;
         }
 
         span:after,
         span:before {
             line-height: 2;
             margin: 0;
             font-size: 1.2em;
             height: 2em;
             width: 2em;
         }
     }
 
     td.options {
         a {
             display: inline-block;
             height: 2em;
 
             &:before {
                 line-height: 1.8;
                 margin: 0;
             }
         }
     }
 
     a.expandlink {
         &:before {
             content: @fa-var-plus-square;
             line-height: 2;
         }
     }
 
     .inner {
         display: none;
     }
 
     html.layout-phone & {
         th.availability,
         th.confirmstate {
             text-indent: -5000px;
         }
 
         td.role {
             max-width: 7em;
         }
 
         select {
             padding-left: .5rem;
         }
     }
 }
 
 .form-searchbar {
     display: flex;
     margin-bottom: .5rem;
 
     input[type=text] {
         flex: 1;
 
         html.layout-phone & {
             max-width: 50%;
         }
     }
 
     input[type=button] {
         margin-left: .5em;
         .overflow-ellipsis;
     }
 }
 
-.attachmentslist li.link {
-    &.message.eml:before {
-        content: @fa-var-envelope;
-    }
-
-    a.messagelink {
-        .overflow-ellipsis;
-        margin-right: .25rem;
-    }
-
-    a.delete .inner {
-        display: none;
-    }
-}
-
 .attachmentslist li.ics:before,
 .attachmentslist li.text.calendar:before,
 .messagelist tbody .attachment span.ical:before {
     .font-icon-regular(@fa-var-calendar-alt);
 }
 
 .alarms-input {
     .edit-alarm-item {
         display: flex;
 
         & + .edit-alarm-item {
             margin-top: .25rem;
         }
 
         &.first .delete-alarm,
         &:not(.first) .add-alarm {
             display: none;
         }
     }
 
     .edit-alarm-buttons {
         a {
             border-top-right-radius: .25rem !important;
             border-bottom-right-radius: .25rem !important;
 
             &:before {
                 margin: 0;
                 width: 1em;
             }
 
             &:focus {
                 box-shadow: none;
             }
 
             &.add:before {
                 content: @fa-var-plus;
             }
         }
 
         .inner {
             display: none;
         }
     }
 
     .edit-alarm-type {
         flex: 1;
         border-top-right-radius: 0;
         border-bottom-right-radius: 0;
 
         &:focus {
             z-index: 2;
         }
     }
 
     .edit-alarm-set {
         display: flex;
         flex: 1;
     }
 
     .edit-alarm-values {
         flex: 5;
 
         .form-control {
             border-radius: 0;
         }
 
         :first-child {
             border-left: 0;
         }
     }
 
     .edit-alarm-offset {
         flex: 5;
     }
 
     .edit-alarm-date,
     .edit-alarm-time,
     .edit-alarm-related {
         flex: 3;
     }
 }
 
 .recurrence-form {
     .recurrence-rdates {
         width: 100%;
         padding: 0;
         list-style-type: none;
 
         &:empty {
             margin: 0;
         }
 
         a.delete {
             margin-left: 2em;
             &:before {
                 display: inline-block;
                 float: none;
             }
         }
 
         .inner {
             display: none;
         }
     }
 
     .recurrence-onevery {
         select {
             width: 40%;
             display: inline;
         }
     }
 
     .inputform {
         display: flex;
 
         input.button {
             margin-left: .25rem;
         }
     }
 
     div.line {
         width: 100%;
         display: flex;
         margin-bottom: .25rem;
 
         label {
             margin-left: .5em;
             min-width: 4em;
             line-height: 2.5;
         }
     }
 
     .month,
     .monthday,
     .weekday {
         display: inline-block;
         width: 3.5em;
         margin-right: .5rem;
         white-space: nowrap;
 
         input {
             margin-right: .25rem;
         }
     }
 
     .monthday {
         width: 2.75em;
     }
 
     .table td {
         border: 0;
         padding: 0;
 
         &.label {
             white-space: nowrap;
         }
 
         &:first-child label {
             line-height: 2.5;
         }
 
         & label.monthday:first-child {
             margin-top: .5rem;
         }
     }
 
     .input-group-append,
     .input-group-prepend {
         display: initial; // fixes buggy height of the element
     }
 }
 
 #event-status-badge {
     width: 7rem;
     height: 7rem;
     position: absolute;
     top: 0;
     right: 0;
     overflow: hidden;
 
     span {
         display: none;
         text-transform: uppercase;
         line-height: 20px;
         position: absolute;
         left: -2.4rem;
         top: 2.4rem;
         width: 13.2rem;
         text-align: center;
         font-weight: bold;
         font-size: .85rem;
         color: #fff;
         -webkit-transform: rotate(45deg);
         transform: rotate(45deg);
 
         &:before {
             &:extend(.font-icon-class);
             display: inline;
             float: none;
         }
 
         .status-cancelled & {
             background-color: darken(@color-error, 10%);
             display: block;
 
             &:before {
                 content: @fa-var-times-circle;
             }
         }
 
         .sensitivity-private & {
             background-color: darken(@color-warning, 10%);
             display: block;
 
             &:before {
                 content: @fa-var-lock;
             }
         }
 
         .sensitivity-confidential & {
             background-color: darken(@color-error, 10%);
             display: block;
 
             &:before {
                 content: @fa-var-user-secret;
             }
         }
     }
 }
 
 #alarm-display {
     h3 {
         font-size: 1.2rem;
         margin-bottom: .25rem;
 
         &:before {
             &:extend(.font-icon-class);
             .font-icon-regular(@fa-var-calendar-alt);
             font-size: 1em;
         }
 
         &.type-task:before {
             .font-icon-regular(@fa-var-calendar-check);
         }
     }
 
     .event-section {
         font-size: .9rem;
         color: @color-black-shade-text;
         white-space: nowrap;
         .overflow-ellipsis;
     }
 
     .alarm-actions {
         text-align: right;
         margin-bottom: .25rem;
 
         a {
             &:first-child {
                 margin-right: 1em;
             }
 
             &:before {
                 &:extend(.font-icon-class);
                 display: inline;
                 float: none;
             }
         }
     }
 
     a.alarm-action-snooze:before {
         content: @fa-var-bell-slash;
     }
 
     a.alarm-action-dismiss:before {
         content: @fa-var-trash-alt;
     }
 }
 
 #alarm-snooze-dropdown a:before {
     .font-icon-regular(@fa-var-clock);
 }
 
 .dialog-message {
     margin: 0;
     opacity: .95;
     width: 100%;
     padding: .75em;
     margin-top: .25em;
     color: @color-message;
     background-color: @color-message-warning-box-background;
 
     & > label {
         margin: 0;
         display: block;
 
         label:before {
             line-height: 1.25;
             margin-right: .25rem;
         }
     }
 
     .message {
         display: flex;
     }
 
     & + .savemode {
         margin-top: 1rem;
 
         a.btn {
             margin-right: .5rem;
         }
     }
 
     & > .savemode {
         margin-top: .5rem;
 
         label {
             margin-right: 1rem;
         }
 
         input {
             margin-right: .25rem;
         }
     }
 }
 
 @media screen and (max-width: 420px) {
     .nav-link.nav-icon {
         width: 3em;
         margin-right: 5px;
         padding: .5rem .5rem .5rem .65rem;
 
         &:before {
             .font-icon-class;
             margin: 0 1rem 0 0;
             width: 1em;
             line-height: 1.2;
         }
 
         &.resources:before {
             content: @fa-var-cube;
             margin-left: .1rem;
         }
 
         &.attachments:before {
             content: @fa-var-paperclip;
         }
 
         &.attendees:before {
             content: @fa-var-users;
         }
     }
 }
diff --git a/plugins/libkolab/skins/elastic/libkolab.less b/plugins/libkolab/skins/elastic/libkolab.less
index a3dbe01b..645850c5 100644
--- a/plugins/libkolab/skins/elastic/libkolab.less
+++ b/plugins/libkolab/skins/elastic/libkolab.less
@@ -1,600 +1,622 @@
 /**
  * Kolab core library
  *
  * This file contains Elastic skin styles for various Kolab plugins.
  *
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * Copyright (C) 2012-2018, 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/>.
  */
 
 @skin: "elastic";
 @skin-path: "../../../../skins/@{skin}";
 
 @import (reference) "@{skin-path}/styles/variables";
 @import (reference) "@{skin-path}/styles/mixins";
 
 
 /*** Common folders list extensions ***/
 
 .listing {
     // Fix focus indicator, because we add div element in the list record
     @media screen and (min-width: @screen-width-large) {
         li > div > a {
             border-left: 2px solid transparent;
         }
         li > div > a:focus {
             border-left: 2px solid @color-list-focus-indicator;
             outline: 0;
         }
     }
 
     li {
         & > div {
             display: flex;
 
             & > a:first-child {
                 .overflow-ellipsis;
                 position: relative;
                 flex-grow: 1;
 
                 & + input {
                     position: initial;
                 }
             }
 
             .custom-switch {
                 position: relative;
             }
 
             &.folder .listname:before {
                 &:extend(.font-icon-class);
                 content: @fa-var-sticky-note;
                 margin-right: .5rem;
             }
 
             span.actions {
                 display: flex;
 
                 input + & {
                     padding-right: 2em;
                 }
 
                 a {
                     padding: 0;
                     margin: 0;
                     margin-right: .2rem;
                     cursor: pointer;
 
                     &:before {
                         margin: 0;
                     }
 
                     &.remove {
                         display: none;
                     }
                 }
 
                 html.touch & {
                     margin-left: .2rem;
                     a {
                         margin-right: .5rem;
                     }
                 }
             }
 
             a.quickview {
                 &:before {
                     content: @fa-var-eye;
                     opacity: .2;
                     color: @color-link;
                 }
 
                 &:after {
                     display: none !important;
                 }
             }
 
             &.focusview {
                 a.quickview:before {
                     content: @fa-var-eye;
                     opacity: 1;
                 }
             }
 
             .subscribed {
                 cursor: pointer;
                 // reset listing's link style
                 padding: 0 !important;
                 border-left: 0;
                 width: auto;
 
                 &:before {
                     .font-icon-regular(@fa-var-bookmark); // TODO: better icon
                     height: auto;
                     color: @color-link;
                     margin-right: .25rem;
                 }
             }
 
             // span.subscribed is used on addressbooks list, a.subscribed in other places
             span.subscribed:before {
                 &:extend(.font-icon-class);
                 .font-icon-regular(@fa-var-bookmark); // TODO: better icon
             }
 
             &.subscribed {
                 .subscribed:before {
                     .font-icon-solid(@fa-var-bookmark); // TODO: better icon
                 }
             }
         }
 
         &.selected > div {
             color: @color-list-selected;
             background-color: @color-list-selected-background;
         }
 
         & > div.readonly a:first-child,
         &.readonly:not(.virtual) > div a:first-child {
             &:after {
                 &:extend(.font-icon-class);
                 content: @fa-var-lock;
                 position: absolute;
                 left: 2.25rem;
                 top: @listing-line-height / 2;
                 font-size: .9em !important;
                 width: .9em;
                 line-height: 1;
                 height: 1em !important;
                 background-color: #fff;
                 border-radius: 50% 50% 0 0;
                 color: @color-font;
                 opacity: .9;
 
                 html.touch & {
                     top: @listing-touch-line-height / 2;
                     left: 2.7rem;
                 }
             }
         }
 
         & > div.other.user > .listname,
         &.other.user > div a:first-child {
             &:before {
                 .font-icon-solid(@fa-var-user);
             }
         }
 
         & > div.virtual.user > .listname,
         &.virtual.user > div a:first-child {
             &:after {
                 display: none;
             }
         }
 
         & > div.virtual.shared > .listname,
         &.virtual.shared > div a:first-child {
             &:before {
                 .font-icon-solid(@fa-var-share-alt);
             }
 
             &:after {
                 display: none;
             }
         }
 
         &.virtual > div > a {
             opacity: .5;
         }
     }
 
     // Tree structure fix
     &.treelist:not(.notree) {
         & > li > div > a {
             padding-left: @listing-treetoggle-width;
         }
     }
 
     li.droptarget > div {
         background-color: @color-list-droptarget-background;
     }
 
     li .count {
         position: absolute;
         top: 0;
         right: 0;
         min-width: 2em;
         line-height: 1.4rem;
         margin: (@listing-line-height - 1.4 * @page-font-size)/2;
         padding: 0 .3em;
         border-radius: .4em;
         background: @color-list-secondary;
         color: #fff;
         text-align: center;
         font-weight: bold;
 
         html.touch & {
             line-height: 2rem;
             margin: (@listing-touch-line-height - 2 * @page-font-size)/2;
         }
     }
 }
 
 @treelist-readonly-icon-margin: 1.7em;
 .treelist {
     ul {
         li {
             a:first-child:after {
                 margin-left: 1 * @treelist-readonly-icon-margin !important;
             }
 
             li {
                 a:first-child:after {
                     margin-left: 2 * @treelist-readonly-icon-margin !important;
                 }
 
                 li {
                     a:first-child:after {
                         margin-left: 3 * @treelist-readonly-icon-margin !important;
                     }
 
                     li {
                         a:first-child:after {
                             margin-left: 4 * @treelist-readonly-icon-margin !important;
                         }
 
                         li {
                             a:first-child:after {
                                 margin-left: 5 * @treelist-readonly-icon-margin !important;
                             }
 
                             li {
                                 a:first-child:after {
                                     margin-left: 6 * @treelist-readonly-icon-margin !important;
                                 }
                             }
                         }
                     }
                 }
             }
         }
     }
 
     &.notree {
         li a:first-child:after {
             left: 1.3rem !important;
         }
     }
 }
 
 .searchresults {
     .boxtitle {
         line-height: 2rem !important;
         font-size: 80%;
         padding: 0 .5rem;
         margin: 0;
         color: @color-popover-separator;
         background-color: @color-popover-separator-background;
         text-align: center;
         border-bottom: 1px solid @color-layout-border;
     }
 }
 
 .folderlist li.mailbox {
     &.type-event > a:before {
         .font-icon-solid(@fa-var-calendar);
     }
     &.type-task > a:before {
         .font-icon-solid(@fa-var-calendar-check);
     }
     &.type-journal > a:before {
         .font-icon-regular(@fa-var-calendar);
     }
     &.type-contact > a:before {
         .font-icon-regular(@fa-var-address-book);
     }
     &.type-note > a:before {
         .font-icon-regular(@fa-var-sticky-note);
     }
     &.type-configuration > a:before {
         .font-icon-solid(@fa-var-cog);
     }
     &.type-freebusy > a:before {
         .font-icon-regular(@fa-var-calendar);
     }
     &.type-file > a:before {
         .font-icon-solid(@fa-var-folder);
     }
 }
 
 .menu {
     li.search {
         padding: .25rem .5rem;
     }
 
     a.history:before {
         content: @fa-var-history;
     }
 }
 
 button.btn {
     &.save.notify:before {
         content: @fa-var-envelope;
     }
 
     &.print:before {
         content: @fa-var-print;
     }
 }
 
 // E.g. notes preview frame
 .watermark {
     background: url("@{skin-path}/images/logo.svg") center no-repeat #fff;
     background-size: 30%;
     background-blend-mode: luminosity;
     width: 100%;
     height: 100%;
 
     & > * {
         display: none;
     }
 
     // this is to blend the watermark image
     &:before {
         content: "";
         position: absolute;
         top: 0;
         bottom: 0;
         left: 0;
         right: 0;
         background: rgba(255, 255, 255, .85);
     }
 
     &.formcontainer {
         background: transparent !important;
 
         &:before {
             display: none;
         }
 
         & > * {
             display: block;
         }
 
         html.layout-small &,
         html.layout-phone & {
             overflow-y: auto !important;
         }
     }
 }
 
 .form-group > .datetime {
     display: flex;
     white-space: nowrap;
 
     input {
         width: 10em;
     }
 
     input:first-child {
         margin-right: .5rem;
         width: 15em;
     }
 
     a {
         margin-left: 1em;
         text-align: right;
         flex: 1;
         line-height: 2.4;
     }
 }
 
 .form-section.form-group.form-check {
     display: flex;
     padding: 0;
 
     label {
         order: 10;
     }
 }
 
 .formcontent.text-only .faded * {
     color: @color-black-shade-text;
 }
 
+.linkslist {
+    // Reset .attachmentslist style
+    border: 0 !important;
+    background: transparent !important;
+
+    li.link {
+        padding: 0;
+
+        &.message.eml:before {
+            content: @fa-var-envelope;
+        }
+
+        a.messagelink {
+            .overflow-ellipsis;
+        }
+
+        a.delete .inner {
+            display: none;
+        }
+    }
+}
+
 .print-config {
     position: fixed;
     top: 0;
     left: 0;
     width: 100%;
     z-index: 10000;
     padding: .5em 1em;
     background-color: @color-black-shade-bg;
 
     button.print {
         margin-right: 1rem;
     }
 
     .prop {
         line-height: 2;
         margin-left: .5rem;
         display: inline-block;
         vertical-align: middle;
 
         label {
             margin: 0;
         }
     }
 
     @media print {
         display: none;
     }
 
     & + .print-content {
         position: relative;
         top: 0;
         left: 0;
         height: auto;
         margin: 5em auto 0 auto;
         overflow: visible;
     }
 }
 
 .selection-dialog {
     .ui-dialog-content {
         display: flex !important;
         overflow: hidden !important;
     }
 
     .selection-list {
         display: flex;
         flex-direction: column;
         border: 1px solid @color-layout-border;
         justify-content: center;
     }
 
     .ui-dialog-content .popupmenu {
         display: flex !important; // overwrites .popupmenu style
         width: 100%;
     }
 
     .scroller {
         flex: 1;
         overflow-y: auto;
     }
 
     .header {
         border-bottom: 1px solid @color-layout-border;
         display: flex;
         background-color: @color-layout-header-background;
         font-size: @layout-header-font-size;
         font-weight: bold;
         line-height: @layout-header-height;
         height: @layout-header-height;
         min-height: @layout-header-height;
         padding: 0 .25em;
         position: relative; // for absolute positioning of searchbar
         overflow: hidden;
         white-space: nowrap;
 
         a.button {
             color: @color-toolbar-button;
             margin: 0 .3rem;
 
             &:before {
                 margin: 0;
             }
         }
     }
 
     .header-title {
         width: 100%;
         text-align: center;
         margin: 0 2em;
     }
 
     .selection-content {
         display: flex;
         flex-direction: column;
     }
 
     .tab-content {
         margin-top: 1rem;
         height: 100%;
         overflow-y: auto;
     }
 
     .form-addon {
         margin: 0;
         padding: .5rem 0;
         width: 100%;
         background-color: @color-black-shade-bg;
         border-top: 1px solid @color-layout-border;
     }
 
     // overwrite .popupmenu colors
     .listing {
         ul {
             background-color: @color-layout-list-background;
         }
 
         li.selected {
             color: @color-font;
         }
     }
 
     @media screen and (max-width: @screen-width-small) {
         .ui-dialog-content {
             padding: 0 !important;
         }
 
         .ui-dialog-titlebar {
             display: none;
             margin: 0;
         }
 
         .selection-list {
             border: 0;
         }
 
         .selection-list,
         .selection-content {
             .header-title {
                 margin-left: 0;
             }
         }
 
         .header {
             a:before {
                 font-size: 1.75rem;
             }
         }
     }
 }
 
 // Use icons-only on taskmenu with small screen height
 @media screen and (max-height: 640px) and (min-width: (@screen-width-small + 1px)) {
     #layout-menu .popover-header img,
     #layout-menu {
         width: @layout-menu-width-sm;
     }
 
     #taskmenu {
         a {
             height: @layout-menu-width-sm;
             width: 100%;
             font-size: 1.2rem !important;
         }
 
         .special-buttons {
             width: @layout-menu-width-sm;
         }
 
         span.inner {
             display: none;
         }
     }
 }
 
 @import "include/calendar";
 @import "include/kolab_activesync";
 @import "include/kolab_delegation";
 @import "include/kolab_files";
 @import "include/kolab_notes";
 @import "include/kolab_tags";
 @import "include/libcalendaring";
 @import "include/tasklist";