1 files changed, 4 insertions, 2 deletions

diff --git a/webapp/components/posts_view.jsx b/webapp/components/posts_view.jsx
index 917411549..aa7f445ce 100644
--- a/webapp/components/posts_view.jsx
+++ b/webapp/components/posts_view.jsx
@@ -204,10 +204,12 @@ export default class PostsView extends React.Component {
                 //     the previous post was made by the same user as the current post,
                 //     the previous post is not a comment,
                 //     the current post is not a comment,
+                //     the previous post is not from a webhook
                 //     the current post is not from a webhook
                 if (prevPostUserId === postUserId &&
                         !prevPostIsComment &&
                         !postIsComment &&
+                        !prevPostFromWebhook &&
                         !postFromWebhook) {
                     hideProfilePic = true;
                 }
@@ -308,7 +310,7 @@ export default class PostsView extends React.Component {
         if (this.props.scrollType === PostsView.SCROLL_TYPE_BOTTOM) {
             this.scrollToBottom();
         } else if (this.props.scrollType === PostsView.SCROLL_TYPE_NEW_MESSAGE) {
-            window.requestAnimationFrame(() => {
+            window.setTimeout(window.requestAnimationFrame(() => {
                 // If separator exists scroll to it. Otherwise scroll to bottom.
                 if (this.refs.newMessageSeparator) {
                     var objDiv = this.refs.postlist;
@@ -316,7 +318,7 @@ export default class PostsView extends React.Component {
                 } else if (this.refs.postlist) {
                     this.refs.postlist.scrollTop = this.refs.postlist.scrollHeight;
                 }
-            });
+            }), 0);
         } else if (this.props.scrollType === PostsView.SCROLL_TYPE_POST && this.props.scrollPostId) {
             window.requestAnimationFrame(() => {
                 const postNode = ReactDOM.findDOMNode(this.refs[this.props.scrollPostId]);