1 files changed, 16 insertions, 2 deletions

diff --git a/webapp/components/post_view/components/post_list.jsx b/webapp/components/post_view/components/post_list.jsx
index 690cd96c7..70107c838 100644
--- a/webapp/components/post_view/components/post_list.jsx
+++ b/webapp/components/post_view/components/post_list.jsx
@@ -15,6 +15,8 @@ import * as Utils from 'utils/utils.jsx';
 import * as PostUtils from 'utils/post_utils.jsx';
 import DelayedAction from 'utils/delayed_action.jsx';
 
+import * as ChannelActions from 'actions/channel_actions.jsx';
+
 import Constants from 'utils/constants.jsx';
 const ScrollTypes = Constants.ScrollTypes;
 
@@ -41,6 +43,7 @@ export default class PostList extends React.Component {
         this.handleResize = this.handleResize.bind(this);
         this.scrollToBottom = this.scrollToBottom.bind(this);
         this.scrollToBottomAnimated = this.scrollToBottomAnimated.bind(this);
+        this.handleKeyDown = this.handleKeyDown.bind(this);
 
         this.jumpToPostNode = null;
         this.wasAtBottom = true;
@@ -61,6 +64,13 @@ export default class PostList extends React.Component {
         }
     }
 
+    handleKeyDown(e) {
+        if (e.which === Constants.KeyCodes.ESCAPE && $('.popover.in,.modal.in').length === 0) {
+            e.preventDefault();
+            ChannelActions.setChannelAsRead();
+        }
+    }
+
     isAtBottom() {
         // consider the view to be at the bottom if it's within this many pixels of the bottom
         const atBottomMargin = 10;
@@ -297,7 +307,7 @@ export default class PostList extends React.Component {
                 );
             }
 
-            if (postUserId !== userId &&
+            if ((postUserId !== userId || this.props.ownNewMessage) &&
                     this.props.lastViewed !== 0 &&
                     post.create_at > this.props.lastViewed &&
                     !renderedLastViewed) {
@@ -417,10 +427,12 @@ export default class PostList extends React.Component {
         }
 
         window.addEventListener('resize', this.handleResize);
+        window.addEventListener('keydown', this.handleKeyDown);
     }
 
     componentWillUnmount() {
         window.removeEventListener('resize', this.handleResize);
+        window.removeEventListener('keydown', this.handleKeyDown);
         this.scrollStopAction.cancel();
     }
 
@@ -515,7 +527,8 @@ export default class PostList extends React.Component {
 }
 
 PostList.defaultProps = {
-    lastViewed: 0
+    lastViewed: 0,
+    ownNewMessage: false
 };
 
 PostList.propTypes = {
@@ -529,6 +542,7 @@ PostList.propTypes = {
     showMoreMessagesTop: React.PropTypes.bool,
     showMoreMessagesBottom: React.PropTypes.bool,
     lastViewed: React.PropTypes.number,
+    ownNewMessage: React.PropTypes.bool,
     postsToHighlight: React.PropTypes.object,
     displayNameType: React.PropTypes.string,
     displayPostsInCenter: React.PropTypes.bool,