diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 5e34d861..da2c7186 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -734,6 +734,10 @@ function rcube_calendar_ui(settings)
       var invite = $('#edit-attendees-invite').get(0);
       var comment = $('#edit-attendees-comment');
 
+      // make sure any calendar is selected
+      if (!calendars.val())
+        calendars.val($('option:first', calendars).attr('value'));
+
       invite.checked = settings.itip_notify & 1 > 0;
       notify.checked = has_attendees(event) && invite.checked;
 
@@ -3542,6 +3546,8 @@ function rcube_calendar_ui(settings)
       rcmail.triggerEvent('selectfolder', { folder:id, prefix:'rcmlical' });
 
       this.selected_calendar = id;
+
+      rcmail.update_state({source: id});
     };
 
     // register the given calendar to the current view
@@ -3748,7 +3754,9 @@ function rcube_calendar_ui(settings)
     });
 
     // select default calendar
-    if (settings.default_calendar && this.calendars[settings.default_calendar] && this.calendars[settings.default_calendar].editable)
+    if (rcmail.env.source && this.calendars[rcmail.env.source])
+      this.selected_calendar = rcmail.env.source;
+    else if (settings.default_calendar && this.calendars[settings.default_calendar] && this.calendars[settings.default_calendar].editable)
       this.selected_calendar = settings.default_calendar;
     
     if (this.selected_calendar)
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 2f2c6b65..cb2b904d 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -235,6 +235,7 @@ class calendar_ui
       );
     }
 
+    $this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
     $this->rc->output->set_env('calendars', $jsenv);
     $this->rc->output->add_gui_object('calendarslist', $attrib['id']);
 
diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index d20e04f3..c7116e0b 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -193,6 +193,8 @@ function kolab_files_init()
       file_api.request('folder_info', {folder: file_api.file_path(rcmail.env.file), sessions: 1}, 'folder_info_response');
     }
     else {
+      file_api.env.folder = rcmail.env.folder;
+      file_api.env.collection = rcmail.env.collection;
       file_api.folder_list();
       file_api.browser_capabilities_check();
     }
@@ -2059,7 +2061,7 @@ function kolab_files_ui()
       });
 
     // select first folder?
-    if (response.result.auth_errors) { }
+    if (response.result.auth_errors && response.result.auth_errors.length) { }
     else if (this.env.folder)
       rcmail.folder_list.select(this.env.folder);
     else if (this.env.collection)
@@ -2085,6 +2087,9 @@ function kolab_files_ui()
     var is_collection = folder.match(/^folder-collection-(.*)$/),
       collection = RegExp.$1 || null;
 
+    if (rcmail.task == 'files' && !rcmail.env.action)
+      rcmail.update_state(is_collection ? {collection: collection} : {folder: folder});
+
     if (collection == 'sessions') {
       rcmail.enable_command('files-list', 'files-folder-delete', 'folder-rename', 'files-upload', false);
       this.sessions_list();
diff --git a/plugins/kolab_files/lib/kolab_files_engine.php b/plugins/kolab_files/lib/kolab_files_engine.php
index cae47016..7032b5a8 100644
--- a/plugins/kolab_files/lib/kolab_files_engine.php
+++ b/plugins/kolab_files/lib/kolab_files_engine.php
@@ -961,6 +961,11 @@ class kolab_files_engine
 
         $this->folder_list_env();
 
+        if ($this->rc->task == 'files') {
+            $this->rc->output->set_env('folder', rcube_utils::get_input_value('folder', rcube_utils::INPUT_GET));
+            $this->rc->output->set_env('collection', rcube_utils::get_input_value('collection', rcube_utils::INPUT_GET));
+        }
+
         $this->rc->output->add_label('uploadprogress', 'GB', 'MB', 'KB', 'B');
         $this->rc->output->set_pagetitle($this->plugin->gettext('files'));
         $this->rc->output->set_env('file_mimetypes', $this->get_mimetypes());
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index c12e8040..ca2ceb51 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -156,6 +156,9 @@ function rcube_tasklist_ui(settings)
             }
         }
 
+        if (rcmail.env.source && me.tasklists[rcmail.env.source])
+            me.selected_list = rcmail.env.source;
+
         // initialize treelist widget that controls the tasklists list
         var widget_class = window.kolab_folderlist || rcube_treelist_widget;
         tasklists_widget = new widget_class(rcmail.gui_objects.tasklistslist, {
@@ -176,6 +179,7 @@ function rcube_tasklist_ui(settings)
             rcmail.enable_command('list-remove', me.tasklists[node.id] && me.tasklists[node.id].removable);
             rcmail.enable_command('list-showurl', me.tasklists[node.id] && !!me.tasklists[node.id].caldavurl);
             me.selected_list = node.id;
+            rcmail.update_state({source: node.id});
         });
         tasklists_widget.addEventListener('subscribe', function(p) {
             var list;
@@ -2939,7 +2943,7 @@ function rcube_tasklist_ui(settings)
             }
         }
 
-        return $.unqiqueStrings(itags);
+        return $.uniqueStrings(itags);
     }
 
     /**
@@ -3414,7 +3418,7 @@ jQuery.fn.sortElements = (function(){
 })();
 
 // equivalent to $.unique() but working on arrays of strings
-jQuery.unqiqueStrings = (function() {
+jQuery.uniqueStrings = (function() {
     return function(arr) {
         var hash = {}, out = [];
 
diff --git a/plugins/tasklist/tasklist_ui.php b/plugins/tasklist/tasklist_ui.php
index da80c3d2..0e81b1b4 100644
--- a/plugins/tasklist/tasklist_ui.php
+++ b/plugins/tasklist/tasklist_ui.php
@@ -202,6 +202,7 @@ class tasklist_ui
             }
         }
 
+        $this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
         $this->rc->output->set_env('tasklists', $jsenv);
         $this->register_gui_object('tasklistslist', $attrib['id']);