diff --git a/res/values/non_localizable_defaults.xml b/res/values/non_localizable_defaults.xml
index 5af444e96..1b5bd2618 100644
--- a/res/values/non_localizable_defaults.xml
+++ b/res/values/non_localizable_defaults.xml
@@ -5,18 +5,18 @@
     <string name="pref_tunnel_port_default">443</string>
     <string name="default_tunnel_mode_entry_value">@string/tunnel_mode_entry_value_disabled</string>
     
-    <bool name="pref_echo_canceller_default">false</bool>
+    <bool name="pref_echo_canceller_default">true</bool>
     <!-- Audio codecs -->
     <bool name="pref_codec_speex16_default">true</bool>
     <bool name="pref_codec_speex8_default">true</bool>
     <bool name="pref_codec_ilbc_default">true</bool>
-    <bool name="pref_codec_amr_default">true</bool>
+    <bool name="pref_codec_amr_default">false</bool>
     <bool name="pref_codec_g729_default">true</bool>
-    <bool name="pref_codec_amrwb_default">true</bool>
+    <bool name="pref_codec_amrwb_default">false</bool>
     <bool name="pref_codec_gsm_default">true</bool>
-    <bool name="pref_codec_g722_default">true</bool>
+    <bool name="pref_codec_g722_default">false</bool>
     <bool name="pref_codec_silk24_default">false</bool>
-    <bool name="pref_codec_silk16_default">false</bool>
+    <bool name="pref_codec_silk16_default">true</bool>
     <bool name="pref_codec_pcmu_default">true</bool>
     <bool name="pref_codec_pcma_default">true</bool>
     
diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index 994a4e282..286d99459 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -139,7 +139,7 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 	}
 
 	private void launchEchoCancellerCalibration(boolean sendEcCalibrationResult) {
-		if (!Hacks.hasBuiltInEchoCanceller() && !mPref.getBoolean(getString(R.string.first_launch_suceeded_once_key), false)) {
+		if (LinphoneManager.getLc().needsEchoCalibration() && !mPref.getBoolean(getString(R.string.first_launch_suceeded_once_key), false)) {
 			EchoCancellerCalibrationFragment fragment = new EchoCancellerCalibrationFragment();
 			fragment.enableEcCalibrationResultSending(sendEcCalibrationResult);
 			changeFragment(fragment);
diff --git a/submodules/linphone b/submodules/linphone
index 04fef5fcc..87906bd74 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 04fef5fcca637a601025b01a62843f1423ff0d96
+Subproject commit 87906bd74c139512c633f31c0b9aa114baa717ec