diff --git a/src/android/org/linphone/contacts/ContactDetailsFragment.java b/src/android/org/linphone/contacts/ContactDetailsFragment.java
index 3567bca15..9fa1490bb 100644
--- a/src/android/org/linphone/contacts/ContactDetailsFragment.java
+++ b/src/android/org/linphone/contacts/ContactDetailsFragment.java
@@ -43,6 +43,8 @@ import org.linphone.core.ChatRoom;
 import org.linphone.core.ChatRoomListenerStub;
 import org.linphone.core.Core;
 import org.linphone.core.Factory;
+import org.linphone.core.PresenceBasicStatus;
+import org.linphone.core.PresenceModel;
 import org.linphone.core.ProxyConfig;
 import org.linphone.fragments.FragmentsAvailable;
 import org.linphone.mediastream.Log;
@@ -205,11 +207,15 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
                 }
             }
 
-            String contactAddress = contact.getPresenceModelForUriOrTel(noa.getValue());
-            if (contactAddress != null) {
-                v.findViewById(R.id.friendLinphone).setVisibility(View.VISIBLE);
+            v.findViewById(R.id.friendLinphone).setVisibility(View.GONE);
+            if (contact.getFriend() != null) {
+                PresenceModel pm = contact.getFriend().getPresenceModelForUriOrTel(noa.getValue());
+                if (pm != null && pm.getBasicStatus().equals(PresenceBasicStatus.Open)) {
+                    v.findViewById(R.id.friendLinphone).setVisibility(View.VISIBLE);
+                }
             }
 
+            String contactAddress = contact.getPresenceModelForUriOrTel(noa.getValue());
             if (!displayChatAddressOnly) {
                 v.findViewById(R.id.contact_call).setOnClickListener(dialListener);
                 if (contactAddress != null) {
diff --git a/src/android/org/linphone/contacts/ContactEditorFragment.java b/src/android/org/linphone/contacts/ContactEditorFragment.java
index a24f8f855..994eac650 100644
--- a/src/android/org/linphone/contacts/ContactEditorFragment.java
+++ b/src/android/org/linphone/contacts/ContactEditorFragment.java
@@ -109,20 +109,20 @@ public class ContactEditorFragment extends Fragment {
 
         view = inflater.inflate(R.layout.contact_edit, container, false);
 
-        phoneNumbersSection = (LinearLayout) view.findViewById(R.id.phone_numbers);
+        phoneNumbersSection = view.findViewById(R.id.phone_numbers);
         if (getResources().getBoolean(R.bool.hide_phone_numbers_in_editor) || !ContactsManager.getInstance().hasContactsAccess()) {
             //Currently linphone friends don't support phone numbers, so hide them
             phoneNumbersSection.setVisibility(View.GONE);
         }
 
-        sipAddressesSection = (LinearLayout) view.findViewById(R.id.sip_addresses);
+        sipAddressesSection = view.findViewById(R.id.sip_addresses);
         if (getResources().getBoolean(R.bool.hide_sip_addresses_in_editor)) {
             sipAddressesSection.setVisibility(View.GONE);
         }
 
-        deleteContact = (ImageView) view.findViewById(R.id.delete_contact);
+        deleteContact = view.findViewById(R.id.delete_contact);
 
-        cancel = (ImageView) view.findViewById(R.id.cancel);
+        cancel = view.findViewById(R.id.cancel);
         cancel.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -130,7 +130,7 @@ public class ContactEditorFragment extends Fragment {
             }
         });
 
-        ok = (ImageView) view.findViewById(R.id.ok);
+        ok = view.findViewById(R.id.ok);
         ok.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -164,7 +164,7 @@ public class ContactEditorFragment extends Fragment {
             }
         });
 
