diff --git a/plugins/kolab_files/kolab_files.php b/plugins/kolab_files/kolab_files.php
index ad9f2846..f598c4a0 100644
--- a/plugins/kolab_files/kolab_files.php
+++ b/plugins/kolab_files/kolab_files.php
@@ -33,7 +33,7 @@ class kolab_files extends rcube_plugin
public function init()
{
- $this->rc = rcmail::get_instance();
+ $this->rc = rcube::get_instance();
// Register hooks
$this->add_hook('refresh', array($this, 'refresh'));
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index 8d287f3e..2e7cbf0e 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -697,10 +697,10 @@ class libcalendaring extends rcube_plugin
$url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']);
$message = $this->rc->gettext('loadingdata');
- header('Content-Type: text/html; charset=' . RCMAIL_CHARSET);
+ header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
print "\n\n"
. '' . "\n"
- . '' . "\n"
+ . '' . "\n"
. "\n\n$message\n\n";
exit;
}