diff --git a/src/org/linphone/ContactEditorFragment.java b/src/org/linphone/ContactEditorFragment.java
index 8544e3056..e94aefdc0 100644
--- a/src/org/linphone/ContactEditorFragment.java
+++ b/src/org/linphone/ContactEditorFragment.java
@@ -385,7 +385,7 @@ public class ContactEditorFragment extends Fragment {
 		if (contact != null) {
 			for (LinphoneNumberOrAddress numberOrAddress : contact.getNumbersOrAddresses()) {
 				if (!numberOrAddress.isSIPAddress()) {
-					View view = displayNumberOrAddress(controls, numberOrAddress.getValue());
+					View view = displayNumberOrAddress(controls, numberOrAddress.getValue(), false);
 					if (view != null)
 						controls.addView(view);
 				}
@@ -395,7 +395,7 @@ public class ContactEditorFragment extends Fragment {
 		if (newSipOrNumberToAdd != null) {
 			boolean isSip = LinphoneUtils.isStrictSipAddress(newSipOrNumberToAdd) || !LinphoneUtils.isNumberAddress(newSipOrNumberToAdd);
 			if(!isSip) {
-				View view = displayNumberOrAddress(controls, newSipOrNumberToAdd);
+				View view = displayNumberOrAddress(controls, newSipOrNumberToAdd, false);
 				if (view != null)
 					controls.addView(view);
 			}
@@ -415,7 +415,7 @@ public class ContactEditorFragment extends Fragment {
 		if (contact != null) {
 			for (LinphoneNumberOrAddress numberOrAddress : contact.getNumbersOrAddresses()) {
 				if (numberOrAddress.isSIPAddress()) {
-					View view = displayNumberOrAddress(controls, numberOrAddress.getValue());
+					View view = displayNumberOrAddress(controls, numberOrAddress.getValue(), true);
 					if (view != null)
 						controls.addView(view);
 				}
@@ -425,7 +425,7 @@ public class ContactEditorFragment extends Fragment {
 		if (newSipOrNumberToAdd != null) {
 			boolean isSip = LinphoneUtils.isStrictSipAddress(newSipOrNumberToAdd) || !LinphoneUtils.isNumberAddress(newSipOrNumberToAdd);
 			if (isSip) {
-				View view = displayNumberOrAddress(controls, newSipOrNumberToAdd);
+				View view = displayNumberOrAddress(controls, newSipOrNumberToAdd, true);
 				if (view != null)
 					controls.addView(view);
 			}
@@ -438,35 +438,33 @@ public class ContactEditorFragment extends Fragment {
 		return controls;
 	}
 	
-	private View displayNumberOrAddress(final LinearLayout controls, String numberOrAddress) {
-		return displayNumberOrAddress(controls, numberOrAddress, false);
+	private View displayNumberOrAddress(final LinearLayout controls, String numberOrAddress, boolean isSIP) {
+		return displayNumberOrAddress(controls, numberOrAddress, isSIP, false);
 	}
 	
 	@SuppressLint("InflateParams")
-	private View displayNumberOrAddress(final LinearLayout controls, String numberOrAddress, boolean forceAddNumber) {
-		boolean isSip = LinphoneUtils.isStrictSipAddress(numberOrAddress) || !LinphoneUtils.isNumberAddress(numberOrAddress);
-		
-		if (isSip) {
+	private View displayNumberOrAddress(final LinearLayout controls, String numberOrAddress, boolean isSIP, boolean forceAddNumber) {
+		if (isSIP) {
 			if (firstSipAddressIndex == -1) {
 				firstSipAddressIndex = controls.getChildCount();
 			}
 			numberOrAddress = numberOrAddress.replace("sip:", "");
 		}
-		if ((getResources().getBoolean(R.bool.hide_phone_numbers_in_editor) && !isSip) || (getResources().getBoolean(R.bool.hide_sip_addresses_in_editor) && isSip)) {
+		if ((getResources().getBoolean(R.bool.hide_phone_numbers_in_editor) && !isSIP) || (getResources().getBoolean(R.bool.hide_sip_addresses_in_editor) && isSIP)) {
 			if (forceAddNumber)
-				isSip = !isSip; // If number can't be displayed because we hide a sort of number, change that category
+				isSIP = !isSIP; // If number can't be displayed because we hide a sort of number, change that category
 			else
 				return null;
 		}
 		
 		LinphoneNumberOrAddress tempNounoa;
 		if (forceAddNumber) {
-			tempNounoa = new LinphoneNumberOrAddress(null, isSip);
+			tempNounoa = new LinphoneNumberOrAddress(null, isSIP);
 		} else {
 			if(isNewContact || newSipOrNumberToAdd != null) {
-				tempNounoa = new LinphoneNumberOrAddress(numberOrAddress, isSip);
+				tempNounoa = new LinphoneNumberOrAddress(numberOrAddress, isSIP);
 			} else {
-				tempNounoa = new LinphoneNumberOrAddress(null, isSip, numberOrAddress);
+				tempNounoa = new LinphoneNumberOrAddress(null, isSIP, numberOrAddress);
 			}
 		}
 		final LinphoneNumberOrAddress nounoa = tempNounoa;
@@ -475,7 +473,7 @@ public class ContactEditorFragment extends Fragment {
 		final View view = inflater.inflate(R.layout.contact_edit_row, null);
 
 		final EditText noa = (EditText) view.findViewById(R.id.numoraddr);
-		noa.setInputType(isSip ? InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS : InputType.TYPE_CLASS_PHONE);
+		noa.setInputType(isSIP ? InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS : InputType.TYPE_CLASS_PHONE);
 		noa.setText(numberOrAddress);
 		noa.addTextChangedListener(new TextWatcher() {
 			@Override
@@ -496,7 +494,7 @@ public class ContactEditorFragment extends Fragment {
 		}
 		
 		ImageView delete = (ImageView) view.findViewById(R.id.delete_field);
-		if ((getResources().getBoolean(R.bool.allow_only_one_phone_number) && !isSip) || (getResources().getBoolean(R.bool.allow_only_one_sip_address) && isSip)) {
+		if ((getResources().getBoolean(R.bool.allow_only_one_phone_number) && !isSIP) || (getResources().getBoolean(R.bool.allow_only_one_sip_address) && isSIP)) {
 			delete.setVisibility(View.GONE);
 		}
 		delete.setOnClickListener(new OnClickListener() {
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 7233462bf..cc73283ec 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -203,12 +203,14 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 			}
 			
 			if (isLinphoneFriend()) {
-				if (!noa.getOldValue().startsWith("sip:")) {
-					noa.setOldValue("sip:" + noa.getOldValue());
+				if (noa.isSIPAddress()) {
+					if (!noa.getOldValue().startsWith("sip:")) {
+						noa.setOldValue("sip:" + noa.getOldValue());
+					}
 				}
 				LinphoneNumberOrAddress toRemove = null;
 				for (LinphoneNumberOrAddress address : addresses) {
-					if (noa.getOldValue().equals(address.getValue())) {
+					if (noa.getOldValue().equals(address.getValue()) && noa.isSIPAddress() == address.isSIPAddress()) {
 						toRemove = address;
 						break;
 					}
@@ -274,15 +276,19 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 				}
 			}
 			if (isLinphoneFriend()) {
-				if (!noa.getValue().startsWith("sip:")) {
-					noa.setValue("sip:" + noa.getValue());
+				if (noa.isSIPAddress()) {
+					if (!noa.getValue().startsWith("sip:")) {
+						noa.setValue("sip:" + noa.getValue());
+					}
 				}
 				if (noa.getOldValue() != null) {
-					if (!noa.getOldValue().startsWith("sip:")) {
-						noa.setOldValue("sip:" + noa.getOldValue());
+					if (noa.isSIPAddress()) {
+						if (!noa.getOldValue().startsWith("sip:")) {
+							noa.setOldValue("sip:" + noa.getOldValue());
+						}
 					}
 					for (LinphoneNumberOrAddress address : addresses) {
-						if (noa.getOldValue().equals(address.getValue())) {
+						if (noa.getOldValue().equals(address.getValue()) && noa.isSIPAddress() == address.isSIPAddress()) {
 							address.setValue(noa.getValue());
 							break;
 						}
@@ -321,10 +327,13 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 			for (LinphoneAddress address : friend.getAddresses()) {
 				friend.removeAddress(address);
 			}
-			for (LinphoneNumberOrAddress address : addresses) {
-				if (address.isSIPAddress()) {
+			for (String phone : friend.getPhoneNumbers()) {
+				friend.removePhoneNumber(phone);
+			}
+			for (LinphoneNumberOrAddress noa : addresses) {
+				if (noa.isSIPAddress()) {
 					try {
-						LinphoneAddress addr = lc.interpretUrl(address.getValue());
+						LinphoneAddress addr = lc.interpretUrl(noa.getValue());
 						if (addr != null) {
 							friend.addAddress(addr);
 							hasAddr = true;
@@ -332,6 +341,8 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 					} catch (LinphoneCoreException e) {
 						Log.e(e);
 					}
+				} else {
+					friend.addPhoneNumber(noa.getValue());
 				}
 			}
 			if (hasAddr) {
@@ -400,6 +411,8 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 							} catch (LinphoneCoreException e) {
 								Log.e(e);
 							}
+						} else {
+							friend.addPhoneNumber(noa.getValue());
 						}
 					}
 				}