diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 93383471f..f4fdb7776 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -12,6 +12,7 @@
 	<bool name="useFirstLoginActivity">false</bool>
 	<bool name="disable_animations">false</bool>
 	<bool name="lock_statusbar">false</bool>
+	<bool name="emoticons_in_messages">false</bool>
 	<bool name="only_display_username_if_unknown">true</bool>
 	<bool name="display_messages_time">true</bool> <!-- Used to show the time of each message arrival -->
 
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index c309ceca3..242dd6873 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -428,10 +428,10 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 			chatFragment.onMessageReceived(from, message);
 			chatStorage.markMessageAsRead(id);
 		} else if (LinphoneService.isReady()) {
-			LinphoneUtils.findUriPictureOfContactAndSetDisplayName(from, getContentResolver());
-			LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), from.getDisplayName(), message);
 			displayMissedChats(chatStorage.getUnreadMessageCount());
 		}
+		LinphoneUtils.findUriPictureOfContactAndSetDisplayName(from, getContentResolver());
+		LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), from.getDisplayName(), message);
 	}
 	
 	public void updateMissedChatCount() {
diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java
index 7e2ecc437..b7dc9661f 100644
--- a/src/org/linphone/ui/BubbleChat.java
+++ b/src/org/linphone/ui/BubbleChat.java
@@ -94,7 +94,11 @@ public class BubbleChat {
 		TextView messageView = new TextView(context);
 		messageView.setId(id);
     	messageView.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-    	messageView.setText(getSmiledText(context, message));
+    	if (context.getResources().getBoolean(R.bool.emoticons_in_messages)) {
+    		messageView.setText(getSmiledText(context, message));
+    	} else {
+    		messageView.setText(message);
+    	}
     	messageView.setTextColor(Color.BLACK);
 
     	view.setId(id);