diff --git a/UI/WebServerResources/js/Mailer/Mailer.app.js b/UI/WebServerResources/js/Mailer/Mailer.app.js
index 1acb680e7..5049486ca 100644
--- a/UI/WebServerResources/js/Mailer/Mailer.app.js
+++ b/UI/WebServerResources/js/Mailer/Mailer.app.js
@@ -103,6 +103,7 @@
             controllerAs: 'viewer'
           }
         },
+        onEnter: onEnterMessage,
         onExit: onExitMessage,
         resolve: {
           stateMessage: stateMessage
@@ -260,7 +261,6 @@
     });
 
     if (message) {
-      stateMailbox.selectedMessage = parseInt($stateParams.messageId);
       return message.$reload();
     }
     else {
@@ -269,6 +269,14 @@
     }
   }
 
+  /**
+   * @ngInject
+   */
+  onEnterMessage.$inject = ['$stateParams', 'stateMailbox'];
+  function onEnterMessage($stateParams, stateMailbox) {
+    stateMailbox.selectedMessage = parseInt($stateParams.messageId);
+  }
+
   /**
    * @ngInject
    */