diff --git a/plugins/kolab_files/config.inc.php.dist b/plugins/kolab_files/config.inc.php.dist
index c05ed1de..7e6d1ce3 100644
--- a/plugins/kolab_files/config.inc.php.dist
+++ b/plugins/kolab_files/config.inc.php.dist
@@ -15,4 +15,13 @@ $config['kolab_files_sort_order'] = 'asc';
 // Number of concurent requests for searching and collections listing. Default: 1
 $config['kolab_files_search_threads'] = 1;
 
-?>
+// LDAP addressbook that would be searched for user names autocomplete.
+// That should be an array refering to the $config['ldap_public'] array key
+// or complete addressbook configuration array.
+$config['kolab_files_users_source'] = '';
+
+// The LDAP attribute which will be used as ACL user identifier
+$config['kolab_files_users_field'] = 'mail';
+
+// The LDAP search filter will be &'d with search queries
+$config['kolab_files_users_filter'] = '';
diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index f711fd7b..4ecdb2b4 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -6,7 +6,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2011-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
@@ -60,20 +60,16 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
           kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
       });
     }
-
-    kolab_files_init();
   }
   else if (rcmail.task == 'calendar') {
     // add "attach from cloud" button for event dialog
     if (!rcmail.env.action)
       kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
-    kolab_files_init();
   }
   else if (rcmail.task == 'tasks') {
     // add "attach from cloud" button for task dialog
     if (!rcmail.env.action)
       kolab_files_from_cloud_widget($('#taskedit-attachment-form > div.buttons'));
-    kolab_files_init();
   }
   else if (rcmail.task == 'files') {
     if (rcmail.gui_objects.filelist) {
@@ -102,21 +98,20 @@ window.rcmail && window.files_api && rcmail.addEventListener('init', function()
     }
 
     // "one file only" commands
-    rcmail.env.file_commands = ['files-get'];
+    rcmail.env.file_commands = ['files-get', 'files-rename'];
     // "one or more file" commands
     rcmail.env.file_commands_all = ['files-delete', 'files-move', 'files-copy'];
 
-    kolab_files_init();
-
-    if (rcmail.env.action == 'open') {
-      rcmail.enable_command('files-get', 'files-delete', rcmail.env.file);
+    if (rcmail.env.action == 'open' || rcmail.env.action == 'edit') {
+      rcmail.enable_command('files-get', true);
+      rcmail.enable_command('files-delete', rcmail.env.file_data.writable);
     }
     else {
-      file_api.folder_list();
-      file_api.browser_capabilities_check();
       rcmail.enable_command('folder-mount', rcmail.env.external_sources);
     }
   }
+
+  kolab_files_init();
 });
 
 
@@ -130,6 +125,8 @@ function kolab_files_init()
   if (window.file_api)
     return;
 
+  var manticore_config = {};
+
   // Initialize application object (don't change var name!)
   file_api = $.extend(new files_api(), new kolab_files_ui());
 
@@ -145,6 +142,61 @@ function kolab_files_init()
   });
 
   file_api.translations = rcmail.labels;
+
+  if (rcmail.task == 'files') {
+    if (rcmail.env.action == 'edit' && rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore) {
+      manticore_config = {
+        // UI elements
+        iframe: $('#fileframe').get(0),
+        export_menu: rcmail.gui_objects.exportmenu ? $('ul', rcmail.gui_objects.exportmenu).get(0) : null,
+        title_input: $('#document-title').get(0),
+        members_list: $('#members').get(0),
+        photo_url: '?_task=addressbook&_action=photo&_error=1&_email=%email',
+        photo_default_url: rcmail.env.photo_placeholder,
+        // events
+        ready: function(data) { manticore_init(); },
+        sessionClosed: function(data) { return manticore_close(); }
+      };
+
+      if (rcmail.env.file_data.writable)
+        manticore_config.documentChanged = function(data) { rcmail.enable_command('document-save', true); };
+    }
+    else if (rcmail.env.action == 'open') {
+      // initialize folders list (for dialogs)
+      file_api.folder_list();
+
+      // get ongoing sessions
+      file_api.request('folder_info', {folder: file_api.file_path(rcmail.env.file), sessions: 1}, 'folder_info_response');
+    }
+    else {
+      file_api.folder_list();
+      file_api.browser_capabilities_check();
+    }
+  }
+
+  if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE && !rcmail.env.framed)
+    $.extend(manticore_config, {
+      // invitation notifications
+      api: file_api,
+      owner: rcmail.env.files_user,
+      interval: rcmail.env.files_interval || 60,
+      invitationMore: true,
+      invitationChange: manticore_invitation_handler
+    });
+
+  $.extend(manticore_config, {
+    // notifications/alerts
+    gettext: function(label) { return rcmail.get_label('kolab_files.' + label); },
+    set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
+    hide_message: function(id) { return rcmail.hide_message(id); },
+    display_message: function(label, type, is_txt, timeout) {
+      if (!is_txt)
+        label = 'kolab_files.' + label;
+      return rcmail.display_message(label, type, timeout * 1000);
+    }
+  });
+
+  manticore = new manticore_api(manticore_config);
 };
 
 // returns API authorization token
@@ -380,25 +432,14 @@ function kolab_files_folder_create_dialog()
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // build parent selector
-  select.append($('<option>').val('').text('---'));
-  $.each(file_api.env.folders, function(i, f) {
-    var n, option = $('<option>'), name = escapeHTML(f.name);
-
-    for (n=0; n<f.depth; n++)
-      name = '&nbsp;&nbsp;&nbsp;' + name;
-
-    option.val(i).html(name).appendTo(select);
-
-    if (i == file_api.env.folder)
-      option.attr('selected', true);
-  });
+  file_api.folder_select_element(select, {empty: true, writable: true});
 };
 
 // folder edit dialog
 function kolab_files_folder_edit_dialog()
 {
   var dialog = $('#files-folder-edit-dialog'),
-    buttons = {}, options = [],
+    buttons = {},
     separator = file_api.env.directory_separator,
     arr = file_api.env.folder.split(separator),
     folder = arr.pop(),
@@ -436,17 +477,7 @@ function kolab_files_folder_edit_dialog()
   $('form', dialog).submit(kolab_dialog_submit_handler);
 
   // build parent selector
-  options.push($('<option>').val('').text('---'));
-  $.each(file_api.env.folders, function(i, f) {
-    var n, name = escapeHTML(f.name);
-
-    for (n=0; n<f.depth; n++)
-      name = '&nbsp;&nbsp;&nbsp;' + name;
-
-    options.push($('<option>').val(i).html(name));
-  });
-
-  select.append(options).val(path);
+  file_api.folder_select_element(select, {selected: path, empty: true});
 };
 
 // folder mounting dialog
@@ -510,14 +541,106 @@ function kolab_files_folder_mount_dialog()
   });
 };
 
