diff --git a/webui/controller/search/helper.php b/webui/controller/search/helper.php
index f94f74d..86ffb8b 100644
--- a/webui/controller/search/helper.php
+++ b/webui/controller/search/helper.php
@@ -54,12 +54,12 @@
 
          $this->fixup_post_request();
 
-         list ($this->data['n'], $this->data['all_ids'], $this->data['messages']) = $this->model_search_search->search_messages($this->a, $this->data['page']);
+         list ($this->data['n'], $this->data['total_found'], $this->data['all_ids'], $this->data['messages']) = $this->model_search_search->search_messages($this->a, $this->data['page']);
       }
 
       else {
          $this->fixup_post_simple_request();
-         list ($this->data['n'], $this->data['all_ids'], $this->data['messages']) = $this->model_search_search->search_messages($this->a, $this->data['page']);
+         list ($this->data['n'], $this->data['total_found'], $this->data['all_ids'], $this->data['messages']) = $this->model_search_search->search_messages($this->a, $this->data['page']);
       }
 
 
diff --git a/webui/model/search/search.php b/webui/model/search/search.php
index 91356ec..2efc978 100644
--- a/webui/model/search/search.php
+++ b/webui/model/search/search.php
@@ -5,6 +5,7 @@
    public function search_messages($data = array(), $page = 0) {
       $one_page_of_ids = array();
       $total_hits = 0;
+      $total_found = 0;
       $sort = "sent";
       $order = "DESC";
       $sortorder = "ORDER BY sent DESC";
@@ -44,13 +45,14 @@
 
       if(isset($m['ids'])) {
          $all_ids = $m['ids'];
+         $total_found = $m['total_found'];
       } else {
 
          if(isset($data['ref']) && $data['ref']){
-            $all_ids = $this->query_all_possible_IDs_by_reference($data['ref'], $cache_key);
+            list ($total_found, $all_ids) = $this->query_all_possible_IDs_by_reference($data['ref'], $cache_key);
          }
          else {
-            $all_ids = $this->query_all_possible_IDs($data, $sort, $order, $sortorder, $cache_key);
+            list ($total_found, $all_ids) = $this->query_all_possible_IDs($data, $sort, $order, $sortorder, $cache_key);
          }
       }
 
@@ -86,7 +88,7 @@
       $all_ids_csv = substr($all_ids_csv, 1, strlen($all_ids_csv));
 
 
-      return array($total_hits, $all_ids_csv, $this->get_meta_data($one_page_of_ids, $q, $sortorder));
+      return array($total_hits, $total_found, $all_ids_csv, $this->get_meta_data($one_page_of_ids, $q, $sortorder));
    }
 
 
@@ -225,7 +227,9 @@
          $query = $this->sphx->query("SELECT id FROM " . SPHINX_MAIN_INDEX . " WHERE $a $id $date $attachment $direction $size $folders MATCH('$match') $sortorder LIMIT 0," . MAX_SEARCH_HITS . " OPTION max_matches=" . MAX_SEARCH_HITS);
       }
 
