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

            else
                @props.actions.set_editing(@props.message, false)

    # All the columns
    avatar_column: ->
        account = @props.user_map?.get(@props.message.get('sender_id'))?.toJS()

                        {@show_history() if not @state.show_history and @props.message.get('history').size > 1}
                        {@hide_history() if @state.show_history and @props.message.get('history').size > 1}
                        {get_timeago(@props.message)}
                        <div style={clear:'both'}></div>
                    </ListGroupItem>
                    <div></div>  {#This div tag fixes a weird bug where <li> tags would be rendered below the <ListGroupItem>}
                </ListGroup>
