diff --git a/db_structure.php b/db_structure.php
index 6000d2791..44a94f990 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -22,7 +22,9 @@ if (empty($is_info)) {
         $action = 'db_structure.php';
         $err_url = 'db_structure.php?'. PMA_generate_common_url($db);
         require './libraries/mult_submits.inc.php';
-        $message = $strSuccess;
+        if (empty($message)) {
+            $message = PMA_Message::success();
+        }
     }
     require './libraries/db_common.inc.php';
     $url_query .= '&goto=db_structure.php';
diff --git a/server_databases.php b/server_databases.php
index d12f56448..338fa84d0 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -57,11 +57,15 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
         }
         require './libraries/mult_submits.inc.php';
         unset($action, $submit_mult, $err_url, $selected_db);
-        if ($mult_btn == $strYes) {
-            $message = sprintf($strDatabasesDropped, count($selected));
-        } else {
-            $message = sprintf($strDatabasesDropped, 0);
+        if (empty($message)) {
+            $message = new PMA_Message('strDatabasesDropped');
+            if ($mult_btn == $strYes) {
+                $message->addParam(count($selected));
+            } else {
+                $message->addParam(0);
+            }
         }
+
     }
 }