-// file edition dialog
-function kolab_files_file_edit_dialog(file)
+// file edit dialog
+function kolab_files_file_edit_dialog(file, sessions, readonly)
 {
-  var dialog = $('#files-file-edit-dialog'),
+  var content = [], items = [], height = 300,
+    dialog = $('#files-file-edit-dialog'),
+    buttons = {}, name = file_api.file_name(file),
+    title = rcmail.gettext('kolab_files.editfiledialog'),
+    mainaction = rcmail.gettext('kolab_files.select'),
+    item_fn = function(id, txt, classes) {
+        return $('<label>').attr('class', 'session' + (classes ? ' ' + classes : ''))
+          .append($('<input>').attr({name: 'opt', value: id, type: 'radio'})).append($('<span>').text(txt));
+      },
+    select_fn = function(dlg) {
+      var session, input = $('input:checked', dialog), id = input.val();
+
+      if (dlg)
+        kolab_dialog_close(dlg);
+
+      if (id && input.parent().is('.session.request')) {
+        manticore.invitation_request({session_id: id});
+        return;
+      }
+
+      if (readonly && (id == 0 || !input.length))
+        return kolab_files_file_create_dialog(file);
+
+      rcmail.files_edit(id ? id : true);
+    };
+
+  // Create sessions selection
+  if (sessions && sessions.length) {
+    items.push($('<div>').text(rcmail.gettext('kolab_files.editfilesessions')));
+
+    // first display owned sessions, then invited, other at the end
+    $.each(sessions, function() {
+      if (this.is_owner) {
+        var txt = rcmail.gettext('kolab_files.ownedsession');
+        items.push(item_fn(this.id, txt, 'owner'));
+      }
+    });
+
+    if (items.length == 1)
+      items.push(item_fn(0, rcmail.gettext('kolab_files.newsession' + (readonly ? 'ro' : ''))));
+
+    $.each(sessions, function() {
+      if (this.is_invited) {
+        var txt = rcmail.gettext('kolab_files.invitedsession')
+          .replace('$user', this.owner_name ? this.owner_name : this.owner);
+        items.push(item_fn(this.id, txt, 'invited'));
+      }
+    });
+
+    $.each(sessions, function() {
+      if (!this.is_owner && !this.is_invited) {
+        var txt = rcmail.gettext('kolab_files.joinsession')
+          .replace('$user', this.owner_name ? this.owner_name : this.owner);
+        items.push(item_fn(this.id, txt, 'request'));
+      }
+    });
+
+    // check the first option
+    $('input', items[1]).attr('checked', true);
+
+    $('div', dialog).html(items);
+
+    // if there's only one session and it's owned, skip the dialog
+    if (!readonly && items.length == 2 && $('input:checked', dialog).parent().is('.owner'))
+      return select_fn();
+  }
+  // no ongoing session, folder is readonly warning
+  else {
+    title = rcmail.gettext('kolab_files.editfilerotitle');
+    height = 150;
+    $('div', dialog).text(rcmail.gettext('kolab_files.editfilero'));
+    mainaction = rcmail.gettext('kolab_files.create');
+  }
+
+  buttons[mainaction] = function() { select_fn(this); };
+  buttons[rcmail.gettext('kolab_files.cancel')] = function () {
+    kolab_dialog_close(this);
+  };
+
+  // show dialog window
+  kolab_dialog_show(dialog, {
+    title: title,
+    buttons: buttons,
+    button_classes: ['mainaction'],
+    minHeight: height - 100,
+    height: height
+  });
+};
+
+// file rename dialog
+function kolab_files_file_rename_dialog(file)
+{
+  var dialog = $('#files-file-rename-dialog'),
     buttons = {}, name = file_api.file_name(file)
     input = $('input[name="name"]', dialog).val(name);
 
-  buttons[rcmail.gettext('kolab_files.save')] = function () {
+  buttons[rcmail.gettext('kolab_files.save')] = function() {
     var folder = file_api.file_path(file), name = input.val();
 
     if (!name)
@@ -525,12 +648,12 @@ function kolab_files_file_edit_dialog(file)
 
     name = folder + file_api.env.directory_separator + name;
 
-    // @TODO: now we only update filename
     if (name != file)
       file_api.file_rename(file, name);
+
     kolab_dialog_close(this);
   };
-  buttons[rcmail.gettext('kolab_files.cancel')] = function () {
+  buttons[rcmail.gettext('kolab_files.cancel')] = function() {
     kolab_dialog_close(this);
   };
 
@@ -539,18 +662,88 @@ function kolab_files_file_edit_dialog(file)
 
   // show dialog window
   kolab_dialog_show(dialog, {
-    title: rcmail.gettext('kolab_files.fileedit'),
+    title: rcmail.gettext('kolab_files.renamefile'),
     buttons: buttons,
-    button_classes: ['mainaction']
+    button_classes: ['mainaction'],
+    minHeight: 100,
+    height: 200
   });
 };
 
+// file creation (or cloning) dialog
+function kolab_files_file_create_dialog(file)
+{
+  var buttons = {}, action = file ? 'copy' : 'create',
+    dialog = $('#files-file-create-dialog'),
+    type_select = $('select[name="type"]', dialog),
+    select = $('select[name="parent"]', dialog).html(''),
+    input = $('input[name="name"]', dialog).val(''),
+    create_func = function(dialog, editaction) {
+      var sel, folder = select.val(), type = type_select.val(), name = input.val();
+
+      if (!name || !folder)
+        return;
+
+      if (!/\.[a-z0-9]{1,5}$/.test(name)) {
+        name += '.' + rcmail.env.file_extensions[type];
+      }
+
+      name = folder + file_api.env.directory_separator + name;
+
+      // get type of cloned file
+      if (file) {
+        if (rcmail.env.file_data)
+          type = rcmail.env.file_data.type;
+        else {
+          sel = rcmail.file_list.get_selection();
+          type = $('#rcmrow' + sel[0]).data('type');
+        }
+      }
+
+      file_api.file_create(name, type, editaction, file);
+      kolab_dialog_close(dialog);
+  };
+
+  buttons[rcmail.gettext('kolab_files.' + action + 'andedit')] = function() {
+    create_func(this, true);
+  };
+
+  if (action == 'create') {
+    buttons[rcmail.gettext('kolab_files.create')] = function() {
+      create_func(this);
+    };
+    type_select.parent('tr').show();
+  }
+  else {
+    input.val(file_api.file_name(file));
+    type_select.parent('tr').hide();
+  }
+
+  buttons[rcmail.gettext('kolab_files.cancel')] = function() {
+    kolab_dialog_close(this);
+  };
+
+  // Fix submitting form with Enter
+  $('form', dialog).submit(kolab_dialog_submit_handler);
+
+  // show dialog window
+  kolab_dialog_show(dialog, {
+    title: rcmail.gettext('kolab_files.' + action + 'file'),
+    buttons: buttons,
+    button_classes: ['mainaction'],
+    minHeight: 150,
+    height: 250
+  });
+
+  // build folder selector
+  file_api.folder_select_element(select, {writable: true});
+};
+
 function kolab_dialog_show(content, params, onopen)
 {
   params = $.extend({
     modal: true,
     resizable: true,
-    closeOnEscape: (!bw.ie6 && !bw.ie7),  // disabled for performance reasons
     minWidth: 400,
     minHeight: 300,
     width: 500,
@@ -573,6 +766,8 @@ function kolab_dialog_show(content, params, onopen)
     }
 
     (elem && elem.length ? elem : window).focus();
+
+    rcmail.ksearch_blur();
   };
 
   // display it as popup
@@ -660,7 +855,7 @@ function kolab_files_upload_input(button)
 
 // for reordering column array (Konqueror workaround)
 // and for setting some message list global variables
-kolab_files_list_coltypes = function()
+function kolab_files_list_coltypes()
 {
   var n, list = rcmail.file_list;
 
@@ -674,7 +869,7 @@ kolab_files_list_coltypes = function()
   list.init_header();
 };
 
-kolab_files_set_list_options = function(cols, sort_col, sort_order)
+function kolab_files_set_list_options(cols, sort_col, sort_order)
 {
   var update = 0, i, idx, name, newcols = [], oldcols = rcmail.env.file_coltypes;
 
@@ -719,7 +914,7 @@ kolab_files_set_list_options = function(cols, sort_col, sort_order)
   }
 };
 
-kolab_files_set_coltypes = function(list)
+function kolab_files_set_coltypes(list)
 {
   var i, found, name, cols = list.list.tHead.rows[0].cells;
 
@@ -738,12 +933,12 @@ kolab_files_set_coltypes = function(list)
   rcmail.http_post('files/prefs', {kolab_files_list_cols: rcmail.env.file_coltypes});
 };
 
-kolab_files_list_dblclick = function(list)
+function kolab_files_list_dblclick(list)
 {
   rcmail.command('files-open');
 };
 
-kolab_files_list_select = function(list)
+function kolab_files_list_select(list)
 {
   var selected = list.selection.length;
 
@@ -758,20 +953,21 @@ kolab_files_list_select = function(list)
     // get file mimetype
     var elem = $('tr.selected', list.list),
       type = elem.data('type'),
-      file = elem.data('file');
+      folder = file_api.file_path(elem.data('file'));
 
-    rcmail.env.viewer = file_api.file_type_supported(type);
+    rcmail.env.viewer = file_api.file_type_supported(type, rcmail.env.files_caps);
 
-    if (!file_api.is_writable(file.replace(/\/[^/]+$/, '')))
-      rcmail.enable_command('files-delete', false);
+    if (!file_api.is_writable(folder))
+      rcmail.enable_command('files-delete', 'files-rename', false);
   }
   else
     rcmail.env.viewer = 0;
 
+  rcmail.enable_command('files-edit', (rcmail.env.viewer & 4) == 4);
   rcmail.enable_command('files-open', rcmail.env.viewer);
 };
 
-kolab_files_list_keypress = function(list)
+function kolab_files_list_keypress(list)
 {
   if (list.modkey == CONTROL_KEY)
     return;
@@ -782,7 +978,7 @@ kolab_files_list_keypress = function(list)
     rcmail.command('files-delete');
 };
 
-kolab_files_drag_start = function(e)
+function kolab_files_drag_start(e)
 {
   rcmail.env.drag_target = null;
 
@@ -790,7 +986,7 @@ kolab_files_drag_start = function(e)
     rcmail.folder_list.drag_start();
 };
 
-kolab_files_drag_end = function(e)
+function kolab_files_drag_end(e)
 {
   if (rcmail.folder_list) {
     rcmail.folder_list.drag_end();
@@ -812,7 +1008,7 @@ kolab_files_drag_end = function(e)
   }
 };
 
-kolab_files_drag_move = function(e)
+function kolab_files_drag_move(e)
 {
   if (rcmail.folder_list) {
     var mouse = rcube_event.get_mouse_pos(e);
@@ -821,7 +1017,7 @@ kolab_files_drag_move = function(e)
   }
 };
 
-kolab_files_drag_menu_action = function(command)
+function kolab_files_drag_menu_action(command)
 {
   var menu = rcmail.gui_objects.file_dragmenu;
 
@@ -831,7 +1027,7 @@ kolab_files_drag_menu_action = function(command)
   rcmail.command(command, rcmail.env.drag_target);
 };
 
-kolab_files_selected = function()
+function kolab_files_selected()
 {
   var files = [];
   $.each(rcmail.file_list.get_selection(), function(i, v) {
@@ -844,18 +1040,24 @@ kolab_files_selected = function()
   return files;
 };
 
-kolab_files_frame_load = function(frame)
+function kolab_files_frame_load(frame)
 {
-  var win = frame.contentWindow;
+  var win = frame.contentWindow,
+    info = rcmail.env.file_data;
 
-  rcmail.file_editor = win.file_editor && win.file_editor.editable ? win.file_editor : null;
+  try {
+    rcmail.file_editor = win.file_editor && win.file_editor.editable ? win.file_editor : null;
+  }
+  catch (e) {};
 
-  if (rcmail.file_editor)
-    rcmail.enable_command('files-edit', true);
-
-  rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable) ||
-    (rcmail.env.file_data && /^image\//i.test(rcmail.env.file_data.type)));
+  // on edit page switch immediately to edit mode
+  if (rcmail.file_editor && rcmail.env.action == 'edit')
+    rcmail.files_edit();
 
+  rcmail.enable_command('files-edit', rcmail.file_editor
+    || (info && info.viewer && info.viewer.manticore));
+  rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable)
+    || (info && /^image\//i.test(info.type)));
   // detect Print button and check if it can be accessed
   try {
     if ($('#fileframe').contents().find('#print').length)
@@ -865,7 +1067,7 @@ kolab_files_frame_load = function(frame)
 };
 
 // activate html5 file drop feature (if browser supports it)
-kolab_files_drag_drop_init = function(container)
+function kolab_files_drag_drop_init(container)
 {
   if (!window.FormData && !(window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary)) {
     return;
@@ -897,7 +1099,7 @@ kolab_files_drag_drop_init = function(container)
 
 
 // handler for drag/drop on element
-kolab_files_drag_hover = function(e)
+function kolab_files_drag_hover(e)
 {
   if (!file_api.is_writable())
     return;
@@ -914,7 +1116,7 @@ kolab_files_drag_hover = function(e)
 };
 
 // returns localized file size
-kolab_files_file_size = function(size)
+function kolab_files_file_size(size)
 {
   var i, units = ['GB', 'MB', 'KB', 'B'];
 
@@ -927,7 +1129,7 @@ kolab_files_file_size = function(size)
   return size;
 };
 
-kolab_files_progress_str = function(param)
+function kolab_files_progress_str(param)
 {
   var current, total = file_api.file_size(param.total).toUpperCase();
 
@@ -949,6 +1151,333 @@ kolab_files_progress_str = function(param)
 };
 
 
+/**********************************************************/
+/*********    Manticore editor functionality     **********/
+/**********************************************************/
+
+// Initialize document toolbar functionality
+function manticore_init()
+{
+  var info = rcmail.env.file_data;
+
+  rcmail.enable_command('document-export', true);
+
+  if (info && info.session && info.session.is_owner)
+    rcmail.enable_command('document-close', 'document-editors', true);
+};
+
+// executed on editing session termination
+function manticore_close()
+{
+  $('<div>').addClass('popupdialog').attr('role', 'alertdialog')
+    .html($('<span>').text(rcmail.gettext('kolab_files.sessionterminated')))
+    .dialog({
+      resizable: false,
+      closeOnEscape: true,
+      dialogClass: 'popupmessage error',
+      title: rcmail.gettext('kolab_files.sessionterminatedtitle'),
+      close: function() { window.close(); },
+      position: ['center', 'center'],
+      width: 420,
+      minHeight: 90
+    }).show();
+
+  return false; // skip Chwala's error message
+};
+
+rcube_webmail.prototype.document_save = function()
+{
+  manticore.save(function(data) {
+    rcmail.enable_command('document-save', false);
+  });
+};
+
+rcube_webmail.prototype.document_export = function(type)
+{
+  manticore.export(type || 'odt');
+};
+
+rcube_webmail.prototype.document_editors = function()
+{
+  kolab_files_editors_dialog();
+};
+
+// close editing session
+rcube_webmail.prototype.document_close = function()
+{
+  // check document "unsaved changes" state and display a warning
+  if (this.commands['document-save'] && !confirm(this.gettext('kolab_files.unsavedchanges')))
+    return;
+
+  file_api.document_delete(this.env.file_data.session.id);
+};
+
+// document editors management dialog
+function kolab_files_editors_dialog(session)
+{
+  var items = [], buttons = {},
+    info = rcmail.env.file_data,
+    dialog = $('#document-editors-dialog'),
+    comment = $('#invitation-comment');
+
+  if (!info || !info.session || !info.session.is_owner)
+    return;
+
+  // always add the session organizer
+  items.push(kolab_files_attendee_record(info.session.owner, 'organizer'));
+
+  $.each(info.session.invitations || [], function(i, u) {
+    var record = kolab_files_attendee_record(u.user, u.status, u.user_name);
+    items.push(record);
+    info.session.invitations[i].record = record;
+  });
+
+  $('table > tbody', dialog).html(items);
+
+  buttons[rcmail.gettext('kolab_files.close')] = function() {
+    kolab_dialog_close(this);
+  };
+
+  // show dialog window
+  kolab_dialog_show(dialog, {
+    title: rcmail.gettext('kolab_files.manageeditors'),
+    buttons: buttons,
+    button_classes: ['mainaction']
+  });
+
+  if (!rcmail.env.editors_dialog) {
+    rcmail.env.editors_dialog = dialog;
+    rcmail.init_address_input_events($('#invitation-editor-name'), {action: 'files/autocomplete'});
+
+    rcmail.addEventListener('autocomplete_insert', function(e) {
+      var success = false;
+      if (e.field.name == 'participant') {
+        // e.data && e.data.type == 'group' ? 'GROUP' : 'INDIVIDUAL'
+        success = kolab_files_add_attendees(e.insert, comment.val());
+      }
+      if (e.field && success) {
+        e.field.value = '';
+      }
+    });
+
+    $('#invitation-editor-add').click(function() {
+      var input = $('#invitation-editor-name');
+      rcmail.ksearch_blur();
+      if (kolab_files_add_attendees(input.val(), comment.val())) {
+        input.val('');
+      }
+    });
+  }
+};
+
+// add the given list of participants
+function kolab_files_add_attendees(names, comment)
+{
+  var i, item, success, email, name, attendees = {}, counter = 0;
+
+  names = file_api.explode_quoted_string(names.replace(/,\s*$/, ''), ',');
+
+  // parse name/email pairs
+  for (i = 0; i < names.length; i++) {
+    email = name = '';
+    item = $.trim(names[i]);
+
+    if (!item.length) {
+      continue;
+    } // address in brackets without name (do nothing)
+    else if (item.match(/^<[^@]+@[^>]+>$/)) {
+      email = item.replace(/[<>]/g, '');
+    } // address without brackets and without name (add brackets)
+    else if (rcube_check_email(item)) {
+      email = item;
+    } // address with name
+    else if (item.match(/([^\s<@]+@[^>]+)>*$/)) {
+      email = RegExp.$1;
+      name = item.replace(email, '').replace(/^["\s<>]+/, '').replace(/["\s<>]+$/, '');
+    }
+
+    if (email) {
+      attendees[email] = {user: email, name: name};
+      counter++;
+    }
+    else {
+      alert(rcmail.gettext('noemailwarning'));
+    }
+  }
+
+  success = counter > 0;
+
+  // remove already existing entries
+  if (counter) {
+    if (attendees[rcmail.env.file_data.session.owner]) {
+      delete attendees[this.user];
+      counter--;
+    }
+    $.each(rcmail.env.file_data.session.invitations || [], function() {
+      if (this.user in attendees) {
+        delete attendees[this.user];
+        counter--;
+      }
+    });
+  }
+
+  if (counter)
+    file_api.document_invite(rcmail.env.file_data.session.id, attendees, comment);
+
+  return success;
+};
+
+function kolab_files_attendee_record(user, status, username)
+{
+  var options = [], select,
+    type = status ? status.replace(/-.*$/, '') : '',
+    name = $('<td class="name">').text(user),
+    buttons = $('<td class="options">'),
+    state = $('<td class="status">').text(rcmail.gettext('kolab_files.status' + type));
+
+  // @todo: accept/decline invitation request
+  if (type == 'requested' || status == 'accepted-owner' || status == 'declined-owner') {
+    select = $('<select>').change(function() {
+        var val = $(this).val(), map = {accepted: 'invitation_accept', declined: 'invitation_decline'};
+        if (map[val])
+          manticore[map[val]]({user: user, session_id: rcmail.env.file_data.session.id});
+      });
+
+    if (type == 'requested')
+      options.push($('<option>').text(rcmail.gettext('kolab_files.statusrequested')).attr('value', 'requested'));
+
+    options.push($('<option>').text(rcmail.gettext('kolab_files.statusaccepted')).attr('value', 'accepted'));
+    options.push($('<option>').text(rcmail.gettext('kolab_files.statusdeclined')).attr('value', 'declined'));
+
+    state.html(select.html(options).val(type));
+  }
+
+  // delete button
+  if (status != 'organizer') {
+    $('<a>').attr({'class': 'delete', href: '#', title: rcmail.gettext('kolab_files.removeparticipant')})
+      .click(function() {
+        file_api.document_cancel(rcmail.env.file_data.session.id, [user]);
+      })
+      .appendTo(buttons);
+  }
+
+  if (username && status != 'organizer')
+    name.html($('<a>').attr({href: 'mailto:' + user, 'class': 'mailtolink'}).text(username))
+      .click(function(e) { rcmail.command('compose', user, e.target, e); return false; });
+
+  return $('<tr>').attr('class', 'invitation' + (type ? ' ' + type : ''))
+      .append(name).append(state).append(buttons);
+};
+
+function manticore_invitation_handler(invitation)
+{
+  // make the "More" link clickable
+  $('#' + invitation.id).parent('div').click(function() { kolab_files_invitation_dialog(invitation); });
+};
+
+function kolab_files_invitation_dialog(invitation)
+{
+  var text, records = [], content = [], buttons = {},
+    dialog = $('#document-invitation-dialog'),
+    data_map = {status: 'status', 'changed': 'when', filename: 'file', comment: 'comment'},
+    record_fn = function(type, label, value) {
+        records.push($('<tr>').attr('class', type)
+          .append($('<td class="label">').text(rcmail.gettext('kolab_files.'+ label)))
+          .append($('<td>').text(value))
+        );
+      };
+    join_session = function() {
+        var viewer = file_api.file_type_supported('application/vnd.oasis.opendocument.text', rcmail.env.files_caps);
+          params = {action: 'edit', session: invitation.session_id};
+
+        file_api.file_open('', viewer, params);
+      };
+
+  if (!dialog.length)
+    dialog = $('<div>').attr({id: 'document-invitation-dialog', role: 'dialog', 'aria-hidden': 'true'})
+      .append($('<div>'))
+      .appendTo(document.body);
+
+  if (!invitation.is_session_owner) {
+    if (invitation.status == 'invited') {
+      text = manticore.invitation_msg(invitation);
+
+      buttons[rcmail.gettext('kolab_files.join')] = function() {
+        join_session();
+        kolab_dialog_close(this);
+      };
+      buttons[rcmail.gettext('kolab_files.accept')] = function() {
+        manticore.invitation_accept(invitation);
+        kolab_dialog_close(this);
+      };
+      buttons[rcmail.gettext('kolab_files.decline')] = function() {
+        manticore.invitation_decline(invitation);
+        kolab_dialog_close(this);
+      };
+    }
+    else if (invitation.status == 'declined-owner') {
+      // @todo: add option to request for an invitation again?
+      text = manticore.invitation_msg(invitation);
+    }
+    else if (invitation.status == 'accepted-owner') {
+      text = manticore.invitation_msg(invitation);
+
+      buttons[rcmail.gettext('kolab_files.join')] = function() {
+        join_session();
+        kolab_dialog_close(this);
+      };
+    }
+  }
+  else {
+    if (invitation.status == 'accepted') {
+      text = manticore.invitation_msg(invitation);
+    }
+    else if (invitation.status == 'declined') {
+      // @todo: add option to invite the user again?
+      text = manticore.invitation_msg(invitation);
+    }
+    else if (invitation.status == 'requested') {
+      text = manticore.invitation_msg(invitation);
+
+      buttons[rcmail.gettext('kolab_files.accept')] = function() {
+        manticore.invitation_accept(invitation);
+        kolab_dialog_close(this);
+      };
+      buttons[rcmail.gettext('kolab_files.decline')] = function() {
+        manticore.invitation_decline(invitation);
+        kolab_dialog_close(this);
+      };
+    }
+  }
+
+  if (text) {
+    $.each(data_map, function(i, label) {
+      var value = invitation[i];
+      if (value) {
+        if (i == 'status')
+          value = rcmail.gettext('kolab_files.status' + value.replace(/-.*$/, ''));
+
+        record_fn(i, label, value);
+      }
+    });
+
+    content.push($('<div>').text(text));
+    content.push($('<table class="propform">').html(records));
+  }
+
+  buttons[rcmail.gettext('kolab_files.close')] = function() {
+    kolab_dialog_close(this);
+  };
+
+  $('div', dialog).html(content);
+
+  // show dialog window
+  kolab_dialog_show(dialog, {
+    title: rcmail.gettext('kolab_files.invitationtitle').replace('$file', invitation.filename),
+    buttons: buttons
+  });
+};
+
 /***********************************************************/
 /**********              Commands                 **********/
 /***********************************************************/
@@ -1033,7 +1562,6 @@ rcube_webmail.prototype.files_list_update = function(head)
 {
   var list = this.file_list;
 
-  list.clear();
   $('thead', list.fixed_header ? list.fixed_header : list.list).html(head);
   kolab_files_list_coltypes();
   file_api.file_list();
@@ -1056,14 +1584,48 @@ rcube_webmail.prototype.files_open = function()
 };
 
 // enable file editor
-rcube_webmail.prototype.files_edit = function()
+rcube_webmail.prototype.files_edit = function(session)
 {
-  if (this.file_editor) {
+  var files, readonly, sessions, file = this.env.file,
+    params = {action: 'edit'};
+
+  if (!file && !this.env.action) {
+    files = kolab_files_selected();
+    if (files.length == 1)
+      file = files[0];
+    readonly = !file_api.is_writable(file_api.file_path(file));
+  }
+  else {
+    readonly = !this.env.file_data.writable;
+  }
+
+  // check if the folder is read-only or there are ongoing sessions
+  // in such cases display dialog for the user to decide what to do
+  if (!session) {
+    sessions = file_api.file_sessions(file);
+    if (sessions.length || readonly) {
+      kolab_files_file_edit_dialog(file, sessions, readonly);
+      return;
+    }
+  }
+  else if (session !== true)
+    params.session = session;
+
+  if (this.file_editor && !session) {
     this.file_editor.enable();
     this.enable_command('files-save', true);
   }
+  else if (this.env.file) {
+    var viewer = file_api.file_type_supported(this.env.file_data.type, this.env.files_caps);
+    params.local = true;
+    file_api.file_open(file, viewer, params);
+  }
+  else if (file) {
+    file_api.file_open(file, this.env.viewer, params);
+  }
 };
 
+// save changes to the file
 rcube_webmail.prototype.files_save = function()
 {
   if (!this.file_editor)
@@ -1130,6 +1692,17 @@ rcube_webmail.prototype.files_set_quota = function(p)
   this.set_quota(p);
 };
 
+rcube_webmail.prototype.files_create = function()
+{
+  kolab_files_file_create_dialog();
+};
+
+rcube_webmail.prototype.files_rename = function()
+{
+  var files = kolab_files_selected();
+  kolab_files_file_rename_dialog(files[0]);
+};
+
 rcube_webmail.prototype.folder_create = function()
 {
   kolab_files_folder_create_dialog();
@@ -1154,6 +1727,7 @@ function kolab_files_ui()
 {
   this.requests = {};
   this.uploads = [];
+  this.workers = {};
 
 /*
   // Called on "session expired" session
@@ -1311,11 +1885,14 @@ function kolab_files_ui()
     else if (first)
       rcmail.folder_list.select(first);
 
+    rcmail.enable_command('files-create', true);
+
     // add tree icons
 //    this.folder_list_tree(this.env.folders);
 
     // handle authentication errors on external sources
-    this.folder_list_auth_errors(response.result);
+    if (elem.length)
+      this.folder_list_auth_errors(response.result);
   };
 
   this.folder_select = function(folder)
@@ -1822,11 +2399,18 @@ function kolab_files_ui()
       params = {};
 
     // reset all pending list requests
-    for (i in this.requests) {
-      this.requests[i].abort();
+    $.each(this.requests, function(i, v) {
+      v.abort();
       rcmail.hide_message(i);
-      delete this.requests[i];
-    }
+    });
+
+    // reset folder_info workers
+    $.each(this.workers, function(i, v) {
+      clearTimeout(v);
+    });
+
+    this.workers = {};
+    this.requests = {};
 
     if (params.all_folders) {
       params.collection = null;
@@ -1887,6 +2471,10 @@ function kolab_files_ui()
 
     this.env.file_list = list;
     rcmail.file_list.resize();
+
+    // update document sessions info of this folder
+    if (list && list.length)
+      this.request('folder_info', {folder: this.file_path(list[0].filename), sessions: 1}, 'folder_info_response');
   };
 
   // call file_list request for every folder (used for search and virt. collections)
@@ -1959,7 +2547,7 @@ function kolab_files_ui()
     // lock table, other list responses will wait
     this.env.folders_loop_lock = true;
 
-    var n, i, len, elem, list = [], rows = [],
+    var n, i, len, elem, row, folder, list = [],
       index = this.env.file_list.length,
       table = rcmail.file_list;
 
@@ -1969,11 +2557,15 @@ function kolab_files_ui()
         if (this.sort_compare(elem, result[i]) < 0)
           break;
 
-        var row = this.file_list_row(i, result[i], ++index);
+        row = this.file_list_row(i, result[i], ++index);
         table.insert_row(row, elem.row);
         result[i].row = row;
         result[i].filename = i;
         list.push(result[i]);
+
+        if (!folder)
+          folder = this.file_path(i);
+
         delete result[i];
       }
 
@@ -1987,10 +2579,17 @@ function kolab_files_ui()
       result[key].row = row;
       result[key].filename = key;
       list.push(result[key]);
+
+      if (!folder)
+        folder = file_api.file_path(key);
     });
 
     this.env.file_list = list;
     this.env.folders_loop_lock = false;
+
+    // update document sessions info of this folder
+    if (folder)
+      this.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response');
   };
 
   // sort files list (without API request)
@@ -2044,10 +2643,6 @@ function kolab_files_ui()
       .html(row)
       .attr({id: 'rcmrow' + index, 'data-file': file, 'data-type': data.type});
 
-    $('td.options > span', row).click(function(e) {
-      kolab_files_file_edit_dialog(file);
-    });
-
     // collection (or search) lists files from all folders
     // display file name with full path as title
     if (!this.env.folder)
@@ -2074,6 +2669,51 @@ function kolab_files_ui()
     }
   };
 
+  // handler for folder info response
+  this.folder_info_response = function(response)
+  {
+    if (!this.response(response) || !response.result)
+      return;
+
+    var folder = response.result.folder,
+      prefix = folder + file_api.env.directory_separator;
+
+    if (response.result.sessions)
+      this.sessions[folder] = response.result.sessions;
+
+    // update files list with document session info
+    $.each(file_api.env.file_list || [], function(i, file) {
+      // skip files from a different folder (in multi-folder listing)
+      if (file.filename.indexOf(prefix) !== 0)
+        return;
+
+      var classes = [];
+
+      if ($(file.row).is('.selected'))
+        classes.push('selected');
+
+      $.each(response.result.sessions || [], function(session_id, session) {
+        if (file.filename == session.file) {
+          if ($.inArray('session', classes) < 0)
+            classes.push('session');
+
+          if (session.is_owner && $.inArray('owner', classes) < 0)
+            classes.push('owner');
+          else if (session.is_invited && $.inArray('invited', classes) < 0)
+            classes.push('invited');
+        }
+      });
+
+      $(file.row).attr('class', classes.join(' '));
+    });
+
+    // refresh sessions info in time intervals
+    if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE && (rcmail.file_list || rcmail.env.file))
+      this.workers[folder] = setTimeout(function() {
+        file_api.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response');
+      }, (rcmail.env.files_interval || 60) * 1000);
+  };
+
   this.file_get = function(file, params)
   {
     if (!params)
@@ -2272,6 +2912,40 @@ function kolab_files_ui()
     }
   };
 
+  // file(s) create (or clone) request
+  this.file_create = function(file, type, edit, cloneof)
+  {
+    this.file_create_edit_file = edit ? file : null;
+    this.file_create_edit_type = edit ? type : null;
+    this.file_create_folder = this.file_path(file);
+
+    if (cloneof) {
+      this.req = this.set_busy(true, 'kolab_files.filecopying');
+      this.request('file_copy', {file: cloneof, 'new': file}, 'file_create_response');
+    }
+    else {
+      this.req = this.set_busy(true, 'kolab_files.filecreating');
+      this.request('file_create', {file: file, 'content-type': type, content: ''}, 'file_create_response');
+    }
+  };
+
+  // file(s) create response handler
+  this.file_create_response = function(response)
+  {
+    if (!this.response(response))
+      return;
+
+    // @TODO: we could update metadata instead
+    if (this.file_create_folder == this.env.folder)
+      this.file_list();
+
+    // open the file for editing if editable
+    if (this.file_create_edit_file) {
+      var viewer = this.file_type_supported(this.file_create_edit_type, rcmail.env.files_caps);
+      this.file_open(this.file_create_edit_file, viewer, {action: 'edit'});
+    }
+  };
+
   // file(s) rename request
   this.file_rename = function(oldfile, newfile)
   {
@@ -2550,10 +3224,27 @@ function kolab_files_ui()
   };
 
   // open file in new window, using file API viewer
-  this.file_open = function(file, viewer)
+  this.file_open = function(file, viewer, params)
   {
-    var href = '?' + $.param({_task: 'files', _action: 'open', file: file, viewer: viewer == 2 ? 1 : 0});
-    rcmail.open_window(href, false, true);
+    var args = {
+      _task: 'files',
+      _action: params && params.action ? params.action : 'open',
+      _file: file,
+      _viewer: viewer || 0,
+    };
+
+    if (params && params.session)
+      args._session = params.session;
+
+    if (rcmail.env.extwin)
+      args._extwin = 1;
+
+    href = '?' + $.param(args);
+
+    if (params && params.local)
+      location.href = href;
+    else
+      rcmail.open_window(href, false, true);
   };
 
   // save file
@@ -2585,6 +3276,85 @@ function kolab_files_ui()
     }
   };
 
+  // document session delete request
+  this.document_delete = function(id)
+  {
+    this.req = this.set_busy(true, 'kolab_files.sessionterminating');
+    this.request('document_delete', {id: id}, 'document_delete_response');
+  };
+
+  // document session delete response handler
+  this.document_delete_response = function(response)
+  {
+    if (!this.response(response))
+      return;
+
+    if (rcmail.task == 'files' && rcmail.env.action == 'edit')
+      window.close();
+
+    // @todo: force sessions info update
+  };
+
+  // Invite document session participants
+  this.document_invite = function(id, attendees, comment)
+  {
+    var list = [];
+
+    // expect attendees to be email => name hash
+    $.each(attendees || {}, function() { list.push(this); });
+
+    if (list.length) {
+      this.req = this.set_busy(true, 'kolab_files.documentinviting');
+      this.request('document_invite', {id: id, users: list, comment: comment || ''}, 'document_invite_response');
+    }
+  };
+
+  // document invite response handler
+  this.document_invite_response = function(response)
+  {
+    if (!this.response(response) || !response.result)
+      return;
+
+    var info = rcmail.env.file_data,
+      table = $('#document-editors-dialog table > tbody');
+
+    $.each(response.result.list || {}, function() {
+      var record = kolab_files_attendee_record(this.user, this.status, this.user_name);
+      table.append(record);
+      if (info.session && info.session.invitations)
+        info.session.invitations.push($.extend({status: 'invited', record: record}, this));
+    });
+  };
+
+  // Cancel invitations to an editing session
+  this.document_cancel = function(id, attendees)
+  {
+    if (attendees.length) {
+      this.req = this.set_busy(true, 'kolab_files.documentcancelling');
+      this.request('document_cancel', {id: id, users: attendees}, 'document_cancel_response');
+    }
+  };
+
+  // document_cancel response handler
+  this.document_cancel_response = function(response)
+  {
+    if (!this.response(response) || !response.result)
+      return;
+
+    var info = rcmail.env.file_data;
+
+    $.each(response.result.list || {}, function(i, user) {
+      var invitations = [];
+      $.each(info.session.invitations, function(i, u) {
+        if (u.user == user && u.record)
+          u.record.remove();
+        else
+          invitations.push(u);
+      });
+      info.session.invitations = invitations;
+    });
+  };
+
   // handle auth errors on folder list
   this.folder_list_auth_errors = function(result)
   {
diff --git a/plugins/kolab_files/kolab_files.php b/plugins/kolab_files/kolab_files.php
index 9ff9a2a3..acbf9f8b 100644
--- a/plugins/kolab_files/kolab_files.php
+++ b/plugins/kolab_files/kolab_files.php
@@ -49,6 +49,8 @@ class kolab_files extends rcube_plugin
         $this->register_action('index', array($this, 'actions'));
         $this->register_action('prefs', array($this, 'actions'));
         $this->register_action('open',  array($this, 'actions'));
+        $this->register_action('edit',  array($this, 'actions'));
+        $this->register_action('autocomplete', array($this, 'autocomplete'));
 
         // we use libkolab::http_request() from libkolab with its configuration
         $this->require_plugin('libkolab');
@@ -76,7 +78,7 @@ class kolab_files extends rcube_plugin
                 return $this->engine = false;
             }
 
-            require_once $this->home . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'kolab_files_engine.php';
+            require_once $this->home . '/lib/kolab_files_engine.php';
 
             $this->engine = new kolab_files_engine($this, $url);
         }
@@ -131,4 +133,16 @@ class kolab_files extends rcube_plugin
             $engine->actions();
         }
     }
+
+    /**
+     * Handler for user autocomplete request
+     */
+    function autocomplete()
+    {
+        $this->load_config();
+
+        require_once $this->home . '/lib/kolab_files_autocomplete.php';
+
+        new kolab_files_autocomplete($this);
+    }
 }
diff --git a/plugins/kolab_files/lib/kolab_files_autocomplete.php b/plugins/kolab_files/lib/kolab_files_autocomplete.php
new file mode 100644
index 00000000..5b2b8be3
--- /dev/null
+++ b/plugins/kolab_files/lib/kolab_files_autocomplete.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * Kolab files collaborators autocompletion
+ *
+ * @version @package_version@
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2013-2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_files_autocomplete
+{
+    private $plugin;
+    private $rc;
+
+
+    /**
+     * Class constructor
+     */
+    public function __construct($plugin)
+    {
+        $this->plugin = $plugin;
+        $this->rc     = rcube::get_instance();
+
+        $search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
+        $reqid  = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
+        $users  = array();
+        $keys   = array();
+
+        if ($this->init_ldap()) {
+            $max  = (int) $this->rc->config->get('autocomplete_max', 15);
+            $mode = (int) $this->rc->config->get('addressbook_search_mode');
+            $me   = $this->rc->get_user_name();
+
+            $this->ldap->set_pagesize($max);
+            $result = $this->ldap->search('*', $search, $mode);
+
+            foreach ($result->records as $record) {
+                $user = $record['uid'];
+
+                if (is_array($user)) {
+                    $user = array_filter($user);
+                    $user = $user[0];
+                }
+
+                if (in_array($me, rcube_addressbook::get_col_values('email', $record, true))) {
+                    continue;
+                }
+
+                if ($user) {
+                    $display = rcube_addressbook::compose_search_name($record);
+                    $user    = array('name' => $user, 'display' => $display);
+                    $users[] = $user;
+                    $keys[]  = $display ?: $user['name'];
+                }
+            }
+/*
+            if ($this->rc->config->get('kolab_files_groups')) {
+                $prefix      = $this->rc->config->get('kolab_files_group_prefix');
+                $group_field = $this->rc->config->get('kolab_files_group_field', 'name');
+                $result      = $this->ldap->list_groups($search, $mode);
+
+                foreach ($result as $record) {
+                    $group    = $record['name'];
+                    $group_id = is_array($record[$group_field]) ? $record[$group_field][0] : $record[$group_field];
+
+                    if ($group) {
+                        $users[] = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group, 'type' => 'group');
+                        $keys[]  = $group;
+                    }
+                }
+            }
+*/
+        }
+
+        if (count($users)) {
+            // sort users index
+            asort($keys, SORT_LOCALE_STRING);
+            // re-sort users according to index
+            foreach ($keys as $idx => $val) {
+                $keys[$idx] = $users[$idx];
+            }
+            $users = array_values($keys);
+        }
+
+        $this->rc->output->command('ksearch_query_results', $users, $search, $reqid);
+        $this->rc->output->send();
+    }
+
+    /**
+     * Initializes autocomplete LDAP backend
+     */
+    private function init_ldap()
+    {
+        if ($this->ldap) {
+            return $this->ldap->ready;
+        }
+
+        // get LDAP config
+        $config = $this->rc->config->get('kolab_files_users_source');
+
+        if (empty($config)) {
+            return false;
+        }
+
+        // not an array, use configured ldap_public source
+        if (!is_array($config)) {
+            $ldap_config = (array) $this->rc->config->get('ldap_public');
+            $config      = $ldap_config[$config];
+        }
+
+        $uid_field = $this->rc->config->get('kolab_files_users_field', 'mail');
+        $filter    = $this->rc->config->get('kolab_files_users_filter');
+        $debug     = $this->rc->config->get('ldap_debug');
+        $domain    = $this->rc->config->mail_domain($_SESSION['imap_host']);
+
+        if (empty($uid_field) || empty($config)) {
+            return false;
+        }
+
+        // get name attribute
+        if (!empty($config['fieldmap'])) {
+            $name_field = $config['fieldmap']['name'];
+        }
+        // ... no fieldmap, use the old method
+        if (empty($name_field)) {
+            $name_field = $config['name_field'];
+        }
+
+        // add UID field to fieldmap, so it will be returned in a record with name
+        $config['fieldmap']['name'] = $name_field;
+        $config['fieldmap']['uid']  = $uid_field;
+
+        // search in UID and name fields
+        // $name_field can be in a form of <field>:<modifier> (#1490591)
+        $name_field = preg_replace('/:.*$/', '', $name_field);
+        $search     = array_unique(array($name_field, $uid_field));
+
+        $config['search_fields']   = $search;
+        $config['required_fields'] = array($uid_field);
+
+        // set search filter
+        if ($filter) {
+            $config['filter'] = $filter;
+        }
+
+        // disable vlv
+        $config['vlv'] = false;
+
+        // Initialize LDAP connection
+        $this->ldap = new rcube_ldap($config, $debug, $domain);
+
+        return $this->ldap->ready;
+    }
+}
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index dc78e0a6..2118a6d1 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -6,7 +6,7 @@
  * @version @package_version@
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2013-2015, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -124,15 +124,27 @@ class kolab_files_engine
         }
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/style.css');
+        $this->plugin->include_script($this->url . '/js/files_api.js');
+        $this->plugin->include_script('kolab_files.js');
+
+        $this->rc->output->set_env('files_url', $this->url . '/api/');
+        $this->rc->output->set_env('files_token', $this->get_api_token());
+        $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
+        $this->rc->output->set_env('files_user', $this->rc->get_user_name());
+
+        if ($_SESSION['kolab_files_caps']['MANTICORE']) {
+            $this->plugin->add_label('declinednotice', 'invitednotice', 'acceptedownernotice',
+                'declinedownernotice', 'requestednotice', 'acceptednotice', 'declinednotice',
+                'more', 'accept', 'decline', 'join', 'status', 'when', 'file', 'comment',
+                'statusaccepted', 'statusinvited', 'statusdeclined', 'statusrequested',
+                'invitationaccepting', 'invitationdeclining', 'invitationrequesting',
+                'close', 'invitationtitle');
+        }
 
         if (!empty($templates)) {
             $collapsed_folders = (string) $this->rc->config->get('kolab_files_collapsed_folders');
 
-            $this->plugin->include_script($this->url . '/js/files_api.js');
-            $this->plugin->include_script('kolab_files.js');
             $this->rc->output->include_script('treelist.js');
-            $this->rc->output->set_env('files_url', $this->url . '/api/');
-            $this->rc->output->set_env('files_token', $this->get_api_token());
             $this->rc->output->set_env('kolab_files_collapsed_folders', $collapsed_folders);
 
             // register template objects for dialogs (and main interface)
@@ -142,9 +154,12 @@ class kolab_files_engine
                 'folder-mount-form'  => array($this, 'folder_mount_form'),
                 'folder-auth-options'=> array($this, 'folder_auth_options'),
                 'file-search-form'   => array($this, 'file_search_form'),
-                'file-edit-form'     => array($this, 'file_edit_form'),
+                'file-rename-form'   => array($this, 'file_rename_form'),
+                'file-create-form'   => array($this, 'file_create_form'),
+                'file-edit-dialog'   => array($this, 'file_edit_dialog'),
                 'filelist'           => array($this, 'file_list'),
                 'filequotadisplay'   => array($this, 'quota_display'),
+                'document-editors-dialog' => array($this, 'document_editors_dialog'),
             ));
 
             if ($this->rc->task != 'files') {
@@ -328,19 +343,61 @@ class kolab_files_engine
     }
 
     /**
-     * Template object for file_edit form
+     * Template object for file edit dialog/warnings
      */
-    public function file_edit_form($attrib)
+    public function file_edit_dialog($attrib)
     {
-        $attrib['name'] = 'file-edit-form';
+        $this->plugin->add_label('select', 'create', 'cancel', 'editfiledialog', 'editfilesessions',
+            'newsession', 'ownedsession', 'invitedsession', 'joinsession', 'editfilero', 'editfilerotitle',
+            'newsessionro'
+        );
+
+        return '<div></div>';
+    }
+
+    /**
+     * Template object for dcument editors dialog
+     */
+    public function document_editors_dialog($attrib)
+    {
+        $table = new html_table(array('cols' => 3, 'border' => 0, 'cellpadding' => 0, 'class' => 'records-table'));
+
+        $table->add_header('username', $this->plugin->gettext('participant'));
+        $table->add_header('status', $this->plugin->gettext('status'));
+        $table->add_header('options', null);
+
+        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'invitation-editor-name', 'size' => 30));
+        $textarea = new html_textarea(array('name' => 'comment', 'id' => 'invitation-comment',
+            'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('invitationtexttitle')));
+        $button   = new html_inputfield(array('type' => 'button', 'class' => 'button', 'id' => 'invitation-editor-add', 'value' => $this->plugin->gettext('addparticipant')));
+
+        $this->plugin->add_label('manageeditors', 'statusorganizer');
+
+        // initialize attendees autocompletion
+        $this->rc->autocomplete_init();
+
+        return '<div>' . $table->show() . html::div(null,
+            html::div(null, $input->show() . " " . $button->show())
+            . html::p('attendees-commentbox', html::label(null,
+                $this->plugin->gettext('invitationtextlabel') . $textarea->show())
+            )
+        ) . '</div>';
+    }
+
+    /**
+     * Template object for file_rename form
+     */
+    public function file_rename_form($attrib)
+    {
+        $attrib['name'] = 'file-rename-form';
         if (empty($attrib['id'])) {
-            $attrib['id'] = 'file-edit-form';
+            $attrib['id'] = 'file-rename-form';
         }
 
-        $input_name = new html_inputfield(array('id' => 'file-name', 'name' => 'name', 'size' => 30));
+        $input_name = new html_inputfield(array('id' => 'file-rename-name', 'name' => 'name', 'size' => 50));
         $table      = new html_table(array('cols' => 2, 'class' => 'propform'));
 
-        $table->add('title', html::label('file-name', rcube::Q($this->plugin->gettext('filename'))));
+        $table->add('title', html::label('file-rename-name', rcube::Q($this->plugin->gettext('filename'))));
         $table->add(null, $input_name->show());
 
         $out = $table->show();
@@ -350,8 +407,57 @@ class kolab_files_engine
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
-        $this->plugin->add_label('save', 'cancel', 'fileupdating', 'fileedit');
-        $this->rc->output->add_gui_object('file-edit-form', $attrib['id']);
+        $this->plugin->add_label('save', 'cancel', 'fileupdating', 'renamefile');
+        $this->rc->output->add_gui_object('file-rename-form', $attrib['id']);
+
+        return $out;
+    }
+
+    /**
+     * Template object for file_create form
+     */
+    public function file_create_form($attrib)
+    {
+        $attrib['name'] = 'file-create-form';
+        if (empty($attrib['id'])) {
+            $attrib['id'] = 'file-create-form';
+        }
+
+        $input_name    = new html_inputfield(array('id' => 'file-create-name', 'name' => 'name', 'size' => 30));
+        $select_parent = new html_select(array('id' => 'file-create-parent', 'name' => 'parent'));
+        $select_type   = new html_select(array('id' => 'file-create-type', 'name' => 'type'));
+        $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
+
+        // @TODO: get this list from Chwala API
+        $types = array(
+            'application/vnd.oasis.opendocument.text' => 'odt',
+            'text/plain' => 'txt',
+            'text/html'  => 'html',
+        );
+        foreach (array_keys($types) as $type) {
+            list ($app, $label) = explode('/', $type);
+            $label = preg_replace('/[^a-z]/', '', $label);
+            $select_type->add($this->plugin->gettext('type.' . $label), $type);
+        }
+
+        $table->add('title', html::label('file-create-name', rcube::Q($this->plugin->gettext('filename'))));
+        $table->add(null, $input_name->show());
+        $table->add('title', html::label('file-create-type', rcube::Q($this->plugin->gettext('type'))));
+        $table->add(null, $select_type->show());
+        $table->add('title', html::label('folder-parent', rcube::Q($this->plugin->gettext('folderinside'))));
+        $table->add(null, $select_parent->show());
+
+        $out = $table->show();
+
+        // add form tag around text field
+        if (empty($attrib['form'])) {
+            $out = $this->rc->output->form_tag($attrib, $out);
+        }
+
+        $this->plugin->add_label('create', 'cancel', 'filecreating', 'createfile', 'createandedit',
+            'copyfile', 'copyandedit');
+        $this->rc->output->add_gui_object('file-create-form', $attrib['id']);
+        $this->rc->output->set_env('file_extensions', $types);
 
         return $out;
     }
@@ -552,7 +658,7 @@ class kolab_files_engine
         $head        = '';
 
         foreach ($this->file_list_head($attrib, $a_show_cols) as $cell) {
-            $head .= html::tag('td', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
+            $head .= html::tag('th', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
         }
 
         $head = html::tag('tr', null, $head);
@@ -843,52 +949,20 @@ class kolab_files_engine
      */
     protected function action_open()
     {
-        $file = rcube_utils::get_input_value('file', rcube_utils::INPUT_GET);
+        $this->rc->output->set_env('file_mimetypes', $this->get_mimetypes());
 
-        // get file info
-        $token   = $this->get_api_token();
-        $request = $this->get_request(array(
-            'method' => 'file_info',
-            'file'   => $file,
-            'viewer' => !empty($_GET['viewer']),
-            ), $token);
+        $this->file_opener(intval($_GET['_viewer']) & ~4);
+    }
 
-        // send request to the API
-        try {
-            $response = $request->send();
-            $status   = $response->getStatus();
-            $body     = @json_decode($response->getBody(), true);
+    /**
+     * Handler for file open action
+     */
+    protected function action_edit()
+    {
+        $this->plugin->add_label('sessionterminating', 'unsavedchanges', 'documentinviting',
+            'documentcancelling', 'removeparticipant', 'sessionterminated', 'sessionterminatedtitle');
 
-            if ($status == 200 && $body['status'] == 'OK') {
-                $this->file_data = $body['result'];
-            }
-            else {
-                throw new Exception($body['reason']);
-            }
-        }
-        catch (Exception $e) {
-            rcube::raise_error(array(
-                'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
-                'message' => $e->getMessage()),
-                true, true);
-        }
-
-        $this->file_data['filename'] = $file;
-
-        $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice');
-
-        // register template objects for dialogs (and main interface)
-        $this->rc->output->add_handlers(array(
-            'fileinfobox'      => array($this, 'file_info_box'),
-            'filepreviewframe' => array($this, 'file_preview_frame'),
-        ));
-
-        // this one is for styling purpose
-        $this->rc->output->set_env('extwin', true);
-        $this->rc->output->set_env('file', $file);
-        $this->rc->output->set_env('file_data', $this->file_data);
-        $this->rc->output->set_pagetitle(rcube::Q($file));
-        $this->rc->output->send('kolab_files.filepreview');
+        $this->file_opener(intval($_GET['_viewer']));
     }
 
     /**
@@ -1173,6 +1247,69 @@ class kolab_files_engine
         $this->rc->output->send();
     }
 
+    /**
+     * Handler for file open/edit action
+     */
+    protected function file_opener($viewer)
+    {
+        $file    = rcube_utils::get_input_value('_file', rcube_utils::INPUT_GET);
+        $session = rcube_utils::get_input_value('_session', rcube_utils::INPUT_GET);
+
+        // get file info
+        $token   = $this->get_api_token();
+        $request = $this->get_request(array(
+            'method'  => 'file_info',
+            'file'    => $file,
+            'viewer'  => $viewer,
+            'session' => $session,
+            ), $token);
+
+        // send request to the API
+        try {
+            $response = $request->send();
+            $status   = $response->getStatus();
+            $body     = @json_decode($response->getBody(), true);
+
+            if ($status == 200 && $body['status'] == 'OK') {
+                $this->file_data = $body['result'];
+            }
+            else {
+                throw new Exception($body['reason']);
+            }
+        }
+        catch (Exception $e) {
+            rcube::raise_error(array(
+                'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
+                'message' => $e->getMessage()),
+                true, true);
+        }
+
+        if ($file === null || $file === '') {
+            $file = $this->file_data['file'];
+        }
+
+        $this->file_data['filename'] = $file;
+
+        $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice');
+
+        // register template objects for dialogs (and main interface)
+        $this->rc->output->add_handlers(array(
+            'fileinfobox'      => array($this, 'file_info_box'),
+            'filepreviewframe' => array($this, 'file_preview_frame'),
+        ));
+
+        $placeholder = $this->rc->output->asset_url('program/resources/blank.gif');
+        $manticore = ($viewer & 4) && $this->file_data['viewer']['manticore'];
+
+        // this one is for styling purpose
+        $this->rc->output->set_env('extwin', true);
+        $this->rc->output->set_env('file', $file);
+        $this->rc->output->set_env('file_data', $this->file_data);
+        $this->rc->output->set_env('photo_placeholder', $placeholder);
+        $this->rc->output->set_pagetitle(rcube::Q($file));
+        $this->rc->output->send('kolab_files.' . ($manticore ? 'docedit' : 'filepreview'));
+    }
+
     /**
      * Returns mimetypes supported by File API viewers
      */
@@ -1248,7 +1385,5 @@ class kolab_files_engine
         $this->rc->output->add_label('foldersubscribing', 'foldersubscribed',
             'folderunsubscribing', 'folderunsubscribed', 'searching'
         );
-
-        $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
     }
 }
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index d3f1a308..5c187d48 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -36,14 +36,20 @@ $labels['get'] = 'Download';
 $labels['getfile'] = 'Download file';
 $labels['view'] = 'View';
 $labels['viewfile'] = 'View file';
-$labels['rename'] = 'Rename file';
+$labels['rename'] = 'Rename';
 $labels['deletefile'] = 'Delete file(s)';
 $labels['edit'] = 'Edit';
 $labels['editfile'] = 'Edit file';
 $labels['save'] = 'Save';
 $labels['savefile'] = 'Save file';
 $labels['printfile'] = 'Print file';
-$labels['fileedit'] = 'File properties';
+$labels['renamefile'] = 'Rename a file';
+$labels['createfile'] = 'Create a file';
+$labels['createandedit'] = 'Create and Edit';
+$labels['copyfile'] = 'Copy a file';
+$labels['copyandedit'] = 'Copy and Edit';
+$labels['documenttitle'] = 'Title:';
+$labels['close'] = 'Close';
 
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
@@ -67,6 +73,7 @@ $labels['saveallnotice'] = 'Successfully saved $n file(s).';
 $labels['saveallerror'] = 'Saving $n file(s) failed.';
 $labels['attacherror'] = 'Failed to attach file(s) from the cloud';
 $labels['fileupdating'] = 'Updating file...';
+$labels['filecreating'] = 'Creating file...';
 $labels['filemoving'] = 'Moving file(s)...';
 $labels['filecopying'] = 'Copying file(s)...';
 $labels['filedeleting'] = 'Deleting file(s)...';
@@ -85,6 +92,55 @@ $labels['fileoverwrite'] = 'Overwrite';
 $labels['fileoverwriteall'] = 'Overwrite all';
 $labels['filemoveconfirm'] = 'This action is going to overwrite the destination file: <b>$file</b>.';
 
+$labels['editfiledialog'] = 'Confirm editing action';
+$labels['editfilesessions'] = 'There are ongoing sessions on the selected file. Please, select the action you want to take.';
+$labels['newsession'] = 'Create a new session';
+$labels['newsessionro'] = 'Create a new session (copy the file into read-write location)';
+$labels['ownedsession'] = 'Continue your existing session';
+$labels['invitedsession'] = 'Join the session of $user';
+$labels['joinsession'] = 'Request an invitation from $user';
+$labels['editfilero'] = 'This file is read-only. Do you want to create and edit a copy of the file?';
+$labels['editfilerotitle'] = 'Read-only file';
+$labels['select'] = 'Select';
+$labels['terminatesession'] = 'Terminate the session';
+$labels['sessionterminatedtitle'] = 'Session terminated';
+$labels['sessionterminated'] = 'The session has been terminated. The window will be closed.';
+$labels['terminate'] = 'Terminate';
+$labels['sessionterminating'] = 'Terminating the session...';
+$labels['unsavedchanges'] = 'There are unsaved changes in the document that will be lost. Do you want to terminate the session anyway?';
+$labels['manageeditors'] = 'Invite to document';
+$labels['participant'] = 'Participant';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Add participant';
+$labels['delparticipant'] = 'Remove participant';
+$labels['invitationtexttitle'] = 'This comment will be attached to the invitation/notification message sent to the participant';
+$labels['invitationtextlabel'] = 'Invitation/notification comment';
+$labels['statusorganizer'] = 'Organizer';
+$labels['statusinvited'] = 'Invited';
+$labels['statusaccepted'] = 'Accepted';
+$labels['statusdeclined'] = 'Declined';
+$labels['statusrequested'] = 'Requested';
+$labels['documentinviting'] = 'Inviting participant(s)...';
+$labels['documentcancelling'] = 'Removing participant(s)...';
+$labels['removeparticipant'] = 'Remove';
+$labels['invitednotice'] = 'You have been invited to the editing session by $owner.';
+$labels['acceptedownernotice'] = '$owner accepted your request to join the editing session.';
+$labels['declinedownernotice'] = '$owner declined your request to join the editing session.';
+$labels['acceptednotice'] = '$user accepted your invitation to the editing session.';
+$labels['declinednotice'] = '$user declined your invitation to the editing session.';
+$labels['requestednotice'] = '$user requested to join the editing session.';
+$labels['more'] = 'More.';
+$labels['accept'] = 'Accept';
+$labels['join'] = 'Join the session';
+$labels['decline'] = 'Decline';
+$labels['when'] = 'When';
+$labels['file'] = 'File';
+$labels['comment'] = 'Comment';
+$labels['invitationtitle'] = 'Invitation for $file';
+$labels['ivitationaccepting'] = 'Accepting an invitation...';
+$labels['ivitationdeclining'] = 'Declining an invitation...';
+$labels['ivitationrequesting'] = 'Requesting an invitation...';
+
 $labels['storepasswords'] = 'remember password';
 $labels['storepasswordsdesc'] = 'Stored passwords will be encrypted. Enable this if you do not want to be asked for the password on every login or you want this storage to be available via WebDAV.';
 
@@ -93,6 +149,7 @@ $labels['arialabelquicksearchbox'] = 'Search input';
 $labels['arialabellistoptions'] = 'Files list options';
 $labels['arialabelfolderoptions'] = 'Folder actions';
 $labels['arialabelfileeditform'] = 'File editing form';
+$labels['arialabelfilecreateform'] = 'File creation form';
 $labels['arialabelfilelist'] = 'List of files';
 $labels['arialabelfoldercreateform'] = 'Folder creation form';
 $labels['arialabelfoldereditform'] = 'Folder editing form';
@@ -104,5 +161,8 @@ $labels['arialabelattachmentoptions'] = 'Attachment save options';
 $labels['arialabelfilesavedialog'] = 'File(s) saving dialog';
 $labels['arialabelfileprops'] = 'File properties';
 $labels['arialabelfilecontent'] = 'File content';
+$labels['arialabelfileeditdialog'] = 'File editing dialog';
 
-?>
+$labels['type.plain'] = 'Plain Text Document';
+$labels['type.vndoasisopendocumenttext'] = 'Text Document (ODF)';
+$labels['type.html'] = 'HTML Document';
diff --git a/plugins/kolab_files/skins/larry/images/buttons.png b/plugins/kolab_files/skins/larry/images/buttons.png
index abd9b548..d5f83b39 100644
Binary files a/plugins/kolab_files/skins/larry/images/buttons.png and b/plugins/kolab_files/skins/larry/images/buttons.png differ
diff --git a/plugins/kolab_files/skins/larry/images/listicons.png b/plugins/kolab_files/skins/larry/images/listicons.png
index 5b5ca85b..aeea5f51 100644
Binary files a/plugins/kolab_files/skins/larry/images/listicons.png and b/plugins/kolab_files/skins/larry/images/listicons.png differ
diff --git a/plugins/kolab_files/skins/larry/style.css b/plugins/kolab_files/skins/larry/style.css
index 33a4cc21..edf19df1 100644
--- a/plugins/kolab_files/skins/larry/style.css
+++ b/plugins/kolab_files/skins/larry/style.css
@@ -36,6 +36,11 @@
   background-position: center -93px;
 }
 
+#filestoolbar a.button.export {
+  background-position: 0 -93px;
+  min-width: 50px;
+}
+
 #filestoolbar a.button.open {
   background-position: center -131px;
 }
@@ -44,10 +49,18 @@
   background-image: url(../../../../skins/larry/images/buttons.png);
 }
 
+#filestoolbar a.button.create {
+  background-position: center -315px;
+}
+
 #filestoolbar a.button.edit {
   background-position: center -173px;
 }
 
