diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index e2a3ffe29..3ac594901 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -206,6 +206,12 @@
 				    android:key="@string/pref_auto_answer_key"
 					android:persistent="false"/>
 
+				<EditTextPreference
+					android:title="@string/pref_incoming_call_timeout_title"
+					android:key="@string/pref_incoming_call_timeout_key"
+					android:numeric="integer"
+					android:persistent="false"/>
+
 				<EditTextPreference
 				    android:title="@string/pref_voice_mail"
 					android:key="@string/pref_voice_mail_key"
diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java
index 5579de2e1..ebaa06871 100644
--- a/src/android/org/linphone/LinphonePreferences.java
+++ b/src/android/org/linphone/LinphonePreferences.java
@@ -976,6 +976,14 @@ public class LinphonePreferences {
 		getLc().setUseSipInfoForDtmfs(use);
 	}
 
+	public int getIncTimeout() {
+		return getLc().getIncomingTimeout();
+	}
+
+	public void setIncTimeout(int timeout) {
+		getLc().setIncomingTimeout(timeout);
+	}
+
 	public String getVoiceMailUri() {
 		return getConfig().getString("app", "voice_mail", null);
 	}
diff --git a/src/android/org/linphone/SettingsFragment.java b/src/android/org/linphone/SettingsFragment.java
index 6f64675c4..13ffa67a4 100644
--- a/src/android/org/linphone/SettingsFragment.java
+++ b/src/android/org/linphone/SettingsFragment.java
@@ -860,11 +860,15 @@ public class SettingsFragment extends PreferencesListFragment {
 		CheckBoxPreference autoAnswer = (CheckBoxPreference) findPreference(getString(R.string.pref_auto_answer_key));
 		CheckBoxPreference rfc2833 = (CheckBoxPreference) findPreference(getString(R.string.pref_rfc2833_dtmf_key));
 		CheckBoxPreference sipInfo = (CheckBoxPreference) findPreference(getString(R.string.pref_sipinfo_dtmf_key));
+		EditTextPreference incTimeout = (EditTextPreference) findPreference(getString(R.string.pref_incoming_call_timeout_key));
+
 
 		rfc2833.setChecked(mPrefs.useRfc2833Dtmfs());
 		sipInfo.setChecked(mPrefs.useSipInfoDtmfs());
 		deviceRingtone.setChecked(mPrefs.isDeviceRingtoneEnabled());
 		autoAnswer.setChecked(mPrefs.isAutoAnswerEnabled());
+		incTimeout.setText(String.valueOf(mPrefs.getIncTimeout()));
+		incTimeout.setSummary((String.valueOf(mPrefs.getIncTimeout())));
 
 		setPreferenceDefaultValueAndSummary(R.string.pref_voice_mail_key, mPrefs.getVoiceMailUri());
 	}
@@ -954,6 +958,16 @@ public class SettingsFragment extends PreferencesListFragment {
 				return true;
 			}
 		});
+
+		findPreference(getString(R.string.pref_incoming_call_timeout_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+			@Override
+			public boolean onPreferenceChange(Preference preference, Object newValue) {
+				String value = (String) newValue;
+				mPrefs.setIncTimeout(Integer.valueOf(value));
+				preference.setSummary(value);
+				return true;
+			}
+		});
 	}
 
 	private void setEncryptionZrtp() {
diff --git a/submodules/linphone b/submodules/linphone
index 9a46a2ac3..af93de9a9 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 9a46a2ac3e3aeaef26b63c51f8f14e5e8cb405f9
+Subproject commit af93de9a95171530c93e22919e88f0db0d785919