diff -r a304796f1c09 -r d18a48a68edf libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Mon Apr 07 23:11:33 2014 +0200
+++ b/libpurple/protocols/jabber/message.c	Tue Apr 08 14:11:19 2014 +0200
@@ -920,8 +920,8 @@
 	if (!jabber_conv_support_custom_smileys(jm->js, conv, jm->to))
 		return NULL;
 
-	found_smileys = purple_smiley_find(purple_smiley_custom_get_list(),
-		xhtml, TRUE);
+	found_smileys = purple_smiley_parser_find(
+		purple_smiley_custom_get_list(), xhtml, TRUE);
 	if (!found_smileys)
 		return NULL;
 
@@ -990,7 +990,8 @@
 
 	g_list_free(found_smileys);
 
-	smileyfied_xhtml = purple_smiley_parse_custom(xhtml,
+	smileyfied_xhtml = purple_smiley_parser_replace(
+		purple_smiley_custom_get_list(), xhtml,
 		jabber_message_smileyify_cb, NULL);
 
 	return smileyfied_xhtml;