                 {<Avatar account={account} /> if account? and @props.show_avatar}
             </div>
         </Col>
+
+    is_user_editing: ->
+        other_editors = @props.message.get('editing').remove(@props.account_id).keySeq()
+        current_user = @props.user_map.get(@props.account_id).get('first_name') + ' ' + @props.user_map.get(@props.account_id).get('last_name')
+        if @is_editing()
+            if other_editors.size is 0 and not (@state.history_size != @props.message.get('history').size and @state.new_changes)
+                return true
+            else
+                return false
+        else
+            return false
 
     content_column: ->
         value = @newest_content()

                text = "#{@props.editor_name} has updated this message. Esc to discard your changes and see theirs"
                color = "#E55435"
            else
                text = "You are now editing ... Shift+Enter to submit changes."
        else
            if other_editors.size == 1
                # One person is editing

        else
            <div className="pull-left small" style={color:color}>
                {text}
                <Button onClick={@save_edit} bsStyle='success' style={marginLeft:'10px',marginTop:'-5px'} className='small'>Save</Button>
            </div>

    edit_message: ->