+#filestoolbar a.button.rename {
+  background-position: center -357px;
+}
+
 #filestoolbar a.button.save {
   background-position: center -213px;
 }
@@ -62,6 +75,50 @@
   display: inline;
 }
 
+#filestoolbar > label {
+  line-height: 42px;
+  vertical-align: top;
+  color: #555;
+  text-shadow: 0 1px 1px #eee;
+}
+
+ul.toolbarmenu li span.saveas {
+  background: url(images/buttons.png) -5px -253px no-repeat;
+}
+
+#document-title {
+  width: 200px;
+}
+
+#collaborators {
+  position: absolute;
+  right: 0;
+  top: -6px;
+}
+
+#collaborators #members {
+  float: right;
+}
+
+#collaborators #members img.photo {
+  width: 32px;
+  height: 32px;
+  overflow: hidden;
+  background: url(../../../../skins/larry/images/contactpic_32px.png) center center no-repeat #fff;
+  border-radius: 5px;
+  border: solid 3px #eee;
+  margin-left: 5px;
+}
+
+#collaborators a.button.add {
+  background: url(../../../../skins/larry/images/buttons.png) -5px -357px no-repeat;
+  min-width: 16px;
+  width: 16px;
+  height: 16px;
+  padding: 2px;
+  margin-top: 10px;
+}
+
 #quicksearchbar #filesearchmenulink {
   position: absolute;
   top: 5px;
