diff --git a/js/db_structure.js b/js/db_structure.js
index 5ef5e99875..ca9a24ed18 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -298,7 +298,10 @@ $(document).ready(function() {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = 'TRUNCATE ' + curr_table_name;
+        var question = 
+            PMA_messages.strTruncateTableStrongWarning + ' ' 
+            + PMA_messages.strDoYouReally
+            + '<br /><br />TRUNCATE ' + curr_table_name;
 
         $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function(url) {
 
diff --git a/js/functions.js b/js/functions.js
index 4d4da3a0c8..84df1bdf7a 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2282,7 +2282,10 @@ $(document).ready(function() {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = PMA_messages['strDropDatabaseStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'DROP DATABASE ' + escapeHtml(window.parent.db);
+        var question = 
+            PMA_messages.strDropDatabaseStrongWarning + ' ' 
+            + PMA_messages.strDoYouReally
+            + '<br /><br />DROP DATABASE ' + escapeHtml(window.parent.db);
 
         $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
 
@@ -3341,7 +3344,10 @@ $(document).ready(function() {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = PMA_messages['strDropTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'DROP TABLE ' + window.parent.table;
+        var question = 
+            PMA_messages.strDropTableStrongWarning + ' ' 
+            + PMA_messages.strDoYouReally
+            + '<br /><br />DROP TABLE ' + window.parent.table;
 
         $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
 
@@ -3372,7 +3378,10 @@ $(document).ready(function() {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = PMA_messages['strTruncateTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'TRUNCATE TABLE ' + window.parent.table;
+        var question = 
+            PMA_messages.strTruncateTableStrongWarning + ' ' 
+            + PMA_messages.strDoYouReally
+            + '<br /><br />TRUNCATE ' + window.parent.table;
 
         $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
 
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index f523b73591..a0cdd0d920 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -2385,13 +2385,13 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
             $message->addMessage(', ', '');
         }
 
-        $messagge_qt = PMA_Message::notice(__('Query took %01.4f sec'));
+        $messagge_qt = PMA_Message::notice(__('Query took %01.4f sec') . ')');
         $messagge_qt->addParam($GLOBALS['querytime']);
 
         $message->addMessage($messagge_qt, '');
-        $message->addMessage(')', '');
-
-        $message->addMessage(isset($sorted_column_message) ? $sorted_column_message : '', '');
+        if (isset($sorted_column_message)) {
+            $message->addMessage($sorted_column_message, '');
+        }
 
         PMA_showMessage($message, $sql_query, 'success');
 
diff --git a/sql.php b/sql.php
index 77e2e81c65..69b4c2447b 100644
--- a/sql.php
+++ b/sql.php
@@ -763,11 +763,9 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
     }
 
     if (isset($GLOBALS['querytime'])) {
-        $_querytime = PMA_Message::notice(__('Query took %01.4f sec'));
+        $_querytime = PMA_Message::notice('(' . __('Query took %01.4f sec') . ')');
         $_querytime->addParam($GLOBALS['querytime']);
-        $message->addMessage('(');
         $message->addMessage($_querytime);
-        $message->addMessage(')');
     }
 
     if ($GLOBALS['is_ajax_request'] == true) {