diff --git a/res/raw/linphonerc b/res/raw/linphonerc
index c3f5f88b6..ee9ac44b1 100644
--- a/res/raw/linphonerc
+++ b/res/raw/linphonerc
@@ -18,7 +18,7 @@ default_proxy=0
 auto_net_state_mon=0
 keepalive_period=30000
 auto_answer_replacing_calls=1
-media_encryption=srtp
+media_encryption=none
 media_encryption_mandatory=0
 
 [rtp]
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index d321c4ded..b26e8c1b5 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -254,12 +254,15 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		routeAudioToSpeakerHelper(false);
 		if (mLc.isIncall()) {
 			//Restore default value
-			if (Version.isArmv7()){
-				mLc.getCurrentCall().enableEchoCancellation(mLc.isEchoCancellationEnabled());
-				mLc.getCurrentCall().enableEchoLimiter(false);
-			}else{
-				mLc.getCurrentCall().enableEchoCancellation(false);
-				mLc.getCurrentCall().enableEchoLimiter(mLc.isEchoCancellationEnabled());
+			LinphoneCall call=mLc.getCurrentCall();
+			if (call!=null){
+				if (Version.isArmv7()){
+					call.enableEchoCancellation(mLc.isEchoCancellationEnabled());
+					call.enableEchoLimiter(false);
+				}else{
+					call.enableEchoCancellation(false);
+					call.enableEchoLimiter(mLc.isEchoCancellationEnabled());
+				}
 			}
 		}
 	}
diff --git a/submodules/externals/exosip b/submodules/externals/exosip
index 0a98b96e5..4eabd05b1 160000
--- a/submodules/externals/exosip
+++ b/submodules/externals/exosip
@@ -1 +1 @@
-Subproject commit 0a98b96e5c72191d42fb8727e1088db126edf005
+Subproject commit 4eabd05b149d18629098f3254f15c8d14ff6664c
diff --git a/submodules/externals/osip b/submodules/externals/osip
index c27b9b670..37d363d04 160000
--- a/submodules/externals/osip
+++ b/submodules/externals/osip
@@ -1 +1 @@
-Subproject commit c27b9b6702f62cdbd2143c1ccc85b8980b83adac
+Subproject commit 37d363d04e8b9300a526dde4f3b331ec8dbbd079
diff --git a/submodules/linphone b/submodules/linphone
index cfaa4721e..f706103cc 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit cfaa4721e5bea988e585ee221ec88e97b657925d
+Subproject commit f706103cc3b7bb5b31c02fd83f8e221677264b68
diff --git a/test/org/linphone/TestConferenceActivity.java b/test/org/linphone/TestConferenceActivity.java
index 246b56053..d54610c10 100644
--- a/test/org/linphone/TestConferenceActivity.java
+++ b/test/org/linphone/TestConferenceActivity.java
@@ -338,6 +338,26 @@ public class TestConferenceActivity extends ConferenceActivity {
 			// TODO Auto-generated method stub
 			
 		}
+		@Override
+		public String getMediaEncryption() {
+			// TODO Auto-generated method stub
+			return null;
+		}
+		@Override
+		public boolean isMediaEncryptionMandatory() {
+			// TODO Auto-generated method stub
+			return false;
+		}
+		@Override
+		public void setMediaEncryption(String menc) {
+			// TODO Auto-generated method stub
+			
+		}
+		@Override
+		public void setMediaEncryptionMandatory(boolean yesno) {
+			// TODO Auto-generated method stub
+			
+		}
 	}