diff --git a/app/build.gradle b/app/build.gradle
index 22ad60378..053fe98a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,7 +52,7 @@ android {
         versionName "4.1"
         applicationId getPackageName()
         multiDexEnabled true
-        manifestPlaceholders = [sync_mimetype:"vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"]
+        manifestPlaceholders = [linphone_address_mime_type:"vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"]
     }
 
     applicationVariants.all { variant ->
@@ -82,7 +82,7 @@ android {
 
             resValue "string", "sync_account_type", getPackageName() + ".sync"
             resValue "string", "file_provider", getPackageName() + ".provider"
-            resValue "string", "sync_mimetype", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"
+            resValue "string", "linphone_address_mime_type", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"
         }
         debug {
             applicationIdSuffix ".debug"
@@ -92,7 +92,7 @@ android {
 
             resValue "string", "sync_account_type", getPackageName() + ".sync"
             resValue "string", "file_provider", getPackageName() + ".provider"
-            resValue "string", "sync_mimetype", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"
+            resValue "string", "linphone_address_mime_type", "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address"
         }
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 10bdd86a2..af5fb514f 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -95,7 +95,7 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="${sync_mimetype}" />
+                <data android:mimeType="${linphone_address_mime_type}" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
diff --git a/app/src/main/java/org/linphone/contacts/AndroidContact.java b/app/src/main/java/org/linphone/contacts/AndroidContact.java
index f8228203f..c0c6e7cd9 100644
--- a/app/src/main/java/org/linphone/contacts/AndroidContact.java
+++ b/app/src/main/java/org/linphone/contacts/AndroidContact.java
@@ -26,6 +26,10 @@ import android.content.ContentUris;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.RawContacts;
 import androidx.core.util.Pair;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -37,12 +41,14 @@ import org.linphone.R;
 import org.linphone.mediastream.Log;
 
 class AndroidContact implements Serializable {
-    protected String mAndroidId, mAndroidRawId, mAndroidTagId, mAndroidLookupKey;
+    protected String mAndroidId, mAndroidRawId, mAndroidLookupKey;
+    protected boolean isAndroidIdLinphone;
 
     private transient ArrayList<ContentProviderOperation> mChangesToCommit;
 
     protected AndroidContact() {
         mChangesToCommit = new ArrayList<>();
+        isAndroidIdLinphone = false;
     }
 
     protected String getAndroidId() {
@@ -63,7 +69,7 @@ class AndroidContact implements Serializable {
 
     protected Uri getAndroidLookupUri() {
         return ContactsContract.Contacts.getLookupUri(
-                Long.parseLong(getAndroidId()), getAndroidLookupKey());
+                Long.parseLong(mAndroidId), getAndroidLookupKey());
     }
 
     protected boolean isAndroidContact() {
@@ -78,15 +84,27 @@ class AndroidContact implements Serializable {
     protected void saveChangesCommited() {
         if (ContactsManager.getInstance().hasContactsAccess() && mChangesToCommit.size() > 0) {
             try {
+                ContentResolver contentResolver = LinphoneService.instance().getContentResolver();
                 ContentProviderResult[] results =
-                        LinphoneService.instance()
-                                .getContentResolver()
-                                .applyBatch(ContactsContract.AUTHORITY, mChangesToCommit);
+                        contentResolver.applyBatch(ContactsContract.AUTHORITY, mChangesToCommit);
                 if (results != null && results.length > 0 && results[0] != null) {
-                    Log.i("[Contact] Contact created with URI " + results[0].uri);
+                    mAndroidRawId = String.valueOf(ContentUris.parseId(results[0].uri));
+                    Log.i("[Contact] Contact created with RAW ID " + mAndroidRawId);
+
+                    final String[] projection =
+                            new String[] {ContactsContract.RawContacts.CONTACT_ID};
+                    final Cursor cursor =
+                            contentResolver.query(results[0].uri, projection, null, null, null);
+                    if (cursor != null) {
+                        cursor.moveToNext();
+                        long contactId = cursor.getLong(0);
+                        mAndroidId = String.valueOf(contactId);
+                        cursor.close();
+                        Log.i("[Contact] Contact created with ID " + mAndroidId);
+                    }
                 }
             } catch (Exception e) {
-                Log.e(e);
+                Log.e("[Contact] Exception while saving changes: " + e);
             } finally {
                 mChangesToCommit.clear();
             }
@@ -94,55 +112,41 @@ class AndroidContact implements Serializable {
     }
 
     protected void createAndroidContact() {
-        // TODO
         if (LinphoneManager.getInstance()
                 .getContext()
                 .getResources()
                 .getBoolean(R.bool.use_linphone_tag)) {
             Log.i("[Contact] Creating contact using linphone account type");
             addChangesToCommit(
-                    ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
+                    ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
                             .withValue(
-                                    ContactsContract.RawContacts.ACCOUNT_TYPE,
+                                    RawContacts.ACCOUNT_TYPE,
                                     ContactsManager.getInstance()
                                             .getString(R.string.sync_account_type))
                             .withValue(
-                                    ContactsContract.RawContacts.ACCOUNT_NAME,
+                                    RawContacts.ACCOUNT_NAME,
                                     ContactsManager.getInstance()
                                             .getString(R.string.sync_account_name))
                             .withValue(
-                                    ContactsContract.RawContacts.AGGREGATION_MODE,
-                                    ContactsContract.RawContacts.AGGREGATION_MODE_DEFAULT)
-                            .build());
-        } else {
-            Log.i("[Contact] Creating contact using default account type");
-            addChangesToCommit(
-                    ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
-                            .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, null)
-                            .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, null)
-                            .withValue(
-                                    ContactsContract.RawContacts.AGGREGATION_MODE,
-                                    ContactsContract.RawContacts.AGGREGATION_MODE_DEFAULT)
+                                    RawContacts.AGGREGATION_MODE,
+                                    RawContacts.AGGREGATION_MODE_DEFAULT)
                             .build());
+            isAndroidIdLinphone = true;
         }
     }
 
     protected void deleteAndroidContact() {
-        ContactsManager.getInstance().delete(getAndroidId());
+        ContactsManager.getInstance().delete(mAndroidId);
     }
 
     protected Uri getContactThumbnailPictureUri() {
-        Uri person =
-                ContentUris.withAppendedId(
-                        ContactsContract.Contacts.CONTENT_URI, Long.parseLong(getAndroidId()));
-        return Uri.withAppendedPath(person, ContactsContract.Contacts.Photo.CONTENT_DIRECTORY);
+        Uri person = ContentUris.withAppendedId(Contacts.CONTENT_URI, Long.parseLong(mAndroidId));
+        return Uri.withAppendedPath(person, Contacts.Photo.CONTENT_DIRECTORY);
     }
 
     protected Uri getContactPictureUri() {
-        Uri person =
-                ContentUris.withAppendedId(
-                        ContactsContract.Contacts.CONTENT_URI, Long.parseLong(getAndroidId()));
-        return Uri.withAppendedPath(person, ContactsContract.Contacts.Photo.DISPLAY_PHOTO);
+        Uri person = ContentUris.withAppendedId(Contacts.CONTENT_URI, Long.parseLong(mAndroidId));
+        return Uri.withAppendedPath(person, Contacts.Photo.DISPLAY_PHOTO);
     }
 
     protected void setName(String fn, String ln) {
@@ -151,9 +155,16 @@ class AndroidContact implements Serializable {
             return;
         }
 
-        if (mAndroidId == null || "0".equals(mAndroidId)) {
+        if (mAndroidId == null) {
             Log.i("[Contact] Setting given & family name " + fn + " " + ln + " to new contact.");
-            // TODO
+            addChangesToCommit(
+                    ContentProviderOperation.newInsert(Data.CONTENT_URI)
+                            .withValueBackReference(Data.RAW_CONTACT_ID, 0)
+                            .withValue(
+                                    Data.MIMETYPE, CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+                            .withValue(CommonDataKinds.StructuredName.GIVEN_NAME, fn)
+                            .withValue(CommonDataKinds.StructuredName.FAMILY_NAME, ln)
+                            .build());
         } else {
             Log.i(
                     "[Contact] Setting given & family name "
@@ -173,9 +184,15 @@ class AndroidContact implements Serializable {
                 return;
             }
         }
-        if (mAndroidId == null || "0".equals(mAndroidId)) {
+        if (mAndroidId == null) {
             Log.i("[Contact] Setting organization " + org + " to new contact.");
-            // TODO
+            addChangesToCommit(
+                    ContentProviderOperation.newInsert(Data.CONTENT_URI)
+                            .withValueBackReference(Data.RAW_CONTACT_ID, 0)
+                            .withValue(
+                                    Data.MIMETYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE)
+                            .withValue(CommonDataKinds.Organization.COMPANY, org)
+                            .build());
         } else {
             Log.i("[Contact] Setting organization " + org + " to existing contact " + mAndroidId);
             // TODO
@@ -188,7 +205,7 @@ class AndroidContact implements Serializable {
             return;
         }
 
-        if (mAndroidId == null || "0".equals(mAndroidId)) {
+        if (mAndroidId == null) {
             Log.i("[Contact] Setting picture to new contact.");
             // TODO
         } else {
@@ -203,7 +220,7 @@ class AndroidContact implements Serializable {
             return;
         }
 
-        if (mAndroidId == null || "0".equals(mAndroidId)) {
+        if (mAndroidId == null) {
             Log.i("[Contact] Removing number or address " + noa + " from new contact.");
             // TODO
         } else {
@@ -216,7 +233,7 @@ class AndroidContact implements Serializable {
         }
     }
 
-    protected void addNumberOrAddress(String value, String oldValueToReplace) {
+    protected void addNumberOrAddress(String value, String oldValueToReplace, boolean isSIP) {
         if (value == null || value.isEmpty()) {
             Log.e("[Contact] Can't add null or empty number or address");
             return;
@@ -237,9 +254,35 @@ class AndroidContact implements Serializable {
                             + mAndroidId);
             // TODO
         } else {
-            if (mAndroidId == null || "0".equals(mAndroidId)) {
+            if (mAndroidId == null) {
                 Log.i("[Contact] Adding number or address " + value + " to new contact.");
-                // TODO
+                if (isSIP) {
+                    addChangesToCommit(
+                            ContentProviderOperation.newInsert(Data.CONTENT_URI)
+                                    .withValueBackReference(Data.RAW_CONTACT_ID, 0)
+                                    .withValue(
+                                            Data.MIMETYPE,
+                                            ContactsManager.getInstance()
+                                                    .getString(R.string.linphone_address_mime_type))
+                                    .withValue("data1", value) // Value
+                                    .withValue(
+                                            "data2",
+                                            ContactsManager.getInstance()
+                                                    .getString(R.string.app_name)) // Summary
+                                    .withValue("data3", value) // Detail
+                                    .build());
+                } else {
+                    addChangesToCommit(
+                            ContentProviderOperation.newInsert(Data.CONTENT_URI)
+                                    .withValueBackReference(Data.RAW_CONTACT_ID, 0)
+                                    .withValue(
+                                            Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
+                                    .withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, value)
+                                    .withValue(
+                                            ContactsContract.CommonDataKinds.Phone.TYPE,
+                                            CommonDataKinds.Phone.TYPE_MOBILE)
+                                    .build());
+                }
             } else {
                 Log.i(
                         "[Contact] Adding number or address "
@@ -257,7 +300,7 @@ class AndroidContact implements Serializable {
                 .getContext()
                 .getResources()
                 .getBoolean(R.bool.use_linphone_tag)) {
-            mAndroidTagId = findLinphoneRawContactId();
+            // TODO
         }
     }
 
@@ -276,8 +319,7 @@ class AndroidContact implements Serializable {
                         + "=?";
         String[] args =
                 new String[] {
-                    getAndroidId(),
-                    ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE
+                    mAndroidId, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE
                 };
         Cursor c = resolver.query(ContactsContract.Data.CONTENT_URI, proj, select, args, null);
         if (c != null) {
@@ -310,7 +352,7 @@ class AndroidContact implements Serializable {
                         + "=?";
         String[] args =
                 new String[] {
-                    getAndroidId(), ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE
+                    mAndroidId, ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE
                 };
         Cursor c = resolver.query(ContactsContract.Data.CONTENT_URI, proj, select, args, null);
         if (c != null) {
@@ -336,7 +378,7 @@ class AndroidContact implements Serializable {
                         ContactsContract.RawContacts.CONTENT_URI,
                         projection,
                         selection,
-                        new String[] {getAndroidId()},
+                        new String[] {mAndroidId},
                         null);
         if (c != null) {
             if (c.moveToFirst()) {
@@ -370,10 +412,11 @@ class AndroidContact implements Serializable {
                         projection,
                         select,
                         new String[] {
-                            getAndroidId(),
+                            mAndroidId,
                             ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE,
                             ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE,
-                            ContactsManager.getInstance().getString(R.string.sync_mimetype)
+                            ContactsManager.getInstance()
+                                    .getString(R.string.linphone_address_mime_type)
                         },
                         null);
         if (c != null) {
@@ -383,7 +426,7 @@ class AndroidContact implements Serializable {
                     if (mime.equals(ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE)
                             || mime.equals(
                                     ContactsManager.getInstance()
-                                            .getString(R.string.sync_mimetype))) {
+                                            .getString(R.string.linphone_address_mime_type))) {
                         String number = c.getString(c.getColumnIndex("data1")); // SIP_ADDRESS
                         result.add(new LinphoneNumberOrAddress(number, true));
                     } else if (mime.equals(
@@ -401,14 +444,16 @@ class AndroidContact implements Serializable {
         return result;
     }
 
-    protected void createLinphoneTagIfNeeded() {
+    protected void createRawLinphoneContactFromExistingAndroidContactIfNeeded(String fullName) {
         if (LinphoneManager.getInstance()
                 .getContext()
                 .getResources()
                 .getBoolean(R.bool.use_linphone_tag)) {
-            if (mAndroidTagId == null && findLinphoneRawContactId() == null) {
-                createLinphoneContactTag();
-            }
+            // TODO
+            /*if (mLinphoneAndroidContactId == null && findLinphoneRawContactId() == null) {
+                createRawLinphoneContactFromExistingAndroidContact(fullName);
+                isAndroidIdLinphone = true;
+            }*/
         }
     }
 
@@ -428,7 +473,7 @@ class AndroidContact implements Serializable {
                         projection,
                         selection,
                         new String[] {
-                            getAndroidId(),
+                            mAndroidId,
                             ContactsManager.getInstance().getString(R.string.sync_account_type)
                         },
                         null);
@@ -441,10 +486,10 @@ class AndroidContact implements Serializable {
         return result;
     }
 
-    private void createLinphoneContactTag() {
+    /*private void createRawLinphoneContactFromExistingAndroidContact(String fullName) {
         ArrayList<ContentProviderOperation> batch = new ArrayList<>();
 
-        /*batch.add(
+        batch.add(
                 ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
                         .withValue(
                                 ContactsContract.RawContacts.ACCOUNT_TYPE,
@@ -465,7 +510,7 @@ class AndroidContact implements Serializable {
                                 ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
                         .withValue(
                                 ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME,
-                                getFullName())
+                                fullName)
                         .build());
 
         batch.add(
@@ -479,17 +524,15 @@ class AndroidContact implements Serializable {
                                 mAndroidRawId)
                         .withValueBackReference(
                                 ContactsContract.AggregationExceptions.RAW_CONTACT_ID2, 0)
-                        .build());*/
-        // TODO
-        Log.i("[Contact] Creating linphone tag");
+                        .build());
+        Log.i("[Contact] Creating linphone contact");
 
         try {
             LinphoneService.instance()
                     .getContentResolver()
                     .applyBatch(ContactsContract.AUTHORITY, batch);
-            mAndroidTagId = findLinphoneRawContactId();
         } catch (Exception e) {
             Log.e(e);
         }
-    }
+    }*/
 }
diff --git a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
index 2cd2ea03b..c0a6c4362 100644
--- a/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
+++ b/app/src/main/java/org/linphone/contacts/AsyncContactsLoader.java
@@ -158,7 +158,7 @@ class AsyncContactsLoader extends AsyncTask<Void, Void, AsyncContactsLoader.Asyn
                     contact.addNumberOrAddress(new LinphoneNumberOrAddress(data1, data4));
                 } else if (ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE.equals(
                                 mime)
-                        || mContext.getString(R.string.sync_mimetype).equals(mime)) {
+                        || mContext.getString(R.string.linphone_address_mime_type).equals(mime)) {
                     contact.addNumberOrAddress(new LinphoneNumberOrAddress(data1, true));
                 } else if (ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE.equals(
                         mime)) {
diff --git a/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java b/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
index 99453b162..78e13f079 100644
--- a/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
@@ -91,7 +91,8 @@ public class ContactEditorFragment extends Fragment {
             Serializable obj = getArguments().getSerializable("Contact");
             if (obj != null) {
                 mContact = (LinphoneContact) obj;
-                mContact.createLinphoneTagIfNeeded();
+                mContact.createRawLinphoneContactFromExistingAndroidContactIfNeeded(
+                        mContact.getFullName());
                 mIsNewContact = false;
                 if (getArguments().getString("NewSipAdress") != null) {
                     mNewSipOrNumberToAdd = getArguments().getString("NewSipAdress");
@@ -175,6 +176,9 @@ public class ContactEditorFragment extends Fragment {
 
                         mContact.save();
                         getFragmentManager().popBackStackImmediate();
+                        if (mIsNewContact) {
+                            LinphoneActivity.instance().displayContact(mContact, false);
+                        }
                     }
                 });
 
diff --git a/app/src/main/java/org/linphone/contacts/LinphoneContact.java b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
index c41f782e3..42dcbcbfa 100644
--- a/app/src/main/java/org/linphone/contacts/LinphoneContact.java
+++ b/app/src/main/java/org/linphone/contacts/LinphoneContact.java
@@ -267,7 +267,7 @@ public class LinphoneContact extends AndroidContact
     public void addOrUpdateNumberOrAddress(LinphoneNumberOrAddress noa) {
         if (noa != null && noa.getValue() != null) {
 
-            addNumberOrAddress(noa.getValue(), noa.getOldValue());
+            addNumberOrAddress(noa.getValue(), noa.getOldValue(), noa.isSIPAddress());
 
             if (isFriend()) {
                 if (noa.isSIPAddress()) {
diff --git a/app/src/main/res/xml/contacts.xml b/app/src/main/res/xml/contacts.xml
index c986a394a..dc6fcc3b7 100644
--- a/app/src/main/res/xml/contacts.xml
+++ b/app/src/main/res/xml/contacts.xml
@@ -5,7 +5,7 @@
         android:detailColumn="data3"
         android:detailSocialSummary="true"
         android:icon="@drawable/linphone_logo"
-        android:mimeType="@string/sync_mimetype"
+        android:mimeType="@string/linphone_address_mime_type"
         android:summaryColumn="data2" />
 
 </ContactsSource>