diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 2ce6972f9..767230229 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -64,6 +64,7 @@
 	<bool name="disable_chat__message_notification">false</bool>
 	<bool name="disable_chat_send_file">false</bool>
 	<bool name="use_linphone_chat_storage">true</bool>
+	<bool name="auto_answer_calls">false</bool>
 	
 	<bool name="hash_images_as_name_before_upload">true</bool>
 	
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 82357d0f7..f8e013523 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -75,7 +75,6 @@ import org.linphone.core.LinphoneInfoMessage;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.PayloadType;
 import org.linphone.core.SubscriptionState;
-import org.linphone.core.VideoSize;
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.AndroidVideoApi5JniWrapper;
@@ -1259,7 +1258,14 @@ public class LinphoneManager implements LinphoneCoreListener {
 			} 
 		}
 		
-		if (state == IncomingReceived || (state == State.CallIncomingEarlyMedia && mR.getBoolean(R.bool.allow_ringing_while_early_media))) {
+		if (state == IncomingReceived && mR.getBoolean(R.bool.auto_answer_calls)) {
+			try {
+				mLc.acceptCall(call);
+			} catch (LinphoneCoreException e) {
+				e.printStackTrace();
+			}
+		}
+		else if (state == IncomingReceived || (state == State.CallIncomingEarlyMedia && mR.getBoolean(R.bool.allow_ringing_while_early_media))) {
 			// Brighten screen for at least 10 seconds
 			if (mLc.getCallsNb() == 1) {
 				ringingCall = call;