diff --git a/app/scenes/channel_drawer/channel_drawer.js b/app/scenes/channel_drawer/channel_drawer.js
index 0a108b879..641125b4c 100644
--- a/app/scenes/channel_drawer/channel_drawer.js
+++ b/app/scenes/channel_drawer/channel_drawer.js
@@ -32,7 +32,7 @@ export default class ChannelDrawer extends PureComponent {
             currentTeam
         } = this.props;
 
-        this.props.actions.markChannelAsRead(id, currentChannel.id);
+        this.props.actions.markChannelAsRead(currentChannel.id);
         this.props.actions.viewChannel(currentTeam.id, id);
         this.props.actions.closeDrawers();
         InteractionManager.runAfterInteractions(() => {
diff --git a/app/scenes/thread/thread.js b/app/scenes/thread/thread.js
index 9ede59a92..14a5ab038 100644
--- a/app/scenes/thread/thread.js
+++ b/app/scenes/thread/thread.js
@@ -27,6 +27,7 @@ export default class Thread extends PureComponent {
         }).isRequired,
         teamId: PropTypes.string.isRequired,
         channelId: PropTypes.string.isRequired,
+        myMember: PropTypes.object.isRequired,
         files: PropTypes.array,
         rootId: PropTypes.string.isRequired,
         draft: PropTypes.string.isRequired,
@@ -40,6 +41,14 @@ export default class Thread extends PureComponent {
         }
     };
 
+    state = {};
+
+    componentWillReceiveProps(nextProps) {
+        if (!this.state.lastViewedAt) {
+            this.setState({lastViewedAt: nextProps.myMember.last_viewed_at});
+        }
+    }
+
     componentWillUnmount() {
         this.props.actions.selectPost('');
     }
@@ -58,7 +67,12 @@ export default class Thread extends PureComponent {
                 keyboardVerticalOffset={65}
             >
                 <StatusBar barStyle='light-content'/>
-                <PostList posts={this.props.posts}/>
+                <PostList
+                    indicateNewMessages={true}
+                    posts={this.props.posts}
+                    currentUserId={this.props.myMember.user_id}
+                    lastViewedAt={this.state.lastViewedAt}
+                />
                 <PostTextbox
                     rootId={this.props.rootId}
                     value={this.props.draft}
diff --git a/app/scenes/thread/thread_container.js b/app/scenes/thread/thread_container.js
index 095a66d7f..d2d4ecefb 100644
--- a/app/scenes/thread/thread_container.js
+++ b/app/scenes/thread/thread_container.js
@@ -8,6 +8,7 @@ import {selectPost} from 'mattermost-redux/actions/posts';
 
 import {makeGetPostsForThread} from 'mattermost-redux/selectors/entities/posts';
 import {getTheme} from 'app/selectors/preferences';
+import {getCurrentChannelMembership} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 
 import navigationSceneConnect from '../navigationSceneConnect';
@@ -33,6 +34,7 @@ function makeMapStateToProps() {
             ...ownProps,
             teamId,
             channelId: ownProps.channelId,
+            myMember: getCurrentChannelMembership(state),
             rootId: ownProps.rootId,
             draft: threadDraft.draft,
             files: threadDraft.files,