diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index 601123870..1aab74c9d 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -46,6 +46,7 @@
     <string name="pref_video_codec_mpeg4_key">pref_video_codec_mpeg4_key</string>
     <string name="pref_video_codec_h264_key">pref_video_codec_h264_key</string>
     <string name="pref_video_automatically_share_my_video_key">pref_video_automatically_share_my_video_key</string>
+    <string name="pref_video_automatically_accept_video_key">pref_video_automatically_accept_video_key</string>
     <string name="pref_video_initiate_call_with_video_key">pref_video_initiate_call_with_video_key</string>
     <string name="pref_video_enable_key">pref_video_enable_key</string>
     <string name="pref_escape_plus_key">pref_escape_plus_key</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bdd3d68bb..896ccecbf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -136,7 +136,9 @@
 	<string name="menu_videocall_terminate_call_title">Terminate call</string>
     <string name="pref_video_settings_title">Video settings</string>
     <string name="pref_video_automatically_share_my_video_title">Share my camera</string>
+    <string name="pref_video_automatically_accept_video_title">Accept incoming camera</string>
     <string name="pref_video_automatically_share_my_video">Automatically send my camera</string>
+    <string name="pref_video_automatically_accept_video">Automatically accept correspondent\'s camera</string>
     <string name="pref_video_initiate_call_with_video_title">Initiate video calls</string>
     <string name="pref_video_initiate_call_with_video"></string>
     <string name="pref_video_enable_title">Enable Video</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 36bca9175..3ea6bc3b5 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -122,6 +122,12 @@
 			android:title="@string/pref_video_automatically_share_my_video_title"
 			android:defaultValue="true" android:summary="@string/pref_video_automatically_share_my_video"
 			android:dependency="@string/pref_video_enable_key"></CheckBoxPreference>
+		
+	    <CheckBoxPreference
+			android:key="@string/pref_video_automatically_accept_video_key"
+			android:title="@string/pref_video_automatically_accept_video_title"
+			android:defaultValue="true" android:summary="@string/pref_video_automatically_accept_video"
+			android:dependency="@string/pref_video_enable_key"></CheckBoxPreference>
 	
 			<PreferenceScreen android:dependency="@string/pref_video_enable_key"
 				android:shouldDisableView="true" android:key="@string/pref_video_codecs_key"
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 68b984203..aa4fffa19 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -1097,6 +1097,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	public boolean shareMyCamera() {
 		return isVideoEnabled() && getPrefBoolean(R.string.pref_video_automatically_share_my_video_key, false);
 	}
+	
+	public boolean autoAcceptCamera() {
+		return getPrefBoolean(R.string.pref_video_automatically_accept_video_key, false);
+	}
 
 	public void setAudioModeIncallForGalaxyS() {
 		mAudioManager.setMode(MODE_IN_CALL);