             {likeText}
           </ActivityLikeLink>
           <Link onClick={@bound 'handleCommentLinkClick'}>Comment</Link>
-          <Link onClick={@bound 'toggleSharePopupVisibility'}>Share</Link>
-          <ActivitySharePopup
-            url = "Activity/Post/#{message.get('slug')}"
-            className='FeedItem-sharePopup'
-            isOpened={@state.isPopupOpen} />
+          <SocialShareLink messageId={message.get('id')} />
         </div>
         <MessageLikeSummary message={message} className="FeedItem-summary" />
         <Comments

ProfileText          = require 'app/components/profile/profiletext'
ActivityFlux         = require 'activity/flux'
Comments             = require 'activity/components/comments'
ActivitySharePopup   = require 'activity/components/activitysharepopup'
Avatar               = require 'app/components/profile/avatar'
MessageItemMenu      = require 'activity/components/messageitemmenu'
classnames           = require 'classnames'

    kd.utils.stopDOMEvent event

    @refs.Comments.focusCommentInput()


  updateMessage: ->
