diff --git a/Makefile b/Makefile
index 0ed124dd1..28f67c96b 100644
--- a/Makefile
+++ b/Makefile
@@ -103,11 +103,11 @@ run-linphone:
 	ant run
 
 run-tests:
+	ant partial-clean && \
 	$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.test
 	$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone
 	@cd $(TOPDIR)/tests/ && \
 	$(SDK_PATH)/android update test-project --path . -m ../ && \
-	ant partial-clean && \
 	ant debug && \
 	ant installd && \
 	ant test
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 7c3f3c40d..204c556ed 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -75,26 +75,22 @@
 				    android:key="@string/pref_codec_ilbc_key"
 					android:title="@string/pref_codec_ilbc"
 					android:defaultValue="@bool/pref_codec_ilbc_default"
-					android:shouldDisableView="true"
 					android:summary="@string/pref_ilbc_summary"/>
 				
 				<CheckBoxPreference 
 				    android:key="@string/pref_codec_amr_key" 
 					android:title="@string/pref_codec_amr" 
-					android:defaultValue="@bool/pref_codec_amr_default"
-					android:shouldDisableView="true"  />
+					android:defaultValue="@bool/pref_codec_amr_default"  />
 				
 				<CheckBoxPreference 
 				    android:key="@string/pref_codec_g729_key"
 	                android:title="@string/pref_codec_g729"
-	                android:defaultValue="@bool/pref_codec_g729_default"
-	                android:shouldDisableView="true"  />
+	                android:defaultValue="@bool/pref_codec_g729_default"  />
 				
 	            <CheckBoxPreference 
 	                android:key="@string/pref_codec_amrwb_key"
 	                android:title="@string/pref_codec_amrwb"
-	                android:defaultValue="@bool/pref_codec_amrwb_default"
-	                android:shouldDisableView="true"  />
+	                android:defaultValue="@bool/pref_codec_amrwb_default"  />
 	            
 			 	<CheckBoxPreference 
 			 	    android:key="@string/pref_codec_gsm_key"
diff --git a/src/org/linphone/PreferencesFragment.java b/src/org/linphone/PreferencesFragment.java
index 0177ea044..7453df8c3 100644
--- a/src/org/linphone/PreferencesFragment.java
+++ b/src/org/linphone/PreferencesFragment.java
@@ -299,6 +299,7 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
 	}
 
 	private void detectAudioCodec(int id, String mime, int rate, int channels, boolean hide) {
+		Log.w("Payload type for codec " + mime + " = " + LinphoneManager.getLc().findPayloadType(mime, rate, channels));
 		boolean enable = LinphoneService.isReady() && LinphoneManager.getLc().findPayloadType(mime, rate, channels)!=null;
 		Preference cb = findPreference(id);
 		cb.setEnabled(enable);