diff --git a/ChangeLog b/ChangeLog
index 3357d2cd0..084446933 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ $Source$
       now correctly works with multibyte strings (bug #936161).
     * libraries/dbi/mysql.dbi.lib.php: Do not break TEXT fields (bug #860160).
     * libraries/display_tbl.lib.php: Show if BLOB is null (RFE #941528).
+    * tbl_properties_structure.php: Forgotten </nobr> -> </div>.
+    * libraries/display_tbl.lib.php: Fixed class="nobr" -> class="nowrap".
 
 2004-04-28 Michal Cihar  <michal@cihar.com>
     * css/phpmyadmin.css.php: Force <button> to be displayed inline.
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 3fee7e9b0..98dcfa9e3 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -824,9 +824,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
                 $order_last_word = $order_link_words[$order_last_word_index];
                 unset($order_link_words[$order_last_word_index]);
                 $order_link = $order_link_pre . implode(' ', $order_link_words)
-                            . ' <div class="nobr">' . $order_last_word . $order_img . '</div>' . $order_link_post . "\n";
+                            . ' <div class="nowrap">' . $order_last_word . $order_img . '</div>' . $order_link_post . "\n";
             } else {
-                $order_link = '<div class="nobr">' . $order_link_pre . $order_link_content . $order_link_post . $order_img . '</div>' . "\n";
+                $order_link = '<div class="nowrap">' . $order_link_pre . $order_link_content . $order_link_post . $order_img . '</div>' . "\n";
             }
 
             if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php
index 0c835af97..3020bc403 100644
--- a/tbl_properties_structure.php
+++ b/tbl_properties_structure.php
@@ -235,16 +235,16 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
 
         if ($propicon == 'both') {
             $titles['Change']        .= '&nbsp;' . $strChange . '</div>';
-            $titles['Drop']          .= '&nbsp;' . $strDrop . '</nobr>';
-            $titles['NoDrop']        .= '&nbsp;' . $strDrop . '</nobr>';
-            $titles['Primary']       .= '&nbsp;' . $strPrimary . '</nobr>';
-            $titles['Index']         .= '&nbsp;' . $strIndex . '</nobr>';
-            $titles['Unique']        .= '&nbsp;' . $strUnique . '</nobr>';
-            $titles['IdxFulltext'  ] .= '&nbsp;' . $strIdxFulltext . '</nobr>';
-            $titles['NoPrimary']     .= '&nbsp;' . $strPrimary . '</nobr>';
-            $titles['NoIndex']       .= '&nbsp;' . $strIndex . '</nobr>';
-            $titles['NoUnique']      .= '&nbsp;' . $strUnique . '</nobr>';
-            $titles['NoIdxFulltext'] .= '&nbsp;' . $strIdxFulltext . '</nobr>';
+            $titles['Drop']          .= '&nbsp;' . $strDrop . '</div>';
+            $titles['NoDrop']        .= '&nbsp;' . $strDrop . '</div>';
+            $titles['Primary']       .= '&nbsp;' . $strPrimary . '</div>';
+            $titles['Index']         .= '&nbsp;' . $strIndex . '</div>';
+            $titles['Unique']        .= '&nbsp;' . $strUnique . '</div>';
+            $titles['IdxFulltext'  ] .= '&nbsp;' . $strIdxFulltext . '</div>';
+            $titles['NoPrimary']     .= '&nbsp;' . $strPrimary . '</div>';
+            $titles['NoIndex']       .= '&nbsp;' . $strIndex . '</div>';
+            $titles['NoUnique']      .= '&nbsp;' . $strUnique . '</div>';
+            $titles['NoIdxFulltext'] .= '&nbsp;' . $strIdxFulltext . '</div>';
         }
     } else {
         $titles['Change']        = $strChange;