diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 2555299d3..3e8237116 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -566,16 +566,14 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso
 			}
 		}
 
-		ProxyConfig lpc = getLc().getDefaultProxyConfig();
-		/*if (lpc != null) {
-			to = lpc.normalizePhoneNumber(to);
-		}*/
-
 		Address lAddress;
-		lAddress = mLc.interpretUrl(to);
+		lAddress = mLc.interpretUrl(to); // InterpretUrl does normalizePhoneNumber
 		if (lAddress == null)  {
+			Log.e("Couldn't convert to String to Address : " + to);
 			return;
 		}
+
+		ProxyConfig lpc = mLc.getDefaultProxyConfig();
 		if (mR.getBoolean(R.bool.forbid_self_call) && lpc != null && lAddress.asStringUriOnly().equals(lpc.getIdentityAddress())) {
 			return;
 		}
diff --git a/src/android/org/linphone/contacts/ContactDetailsFragment.java b/src/android/org/linphone/contacts/ContactDetailsFragment.java
index 30235a517..df1e37f6b 100644
--- a/src/android/org/linphone/contacts/ContactDetailsFragment.java
+++ b/src/android/org/linphone/contacts/ContactDetailsFragment.java
@@ -144,9 +144,11 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 
 
 			ProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig();
-			if (lpc != null && !noa.isSIPAddress()) {
+			if (lpc != null) {
 				String username = lpc.normalizePhoneNumber(displayednumberOrAddress);
-				value = LinphoneUtils.getFullAddressFromUsername(username);
+				if (username != null) {
+					value = LinphoneUtils.getFullAddressFromUsername(username);
+				}
 			}
 
 			String contactAddress = contact.getPresenceModelForUriOrTel(noa.getValue());
diff --git a/src/android/org/linphone/contacts/ContactsManager.java b/src/android/org/linphone/contacts/ContactsManager.java
index b991139b2..4f501f78a 100644
--- a/src/android/org/linphone/contacts/ContactsManager.java
+++ b/src/android/org/linphone/contacts/ContactsManager.java
@@ -231,6 +231,7 @@ public class ContactsManager extends ContentObserver {
 		}
 		if (lpc == null) return null;
 		String normalized = lpc.normalizePhoneNumber(phoneNumber);
+		if (normalized == null) normalized = phoneNumber;
 
 		Address addr = lpc.normalizeSipUri(normalized);
 		if (addr == null) {
diff --git a/submodules/linphone b/submodules/linphone
index 94a51d3ec..447076ead 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 94a51d3ec1b7dd69fd595e1eab50fda72c33dbda
+Subproject commit 447076eadcd364815cc105578676d5579b358aa0