@@ -87,6 +144,10 @@
   overflow: auto;
 }
 
+#filecontent.docedit {
+  left: 0;
+}
+
 #filelistbox {
   overflow: auto;
   top: 0;
@@ -216,7 +277,6 @@
 
 .filelist tr > .options {
   width: 32px;
-  cursor: pointer;
 }
 
 .filelist thead tr th.filename,
@@ -278,13 +338,6 @@
   border-radius: 4px 0 0 0;
 }
 
-.filelist tbody tr td.options:hover span {
-  width: 26px;
-  height: 18px;
-  background: url(../../../../skins/larry/images/buttons.png) -5px -417px no-repeat;
-  display: block;
-}
-
 .filelist td.filename {
   padding: 0 4px;
 }
@@ -295,12 +348,23 @@
   height: 16px;
 }
 
-/*
-.filelist tbody td.filename span input {
-  padding: 0 2px;
-  height: 18px;
+.filelist tbody td.options span {
+  background-image: url(images/listicons.png);
+  display: block;
+  height: 16px;
+}
+
+.filelist tbody tr.session > td.options span {
+  background-position: center -212px;
+}
+
+.filelist tbody tr.session.invited > td.options span {
+  background-position: center -236px;
+}
+
+.filelist tbody tr.session.owner > td.options span {
+  background-position: center -188px;
 }
-*/
 
 #fileinfobox table {
   table-layout: fixed;
