diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so
index c6b38b0fd..6ce06a654 100755
Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ
diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so
index b672c656f..bd994d3a8 100755
Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 60d1daa0a..218bffe1e 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -9,7 +9,7 @@
 			android:key="@string/pref_domain_key"></EditTextPreference>
 		<EditTextPreference android:title="@string/pref_proxy"
 			android:key="@string/pref_proxy_key"></EditTextPreference>
-	<CheckBoxPreference android:enabled="true" android:selectable="false" android:key="@string/pref_enable_outbound_proxy_key" android:title="@string/pref_enable_outbound_proxy"></CheckBoxPreference>
+	<CheckBoxPreference android:enabled="true" android:selectable="true" android:key="@string/pref_enable_outbound_proxy_key" android:title="@string/pref_enable_outbound_proxy"></CheckBoxPreference>
 </PreferenceCategory>
 	<PreferenceCategory android:title="@string/pref_advanced">
 		<PreferenceScreen android:title="@string/pref_codecs" android:key="@string/pref_codecs_key">
diff --git a/src/org/linphone/AboutActivity.java b/src/org/linphone/AboutActivity.java
index 1344fec8a..3797305cd 100644
--- a/src/org/linphone/AboutActivity.java
+++ b/src/org/linphone/AboutActivity.java
@@ -39,4 +39,3 @@ public class AboutActivity extends Activity {
 		}
 	}
 }
-
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
index dfd5c78e4..e8907126c 100644
--- a/src/org/linphone/DialerActivity.java
+++ b/src/org/linphone/DialerActivity.java
@@ -438,17 +438,20 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 		mInCallAddressLayout.setVisibility(View.VISIBLE);
 		mCall.setEnabled(false);
 		mHangup.setEnabled(true);
-		String DisplayName = lc.getRemoteAddress().getDisplayName();
-		if (DisplayName!=null) {
-			mDisplayNameView.setText(DisplayName);
-		} else {
-			mDisplayNameView.setText(lc.getRemoteAddress().getUserName());
+		LinphoneAddress remote=lc.getRemoteAddress();
+		if (remote!=null){
+			String DisplayName = remote.getDisplayName();
+			if (DisplayName!=null) {
+				mDisplayNameView.setText(DisplayName);
+			} else {
+				mDisplayNameView.setText(lc.getRemoteAddress().getUserName());
+			}
 		}
-		 if (mSpeaker.isChecked()) {
+		if (mSpeaker.isChecked()) {
 			 routeAudioToSpeaker();
-		 } else {
+		} else {
 			 routeAudioToReceiver();
-		 }
+		}
 		setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
 	}
 	private void exitCallMode() {
@@ -524,5 +527,4 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 			return;
 		}
 	}
-	
 }
diff --git a/submodules/linphone b/submodules/linphone
index 4d214fbde..ab5503fca 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 4d214fbde859f93442376f0de68ffc1f1dcf1717
+Subproject commit ab5503fca8ef3932bb5211396893012c9ef4ef6d