remaining part of my patch

1 files changed, 2 insertions, 3 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 b81544e6..c5ee9ba6 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -139,10 +139,9 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		} else {
 			if ((message.getEncryption() != Message.ENCRYPTION_PGP)
 					&& (message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED)) {
-				String body = Config.PARSE_EMOTICONS ? UIHelper
+				mLastMessage.setText(Config.PARSE_EMOTICONS ? UIHelper
 						.transformAsciiEmoticons(message.getBody()) : message
-						.getBody();
-				mLastMessage.setText(body);
+						.getBody());
 			} else {
 				mLastMessage.setText(R.string.encrypted_message_received);
 			}