@@ -347,11 +411,15 @@
 
 #files-dialog,
 #files-compose-dialog,
+#files-file-rename-dialog,
+#files-file-create-dialog,
 #files-file-edit-dialog,
 #files-folder-mount-dialog,
 #files-folder-auth-dialog,
 #files-folder-create-dialog,
-#files-folder-edit-dialog {
+#files-folder-edit-dialog,
+#document-invitation-dialog,
+#document-editors-dialog {
   display: none;
 }
 
@@ -415,6 +483,11 @@
   cursor: pointer;
 }
 
+#files-file-edit-dialog label {
+  display: block;
+  height: 20px;
+}
+
 a.filesaveall {
   display: inline-block;
   margin-top: .5em;
@@ -435,10 +508,6 @@ a.filesaveall {
   width: 200px;
 }
 
-ul.toolbarmenu li span.saveas {
-  background: url(images/buttons.png) -5px -253px no-repeat;
-}
-
 table.propform td.source.selected {
   background-color: #c7e3ef;
 }
@@ -488,3 +557,64 @@ table.propform td.source table.propform td {
 .auth-options label {
   vertical-align: middle;
 }
+
+#document-editors-dialog textarea {
+  width: 98%
+}
+
+#document-editors-dialog label {
+  display: block;
+}
+
+#document-editors-dialog table {
+  margin-top: 0.5em;
+  margin-bottom: 1em;
+}
+
+#document-editors-dialog table th.status {
+  width: 9em;
+}
+
+#document-editors-dialog table th.options {
+  width: 16px
+}
+
+#document-editors-dialog table td.status select {
+  width: 100%;
+}
+
+#document-editors-dialog table td {
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+
+#document-editors-dialog table td.name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: auto;
+}
+
+#document-editors-dialog table tr:last-child td {
+  border-bottom: 0;
+}
+
+#document-editors-dialog table tr.organizer td {
+  color: #888;
+}
+
+#document-editors-dialog table td.options a.delete {
+  background: url(../../../../skins/larry/images/buttons.png) -7px -379px no-repeat;
+  height: 16px;
+  width: 16px;
+  display: block;
+}
+
+#document-invitation-dialog table {
+  margin-top: 15px;
+}
+
+#document-invitation-dialog table td.label {
+  width: 1%;
+  white-space: nowrap;
+  font-weight: bold;
+}
diff --git a/plugins/kolab_files/skins/larry/templates/docedit.html b/plugins/kolab_files/skins/larry/templates/docedit.html
new file mode 100644
index 00000000..90629786
--- /dev/null
+++ b/plugins/kolab_files/skins/larry/templates/docedit.html
@@ -0,0 +1,66 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script src="plugins/kolab_files/skins/larry/ui.js" type="text/javascript"></script>
+</head>
+<body class="files noscroll extwin">
+
+<roundcube:include file="/includes/header.html" />
+
+<div id="mainscreen" class="manticore">
+
+<h1 class="voice"><roundcube:label name="kolab_files.docedit" /></h1>
+
+<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+<div id="filestoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
+<!--
+    <roundcube:button command="files-delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="kolab_files.deletefile" />
+-->
+    <roundcube:button command="document-close" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="kolab_files.terminate" title="kolab_files.terminatesession" />
+    <span class="dropbutton">
+        <roundcube:button command="document-export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="kolab_files.get" title="kolab_files.getfile" />
+        <a href="#export" class="dropbuttontip" id="exportmenulink" onclick="UI.toggle_popup('exportmenu',event);return false" aria-haspopup="true" aria-expanded="false" aria-owns="exportmenu-menu" tabindex="0">Export options</a>
+    </span>
+<!--
+    <roundcube:button command="document-print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="kolab_files.printfile" />
+    <span class="spacer"></span>
+-->
+    <roundcube:button command="document-save" type="link" class="button save disabled" classAct="button save" classSel="button save pressed" label="kolab_files.save" title="kolab_files.savefile" />
+    <span class="spacer"></span>
+    <label for="document-title"><roundcube:label name="kolab_files.documenttitle" />&nbsp;<input id="document-title" type="text" value="" /></label>
+</div>
+
+<h2 id="aria-label-collaborators" class="voice"><roundcube:label name="kolab_files.arialabelcollaborators" /></h2>
+<div id="collaborators" class="toolbar" role="toolbar" aria-labelledby="aria-label-collaborators">
+    <roundcube:button command="document-editors" type="link" class="button add disabled" classAct="button add" classSel="button add pressed" content=" " title="kolab_files.manageeditors" />
+    <div id="members"></div>
+</div>
+
+<div id="filecontent" class="uibox docedit">
+    <div class="iframebox">
+        <roundcube:object name="filepreviewframe" id="fileframe" frameborder="0" title="kolab_files.arialabelfilecontent" />
+    </div>
+</div>
+
+</div>
+
+<div id="exportmenu" class="popupmenu" aria-hidden="true">
+    <h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="kolab_files.arialabelexportoptions" /></h3>
+    <ul id="exportmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-exportmenu"></ul>
+</div>
+
+<div id="document-editors-dialog" class="uidialog" data-editable="true" role="dialog" aria-labelledby="aria-label-doceditorsdialog" aria-hidden="true">
+    <h3 id="aria-label-doceditorsdialog" class="voice"><roundcube:label name="kolab_files.arialabeldoceditorsdialog" /></h3>
+    <roundcube:object name="document-editors-dialog" />
+</div>
+
+<roundcube:include file="/includes/footer.html" />
+
+<script type="text/javascript">
+kolab_files_ui_init();
+</script>
+
+</body>
+</html>
diff --git a/plugins/kolab_files/skins/larry/templates/filepreview.html b/plugins/kolab_files/skins/larry/templates/filepreview.html
index a0b51393..f669e32f 100644
--- a/plugins/kolab_files/skins/larry/templates/filepreview.html
+++ b/plugins/kolab_files/skins/larry/templates/filepreview.html
@@ -35,7 +35,17 @@
 
 </div>
 
