--- a/libpurple/protocols/jabber/message.c Sun Apr 06 21:02:03 2014 +0200 +++ b/libpurple/protocols/jabber/message.c Mon Apr 07 12:48:38 2014 +0200 @@ -868,6 +868,8 @@ const gssize len = strlen(shortcut); gchar *escaped = g_markup_escape_text(shortcut, len); + /* TODO: it doesn't take care of text inside a tag. + * Use purple_smiley_parse. */ if (g_str_has_prefix(&(xhtml[pos]), escaped)) { /* we found the current smiley at this position */ const JabberData *data =