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

        m = messages = @redux.getStore(@name).get('messages')
        for x in changes
            if x.insert
                #console.log('change', x.insert)
                # OPTIMIZATION: make into custom conversion to immutable
                x.insert.history = immutable.Stack(immutable.fromJS(x.insert.history))
                x.insert.editing = immutable.Set(x.insert.editing)
                messages = messages.set("#{x.insert.date - 0}", immutable.fromJS(x.insert))
            else if x.remove
                messages = messages.delete(x.remove.date - 0)
        if m != messages

                    <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>