+<div id="files-file-create-dialog" role="dialog" aria-labelledby="aria-label-filecreateform" aria-hidden="true">
+    <h3 id="aria-label-filecreateform" class="voice"><roundcube:label name="kolab_files.arialabelfilecreateform" /></h3>
+    <roundcube:object name="file-create-form" />
+</div>
+<div id="files-file-edit-dialog" role="dialog" aria-labelledby="aria-label-fileeditdialog" aria-hidden="true">
+    <h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3>
+    <roundcube:object name="file-edit-dialog">
+</div>
+
 <roundcube:include file="/includes/footer.html" />
+
 <script type="text/javascript">
 kolab_files_ui_init();
 </script>
diff --git a/plugins/kolab_files/skins/larry/templates/files.html b/plugins/kolab_files/skins/larry/templates/files.html
index 5569fee2..6b8b8178 100644
--- a/plugins/kolab_files/skins/larry/templates/files.html
+++ b/plugins/kolab_files/skins/larry/templates/files.html
@@ -20,6 +20,9 @@
     </form>
     <roundcube:button command="files-get" type="link" class="button get disabled" classAct="button get" classSel="button get pressed" label="kolab_files.get" title="kolab_files.getfile" />
     <roundcube:button command="files-open" type="link" class="button open disabled" classAct="button open" classSel="button open pressed" label="kolab_files.view" title="kolab_files.viewfile" />
