diff --git a/Makefile b/Makefile
index 34ad2d7fe..efd35a7ea 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
 LINPHONE_VERSION=$(shell cd submodules/linphone && git describe)
 ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1)
 
-BUILD_X264=1
+BUILD_X264=0
 BUILD_AMRNB=full # 0, light or full
 BUILD_AMRWB=0
 BUILD_GPLV3_ZRTP=0
diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index 2d6b14c30..acb82890b 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -183,6 +183,9 @@
 	<string name="pref_media_encryption">Encryption</string>
 	<string name="media_encryption_none">Aucune</string>
 	
+	<string name="pref_video_codec_h264_unavailable">Codec supporté uniquement si compilé depuis les sources</string>
+	<string name="pref_video_codec_mpeg4_unavailable">Codec supporté uniquement si compilé depuis les sources</string>
+	
 	<string name="pref_sipaccounts">Comptes SIP</string>
 	<string name="pref_wifi_only">Wi-Fi uniquement</string>
 	<string name="pref_push_notification">Activer les notifications poussées</string>
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index f58d2a26e..389108b31 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -49,7 +49,9 @@
 	<bool name="allow_edit_in_dialer">true</bool>
 	<bool name="forbid_self_call">false</bool>
 	<bool name="disable_chat">false</bool>
-	<bool name="disable_all_security_features_for_markets">false</bool>
+	
+	<bool name="disable_all_security_features_for_markets">true</bool> <!-- Disable TLS/SRTP/ZRTP -->
+	<bool name="disable_all_patented_codecs_for_markets">true</bool> <!-- Disable MPEG4/H264 -->
 	
 	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
 	<string name="temp_photo_name">linphone-android-photo-temp.jpg</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e9f81d511..b29ff0ad1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -230,6 +230,9 @@
 	<string name="media_encryption_srtp">SRTP</string>
 	<string name="media_encryption_zrtp">ZRTP</string>
 	
+	<string name="pref_video_codec_h264_unavailable">Codec only supported if build from sources</string>
+	<string name="pref_video_codec_mpeg4_unavailable">Codec only supported if build from sources</string>
+	
 	<string name="pref_sipaccounts">SIP Accounts</string>
 	<string name="pref_wifi_only">Use wifi only</string>
 	<string name="pref_push_notification">Enable push notifications</string>
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 6c25f894a..351738cae 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -721,8 +721,7 @@ public class LinphoneActivity extends FragmentActivity implements
 	}
 
 	@Override
-	public void onMessageReceived(LinphoneAddress from,
-			LinphoneChatMessage message) {
+	public void onMessageReceived(LinphoneAddress from, LinphoneChatMessage message) {
 		if (getResources().getBoolean(R.bool.disable_chat)) {
 			return;
 		}
diff --git a/src/org/linphone/PreferencesFragment.java b/src/org/linphone/PreferencesFragment.java
index d95814b84..b9185cf0d 100644
--- a/src/org/linphone/PreferencesFragment.java
+++ b/src/org/linphone/PreferencesFragment.java
@@ -164,13 +164,23 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
 		}
 
 
-		detectVideoCodec(R.string.pref_video_codec_h264_key, "H264");
-		if (!Version.hasNeon())
-		{
-			// Android without neon doesn't support H264
-			Log.w("No NEON available, disabling H264");
-			findPreference(R.string.pref_video_codec_h264_key).setEnabled(false);
-			findPreference(R.string.pref_video_codec_h264_key).setDefaultValue(false);
+		if (getResources().getBoolean(R.bool.disable_all_patented_codecs_for_markets)) {
+			Preference prefH264 = findPreference(R.string.pref_video_codec_h264_key);
+			prefH264.setEnabled(false);
+			prefH264.setSummary(R.string.pref_video_codec_h264_unavailable);
+			
+			Preference prefMPEG4 = findPreference(R.string.pref_video_codec_mpeg4_key);
+			prefMPEG4.setEnabled(false);
+			prefMPEG4.setSummary(R.string.pref_video_codec_mpeg4_unavailable);
+		} else {
+			detectVideoCodec(R.string.pref_video_codec_h264_key, "H264");
+			if (!Version.hasNeon())
+			{
+				// Android without neon doesn't support H264
+				Log.w("No NEON available, disabling H264");
+				findPreference(R.string.pref_video_codec_h264_key).setEnabled(false);
+				findPreference(R.string.pref_video_codec_h264_key).setDefaultValue(false);
+			}
 		}
 		
 		if (Hacks.needSoftvolume()) {