diff --git a/src/js/controller/mail-list.js b/src/js/controller/mail-list.js
index b030064..503d25b 100644
--- a/src/js/controller/mail-list.js
+++ b/src/js/controller/mail-list.js
@@ -417,12 +417,11 @@ define(function(require) {
             elm.on('touchstart', function() {
                 elm.addClass('active');
             });
-            elm.on('touchleave touchcancel touchmove', function() {
+            elm.on('touchleave touchcancel touchmove touchend', function() {
                 elm.removeClass('active');
             });
 
-            elm.on('touchend click', function(event) {
-                event.preventDefault();
+            elm.on('click', function(event) {
                 elm.removeClass('active');
                 scope.$apply(function() {
                     handler(scope, {
diff --git a/src/tpl/mail-list.html b/src/tpl/mail-list.html
index c3d244c..0b0894b 100644
--- a/src/tpl/mail-list.html
+++ b/src/tpl/mail-list.html
@@ -18,7 +18,7 @@
     <ul class="mail-list" infinite-scroll="displayMore()"
       infinite-scroll-distance="1" infinite-scroll-parent="true">
       <li ng-class="{'mail-list-active': email === state.mailList.selected}"
-        ng-click="select(email)"
+        wo-touch="select(email)"
         ng-repeat="email in displayMessages">
         <h3>{{email.from[0].name || email.from[0].address}}</h3>
         <div class="encrypted" data-icon="{{email.encrypted && email.decrypted ? '&#xe012;' : email.encrypted ? '&#xe009;' : ''}}"></div>