diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index 6bd632f84..18bb50e09 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -92,8 +92,11 @@ public class ContactsManager {
 		initializeContactManager(context,contentResolver);
 		Account newAccount = new Account(context.getString(R.string.sync_account_name), context.getString(R.string.sync_account_type));
 		AccountManager accountManager = (AccountManager) context.getSystemService(context.ACCOUNT_SERVICE);
-		accountManager.addAccountExplicitly(newAccount, null, null);
-		mAccount = newAccount;
+		if(accountManager.addAccountExplicitly(newAccount, null, null)){
+			mAccount = newAccount;
+		} else {
+			mAccount = null;
+		}
 	}
 
 	public String getDisplayName(String firstName, String lastName) {
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index bfba1f193..4450add06 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -800,11 +800,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) {
 	}
 
-	public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,
-			LinphoneAddress from, String message) {
-		//deprecated
-	}
-
 	@Override
 	public void dtmfReceived(LinphoneCore lc, LinphoneCall call, int dtmf) {
 		Log.d("DTMF received: " + dtmf);
diff --git a/src/org/linphone/setup/EchoCancellerCalibrationFragment.java b/src/org/linphone/setup/EchoCancellerCalibrationFragment.java
index a347a5f3e..d3e317da4 100644
--- a/src/org/linphone/setup/EchoCancellerCalibrationFragment.java
+++ b/src/org/linphone/setup/EchoCancellerCalibrationFragment.java
@@ -81,8 +81,6 @@ public class EchoCancellerCalibrationFragment extends Fragment {
 		return view;
 	}
 
-	
-
 	public void enableEcCalibrationResultSending(boolean enabled) {
 		mSendEcCalibrationResult = enabled;
 	}
@@ -111,9 +109,10 @@ public class EchoCancellerCalibrationFragment extends Fragment {
 			    }
 			};
 
-			Log.i("Add echo canceller calibration result: manufacturer=" + Build.MANUFACTURER + " model=" + Build.MODEL + " status=" + status + " delay=" + delayMs + "ms");
-		    client.callAsync(listener, "add_ec_calibration_result", Build.MANUFACTURER, Build.MODEL, status.toString(), delayMs);
-		} 
+			Boolean hasBuiltInEchoCanceler = LinphoneManager.getLc().hasBuiltInEchoCanceler();
+			Log.i("Add echo canceller calibration result: manufacturer=" + Build.MANUFACTURER + " model=" + Build.MODEL + " status=" + status + " delay=" + delayMs + "ms" + " hasBuiltInEchoCanceler " + hasBuiltInEchoCanceler);
+		    client.callAsync(listener, "add_ec_calibration_result", Build.MANUFACTURER, Build.MODEL, status.toString(), delayMs, hasBuiltInEchoCanceler);
+		}
 		catch(Exception ex) {}
 	}
 }
diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index 4cfce5d42..62c70abc2 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -224,7 +224,7 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 			cancel.setEnabled(false);
 		} else {
 			if (mPrefs.isFirstLaunch()) {
-				mPrefs.setEchoCancellation(LinphoneManager.getLc().needsEchoCanceler());
+				mPrefs.setEchoCancellation(LinphoneManager.getLc().hasBuiltInEchoCanceler());
 			}
 			success();
 		}		
diff --git a/submodules/linphone b/submodules/linphone
index 098ddaead..075f13f23 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 098ddaead686928c735c05c2c808600eef55ae0b
+Subproject commit 075f13f233c21caec79ca0e3ed3796f0e0082e4f
diff --git a/tests/src/org/linphone/test/LinphoneTestManager.java b/tests/src/org/linphone/test/LinphoneTestManager.java
index 9fc68ab95..3d06e9c7b 100644
--- a/tests/src/org/linphone/test/LinphoneTestManager.java
+++ b/tests/src/org/linphone/test/LinphoneTestManager.java
@@ -338,13 +338,6 @@ public class LinphoneTestManager implements LinphoneCoreListener{
 
 	}
 
-	@Override
-	public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,
-			LinphoneAddress from, String message) {
-		// TODO Auto-generated method stub
-
-	}
-
 	@Override
 	public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr,
 			LinphoneChatMessage message) {