         if e.keyCode==27 # ESC
             e.preventDefault()
             @setState
-                edited_message  : @newest_content()
-                show_edit_input : false
-            @props.actions.toggle_editing(@props.message, false)
+                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)
             else
-                @props.actions.toggle_editing(@props.message, false)
-            @setState(show_edit_input:false)
+                @props.actions.set_editing(@props.message, false)
 
     edit_message: ->
-        @props.actions.toggle_editing(@props.message, true)
-        @setState(show_edit_input:true)
+        @props.actions.set_editing(@props.message, true)
 
     focus_endpoint: (e) ->
         val = e.target.value

        else
            editing = message.get('editing').remove(author_id)

        console.log("TOGGLE EDITORS:", editing.toJS())
        @syncdb.update
            set :
                editing : editing.toJS()


    editing_status: ->
        other_editors = @props.message.get('editing').remove(@props.account_id)
        if @is_editing()
            if other_editors.size == 1
                # This user and someone else is also editing
                text = "#{@props.get_user_name(other_editors.first())} is also editing this!"