-      if(ENABLE_SYSLOG == 1) { syslog(LOG_INFO, sprintf("sphinx query: '%s' in %.2f s, %d hits", $query->query, $query->exec_time, $query->num_rows)); }
+      $total_found = $query->total_found;
+
+      if(ENABLE_SYSLOG == 1) { syslog(LOG_INFO, sprintf("sphinx query: '%s' in %.2f s, %d hits, %d total found", $query->query, $query->exec_time, $query->num_rows, $total_found)); }
 
 
       /*
@@ -251,11 +255,11 @@
 
       if($data['sort'] == 'from' || $data['sort'] == 'subj') {
 
-         $query = $this->db->query("SELECT id FROM " . TABLE_META . " WHERE id IN ($q) ORDER BY `$sort` $order", $ids);
+         $fs_query = $this->db->query("SELECT id FROM " . TABLE_META . " WHERE id IN ($q) ORDER BY `$sort` $order", $ids);
 
          $ids = array();
 
-         foreach($query->rows as $q) {
+         foreach($fs_query->rows as $q) {
             array_push($ids, $q['id']);
          }
 
@@ -264,10 +268,10 @@
 
       if(MEMCACHED_ENABLED && $cache_key) {
          $memcache = Registry::get('memcache');
-         $memcache->add($cache_key, array('ts' => time(), 'total_hits' => count($ids), 'ids' => $ids), 0, MEMCACHED_TTL);
+         $memcache->add($cache_key, array('ts' => time(), 'total_hits' => count($ids), 'ids' => $ids, 'total_found' => $total_found), 0, MEMCACHED_TTL);
       }
 
-      return $ids;
+      return array($total_found, $ids);
    }
 
 
@@ -292,13 +296,14 @@
          }
       }
 
+      $total_found = count($ids);
 
       if(MEMCACHED_ENABLED && $cache_key) {
          $memcache = Registry::get('memcache');
-         $memcache->add($cache_key, array('ts' => time(), 'total_hits' => count($ids), 'ids' => $ids), 0, MEMCACHED_TTL);
+         $memcache->add($cache_key, array('ts' => time(), 'total_hits' => count($ids), 'total_found' => $total_found, 'ids' => $ids), 0, MEMCACHED_TTL);
       }
 
-      return $ids;
+      return array($total_found, $ids);
    }
 
 
diff --git a/webui/view/theme/default/templates/search/helper.tpl b/webui/view/theme/default/templates/search/helper.tpl
index b9c4fdb..3bc2d1c 100644
--- a/webui/view/theme/default/templates/search/helper.tpl
+++ b/webui/view/theme/default/templates/search/helper.tpl
@@ -125,7 +125,7 @@
              
             <?php if($page > 0) { ?><a href="#" class="navlink" onclick="Piler.navigation(<?php print $prev_page; ?>);"><i class="icon-angle-left icon-large"></i></a><?php } else { ?><span class="navlink"><i class="icon-angle-left icon-large muted"></i></span><?php } ?>
             &nbsp;
-            <?php print $hits_from; ?>-<?php print $hits_to; ?>, <?php print $text_total; ?>: <?php print $n; ?>
+            <?php print $hits_from; ?>-<?php print $hits_to; ?>, <?php print $text_total; ?>: <?php print $n; ?><?php if($total_found > $n) { ?> (<?php print $total_found; ?>)<?php } ?>
             &nbsp;
             <?php if($next_page <= $total_pages){ ?><a href="#" class="navlink" onclick="Piler.navigation(<?php print $next_page; ?>);"><i class="icon-angle-right icon-large"></i></a> <?php } else { ?><span class="navlink"><i class="icon-angle-right icon-large muted"></i></span><?php } ?>
             &nbsp;
diff --git a/webui/view/theme/mobile/templates/search/helper.tpl b/webui/view/theme/mobile/templates/search/helper.tpl
index e36e742..e47c0eb 100644
--- a/webui/view/theme/mobile/templates/search/helper.tpl
+++ b/webui/view/theme/mobile/templates/search/helper.tpl
@@ -96,7 +96,7 @@
          <?php if($page > 0) { ?><a href="#" onclick="Piler.navigation(0);">&lt;&lt;</a> &nbsp; <?php } else { ?><span class="navlink">&lt;&lt; &nbsp; </span><?php } ?>
          <?php if($page > 0) { ?><a href="#" onclick="Piler.navigation(<?php print $prev_page; ?>);"> &lt; </a> <?php } else { ?><span class="navlink"> &lt; </span><?php } ?>
 
-         <?php print $hits_from; ?>-<?php print $hits_to; ?>, <?php print $text_total; ?>: <?php print $n; ?>
+         <?php print $hits_from; ?>-<?php print $hits_to; ?>, <?php print $text_total; ?>: <?php print $n; ?><?php if($total_found > $n) { ?> (<?php print $total_found; ?>)<?php } ?>
 
          <?php if($next_page <= $total_pages){ ?><a href="#" onclick="Piler.navigation(<?php print $next_page; ?>);">&gt; </a> <?php } else { ?><span class="navlink">&gt; </span><?php } ?>
          <?php if($page < $total_pages) { ?> &nbsp; <a href="#" onclick="Piler.navigation(<?php print $total_pages; ?>);"> &gt;&gt; </a><?php } else { ?> <span class="navlink"> &nbsp; &gt;&gt;</span><?php } ?>