diff --git a/import.php b/import.php
index 0a7f5fb7c..32df11140 100644
--- a/import.php
+++ b/import.php
@@ -50,8 +50,10 @@ if (!empty($sql_query)) {
 // upload limit has been reached, let's assume the second possibility.
 if ($_POST == array() && $_GET == array()) {
     require_once './libraries/header.inc.php';
-    PMA_showMessage(sprintf($strUploadLimit, '[a@./Documentation.html#faq1_16@_blank]', '[/a]'),
-        null, 'error');
+    $message = PMA_Message::error('strUploadLimit');
+    $message->addParam('[a@./Documentation.html#faq1_16@_blank]');
+    $message->addParam('[/a]');
+    $message->display();
     require './libraries/footer.inc.php';
 }
 
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 5694f9955..bfd9e0d27 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -35,7 +35,7 @@ $export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $exp
 
 /* Fail if we didn't find any plugin */
 if (empty($export_list)) {
-    PMA_showMessage($strCanNotLoadExportPlugins, null, 'error');
+    PMA_Message::error('strCanNotLoadExportPlugins')->display();
     require './libraries/footer.inc.php';
 }
 ?>
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index c2f67381c..2b0435156 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -16,7 +16,7 @@ $import_list = PMA_getPlugins('./libraries/import/', $import_type);
 
 /* Fail if we didn't find any plugin */
 if (empty($import_list)) {
-    PMA_showMessage($strCanNotLoadImportPlugins, null, 'error');
+    PMA_Message::error('strCanNotLoadImportPlugins')->display();
     require './libraries/footer.inc.php';
 }
 ?>
diff --git a/server_binlog.php b/server_binlog.php
index 5925b4e35..762f12938 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -25,7 +25,6 @@
  * @uses    PMA_generate_common_hidden_inputs()
  * @uses    PMA_generate_common_url()
  * @uses    PMA_formatByteDown()
- * @uses    PMA_showMessage()
  * @uses    PMA_DBI_fetch_assoc()
  * @uses    PMA_strlen()
  * @uses    PMA_substr()
@@ -144,7 +143,7 @@ if (count($binary_logs) > 1) {
     echo '</form>';
 }
 
-PMA_showMessage($GLOBALS['strSuccess'], null, 'success');
+PMA_Message::success()->display();
 
 /**
  * Displays the page
diff --git a/server_processlist.php b/server_processlist.php
index 6af1dd952..6c7f9d533 100644
--- a/server_processlist.php
+++ b/server_processlist.php
@@ -50,7 +50,7 @@ echo '<h2>' . "\n"
 $sql_query = 'SHOW' . (empty($full) ? '' : ' FULL') . ' PROCESSLIST';
 $result = PMA_DBI_query($sql_query);
 
-PMA_showMessage($GLOBALS['strSuccess'], null, 'success');
+PMA_Message::success()->display();
 
 
 /**