+    <roundcube:button command="files-edit" type="link" class="button edit disabled" classAct="button edit" classSel="button edit pressed" label="kolab_files.edit" title="kolab_files.editfile" />
+    <roundcube:button command="files-create" type="link" class="button create disabled" classAct="button create" classSel="button create pressed" label="kolab_files.create" title="kolab_files.createfile" />
+    <roundcube:button command="files-rename" type="link" class="button rename disabled" classAct="button rename" classSel="button rename pressed" label="kolab_files.rename" title="kolab_files.renamefile" />
     <roundcube:button command="files-delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="kolab_files.deletefile" />
 </div>
 
@@ -90,14 +93,22 @@
     <h3 id="aria-label-foldermountform" class="voice"><roundcube:label name="kolab_files.arialabelfoldermountform" /></h3>
     <roundcube:object name="folder-mount-form" />
 </div>
-<div id="files-file-edit-dialog" role="dialog" aria-labelledby="aria-label-fileeditform" aria-hidden="true">
-    <h3 id="aria-label-fileeditform" class="voice"><roundcube:label name="kolab_files.arialabelfileeditform" /></h3>
-    <roundcube:object name="file-edit-form" />
+<div id="files-file-rename-dialog" role="dialog" aria-labelledby="aria-label-filerenameform" aria-hidden="true">
+    <h3 id="aria-label-filerenameform" class="voice"><roundcube:label name="kolab_files.arialabelfilerenameform" /></h3>
+    <roundcube:object name="file-rename-form" />
+</div>
+<div id="files-file-create-dialog" role="dialog" aria-labelledby="aria-label-filecreateform" aria-hidden="true">
+    <h3 id="aria-label-filecreateform" class="voice"><roundcube:label name="kolab_files.arialabelfilecreateform" /></h3>
+    <roundcube:object name="file-create-form" />
 </div>
 <div id="files-folder-auth-dialog" role="dialog" aria-labelledby="aria-label-folderauthform" aria-hidden="true">
     <h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
     <roundcube:object name="folder-auth-options">
 </div>