-        lastName = (EditText) view.findViewById(R.id.contactLastName);
+        lastName = view.findViewById(R.id.contactLastName);
         // Hack to display keyboard when touching focused edittext on Nexus One
         if (Version.sdkStrictlyBelow(Version.API11_HONEYCOMB_30)) {
             lastName.setOnClickListener(new OnClickListener() {
@@ -194,7 +194,7 @@ public class ContactEditorFragment extends Fragment {
             }
         });
 
-        firstName = (EditText) view.findViewById(R.id.contactFirstName);
+        firstName = view.findViewById(R.id.contactFirstName);
         firstName.addTextChangedListener(new TextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
@@ -215,7 +215,7 @@ public class ContactEditorFragment extends Fragment {
         });
 
 
-        organization = (EditText) view.findViewById(R.id.contactOrganization);
+        organization = view.findViewById(R.id.contactOrganization);
         boolean isOrgVisible = getResources().getBoolean(R.bool.display_contact_organization);
         if (!isOrgVisible) {
             organization.setVisibility(View.GONE);
@@ -241,8 +241,8 @@ public class ContactEditorFragment extends Fragment {
                 @Override
                 public void onClick(View v) {
                     final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
-                    Button delete = (Button) dialog.findViewById(R.id.delete_button);
-                    Button cancel = (Button) dialog.findViewById(R.id.cancel);
+                    Button delete = dialog.findViewById(R.id.delete_button);
+                    Button cancel = dialog.findViewById(R.id.cancel);
 
                     delete.setOnClickListener(new OnClickListener() {
                         @Override
@@ -267,7 +267,7 @@ public class ContactEditorFragment extends Fragment {
             deleteContact.setVisibility(View.INVISIBLE);
         }
 
-        contactPicture = (ImageView) view.findViewById(R.id.contact_picture);
+        contactPicture = view.findViewById(R.id.contact_picture);
         if (contact != null) {
             LinphoneUtils.setImagePictureFromUri(getActivity(), contactPicture, contact.getPhotoUri(), contact.getThumbnailUri());
         } else {
@@ -286,7 +286,7 @@ public class ContactEditorFragment extends Fragment {
         sipAddresses = initSipAddressFields(contact);
         numbers = initNumbersFields(contact);
 
-        addSipAddress = (ImageView) view.findViewById(R.id.add_address_field);
+        addSipAddress = view.findViewById(R.id.add_address_field);
         if (getResources().getBoolean(R.bool.allow_only_one_sip_address)) {
             addSipAddress.setVisibility(View.GONE);
         }
@@ -297,7 +297,7 @@ public class ContactEditorFragment extends Fragment {
             }
         });
 
-        addNumber = (ImageView) view.findViewById(R.id.add_number_field);
+        addNumber = view.findViewById(R.id.add_number_field);
         if (getResources().getBoolean(R.bool.allow_only_one_phone_number)) {
             addNumber.setVisibility(View.GONE);
         }
@@ -426,7 +426,7 @@ public class ContactEditorFragment extends Fragment {
     }
 
     private LinearLayout initNumbersFields(final LinphoneContact contact) {
-        LinearLayout controls = (LinearLayout) view.findViewById(R.id.controls_numbers);
+        LinearLayout controls = view.findViewById(R.id.controls_numbers);
         controls.removeAllViews();
 
         if (contact != null) {
@@ -449,7 +449,7 @@ public class ContactEditorFragment extends Fragment {
         }
 
         if (newDisplayName != null) {
-            EditText lastNameEditText = (EditText) view.findViewById(R.id.contactLastName);
+            EditText lastNameEditText = view.findViewById(R.id.contactLastName);
             if (view != null)
                 lastNameEditText.setText(newDisplayName);
         }
@@ -462,7 +462,7 @@ public class ContactEditorFragment extends Fragment {
     }
 
     private LinearLayout initSipAddressFields(final LinphoneContact contact) {
-        LinearLayout controls = (LinearLayout) view.findViewById(R.id.controls_sip_address);
+        LinearLayout controls = view.findViewById(R.id.controls_sip_address);
         controls.removeAllViews();
 
         if (contact != null) {
@@ -526,7 +526,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);
+        final EditText noa = view.findViewById(R.id.numoraddr);
         if (!isSIP) {
             noa.setInputType(InputType.TYPE_CLASS_PHONE);
         }
@@ -549,7 +549,7 @@ public class ContactEditorFragment extends Fragment {
             nounoa.setValue(noa.getText().toString());
         }
 
-        ImageView delete = (ImageView) view.findViewById(R.id.delete_field);
+        ImageView delete = 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)) {
             delete.setVisibility(View.GONE);
         }
@@ -572,7 +572,7 @@ public class ContactEditorFragment extends Fragment {
         final View view = inflater.inflate(R.layout.contact_edit_row, null);
         final LinphoneNumberOrAddress nounoa = new LinphoneNumberOrAddress(null, isSip);
 
-        final EditText noa = (EditText) view.findViewById(R.id.numoraddr);
+        final EditText noa = view.findViewById(R.id.numoraddr);
         numbersAndAddresses.add(nounoa);
         noa.setHint(isSip ? getString(R.string.sip_address) : getString(R.string.phone_number));
         if (!isSip) {
@@ -594,7 +594,7 @@ public class ContactEditorFragment extends Fragment {
             }
         });
 
-        final ImageView delete = (ImageView) view.findViewById(R.id.delete_field);
+        final ImageView delete = 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)) {
             delete.setVisibility(View.GONE);
         }
diff --git a/src/android/org/linphone/contacts/ContactsListAdapter.java b/src/android/org/linphone/contacts/ContactsListAdapter.java
index 13ad6a86c..ac05ab0e7 100644
--- a/src/android/org/linphone/contacts/ContactsListAdapter.java
+++ b/src/android/org/linphone/contacts/ContactsListAdapter.java
@@ -146,7 +146,6 @@ public class ContactsListAdapter extends SelectableAdapter<ContactsListAdapter.V
 
         holder.delete.setVisibility(isEditionEnabled() ? View.VISIBLE : View.INVISIBLE);
         holder.delete.setChecked(isSelected(position));
-
     }
 
     @Override
diff --git a/src/android/org/linphone/contacts/ContactsListFragment.java b/src/android/org/linphone/contacts/ContactsListFragment.java
index 69cf5f3a1..9261a48f5 100644
--- a/src/android/org/linphone/contacts/ContactsListFragment.java
+++ b/src/android/org/linphone/contacts/ContactsListFragment.java
@@ -342,14 +342,9 @@ public class ContactsListFragment extends Fragment implements OnItemClickListene
     public void onContactsUpdated() {
         if (!LinphoneActivity.isInstanciated() || LinphoneActivity.instance().getCurrentFragment() != FragmentsAvailable.CONTACTS_LIST)
             return;
-        ContactsListAdapter adapter = (ContactsListAdapter) contactsList.getAdapter();
-        if (adapter != null) {
-            if (onlyDisplayLinphoneContacts) {
-                adapter.updateDataSet(ContactsManager.getInstance().getSIPContacts());
-            } else {
-                adapter.updateDataSet(ContactsManager.getInstance().getContacts());
-            }
-            contactsFetchInProgress.setVisibility(View.GONE);
+        if (mContactAdapter != null) {
+            mContactAdapter.updateDataSet(onlyDisplayLinphoneContacts ? ContactsManager.getInstance().getSIPContacts() : ContactsManager.getInstance().getContacts());
+            mContactAdapter.notifyDataSetChanged();
         }
     }
 
diff --git a/src/android/org/linphone/contacts/ContactsManager.java b/src/android/org/linphone/contacts/ContactsManager.java
index b8668f79e..125206172 100644
--- a/src/android/org/linphone/contacts/ContactsManager.java
+++ b/src/android/org/linphone/contacts/ContactsManager.java
@@ -97,13 +97,6 @@ public class ContactsManager extends ContentObserver implements FriendListListen
         if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
             magicSearch = LinphoneManager.getLcIfManagerNotDestroyedOrNull().createMagicSearch();
         }
-
-        Core lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-        if (lc != null) {
-            for (FriendList list : lc.getFriendsLists()) {
-                list.setListener(this);
-            }
-        }
     }
 
     public void destroy() {
@@ -267,11 +260,14 @@ public class ContactsManager extends ContentObserver implements FriendListListen
         return null;
     }
 
-    public synchronized void refreshSipContact(Friend lf) {
+    public synchronized boolean refreshSipContact(Friend lf) {
         LinphoneContact contact = (LinphoneContact) lf.getUserData();
         if (contact != null && !mSipContacts.contains(contact)) {
             mSipContacts.add(contact);
+            Collections.sort(mSipContacts);
+            return true;
         }
+        return false;
     }
 
     public static String getAddressOrNumberForAndroidContact(ContentResolver resolver, Uri contactUri) {
@@ -352,12 +348,12 @@ public class ContactsManager extends ContentObserver implements FriendListListen
     @Override
     public void onPresenceReceived(FriendList list, Friend[] friends) {
         for (Friend lf : friends) {
-            ContactsManager.getInstance().refreshSipContact(lf);
-        }
-
-        Collections.sort(mSipContacts);
-        for (ContactsUpdatedListener listener : contactsUpdatedListeners) {
-            listener.onContactsUpdated();
+            boolean newContact = ContactsManager.getInstance().refreshSipContact(lf);
+            if (newContact) {
+                for (ContactsUpdatedListener listener : contactsUpdatedListeners) {
+                    listener.onContactsUpdated();
+                }
+            }
         }
     }
 
@@ -504,10 +500,14 @@ public class ContactsManager extends ContentObserver implements FriendListListen
         setSipContacts(sipContacts);
 
         if (LinphonePreferences.instance() != null && LinphonePreferences.instance().isFriendlistsubscriptionEnabled()) {
-            if (mActivity.getString(R.string.rls_uri) != null) {
-                LinphoneManager.getLc().getFriendsLists()[0].setRlsUri(mActivity.getString(R.string.rls_uri));
+            String rls = mActivity.getString(R.string.rls_uri);
+            for (FriendList list : LinphoneManager.getLc().getFriendsLists()) {
+                if (rls != null && rls.equals(list.getRlsAddress().asStringUriOnly())) {
+                    list.setRlsUri(mActivity.getString(R.string.rls_uri));
+                }
+                list.setListener(this);
+                list.updateSubscriptions();
             }
-            LinphoneManager.getLc().getFriendsLists()[0].updateSubscriptions();
         }
 
         long timeElapsed = (new Date()).getTime() - contactsTime.getTime();
@@ -516,6 +516,10 @@ public class ContactsManager extends ContentObserver implements FriendListListen
                 TimeUnit.MILLISECONDS.toSeconds(timeElapsed) -
                         TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(timeElapsed)));
         Log.i("[ContactsManager] For " + contacts.size() + " contacts: " + time + " elapsed since starting");
+
+        for (ContactsUpdatedListener listener : contactsUpdatedListeners) {
+            listener.onContactsUpdated();
+        }
     }
 
     @Override
diff --git a/src/android/org/linphone/contacts/LinphoneContact.java b/src/android/org/linphone/contacts/LinphoneContact.java
index 52a9af7f4..60c55a76c 100644
--- a/src/android/org/linphone/contacts/LinphoneContact.java
+++ b/src/android/org/linphone/contacts/LinphoneContact.java
@@ -243,21 +243,21 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
     public void removeNumberOrAddress(LinphoneNumberOrAddress noa) {
         if (noa != null && noa.getOldValue() != null) {
             if (isAndroidContact()) {
-                String select;
-                if (noa.isSIPAddress()) {
-                    select = ContactsContract.Data.CONTACT_ID + "=? AND " + ContactsContract.Data.MIMETYPE + "='" + ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE + "' AND " + ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS + "=?";
-                } else {
-                    select = ContactsContract.Data.CONTACT_ID + "=? AND " + ContactsContract.Data.MIMETYPE + "='" + ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE + "' AND " + ContactsContract.CommonDataKinds.Phone.NUMBER + "=?";
-                }
-                String[] args = new String[]{getAndroidId(), noa.getOldValue()};
-
-                changesToCommit.add(ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
-                        .withSelection(select, args)
-                        .build());
-
                 if (androidTagId != null && noa.isSIPAddress()) {
-                    select = ContactsContract.Data.RAW_CONTACT_ID + "=? AND " + ContactsContract.Data.DATA1 + "=?";
-                    args = new String[]{androidTagId, noa.getOldValue()};
+                    String select = ContactsContract.Data.RAW_CONTACT_ID + "=? AND " + ContactsContract.Data.DATA1 + "=?";
+                    String[] args = new String[]{androidTagId, noa.getOldValue()};
+
+                    changesToCommit.add(ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
+                            .withSelection(select, args)
+                            .build());
+                } else {
+                    String select;
+                    if (noa.isSIPAddress()) {
+                        select = ContactsContract.Data.CONTACT_ID + "=? AND " + ContactsContract.Data.MIMETYPE + "='" + ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE + "' AND " + ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS + "=?";
+                    } else {
+                        select = ContactsContract.Data.CONTACT_ID + "=? AND " + ContactsContract.Data.MIMETYPE + "='" + ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE + "' AND " + ContactsContract.CommonDataKinds.Phone.NUMBER + "=?";
+                    }
+                    String[] args = new String[]{getAndroidId(), noa.getOldValue()};
 
                     changesToCommit.add(ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI)
                             .withSelection(select, args)
@@ -289,30 +289,6 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
         if (noa != null && noa.getValue() != null) {
             if (isAndroidContact()) {
                 if (noa.getOldValue() == null) {
-                    ContentValues values = new ContentValues();
-                    if (noa.isSIPAddress()) {
-                        values.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE);
-                        values.put(ContactsContract.CommonDataKinds.SipAddress.DATA, noa.getValue());
-                        values.put(CommonDataKinds.SipAddress.TYPE, CommonDataKinds.SipAddress.TYPE_CUSTOM);
-                        values.put(CommonDataKinds.SipAddress.LABEL, ContactsManager.getInstance().getString(R.string.addressbook_label));
-                    } else {
-                        values.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
-                        values.put(ContactsContract.CommonDataKinds.Phone.NUMBER, noa.getValue());
-                        values.put(ContactsContract.CommonDataKinds.Phone.TYPE, ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM);
-                        values.put(ContactsContract.CommonDataKinds.Phone.LABEL, ContactsManager.getInstance().getString(R.string.addressbook_label));
-                    }
-                    if (androidRawId != null) {
-                        changesToCommit.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
-                                .withValue(ContactsContract.Data.RAW_CONTACT_ID, androidRawId)
-                                .withValues(values)
-                                .build());
-                    } else {
-                        changesToCommit.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
-                                .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
-                                .withValues(values)
-                                .build());
-                    }
-
                     if (noa.isSIPAddress() && LinphoneManager.getInstance().getContext().getResources().getBoolean(R.bool.use_linphone_tag)) {
                         if (androidTagId != null) {
                             changesToCommit.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
@@ -331,26 +307,32 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
                                     .withValue(ContactsContract.Data.DATA3, noa.getValue())
                                     .build());
                         }
+                    } else {
+                        ContentValues values = new ContentValues();
+                        if (noa.isSIPAddress()) {
+                            values.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE);
+                            values.put(ContactsContract.CommonDataKinds.SipAddress.DATA, noa.getValue());
+                            values.put(CommonDataKinds.SipAddress.TYPE, CommonDataKinds.SipAddress.TYPE_CUSTOM);
+                            values.put(CommonDataKinds.SipAddress.LABEL, ContactsManager.getInstance().getString(R.string.addressbook_label));
+                        } else {
+                            values.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
+                            values.put(ContactsContract.CommonDataKinds.Phone.NUMBER, noa.getValue());
+                            values.put(ContactsContract.CommonDataKinds.Phone.TYPE, ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM);
+                            values.put(ContactsContract.CommonDataKinds.Phone.LABEL, ContactsManager.getInstance().getString(R.string.addressbook_label));
+                        }
+                        if (androidRawId != null) {
+                            changesToCommit.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+                                    .withValue(ContactsContract.Data.RAW_CONTACT_ID, androidRawId)
+                                    .withValues(values)
+                                    .build());
+                        } else {
+                            changesToCommit.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+                                    .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+                                    .withValues(values)
+                                    .build());
+                        }
                     }
                 } else {
-                    ContentValues values = new ContentValues();
-                    String select;
-                    String[] args = new String[]{getAndroidId(), noa.getOldValue()};
-
-                    if (noa.isSIPAddress()) {
-                        select = ContactsContract.Data.CONTACT_ID + "=? AND " + ContactsContract.Data.MIMETYPE + "='" + ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE + "' AND " + ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS + "=?";
-                        values.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE);
-                        values.put(ContactsContract.CommonDataKinds.SipAddress.DATA, noa.getValue());
-                    } else {
-                        select = ContactsContract.Data.CONTACT_ID + "=? AND " + ContactsContract.Data.MIMETYPE + "='" + ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE + "' AND " + ContactsContract.CommonDataKinds.Phone.NUMBER + "=?";
-                        values.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
-                        values.put(ContactsContract.CommonDataKinds.Phone.NUMBER, noa.getValue());
-                    }
-                    changesToCommit.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
-                            .withSelection(select, args)
-                            .withValues(values)
-                            .build());
-
                     if (noa.isSIPAddress() && LinphoneManager.getInstance().getContext().getResources().getBoolean(R.bool.use_linphone_tag)) {
                         if (androidTagId != null) {
                             changesToCommit.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
@@ -368,6 +350,24 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
                                     .withValue(ContactsContract.Data.DATA3, noa.getValue())
                                     .build());
                         }
+                    } else {
+                        ContentValues values = new ContentValues();
+                        String select;
+                        String[] args = new String[]{getAndroidId(), noa.getOldValue()};
+
+                        if (noa.isSIPAddress()) {
+                            select = ContactsContract.Data.CONTACT_ID + "=? AND " + ContactsContract.Data.MIMETYPE + "='" + ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE + "' AND " + ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS + "=?";
+                            values.put(ContactsContract.Data.MIMETYPE, CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE);
+                            values.put(ContactsContract.CommonDataKinds.SipAddress.DATA, noa.getValue());
+                        } else {
+                            select = ContactsContract.Data.CONTACT_ID + "=? AND " + ContactsContract.Data.MIMETYPE + "='" + ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE + "' AND " + ContactsContract.CommonDataKinds.Phone.NUMBER + "=?";
+                            values.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
+                            values.put(ContactsContract.CommonDataKinds.Phone.NUMBER, noa.getValue());
+                        }
+                        changesToCommit.add(ContentProviderOperation.newUpdate(ContactsContract.Data.CONTENT_URI)
+                                .withSelection(select, args)
+                                .withValues(values)
+                                .build());
                     }
                 }
             }
@@ -483,10 +483,6 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 
     public void delete() {
         if (isAndroidContact()) {
-            String select = ContactsContract.Data.CONTACT_ID + " = ?";
-            String[] args = new String[]{getAndroidId()};
-            changesToCommit.add(ContentProviderOperation.newDelete(ContactsContract.RawContacts.CONTENT_URI).withSelection(select, args).build());
-            save();
             ContactsManager.getInstance().delete(getAndroidId());
         }
         if (isFriend()) {