1 files changed, 4 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 a44851e3..6758acb6 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -14,6 +14,7 @@ import eu.siacs.conversations.utils.UIHelper;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -139,7 +140,9 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		} else {
 			if ((message.getEncryption() != Message.ENCRYPTION_PGP)
 					&& (message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED)) {
-				mLastMessage.setText(Config.PARSE_EMOTICONS ? UIHelper
+                boolean parseEmoticons = PreferenceManager
+                    .getDefaultSharedPreferences(activity).getBoolean("parse_emoticons", true);
+				mLastMessage.setText(parseEmoticons ? UIHelper
 						.transformAsciiEmoticons(getContext(), message.getBody()) : message
 						.getBody());
 			} else {