diff --git a/.gitmodules b/.gitmodules
index b49766877..d0d34fa95 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,9 @@
 [submodule "submodules/externals/speex"]
 	path = submodules/externals/speex
 	url = http://git.xiph.org/speex.git
+[submodule "submodules/msilbc"]
+	path = submodules/msilbc
+	url = git://git.linphone.org/msilbc.git
+[submodule "submodules/libilbc-rfc3951"]
+	path = submodules/libilbc-rfc3951
+	url = git://git.linphone.org/libilbc-rfc3951.git
diff --git a/Android.mk b/Android.mk
index 084805be6..c419657aa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,9 @@ include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk
 
 include $(root-dir)/submodules/msandroid/Android.mk
 
+include $(root-dir)/submodules/msilbc/Android.mk
+
+
 include $(root-dir)/submodules/linphone/build/android/Android.mk
 
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d9472528e..dc7e5c2b5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
-      android:versionCode="108"
-      android:versionName="1.08">
+      android:versionName="1.09" android:versionCode="109"> 
     <uses-sdk android:minSdkVersion="3" />
     <application android:label="@string/app_name" android:debuggable = "true" android:icon="@drawable/logo_linphone_57x57">
          
diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so
index 9b23b0662..3c9ef3bfd 100755
Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index e32825100..da3e8676b 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -8,7 +8,7 @@
 		<LinearLayout android:layout_height="wrap_content"
 			android:layout_width="fill_parent" android:id="@+id/Addresslayout">
 			<EditText android:id="@+id/SipUri" android:background="@drawable/clavier_bg_grey" android:hint="sip:" android:layout_width="fill_parent"
-				android:lines="1" android:layout_weight="0.2" android:layout_height="fill_parent"></EditText>
+				android:lines="1" android:layout_weight="0.2" android:layout_height="fill_parent" android:padding="10px"></EditText>
 			<Button android:layout_height="fill_parent" android:background="@drawable/clavier_bg" android:id="@+id/Erase"
 				android:layout_width="fill_parent" android:layout_weight="0.8" android:textSize="20sp"
 				android:textStyle="bold" android:text="&lt;" android:layout_gravity="top"></Button>
diff --git a/res/raw/linphonerc b/res/raw/linphonerc
index 905235b83..b9571e707 100644
--- a/res/raw/linphonerc
+++ b/res/raw/linphonerc
@@ -14,6 +14,7 @@ use_ipv6=0
 register_only_when_network_is_up=0
 default_proxy=0
 auto_net_state_mon=0
+keepalive_period=3600000
 
 [rtp]
 audio_rtp_port=7076
@@ -29,43 +30,4 @@ capture_dev_id=ANDROID SND: Android Sound card
 remote_ring=/data/data/org.linphone/files/ringback.wav
 local_ring=/data/data/org.linphone/files/oldphone_mono.wav
 
-[audio_codec_0]
-mime=speex
-rate=32000
-enabled=0
-
-[audio_codec_1]
-mime=speex
-rate=16000
-enabled=1
-
-[audio_codec_2]
-mime=speex
-rate=8000
-enabled=1
-
-[audio_codec_3]
-mime=GSM
-rate=22050
-enabled=0
-
-[audio_codec_4]
-mime=GSM
-rate=11025
-enabled=0
-
-[audio_codec_5]
-mime=GSM
-rate=8000
-enabled=1
-
-[audio_codec_6]
-mime=PCMU
-rate=8000
-enabled=1
-
-[audio_codec_7]
-mime=PCMA
-rate=8000
-enabled=1
 
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index 859fde229..ac16abd69 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -147,7 +147,15 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 				public void onClick(View v) {
 					LinphoneCore lLinphoneCore =  LinphoneService.instance().getLinphoneCore();
 					if (lLinphoneCore.isInComingInvitePending()) {
-						lLinphoneCore.acceptCall();
+						try {
+							lLinphoneCore.acceptCall();
+						} catch (LinphoneCoreException e) {
+							lLinphoneCore.terminateCall();
+							Toast toast = Toast.makeText(DialerActivity.this
+									,String.format(getString(R.string.warning_wrong_destination_address),mAddress.getText().toString())
+									, Toast.LENGTH_LONG);
+							toast.show();
+						}
 						return;
 					}
 					if (lLinphoneCore.isIncall()) {
diff --git a/submodules/libilbc-rfc3951 b/submodules/libilbc-rfc3951
new file mode 160000
index 000000000..2f7640d57
--- /dev/null
+++ b/submodules/libilbc-rfc3951
@@ -0,0 +1 @@
+Subproject commit 2f7640d571fa12f75d269eda59d91e2037f99c5d
diff --git a/submodules/linphone b/submodules/linphone
index ec20c5451..936920203 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ec20c545196905108f76a78190b8273f1d3e698e
+Subproject commit 936920203a4fa75c798ba142a8bd7407497deea5
diff --git a/submodules/msilbc b/submodules/msilbc
new file mode 160000
index 000000000..7320dbb52
--- /dev/null
+++ b/submodules/msilbc
@@ -0,0 +1 @@
+Subproject commit 7320dbb5294f4fc92d80e794cb805185934ea16b