diff --git a/ChangeLog b/ChangeLog
index 0f96c688e..e637cf0e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Mongolian update, thanks to Bayarsaikhan Enkhtaivan - bayaraa 
 - patch #2553372 [display] DB comment tooltips not shown on navi,
   thanks to Erdem - ahard
+- patch #2561433 [structure] Display true number of rows in a view
+  if it contains less than MaxExactCountViews,
+  thanks to Virsacer - virsacer
 
 3.1.2.0 (2009-01-19)
 - bug #1253252 [display] Can't NULL a column with relation defined 
diff --git a/db_structure.php b/db_structure.php
index c0c1e6da9..9d5cc4f97 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -390,9 +390,11 @@ foreach ($tables as $keyname => $each_table) {
     //  that needs to be repaired
     if (isset($each_table['TABLE_ROWS']) && ($each_table['ENGINE'] != null || $table_is_view)) {
         if ($table_is_view) {
-            $row_count_pre = '~';
-            $sum_row_count_pre = '~';
-            $show_superscript = PMA_showHint(PMA_sanitize(sprintf($strViewHasAtLeast, '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]')));
+            if ($each_table['TABLE_ROWS'] >= $GLOBALS['cfg']['MaxExactCountViews']){
+                $row_count_pre = '~';
+                $sum_row_count_pre = '~';
+                $show_superscript = PMA_showHint(PMA_sanitize(sprintf($strViewHasAtLeast, '[a@./Documentation.html#cfg_MaxExactCountViews@_blank]', '[/a]')));
+            }
         } elseif($each_table['ENGINE'] == 'InnoDB' && (! $each_table['COUNTED'])) {
             // InnoDB table: we did not get an accurate row count
             $row_count_pre = '~';