diff --git a/src/tpl/mail-list.html b/src/tpl/mail-list.html
index 20b008b..330af62 100644
--- a/src/tpl/mail-list.html
+++ b/src/tpl/mail-list.html
@@ -8,7 +8,7 @@
     <input class="input-text input-search" type="search" results="5" ng-model="searchText" placeholder=" Filter..." focus-me="state.mailList.searching">
   </div>
 
-  <div class="list-wrapper" ng-iscroll="state.nav.currentFolder.messages.length">
+  <div class="list-wrapper" ng-iscroll="filteredMessages.length">
     <ul class="mail-list">
       <li ng-class="{'mail-list-active': email === state.mailList.selected, 'mail-list-attachment': email.attachments !== undefined && email.attachments.length > 0, 'mail-list-unread': email.unread, 'mail-list-replied': !email.unread && email.answered}" ng-click="select(email)" ng-repeat="email in (filteredMessages = (state.nav.currentFolder.messages | orderBy:'uid':true | filter:searchText))">
         <h3>{{email.from[0].name || email.from[0].address}}</h3>