social_emoji with mentions bug

Problem/Motivation

When I mention a user before adding an emoticon, the mention link is broken. If i first add an emoticon and mention a user, the link works fine.

Steps to reproduce

Proposed resolution

Remaining tasks

User interface changes

API changes

Data model changes