diff --git a/src/js/controller/mail-list.js b/src/js/controller/mail-list.js
index 6839cb7..2d87e01 100644
--- a/src/js/controller/mail-list.js
+++ b/src/js/controller/mail-list.js
@@ -354,17 +354,17 @@ define(function(require) {
     //
 
     var ngModule = angular.module('mail-list', []);
-    ngModule.directive('ngIscroll', function($timeout) {
+    ngModule.directive('ngIscroll', function($parse) {
         return {
-            link: function(scope, elm) {
-                $timeout(function() {
+            link: function(scope, elm, attrs) {
+                var model = $parse(attrs.ngIscroll);
+                scope.$watch(model, function() {
                     var myScroll;
                     // activate iscroll
                     myScroll = new IScroll(elm[0], {
                         mouseWheel: true
                     });
                 });
-
             }
         };
     });
diff --git a/src/tpl/mail-list.html b/src/tpl/mail-list.html
index 0a97bf4..9546da7 100644
--- a/src/tpl/mail-list.html
+++ b/src/tpl/mail-list.html
@@ -4,7 +4,7 @@
     <h2>{{state.nav.currentFolder.type}}</h2>
   </header>
 
-  <div class="list-wrapper" ng-iscroll>
+  <div class="list-wrapper" ng-iscroll="emails">
     <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.answered}" ng-click="select(email)" ng-repeat="email in emails">
         <h3>{{email.from[0].name || email.from[0].address}}</h3>