diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index aa4fffa19..ff0ff6939 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -458,7 +458,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			mLc.setRing(null);
 			mLc.setRootCA(mLinphoneRootCaFile);
 			mLc.setPlayFile(mPauseSoundFile);
-
+			mLc.setVideoPolicy(isAutoInitiateVideoCalls(), isAutoAcceptCamera());
 
 			try {
 				initFromConf();
@@ -1098,9 +1098,13 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		return isVideoEnabled() && getPrefBoolean(R.string.pref_video_automatically_share_my_video_key, false);
 	}
 	
-	public boolean autoAcceptCamera() {
+	public boolean isAutoAcceptCamera() {
 		return getPrefBoolean(R.string.pref_video_automatically_accept_video_key, false);
 	}
+	
+	public boolean isAutoInitiateVideoCalls() {
+		return getPrefBoolean(R.string.pref_video_initiate_call_with_video_key, false);
+	}
 
 	public void setAudioModeIncallForGalaxyS() {
 		mAudioManager.setMode(MODE_IN_CALL);
@@ -1325,6 +1329,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			if (state == State.CallEnd && mLc.getCallsNb() == 0) {
 				routeAudioToReceiver();
 			}
+			
 			if (serviceListener != null) serviceListener.onCallStateChanged(call, state, message);
 			for (LinphoneOnCallStateChangedListener l : getSimpleListeners(LinphoneOnCallStateChangedListener.class)) {
 				l.onCallStateChanged(call, state, message);
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index f6ee3c835..2e79fde95 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -692,4 +692,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 			throws LinphoneCoreException {
 		deferCallUpdate(nativePtr, aCall, params);
 	}
+	
+	private native void setVideoPolicy(long nativePtr, boolean autoInitiate, boolean autoAccept);
+	public void setVideoPolicy(boolean autoInitiate, boolean autoAccept) {
+		setVideoPolicy(nativePtr, autoInitiate, autoAccept);
+	}
 }
diff --git a/submodules/externals/exosip b/submodules/externals/exosip
index c3da03035..7f12fd70a 160000
--- a/submodules/externals/exosip
+++ b/submodules/externals/exosip
@@ -1 +1 @@
-Subproject commit c3da0303519ad3120355cb85baee9cf6d0e4d1c2
+Subproject commit 7f12fd70a3109a8d3c8e874a16d2992231ce9915
diff --git a/submodules/linphone b/submodules/linphone
index 221c0c580..9bb862151 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 221c0c58067b858c9cee8a8aadb3a763003b7887
+Subproject commit 9bb8621513b435ff07b8a66138941632f5130710