diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 87a4ebeb..6cd4f68c 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -2611,9 +2611,10 @@ class calendar extends rcube_plugin
     $uid      = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
     $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
     $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
+    $listmode = calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL;
 
     // search for event if only UID is given
-    if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $instance), calendar_driver::FILTER_WRITEABLE)) {
+    if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $instance), $listmode)) {
       $event['_savemode'] = $savemode;
       $success = $this->driver->remove_event($event, true);
     }
diff --git a/plugins/kolab_delegation/kolab_delegation.js b/plugins/kolab_delegation/kolab_delegation.js
index 88406d97..56ca066c 100644
--- a/plugins/kolab_delegation/kolab_delegation.js
+++ b/plugins/kolab_delegation/kolab_delegation.js
@@ -33,6 +33,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
     rcmail.addEventListener('requestcalendar/mailimportevent', function(o) { rcmail.event_delegator_request(o); });
     rcmail.addEventListener('requestcalendar/mailimportitip', function(o) { rcmail.event_delegator_request(o); });
     rcmail.addEventListener('requestcalendar/itip-status', function(o) { rcmail.event_delegator_request(o); });
+    rcmail.addEventListener('requestcalendar/itip-remove', function(o) { rcmail.event_delegator_request(o); });
 
     if (rcmail.env.delegators && window.rcube_calendar_ui) {
       rcmail.calendar_identity_init();
diff --git a/plugins/kolab_delegation/kolab_delegation_engine.php b/plugins/kolab_delegation/kolab_delegation_engine.php
index 68e9085e..3f63df9b 100644
--- a/plugins/kolab_delegation/kolab_delegation_engine.php
+++ b/plugins/kolab_delegation/kolab_delegation_engine.php
@@ -813,12 +813,17 @@ class kolab_delegation_engine
                         continue;
                     }
 
+                    $found = false;
                     foreach ($other_ns as $ns) {
                         $folder = $ns[0] . $context . $delim;
-                        if (strpos($cal->name, $folder) !== 0) {
-                            continue;
+                        if (strpos($cal->name, $folder) === 0) {
+                            $found = true;
                         }
                     }
+
+                    if (!$found) {
+                        continue;
+                    }
                 }
             }