diff --git a/plugins/filesystem_attachments/filesystem_attachments.php b/plugins/filesystem_attachments/filesystem_attachments.php
index 50bd62465..164efa600 100644
--- a/plugins/filesystem_attachments/filesystem_attachments.php
+++ b/plugins/filesystem_attachments/filesystem_attachments.php
@@ -50,7 +50,7 @@ class filesystem_attachments extends rcube_plugin
     {
         $args['status'] = false;
         $group  = $args['group'];
-        $rcmail = rcmail::get_instance();
+        $rcmail = rcube::get_instance();
 
         // use common temp dir for file uploads
         $temp_dir = $rcmail->config->get('temp_dir');
@@ -78,7 +78,7 @@ class filesystem_attachments extends rcube_plugin
         $args['status'] = false;
 
         if (!$args['path']) {
-            $rcmail   = rcmail::get_instance();
+            $rcmail   = rcube::get_instance();
             $temp_dir = $rcmail->config->get('temp_dir');
             $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
 
@@ -160,7 +160,7 @@ class filesystem_attachments extends rcube_plugin
 
     function file_id()
     {
-        $userid = rcmail::get_instance()->user->ID;
+        $userid = rcube::get_instance()->user->ID;
         list($usec, $sec) = explode(' ', microtime());
         $id = preg_replace('/[^0-9]/', '', $userid . $sec . $usec);
 
diff --git a/plugins/redundant_attachments/redundant_attachments.php b/plugins/redundant_attachments/redundant_attachments.php
index 24af7d973..17427f0d8 100644
--- a/plugins/redundant_attachments/redundant_attachments.php
+++ b/plugins/redundant_attachments/redundant_attachments.php
@@ -63,7 +63,7 @@ class redundant_attachments extends filesystem_attachments
             return;
         }
 
-        $rcmail = rcmail::get_instance();
+        $rcmail = rcube::get_instance();
 
         // load configuration
         $this->load_config();