                 # Multiple other editors
                 text = "#{other_editors.size} other users are also editing this!"
                 color = "#E55435"
+            else if @state.new_changes
+                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

            @setState
                edited_message : @newest_content()
            @props.actions.set_editing(@props.message, false)
        else if e.keyCode==13 and not e.shiftKey # 13: enter key
            mesg = @refs.editedMessage.getValue()
            if mesg != @newest_content()
                @props.actions.send_edit(@props.message, mesg)

                    <ListGroupItem onDoubleClick={@edit_message} style={background:color, fontSize: font_size, borderRadius: borderRadius}>
                        {@render_markdown(value) if not @is_editing()}
                        {@render_input() if @is_editing()}
                        {@editing_status() if @props.message.get('history').size > 1 or  @props.message.get('editing').size > 0}
                        {@get_timeago()}
                    </ListGroupItem>
                </ListGroup>
