diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index c15692cdd..def3a8d98 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -117,6 +117,7 @@
     <string name="pref_audio_port_title">Port ou plage de port audio</string>
     <string name="pref_video_port_description">Port ou plage (min-max) pour l\'audio</string>
     <string name="pref_audio_port_description">Port ou plage (min-max) pour la video</string>
+    <string name="pref_incoming_call_timeout_title">Timeout (en secondes) pour les appels entrants</string>
     
 	<string name="pref_debug">Activer les traces de débogage</string>
 	<string name="about_report_issue">Reporter un problème</string>
diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index 6efcf79ca..64096947a 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -93,6 +93,5 @@
 	
     <string name="pref_video_port_key">pref_video_port_key</string>
     <string name="pref_audio_port_key">pref_audio_port_key</string>
-    <string name="pref_incoming_expire_key">pref_incoming_expire_key</string>
-    <string name="pref_communication_expire_key">pref_communication_expire_key</string>
+    <string name="pref_incoming_call_timeout_key">pref_incoming_expire_key</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index feb31f1a7..887665e9e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -163,6 +163,7 @@
     <string name="pref_audio_port_title">Audio port or port range</string>
     <string name="pref_video_port_description">Video port or port range (minport-maxport)</string>
     <string name="pref_audio_port_description">Audio port or port range (minport-maxport)</string>
+    <string name="pref_incoming_call_timeout_title">Incoming call timeout (in seconds)</string>
     <string name="place_call_chooser">Place a call</string>
     
 	<string name="pref_debug">Debug</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 30804d9fc..4f845fbb0 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -252,6 +252,12 @@
 		<CheckBoxPreference 
 		    android:key="@string/pref_escape_plus_key"
 			android:title="@string/pref_escape_plus"/>
+		
+		<EditTextPreference 
+		    android:key="@string/pref_incoming_call_timeout_key"
+		    android:title="@string/pref_incoming_call_timeout_title"
+		    android:defaultValue="30"
+		    android:layout="@layout/hidden"/>
 
 		<CheckBoxPreference 
 		    android:key="@string/pref_debug_key"
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 097ccc396..970da3872 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -698,6 +698,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		
 		readAndSetAudioAndVideoPorts();
 		
+		int incomingCallTimeout = Integer.parseInt(getPrefString(R.string.pref_incoming_call_timeout_key, "30"));
+		mLc.setIncomingTimeout(incomingCallTimeout);
+		
 		try {
 			// Configure audio codecs
 //			enableDisableAudioCodec("speex", 32000, 1, R.string.pref_codec_speex32_key);
diff --git a/submodules/linphone b/submodules/linphone
index 78a66ffc9..30032453d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 78a66ffc91e960f4cd3379495f02a00898235f3e
+Subproject commit 30032453d692bf5440a9b90f830c19f559a72005