diff --git a/app/build.gradle b/app/build.gradle
index 1e61225f..bdd914c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,7 +45,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.20.5'
+    implementation 'com.simplemobiletools:commons:3.20.6'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'com.facebook.stetho:stetho:1.5.0'
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 65dff99d..f8b1cd21 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,8 @@
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
 
     <uses-permission
         android:name="android.permission.USE_FINGERPRINT"
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
index 22722186..03a277aa 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt
@@ -234,16 +234,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
 
     private fun storeLocalAccountData() {
         if (config.localAccountType == "-1") {
-            // some manufacturer contact account types from https://stackoverflow.com/a/44802016/1967672
-            val localAccountTypes = arrayListOf("vnd.sec.contact.phone",
-                    "com.htc.android.pcsc",
-                    "com.sonyericsson.localcontacts",
-                    "com.lge.sync",
-                    "com.lge.phone",
-                    "vnd.tmobileus.contact.phone",
-                    "com.android.huawei.phone",
-                    "Local Phone Account")
-
             ContactsHelper(this).getContactSources {
                 var localAccountType = ""
                 var localAccountName = ""
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt
index a4f0b9b7..0b2e1b25 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/Constants.kt
@@ -93,3 +93,14 @@ const val DEFAULT_ADDRESS_TYPE = CommonDataKinds.StructuredPostal.TYPE_HOME
 const val DEFAULT_EVENT_TYPE = CommonDataKinds.Event.TYPE_BIRTHDAY
 const val DEFAULT_ORGANIZATION_TYPE = CommonDataKinds.Organization.TYPE_WORK
 const val DEFAULT_WEBSITE_TYPE = CommonDataKinds.Website.TYPE_HOMEPAGE
+
+// some manufacturer contact account types from https://stackoverflow.com/a/44802016/1967672
+val localAccountTypes = arrayListOf("vnd.sec.contact.phone",
+        "com.htc.android.pcsc",
+        "com.sonyericsson.localcontacts",
+        "com.lge.sync",
+        "com.lge.phone",
+        "vnd.tmobileus.contact.phone",
+        "com.android.huawei.phone",
+        "Local Phone Account"
+)
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt
index fc09e35d..6ea1a183 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt
@@ -1,9 +1,7 @@
 package com.simplemobiletools.contacts.helpers
 
-import android.content.ContentProviderOperation
-import android.content.ContentProviderResult
-import android.content.ContentUris
-import android.content.ContentValues
+import android.accounts.AccountManager
+import android.content.*
 import android.database.Cursor
 import android.graphics.Bitmap
 import android.net.Uri
@@ -621,64 +619,34 @@ class ContactsHelper(val activity: BaseSimpleActivity) {
 
     fun getContactSources(callback: (ArrayList<ContactSource>) -> Unit) {
         Thread {
-            val sources = LinkedHashSet<ContactSource>()
-            getDeviceContactSources(sources)
+            val sources = getDeviceContactSources()
             sources.add(ContactSource(activity.getString(R.string.phone_storage_hidden), SMT_PRIVATE))
             callback(ArrayList(sources))
         }.start()
     }
 
-    private fun getDeviceContactSources(sources: LinkedHashSet<ContactSource>) {
+    private fun getDeviceContactSources(): LinkedHashSet<ContactSource> {
+        val sources = LinkedHashSet<ContactSource>()
         if (!activity.hasContactPermissions()) {
-            return
+            return sources
         }
 
-        val uri = ContactsContract.RawContacts.CONTENT_URI
-        val projection = arrayOf(ContactsContract.RawContacts.ACCOUNT_NAME, ContactsContract.RawContacts.ACCOUNT_TYPE)
-
-        var cursor: Cursor? = null
-        try {
-            cursor = activity.contentResolver.query(uri, projection, null, null, null)
-            if (cursor?.moveToFirst() == true) {
-                do {
-                    val name = cursor.getStringValue(ContactsContract.RawContacts.ACCOUNT_NAME) ?: continue
-                    val type = cursor.getStringValue(ContactsContract.RawContacts.ACCOUNT_TYPE) ?: continue
-                    val contactSource = ContactSource(name, type)
-                    sources.add(contactSource)
-                } while (cursor.moveToNext())
+        val accountManager = AccountManager.get(activity)
+        accountManager.accounts.filter { it.name.contains("@") || localAccountTypes.contains(it.type) }.forEach {
+            if (ContentResolver.getIsSyncable(it, ContactsContract.Contacts.CONTENT_URI.authority) == 1) {
+                val contactSource = ContactSource(it.name, it.type)
+                sources.add(contactSource)
             }
-        } catch (e: Exception) {
-            activity.showErrorToast(e)
-        } finally {
-            cursor?.close()
         }
 
         if (sources.isEmpty() && activity.config.localAccountName.isEmpty() && activity.config.localAccountType.isEmpty()) {
             sources.add(ContactSource("", ""))
         }
+
+        return sources
     }
 
-    private fun getContactSourceType(accountName: String): String {
-        if (accountName.isEmpty()) {
-            return ""
-        }
-
-        val uri = ContactsContract.RawContacts.CONTENT_URI
-        val projection = arrayOf(ContactsContract.RawContacts.ACCOUNT_TYPE)
-        val selection = "${ContactsContract.RawContacts.ACCOUNT_NAME} = ?"
-        val selectionArgs = arrayOf(accountName)
-
-        var cursor: Cursor? = null
-        try {
-            cursor = activity.contentResolver.query(uri, projection, selection, selectionArgs, null)
-            if (cursor?.moveToFirst() == true) {
-                return cursor.getStringValue(ContactsContract.RawContacts.ACCOUNT_TYPE)
-            }
-        } finally {
-            cursor?.close()
-        }
-        return ""
-    }
+    private fun getContactSourceType(accountName: String) = getDeviceContactSources().firstOrNull { it.name == accountName }?.type ?: ""
 
     private fun getContactProjection() = arrayOf(
             ContactsContract.Data.CONTACT_ID,