diff --git a/res/values/custom.xml b/res/values/custom.xml
index 9802a3127..0b975b0c4 100644
--- a/res/values/custom.xml
+++ b/res/values/custom.xml
@@ -3,27 +3,9 @@
 
 
 	<string name="app_name">Linphone</string>
-	<string name="default_domain">test.linphone.org</string>
-
-	<bool name="use_android_contact_picker">true</bool>
-    
-    <bool name="useFirstLoginActivity">false</bool>
-	<bool name="useMenuSettings">true</bool>
-	<bool name="useMenuAbout">true</bool>
-	<bool name="use_incall_activity">false</bool>
-	<bool name="use_conference_activity">true</bool>
-	<bool name="use_video_activity">true</bool>
-	<bool name="use_incoming_call_dialog">false</bool>
-	<bool name="use_incoming_call_activity">true</bool>
-	<bool name="show_full_remote_address_on_incoming_call">true</bool>
-
 	<string name="notification_title">Linphone</string>
-	<bool name="allow_edit_in_dialer">true</bool>
 	<string name="notification_registered">Registered to %s </string> 
 	<string name="notification_register_failure">Fails to register to %s</string>
-	<color name="conf_active_bg_color">#191970</color>
-
 	<string name="about_text">Linphone %s SIP (rfc 3261) compatible phone under GNU Public License V2\n http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/m/help\n\n© 2011 Belledonne Communications</string>
-	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
 </resources>
  
\ No newline at end of file
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
new file mode 100644
index 000000000..68d828161
--- /dev/null
+++ b/res/values/non_localizable_custom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+	<string name="default_domain">test.linphone.org</string>
+
+	<bool name="use_android_contact_picker">true</bool>
+    
+    <bool name="useFirstLoginActivity">false</bool>
+	<bool name="useMenuSettings">true</bool>
+	<bool name="useMenuAbout">true</bool>
+	<bool name="use_incall_activity">false</bool>
+	<bool name="use_conference_activity">true</bool>
+	<bool name="use_video_activity">true</bool>
+	<bool name="use_incoming_call_dialog">false</bool>
+	<bool name="use_incoming_call_activity">true</bool>
+	<bool name="show_full_remote_address_on_incoming_call">true</bool>
+
+	<bool name="allow_edit_in_dialer">true</bool>
+	<color name="conf_active_bg_color">#191970</color>
+
+	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
+</resources>
+ 
\ No newline at end of file
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 25f3daa8b..270f2d7c4 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -497,11 +497,9 @@ public class ConferenceActivity extends ListActivity implements
 
 			LinphoneAddress address = call.getRemoteAddress();
 			String mainText = address.getDisplayName();
-			String complText;
+			String complText = address.getUserName();
 			if ((getResources().getBoolean(R.bool.show_full_remote_address_on_incoming_call))) {
-				complText = address.getUserName() + "@" + address.getDomain();
-			} else {
-				complText = address.getUserName();
+				complText += "@" + address.getDomain();
 			}
 			TextView mainTextView = (TextView) v.findViewById(R.id.name);
 			TextView complTextView = (TextView) v.findViewById(R.id.address);
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index e21727c60..ce1c2fe0a 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -112,7 +112,7 @@ public class IncomingCallActivity extends Activity implements LinphoneManagerRea
 		if (getResources().getBoolean(R.bool.show_full_remote_address_on_incoming_call)) {
 			mNumberView.setText(address.asStringUriOnly());
 		} else {
-			mNumberView.setText("");
+			mNumberView.setText(address.getUserName());
 		}
 	}