         e.stopPropagation()
 
     onMessageClick: (event) ->
-        if @props.edited
+        node = @refs.target.getDOMNode()
+        if @props.edited and event.target.classList.contains 'select-target'
             @props.onSelect(not @props.selected)
             event.preventDefault()
             event.stopPropagation()
         else
             if not (event.target.getAttribute('type') is 'checkbox')
                 event.preventDefault()
-                node = @refs.target.getDOMNode()
                 MessageActionCreator.setCurrent node.dataset.messageId, true
                 if @props.settings.get('displayPreview')
-                    href = '#' + node.href.split('#')[1]
+                    href = '#' + node.dataset.href.split('#')[1]
                     @redirect href
 
     onMessageDblClick: (event) ->

        ,
            tag
                href: url,
                className: 'wrapper'
                'data-message-id': message.get('id'),
                onClick: @onMessageClick,
                onDoubleClick: @onMessageDblClick,
                ref: 'target',
                    div
                        className: 'avatar-wrapper',
                        input
                            ref: 'select'
                            className: 'select',
                            type: 'checkbox',
                            checked: @props.selected,
                            onChange: @onSelect

                params =
                    conversationID: conversationID
                    messageID: message.get 'id'
        url = @buildUrl
            direction: 'second'
            action: action
            parameters: params
        if not @props.edited
            tag = a
        else
            tag = span
