diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 52bcb796e..62800b38f 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -8,6 +8,7 @@
 	<string name="push_sender_id">622464153529</string>
 
 	<string name="default_domain">sip.linphone.org</string>
+	<bool name="override_domain_using_default_one">true</bool>
 	<string name="wizard_url">https://www.linphone.org/wizard.php</string>
 
 	<!-- Interface settings -->
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 947c1bcc3..7741e1465 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -383,6 +383,9 @@ public class LinphoneManager implements LinphoneCoreListener {
 		LinphoneAddress lAddress;
 		try {
 			lAddress = mLc.interpretUrl(to);
+			if (mServiceContext.getResources().getBoolean(R.bool.override_domain_using_default_one)) {
+				lAddress.setDomain(mServiceContext.getString(R.string.default_domain));
+			}
 			LinphoneProxyConfig lpc = mLc.getDefaultProxyConfig();
 
 			if (mR.getBoolean(R.bool.forbid_self_call) && lpc!=null && lAddress.asStringUriOnly().equals(lpc.getIdentity())) {
diff --git a/submodules/linphone b/submodules/linphone
index d1dc89b52..743594103 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit d1dc89b52078c002eeb2686179d70fe80c6f6ef2
+Subproject commit 74359410314eb7a49e5eeb56c4d995f234d36bac