diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index c6faa037b..d050ad2ee 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -387,21 +387,21 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			registerForContextMenu(v);
 			RelativeLayout rlayout = new RelativeLayout(context);
 
-		/*	CheckBox deleteChatBubble = (CheckBox) v.findViewById(R.id.delete_message);
+			//CheckBox deleteChatBubble = (CheckBox) v.findViewById(R.id.delete_message);
 
 			if(isEditMode) {
-				deleteChatBubble.setVisibility(View.VISIBLE);
+				//deleteChatBubble.setVisibility(View.VISIBLE);
 				if(message.isOutgoing()){
 					RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
 					layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
 					layoutParams.setMargins(100, 10, 10, 10);
 					v.setLayoutParams(layoutParams);
 				} else {
-					LinearLayout message_layout = (LinearLayout) v.findViewById(R.id.message_content);
+					LinearLayout message_layout = (LinearLayout) v.findViewById(R.id.message_layout);
 					message_layout.setGravity(Gravity.RIGHT);
 				}
 
-				deleteChatBubble.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+			/*	deleteChatBubble.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 					@Override
 					public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
 						messagesList.setItemChecked(position, b);
@@ -423,12 +423,13 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 					}
 				});
 
+
 				if(messagesList.isItemChecked(position)) {
 					deleteChatBubble.setChecked(true);
 				} else {
 					deleteChatBubble.setChecked(false);
 				}
-
+				*/
 				rlayout.addView(v);
 			} else {
 				if(message.isOutgoing()){
@@ -444,7 +445,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 				}
 				rlayout.addView(v);
 			}
-			*/
+			
 			return rlayout;
 		}
 	}
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 3f939c632..8901287c5 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -748,6 +748,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	}
 
 	public void displayChat(String sipUri) {
+		Log.e("===>>> displayChat");
 		if (getResources().getBoolean(R.bool.disable_chat)) {
 			return;
 		}