diff --git a/db_operations.php b/db_operations.php
index 1ca2b299b..01185b905 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -399,8 +399,8 @@ if (!$is_information_schema) {
     if ($num_tables > 0
       && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
         $message = PMA_Message::notice('strRelationNotWorking');
-        $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">');
-        $message->addParam('</a>');
+        $message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', false);
+        $message->addParam('</a>', false);
         /* Show error if user has configured something, notice elsewhere */
         if (!empty($cfg['Servers'][$server]['pmadb'])) {
             $message->isError(true);
diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php
index be57d8b23..b30273ee2 100644
--- a/libraries/dbg/setup.php
+++ b/libraries/dbg/setup.php
@@ -17,9 +17,9 @@ if ($GLOBALS['cfg']['DBG']['enable']) {
     if (! @extension_loaded('dbg') && ! PMA_dl('dbg')) {
         $message = PMA_Message::error('strCantLoad');
         $message->addParam('DBG');
-        $message->addMessage('<a href="./Documentation.html#faqdbg" target="documentation">');
+        $message->addMessage('<a href="./Documentation.html#faqdbg" target="documentation">', false);
         $message->addString('strDocu');
-        $message->addMessage('</a>');
+        $message->addMessage('</a>', false);
         $message->display();
     } else {
         $GLOBALS['DBG'] = true;
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index bfd9e0d27..8706c0705 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -143,18 +143,22 @@ echo PMA_pluginGetJavascript($export_list);
         <?php
         echo $strFileNameTemplate;
 
-        $trans = '__SERVER__/' . $strFileNameTemplateDescriptionServer;
+        $trans = new PMA_Message;
+        $trans->addMessage('__SERVER__/');
+        $trans->addString('strFileNameTemplateDescriptionServer');
         if ($export_type == 'database' || $export_type == 'table') {
-            $trans .= ', __DB__/' . $strFileNameTemplateDescriptionDatabase;
+            $trans->addMessage('__DB__/');
+            $trans->addString('strFileNameTemplateDescriptionDatabase');
             if ($export_type == 'table') {
-                $trans .= ', __TABLE__/' . $strFileNameTemplateDescriptionTable;
+                $trans->addMessage('__TABLE__/');
+                $trans->addString('strFileNameTemplateDescriptionTable');
             }
         }
 
         $message = new PMA_Message('strFileNameTemplateDescription');
         $message->addParam('<a href="http://php.net/strftime" target="documentation" title="'
-            . $strDocu . '">');
-        $message->addParam('</a>');
+            . $strDocu . '">', false);
+        $message->addParam('</a>', false);
         $message->addParam($trans);
 
         echo PMA_showHint($message);
diff --git a/server_privileges.php b/server_privileges.php
index 2c09ed24d..2cb7f99c8 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1530,8 +1530,8 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
             } // end if (display overview)
             echo '</form>' . "\n";
             $flushnote = new PMA_Message('strFlushPrivilegesNote', PMA_Message::NOTICE);
-            $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;flush_privileges=1">');
-            $flushnote->addParam('</a>');
+            $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;flush_privileges=1">', false);
+            $flushnote->addParam('</a>', false);
             $flushnote->display();
          }
 
diff --git a/tbl_alter.php b/tbl_alter.php
index d41bc2068..009898340 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -75,7 +75,7 @@ if (isset($do_save_data)) {
 
     if ($error_create == FALSE) {
         $message = PMA_Message::success('strTableAlteredSuccessfully');
-        $message->addParam(htmlspecialchars($table));
+        $message->addParam($table);
         $btnDrop = 'Fake';
 
         // garvin: If comments were sent, enable relation stuff