diff --git a/src/js/controller/mail-list.js b/src/js/controller/mail-list.js
index f03f767..3bc9c96 100644
--- a/src/js/controller/mail-list.js
+++ b/src/js/controller/mail-list.js
@@ -195,8 +195,10 @@ define(function(require) {
                 return;
             }
 
-            // select first message
-            $scope.select(emails[emails.length - 1]);
+            if (!$scope.state.mailList.selected) {
+                // select first message
+                $scope.select(emails[emails.length - 1]);
+            }
         }
 
         function getFolder() {