diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index d18553c8f..93383471f 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -13,7 +13,6 @@
false
false
true
- true
true
true
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index 932057d91..f75bd5a06 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -97,10 +97,10 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat
// To be done after findUriPictureOfContactAndSetDisplayName called
mNameView.setText(address.getDisplayName());
- if (getResources().getBoolean(R.bool.show_full_remote_address_on_incoming_call)) {
- mNumberView.setText(address.asStringUriOnly());
- } else {
+ if (getResources().getBoolean(R.bool.only_display_username_if_unknown)) {
mNumberView.setText(address.getUserName());
+ } else {
+ mNumberView.setText(address.asStringUriOnly());
}
}