fix bug where sdk < kitkat is unjustly punished

src/org/thoughtcrime/securesms/ConversationItem.java

@@ -186,10 +186,6 @@ public class ConversationItem extends LinearLayout {
 
   private void setBodyText(MessageRecord messageRecord) {
 
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-      bodyText.setText(Emoji.getInstance(context).emojify(messageRecord.getDisplayBody(), Emoji.EMOJI_LARGE),
-                       TextView.BufferType.SPANNABLE);
-    } else {
     if (messageRecord.isPush() && messageRecord.isOutgoing()) {
       LinearLayout conversationParent = (LinearLayout)findViewById(R.id.conversation_item_parent);
       if (conversationParent != null) {
@@ -204,6 +200,11 @@ public class ConversationItem extends LinearLayout {
         }
       }
     }
+
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+      bodyText.setText(Emoji.getInstance(context).emojify(messageRecord.getDisplayBody(), Emoji.EMOJI_LARGE),
+                       TextView.BufferType.SPANNABLE);
+    } else {
       bodyText.setText(messageRecord.getDisplayBody());
     }
   }