3 files changed, 13 insertions, 2 deletions

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 48cb4d13b..68de80228 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -4,6 +4,7 @@
 var ChannelStore = require('../stores/channel_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var PostStore = require('../stores/post_store.jsx');
+var SocketStore = require('../stores/socket_store.jsx')
 var UserProfile = require( './user_profile.jsx' );
 var NavbarSearchBox =require('./search_bar.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
@@ -82,6 +83,7 @@ module.exports = React.createClass({
         ChannelStore.addExtraInfoChangeListener(this._onChange);
         PostStore.addSearchChangeListener(this._onChange);
         UserStore.addChangeListener(this._onChange);
+        SocketStore.addChangeListener(this._onSocketChange);
     },
     componentWillUnmount: function() {
         ChannelStore.removeChangeListener(this._onChange);
@@ -96,6 +98,11 @@ module.exports = React.createClass({
         }
         $(".channel-header__info .description").popover({placement : 'bottom', trigger: 'hover', html: true, delay: {show: 500, hide: 500}});
     },
+    _onSocketChange: function(msg) {
+        if(msg.action === "new_user") {
+            AsyncClient.getChannelExtraInfo(true);
+        }
+    },
     getInitialState: function() {
         return getStateFromStores();
     },
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 2fecc129a..b666fcfae 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -14,7 +14,7 @@ module.exports = React.createClass({
         PostStore.addMentionDataChangeListener(this._onChange);
 
         var self = this;
-        $('#'+this.props.id).on('keypress.mentionlist',
+        $('body').on('keypress.mentionlist', '#'+this.props.id,
             function(e) {
                 if (!self.isEmpty() && self.state.mentionText != '-1' && e.which === 13) {
                     e.stopPropagation();
@@ -31,7 +31,7 @@ module.exports = React.createClass({
     },
     componentWillUnmount: function() {
         PostStore.removeMentionDataChangeListener(this._onChange);
-        $('#'+this.props.id).off('keypress.mentionlist');
+        $('body').off('keypress.mentionlist', '#'+this.props.id);
     },
     _onChange: function(id, mentionText, excludeList) {
         if (id !== this.props.id) return;
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index 934e863a2..6b746aa78 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -78,6 +78,8 @@ module.exports = React.createClass({
             var re = new RegExp('( |^)@' + m + '( |$|\n)', 'm');
             html = html.replace(re, '$1<span class="mention">@'+m+'</span>$2');
         }
+        var re2 = new RegExp('(^$)(?![.\n])', 'gm');
+        html = html.replace(re2, '<br/><br/>');
         $(this.refs.textdiv.getDOMNode()).html(html);
     },
     handleChange: function() {
@@ -262,6 +264,8 @@ module.exports = React.createClass({
             $(d).css({'height':'auto','overflow-y':'scroll'}).height(167);
             $(w).css({'height':'auto'}).height(167);
         }
+
+        $(d).scrollTop($(e).scrollTop());
     },
     handleFocus: function() {
         var elm = this.refs.message.getDOMNode();