diff --git a/show_gravatar.php b/show_gravatar.php
index 94d787a..9f5d99d 100644
--- a/show_gravatar.php
+++ b/show_gravatar.php
@@ -106,7 +106,7 @@ class show_gravatar extends rcube_plugin
       $checkbox = new html_checkbox(array('name' => '_'.$option, 'id' => $option, 'value' => 1));

       $options[$option] = array(
-        'title' => html::label($option, Q($this->gettext($option))),
+        'title' => html::label($option, rcube::Q($this->gettext($option))),
         'content' => $checkbox->show($value?1:0)
       );
   }
@@ -142,7 +142,7 @@ class show_gravatar extends rcube_plugin


       $options[$option] = array(
-        'title' => html::label($option, Q($this->gettext($option))),
+        'title' => html::label($option, rcube::Q($this->gettext($option))),
         'content' => $select->show($value)
       );
   }
@@ -158,10 +158,10 @@ class show_gravatar extends rcube_plugin

     $this->select('gravatar_size', array('16','24','32','48','64','128'), "{$this->default_size}", $options);
     $this->select('gravatar_rating',
-                    array('g' => Q($this->gettext('gravatar_G')),
-                          'pg' => Q($this->gettext('gravatar_PG')),
-                          'r' => Q($this->gettext('gravatar_R')),
-                          'x' => Q($this->gettext('gravatar_X'))
+                    array('g' => rcube::Q($this->gettext('gravatar_G')),
+                          'pg' => rcube::Q($this->gettext('gravatar_PG')),
+                          'r' => rcube::Q($this->gettext('gravatar_R')),
+                          'x' => rcube::Q($this->gettext('gravatar_X'))
                       ), $this->default_rating, $options);

     if (!$this->nativepics) {
@@ -171,7 +171,7 @@ class show_gravatar extends rcube_plugin
                           'monsterid' => 'Monsterid',
                           'wavatar' => 'Wavatar',
                           'mm' => 'Mistery-man',
-                          '404' => Q($this->gettext('gravatar_none'))
+                          '404' => rcube::Q($this->gettext('gravatar_none'))
                       ), $this->default_default, $options);

       $this->checkbox('gravatar_border', $options);
@@ -180,7 +180,7 @@ class show_gravatar extends rcube_plugin
     if ($args['section'] == 'mailview') {

       $args['blocks']['gravatar'] = array(
-        'name' => Q($this->gettext('gravatars')),
+        'name' => rcube::Q($this->gettext('gravatars')),
         'options' => $options
       );
     }