diff --git a/ChangeLog b/ChangeLog
index 6b46e77a0..448fc8786 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ $Source$
     * db_details_structure.php: bug #1431340, rowcount for views and
       unneeded $strViewMaxExactCount
     * libraries/common.lib.php: array to string conversion
+    * libraries/display_tbl.lib.php: bug #1396998, added $strViewMaxExactCount
+      when browsing
 
 2006-02-17 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * docs.css, Documentation.html, translators.html:
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index d8ed358ff..d9b4953c4 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1717,6 +1717,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
                         ? $total - 1
                         : $pos_next - 1;
         PMA_showMessage($GLOBALS['strShowingRecords'] . " $pos - $last_shown_rec (" . PMA_formatNumber( $total, 0 ) . ' ' . $GLOBALS['strTotal'] . $selectstring . ', ' . sprintf($GLOBALS['strQueryTime'], $GLOBALS['querytime']) . ')');
+        if (PMA_tableIsView($db, $table) && $total ==  $GLOBALS['cfg']['MaxExactCount']) {
+            echo '<div class="notice">' . "\n";
+            echo PMA_sanitize(sprintf($GLOBALS['strViewMaxExactCount'], PMA_formatNumber($GLOBALS['cfg']['MaxExactCount'], 0), '[a@./Documentation.html#cfg_MaxExactCount@_blank]', '[/a]')) . "\n";
+            echo '</div>' . "\n";
+        }
     } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
         PMA_showMessage($GLOBALS['strSQLQuery']);
     }