diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
index 5691f9157..663abddbb 100644
--- a/res/layout/incoming.xml
+++ b/res/layout/incoming.xml
@@ -4,12 +4,8 @@
 	android:layout_width="match_parent" 
 	android:layout_height="match_parent"
   	android:background="@drawable/background">
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="75dp"
-        android:scaleType="fitXY"
-        android:src="@drawable/header_incoming" />
+    
+    <include layout="@layout/incoming_header" />
     
 	<LinearLayout 
 		android:layout_width="match_parent" 
diff --git a/res/layout/incoming_header.xml b/res/layout/incoming_header.xml
new file mode 100644
index 000000000..c3075e73c
--- /dev/null
+++ b/res/layout/incoming_header.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+    xmlns:linphone="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="75dp"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:background="@drawable/cell_call_first">
+	    
+    <TextView
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical|left"
+        android:paddingBottom="20dp"
+        android:paddingLeft="20dp"
+       	android:paddingRight="10dp"
+        android:textStyle="bold"
+        android:textColor="@color/text_header"
+        android:text="@string/incoming"
+        android:textSize="26dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index c682e83fb..4021030ac 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -202,6 +202,7 @@
 	
 	<string name="addressHint">Numéro ou adresse</string>
 	<string name="conference">Conférence</string>
+	<string name="incoming">Appel entrant</string>
 	<string name="draft">Brouillon</string>
 	<string name="new_fast_chat">Entrez une adresse SIP&#8230;</string>
 	<string name="no_call_history">Aucun appel dans votre historique.</string>
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 29cc1318e..24662a71d 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -40,6 +40,7 @@
 	<bool name="allow_transfers">true</bool>
 	<bool name="allow_edit_in_dialer">true</bool>
 	<bool name="forbid_self_call">false</bool>
+	<bool name="disable_chat">false</bool>
 	
 	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d181a5702..0c08fcea6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -252,6 +252,7 @@
 	
 	<string name="addressHint">Number or address</string>
 	<string name="conference">Conference</string>
+	<string name="incoming">Incoming call</string>
 	<string name="draft">Draft</string>
 	<string name="new_fast_chat">Enter a SIP address to chat with&#8230;</string>
 	<string name="no_call_history">No call in your history.</string>
diff --git a/src/org/linphone/ContactFragment.java b/src/org/linphone/ContactFragment.java
index b6abcaadd..21d76f81c 100644
--- a/src/org/linphone/ContactFragment.java
+++ b/src/org/linphone/ContactFragment.java
@@ -156,6 +156,10 @@ public class ContactFragment extends Fragment implements OnClickListener {
 				}
 			}
 			
+			if (getResources().getBoolean(R.bool.disable_chat)) {
+				v.findViewById(R.id.chat).setVisibility(View.GONE);
+			}
+			
 			controls.addView(v);
 		}
 	}
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index eb4a7e6d2..da4f1b209 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -476,6 +476,10 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 	}
 	
 	public void displayChat(String sipUri) {
+		if (getResources().getBoolean(R.bool.disable_chat)) {
+			return;
+		}
+		
 		LinphoneAddress lAddress = LinphoneCoreFactory.instance().createLinphoneAddress(sipUri);
 		Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(lAddress, getContentResolver());
 		String displayName = lAddress.getDisplayName();
@@ -684,6 +688,10 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 	
 	@Override
 	public void onMessageReceived(LinphoneAddress from, LinphoneChatMessage message) {
+		if (getResources().getBoolean(R.bool.disable_chat)) {
+			return;
+		}
+		
 		String textMessage = message.getMessage();
 		String url = message.getExternalBodyUrl();
 		String notificationText = null;