diff --git a/src/android/org/linphone/contacts/ContactsListFragment.java b/src/android/org/linphone/contacts/ContactsListFragment.java
index 9261a48f5..ac62f7c52 100644
--- a/src/android/org/linphone/contacts/ContactsListFragment.java
+++ b/src/android/org/linphone/contacts/ContactsListFragment.java
@@ -130,7 +130,6 @@ public class ContactsListFragment extends Fragment implements OnItemClickListene
         linphoneContacts.setEnabled(!allContacts.isEnabled());
         contactsFetchInProgress.setVisibility(View.VISIBLE);
 
-
         clearSearchField = view.findViewById(R.id.clearSearchField);
         clearSearchField.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -166,7 +165,7 @@ public class ContactsListFragment extends Fragment implements OnItemClickListene
         dividerItemDecoration.setDrawable(getActivity().getResources().getDrawable(R.drawable.divider));
         contactsList.addItemDecoration(dividerItemDecoration);
 
-        contactsFetchInProgress = (ProgressBar) view.findViewById(R.id.contactsFetchInProgress);
+        contactsFetchInProgress = view.findViewById(R.id.contactsFetchInProgress);
         contactsFetchInProgress.setVisibility(View.VISIBLE);
 
         return view;
@@ -226,8 +225,6 @@ public class ContactsListFragment extends Fragment implements OnItemClickListene
             } else {
                 listContact = ContactsManager.getInstance().getContacts();
             }
-
-
         } else {
             if (onlyDisplayLinphoneContacts) {
                 listContact = ContactsManager.getInstance().getSIPContacts(searchField.getText().toString());
diff --git a/src/android/org/linphone/contacts/LinphoneContact.java b/src/android/org/linphone/contacts/LinphoneContact.java
index 4ebe9fa87..7572461e2 100644
--- a/src/android/org/linphone/contacts/LinphoneContact.java
+++ b/src/android/org/linphone/contacts/LinphoneContact.java
@@ -71,6 +71,17 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
     public int compareTo(LinphoneContact contact) {
         String fullName = getFullName() != null ? getFullName().toUpperCase(Locale.getDefault()) : "";
         String contactFullName = contact.getFullName() != null ? contact.getFullName().toUpperCase(Locale.getDefault()) : "";
+
+        if (fullName.equals(contactFullName)) {
+            if (getAndroidId() != null) {
+                if (contact.getAndroidId() != null) {
+                    return getAndroidId().compareTo(contact.getAndroidId());
+                }
+                return -1;
+            }
+            if (contact.getAndroidId() != null) return 1;
+            return 0;
+        }
         return fullName.compareTo(contactFullName);
     }
 
@@ -700,12 +711,6 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
                 if (mime != null && mime.length() > 0) {
                     if (mime.equals(ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE) || mime.equals(ContactsManager.getInstance().getString(R.string.sync_mimetype))) {
                         String number = c.getString(c.getColumnIndex("data1")); // SIP_ADDRESS
-                        if (!number.startsWith("sip:")) {
-                            number = "sip:" + number;
-                        }
-                        if (!number.contains("@")) {
-                            number = number + "@" + ContactsManager.getInstance().getString(R.string.default_domain);
-                        }
                         result.add(new LinphoneNumberOrAddress(number, true));
                     } else if (mime.equals(ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE)) {
                         String number = c.getString(c.getColumnIndex("data1")); // PHONE_NUMBER