diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index f4fdb7776..3832407ad 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -12,7 +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="emoticons_in_messages">true</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/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 06d9b50ec..09cb19d67 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -164,7 +164,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneO
 				LinphoneActivity.instance().onMessageSent(sipUri, messageToSend);
 			}
 			
-			displayMessage(previousMessageID + 1, messageToSend, getString(R.string.now_date_format), false, messagesLayout);
+			displayMessage(previousMessageID + 2, messageToSend, getString(R.string.now_date_format), false, messagesLayout);
 			scrollToEnd();
 		}
 	}
@@ -181,7 +181,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneO
 	@Override
 	public void onMessageReceived(LinphoneAddress from, String message) {
 		if (from.asStringUriOnly().equals(sipUri))  {
-			int id = previousMessageID + 1;
+			int id = previousMessageID + 2;
 			displayMessage(id, message, getString(R.string.now_date_format), true, messagesLayout);
 			scrollToEnd();
 		}
diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java
index b7dc9661f..17f59b80f 100644
--- a/src/org/linphone/ui/BubbleChat.java
+++ b/src/org/linphone/ui/BubbleChat.java
@@ -24,6 +24,7 @@ import java.util.Map.Entry;
 
 import org.linphone.LinphoneUtils;
 import org.linphone.R;
+import org.linphone.core.Log;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -75,7 +76,7 @@ public class BubbleChat {
 	
 	public BubbleChat(Context context, int id, String message, String time, boolean isIncoming, int previousID) {
 		view = new RelativeLayout(context);
-    	
+		
     	LayoutParams layoutParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
     	
     	if (isIncoming) {