diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index 72f7a7f2a..51854b7c3 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -111,12 +111,12 @@ class archive extends rcube_plugin
     $delimiter      = $storage->get_hierarchy_delimiter();
     $archive_folder = $rcmail->config->get('archive_mbox');
     $archive_type   = $rcmail->config->get('archive_type', '');
-    $current_mbox   = rcube_utils::get_input_value('_mbox', RCUBE_INPUT_POST);
+    $current_mbox   = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
 
     $result  = array('reload' => false, 'update' => false, 'errors' => array());
     $folders = array();
-    $uids    = rcube_utils::get_input_value('_uid', RCUBE_INPUT_POST);
-    $search_request = get_input_value('_search', RCUBE_INPUT_GPC);
+    $uids    = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+    $search_request = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC);
 
     if ($uids == '*') {
       $index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order());
@@ -220,7 +220,7 @@ class archive extends rcube_plugin
     }
 
     if ($_POST['_from'] == 'show' && !empty($result['update'])) {
-      if ($next = get_input_value('_next_uid', RCUBE_INPUT_GPC)) {
+      if ($next = rcube_utils::get_input_value('_next_uid', rcube_utils::INPUT_GPC)) {
         $rcmail->output->command('show_message', $next);
       }
       else {
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index f00101a6a..6a40bec56 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -2249,8 +2249,8 @@ class rcmail extends rcube
         // message UID (or comma-separated list of IDs) is provided in
         // the form of <ID>-<MBOX>[,<ID>-<MBOX>]*
 
-        $_uid  = $uids ?: rcube_utils::get_input_value('_uid', RCUBE_INPUT_GPC);
-        $_mbox = $mbox ?: (string)rcube_utils::get_input_value('_mbox', RCUBE_INPUT_GPC);
+        $_uid  = $uids ?: rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GPC);
+        $_mbox = $mbox ?: (string) rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC);
 
         // already a hash array
         if (is_array($_uid) && !isset($_uid[0])) {
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 6e2f982db..d07847879 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -37,7 +37,7 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'])
 }
 
 // remove mbox part from _uid
-if (($_uid  = rcube_utils::get_input_value('_uid', RCUBE_INPUT_GPC)) && !is_array($_uid) && preg_match('/^\d+-.+/', $_uid)) {
+if (($_uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GPC)) && !is_array($_uid) && preg_match('/^\d+-.+/', $_uid)) {
   list($_uid, $mbox) = explode('-', $_uid, 2);
   if (isset($_GET['_uid']))  $_GET['_uid']  = $_uid;
   if (isset($_POST['_uid'])) $_POST['_uid'] = $_uid;
@@ -481,7 +481,7 @@ function rcmail_js_message_list($a_headers, $insert_top=false, $a_show_cols=null
                 $cont = rcube::Q($cont);
             }
             else if ($col == 'size')
-                $cont = show_bytes($header->$col);
+                $cont = $RCMAIL->show_bytes($header->$col);
             else if ($col == 'date')
                 $cont = $RCMAIL->format_date($header->date);
             else if ($col == 'folder') {