1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index c3736f0b..c98dbdd0 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -226,17 +226,17 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			final String formattedBody = message.getMergedBody().replaceAll("^" + Message.ME_COMMAND,
 					nick + " ");
 			if (message.getType() != Message.TYPE_PRIVATE) {
-                boolean parseEmoticons = Settings.PARSE_EMOTICONS;
-                viewHolder.messageBody.setText(parseEmoticons ? UIHelper
-						.transformAsciiEmoticons(getContext(), message.getMergedBody())
-						: message.getMergedBody());
+
 				if (message.hasMeCommand()) {
 					final Spannable span = new SpannableString(formattedBody);
 					span.setSpan(new StyleSpan(Typeface.BOLD_ITALIC), 0, nick.length(),
 							Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 					viewHolder.messageBody.setText(span);
 				} else {
-					viewHolder.messageBody.setText(message.getMergedBody());
+                    boolean parseEmoticons = Settings.PARSE_EMOTICONS;
+                    viewHolder.messageBody.setText(parseEmoticons ? UIHelper
+                            .transformAsciiEmoticons(getContext(), message.getMergedBody())
+                            : message.getMergedBody());
 				}
 			} else {
 				String privateMarker;