diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 3939ec2c..fce626a4 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -435,7 +435,7 @@ class calendar extends rcube_plugin
       $this->rc->output->show_message('calendar.errorsaving', 'error');
 
     // FIXME: update a single event object on the client instead of reloading the entire source
-    if ($success && $reload or ($removed && $reload))
+    if ($success && $reload || ($removed && $reload))
       $this->rc->output->command('plugin.reload_calendar', array('source' => $event['calendar']));
   }
   
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index ecb58939..11f0ab89 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -69,7 +69,8 @@ class kolab_calendar
   public function get_name()
   {
     $dispname = preg_replace(array('!INBOX/Calendar/!', '!^INBOX/!', '!^shared/!', '!^user/([^/]+)/!'), array('','','','(\\1) '), $this->imap_folder);
-    return strlen($dispname) ? $dispname : $this->imap_folder;
+    $toret = strlen($dispname) ? $dispname : $this->imap_folder;
+	return mb_convert_encoding($toret,"UTF8", "UTF7-IMAP");
   }
   
   /**