diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so
old mode 100644
new mode 100755
index 78ea1bceb..c6b38b0fd
Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ
diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so
index 4df89d27c..b672c656f 100755
Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ
diff --git a/res/raw/linphonerc b/res/raw/linphonerc
index 5bc29692c..09d00c187 100644
--- a/res/raw/linphonerc
+++ b/res/raw/linphonerc
@@ -30,7 +30,7 @@ ringer_dev_id=ANDROID SND: Android Sound card
 capture_dev_id=ANDROID SND: Android Sound card
 remote_ring=/data/data/org.linphone/files/ringback.wav
 local_ring=/data/data/org.linphone/files/oldphone_mono.wav
-ec_delay=250
-ec_tail_len=300
+ec_delay=400
+ec_tail_len=200
 
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f802d269a..6864e431d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pref_ilbc_summary">ILBC codec not avalaible on old phone</string>
+    <string name="pref_ilbc_summary">ILBC codec might be unavailable on some phone models.</string>
     <string name="pref_echo_cancellation">Echo cancellation</string>
     <string name="pref_echo_cancellation_key">pref_echo_cancellation_key</string>
     <string name="pref_handle_outcall_summarry">If set cellular call are redirected to voip when possible</string>
@@ -54,7 +54,7 @@
 <string name="no">No</string>
 <string name="never_remind">Never remind me</string>
 <string name="config_error">%s, do you want to go to the settings page ?</string>
-<string name="initial_config_error">No initial config found, do you want to return to the settings page ?</string>
+<string name="initial_config_error">No SIP account has been configured yet, do you want to go to the settings page ?</string>
 <string name="warning_already_incall">Cannot initiate a new call because a call is already engaged</string>
 <string name="tab_history">History</string>
 <string name="warning_wrong_destination_address">Cannot build destination address from [%s]</string>
diff --git a/src/org/linphone/AboutActivity.java b/src/org/linphone/AboutActivity.java
index 3797305cd..1344fec8a 100644
--- a/src/org/linphone/AboutActivity.java
+++ b/src/org/linphone/AboutActivity.java
@@ -39,3 +39,4 @@ public class AboutActivity extends Activity {
 		}
 	}
 }
+
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 64adc0aa4..5bdaaf512 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -260,3 +260,4 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
 	
 
 }
+
diff --git a/src/org/linphone/NetworkManager.java b/src/org/linphone/NetworkManager.java
index e47b6f5ca..faefe57cf 100644
--- a/src/org/linphone/NetworkManager.java
+++ b/src/org/linphone/NetworkManager.java
@@ -44,7 +44,7 @@ public class NetworkManager extends BroadcastReceiver {
 		 } else if (lNetworkInfo.getState() == NetworkInfo.State.CONNECTED){
 			 LinphoneService.instance().getLinphoneCore().setNetworkStateReachable(true);
 		 } else {
-			 //unhandle event 
+			 //unhandled event 
 		 }
 			
 
diff --git a/submodules/linphone b/submodules/linphone
index 94b38f943..4d214fbde 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 94b38f943d37072154c55094ed2a6d7b4cecbe0e
+Subproject commit 4d214fbde859f93442376f0de68ffc1f1dcf1717