+<div id="files-file-edit-dialog" role="dialog" aria-labelledby="aria-label-fileeditdialog" aria-hidden="true">
+    <h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3>
+    <roundcube:object name="file-edit-dialog">
+</div>
 
 <div id="listoptions" class="propform popupdialog" data-editable="true" role="dialog" aria-labelledby="aria-label-listoptions" aria-hidden="true">
     <h3 id="aria-label-listoptions" class="voice"><roundcube:label name="kolab_files.arialabellistoptions" /></h3>
diff --git a/plugins/kolab_files/skins/larry/ui.js b/plugins/kolab_files/skins/larry/ui.js
index 911f6978..07d7e7c2 100644
--- a/plugins/kolab_files/skins/larry/ui.js
+++ b/plugins/kolab_files/skins/larry/ui.js
@@ -1,10 +1,13 @@
 function kolab_files_ui_init()
 {
-  if (rcmail.env.action == 'open') {
+  if (rcmail.env.action == 'open' || rcmail.env.action == 'edit') {
     var filesviewsplit = new rcube_splitter({ id:'filesopensplitter', p1:'#fileinfobox', p2:'#filecontent',
       orientation:'v', relative:true, start:226, min:150, size:12 }).init();
 
     rcmail.addEventListener('enable-command', kolab_files_enable_command);
+
+    if ($('#exportmenu').length)
+      rcmail.gui_object('exportmenu', 'exportmenu');
   }
   else
     var filesviewsplit = new rcube_splitter({ id:'filesviewsplitter', p1:'#folderlistbox', p2:'#filelistcontainer',