1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 86526040..b6f88356 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -31,6 +31,8 @@ import eu.siacs.conversations.entities.Presences;
 import eu.siacs.conversations.ui.ConversationActivity;
 import eu.siacs.conversations.ui.XmppActivity;
 import eu.siacs.conversations.utils.UIHelper;
+import github.ankushsachdeva.emojicon.EmojiconTextView;
+
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
@@ -79,7 +81,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		} else {
 			convName.setText(conversation.getJid().toBareJid().toString());
 		}
-		TextView mLastMessage = (TextView) view.findViewById(R.id.conversation_lastmsg);
+		EmojiconTextView mLastMessage = (EmojiconTextView) view.findViewById(R.id.conversation_lastmsg);
 		TextView mTimestamp = (TextView) view.findViewById(R.id.conversation_lastupdate);
 		ImageView imagePreview = (ImageView) view.findViewById(R.id.conversation_lastimage);