diff --git a/UI/WebServerResources/js/Mailer/Mailer.app.js b/UI/WebServerResources/js/Mailer/Mailer.app.js
index f2a36a445..1acb680e7 100644
--- a/UI/WebServerResources/js/Mailer/Mailer.app.js
+++ b/UI/WebServerResources/js/Mailer/Mailer.app.js
@@ -103,6 +103,7 @@
             controllerAs: 'viewer'
           }
         },
+        onExit: onExitMessage,
         resolve: {
           stateMessage: stateMessage
         }
@@ -268,6 +269,14 @@
     }
   }
 
+  /**
+   * @ngInject
+   */
+  onExitMessage.$inject = ['stateMailbox'];
+  function onExitMessage(stateMailbox) {
+    stateMailbox.selectedMessage = -1;
+  }
+
   /**
    * @ngInject
    */