diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed1931bb..591523e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,17 +19,20 @@ jobs:
   debug-builds:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2
+      
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: "temurin"
           cache: "gradle"
+          
       - name: Compile
         run: |
           ./gradlew assembleDebug
+          
       - name: Sign Apk
         continue-on-error: true
         id: sign_apk
@@ -40,12 +43,14 @@ jobs:
           keyAlias: ${{ secrets.ANDROID_KEY_ALIAS }}
           keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}
+          
       - name: Remove file that aren't signed
         continue-on-error: true
         run: |
           ls | grep 'signed\.apk$' && find . -type f -name '*.apk' ! -name '*-signed.apk' -delete
+          
       - name: Upload APK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: app
           path: app/build/outputs/apk/debug/*.apk
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb865f69..0897082f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6b226add..e873dec7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -8,12 +8,16 @@ android {
     namespace = "com.bnyro.contacts"
     compileSdk = 33
 
+    androidResources {
+        generateLocaleConfig = true
+    }
+
     defaultConfig {
         applicationId = "com.bnyro.contacts"
         minSdk = 23
         targetSdk = 33
-        versionCode = 27
-        versionName = "8.1"
+        versionCode = 28
+        versionName = "9.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -76,6 +80,7 @@ dependencies {
     implementation("androidx.compose.ui:ui-tooling-preview:$compose_version")
     implementation("androidx.compose.material3:material3:1.2.0-alpha02")
     implementation("androidx.compose.material:material-icons-extended:1.4.3")
+    implementation("com.github.nanihadesuka:LazyColumnScrollbar:1.9.0")
 
     // VCard
     implementation("com.googlecode.ez-vcard:ez-vcard:0.11.3")
@@ -84,12 +89,16 @@ dependencies {
     // Image parsing
     implementation("androidx.exifinterface:exifinterface:1.3.6")
 
+    // Phone number formatting
+    implementation("com.googlecode.libphonenumber:libphonenumber:8.2.0")
+
     // Markdown support for notes
     implementation("com.halilibo.compose-richtext:richtext-ui-material3:0.17.0")
     implementation("com.halilibo.compose-richtext:richtext-commonmark:0.17.0")
 
     // Room database
     implementation("androidx.room:room-ktx:2.5.1")
+    implementation("androidx.navigation:navigation-compose:2.5.2")
     kapt("androidx.room:room-compiler:2.5.1")
 
     // Testing
diff --git a/app/schemas/com.bnyro.contacts.db.AppDatabase/4.json b/app/schemas/com.bnyro.contacts.db.AppDatabase/4.json
new file mode 100644
index 00000000..32a2ff4b
--- /dev/null
+++ b/app/schemas/com.bnyro.contacts.db.AppDatabase/4.json
@@ -0,0 +1,165 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "9c6b62e79ca517c51c6b234b62f23eb4",
+    "entities": [
+      {
+        "tableName": "localContacts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `displayName` TEXT, `firstName` TEXT, `surName` TEXT, `nickName` TEXT, `organization` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "firstName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "surName",
+            "columnName": "surName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "nickName",
+            "columnName": "nickName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "organization",
+            "columnName": "organization",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "valuableTypes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `contactId` INTEGER NOT NULL, `category` INTEGER NOT NULL, `value` TEXT NOT NULL, `type` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactId",
+            "columnName": "contactId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "localSms",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `address` TEXT NOT NULL, `body` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `threadId` INTEGER NOT NULL, `type` INTEGER NOT NULL, `simNumber` INTEGER DEFAULT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "body",
+            "columnName": "body",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "threadId",
+            "columnName": "threadId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "simNumber",
+            "columnName": "simNumber",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9c6b62e79ca517c51c6b234b62f23eb4')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/com.bnyro.contacts.db.AppDatabase/5.json b/app/schemas/com.bnyro.contacts.db.AppDatabase/5.json
new file mode 100644
index 00000000..e0aa2a74
--- /dev/null
+++ b/app/schemas/com.bnyro.contacts.db.AppDatabase/5.json
@@ -0,0 +1,171 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "d90f0abe705f87ae3f5682c2f4b7c8a8",
+    "entities": [
+      {
+        "tableName": "localContacts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `displayName` TEXT, `firstName` TEXT, `surName` TEXT, `nickName` TEXT, `title` TEXT, `organization` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "firstName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "surName",
+            "columnName": "surName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "nickName",
+            "columnName": "nickName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "organization",
+            "columnName": "organization",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "valuableTypes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `contactId` INTEGER NOT NULL, `category` INTEGER NOT NULL, `value` TEXT NOT NULL, `type` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactId",
+            "columnName": "contactId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "localSms",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `address` TEXT NOT NULL, `body` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `threadId` INTEGER NOT NULL, `type` INTEGER NOT NULL, `simNumber` INTEGER DEFAULT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "body",
+            "columnName": "body",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "threadId",
+            "columnName": "threadId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "simNumber",
+            "columnName": "simNumber",
+            "affinity": "INTEGER",
+            "notNull": false,
+            "defaultValue": "NULL"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd90f0abe705f87ae3f5682c2f4b7c8a8')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 12dab9d3..649d6dc2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,8 +6,14 @@
         android:name="android.hardware.telephony"
         android:required="false" />
 
+    <!-- Contacts permissions -->
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+
+    <!-- Contact account types -->
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+
     <!-- Needed for adding contact shortcuts to the home screen -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
@@ -52,7 +58,8 @@
 
         <activity
             android:name=".ui.activities.MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:windowSoftInputMode="adjustResize">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -235,6 +242,10 @@
             android:name=".receivers.DeleteSmsReceiver"
             android:exported="false" />
 
+        <receiver
+            android:name=".receivers.CopyTextReceiver"
+            android:exported="false" />
+
         <receiver
             android:name=".receivers.CallActionReceiver"
             android:exported="false" />
diff --git a/app/src/main/java/com/bnyro/contacts/App.kt b/app/src/main/java/com/bnyro/contacts/App.kt
index 39065819..7cdcf386 100644
--- a/app/src/main/java/com/bnyro/contacts/App.kt
+++ b/app/src/main/java/com/bnyro/contacts/App.kt
@@ -3,11 +3,13 @@ package com.bnyro.contacts
 import android.app.Application
 import com.bnyro.contacts.db.DatabaseHolder
 import com.bnyro.contacts.repo.DeviceContactsRepository
+import com.bnyro.contacts.repo.DeviceSmsRepo
 import com.bnyro.contacts.repo.LocalContactsRepository
+import com.bnyro.contacts.repo.LocalSmsRepo
+import com.bnyro.contacts.repo.SmsRepository
 import com.bnyro.contacts.util.NotificationHelper
 import com.bnyro.contacts.util.Preferences
 import com.bnyro.contacts.util.ShortcutHelper
-import com.bnyro.contacts.util.SmsUtil
 import com.bnyro.contacts.workers.BackupWorker
 
 class App : Application() {
@@ -18,6 +20,16 @@ class App : Application() {
         LocalContactsRepository(this)
     }
 
+    lateinit var smsRepo: SmsRepository
+
+    fun initSmsRepo() {
+        smsRepo = if (Preferences.getBoolean(Preferences.storeSmsLocallyKey, false)) {
+            LocalSmsRepo()
+        } else {
+            DeviceSmsRepo()
+        }
+    }
+
     override fun onCreate() {
         super.onCreate()
 
@@ -31,6 +43,6 @@ class App : Application() {
 
         NotificationHelper.createChannels(this)
 
-        SmsUtil.initSmsRepo()
+        initSmsRepo()
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/db/AppDatabase.kt b/app/src/main/java/com/bnyro/contacts/db/AppDatabase.kt
index 1f4ce2af..b7dbf4cb 100644
--- a/app/src/main/java/com/bnyro/contacts/db/AppDatabase.kt
+++ b/app/src/main/java/com/bnyro/contacts/db/AppDatabase.kt
@@ -11,8 +11,12 @@ import com.bnyro.contacts.db.obj.SmsData
 
 @Database(
     entities = [LocalContact::class, DbDataItem::class, SmsData::class],
-    autoMigrations = [AutoMigration(2, 3)],
-    version = 3
+    autoMigrations = [
+        AutoMigration(2, 3),
+        AutoMigration(3, 4),
+        AutoMigration(4, 5)
+    ],
+    version = 5
 )
 abstract class AppDatabase : RoomDatabase() {
     abstract fun localContactsDao(): LocalContactsDao
diff --git a/app/src/main/java/com/bnyro/contacts/db/dao/LocalSmsDao.kt b/app/src/main/java/com/bnyro/contacts/db/dao/LocalSmsDao.kt
index 9475e7bb..fbb5c3c1 100644
--- a/app/src/main/java/com/bnyro/contacts/db/dao/LocalSmsDao.kt
+++ b/app/src/main/java/com/bnyro/contacts/db/dao/LocalSmsDao.kt
@@ -4,11 +4,12 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
 import com.bnyro.contacts.db.obj.SmsData
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface LocalSmsDao {
     @Query("SELECT * from localSms")
-    suspend fun getAll(): List<SmsData>
+    fun getStream(): Flow<List<SmsData>>
 
     @Query("DELETE FROM localSms WHERE id = :id")
     suspend fun deleteSms(id: Long)
diff --git a/app/src/main/java/com/bnyro/contacts/db/obj/LocalContact.kt b/app/src/main/java/com/bnyro/contacts/db/obj/LocalContact.kt
index cc764186..6b29a9d4 100644
--- a/app/src/main/java/com/bnyro/contacts/db/obj/LocalContact.kt
+++ b/app/src/main/java/com/bnyro/contacts/db/obj/LocalContact.kt
@@ -12,5 +12,6 @@ data class LocalContact(
     @ColumnInfo val firstName: String? = null,
     @ColumnInfo val surName: String? = null,
     @ColumnInfo val nickName: String? = null,
+    @ColumnInfo val title: String? = null,
     @ColumnInfo val organization: String? = null
 )
diff --git a/app/src/main/java/com/bnyro/contacts/db/obj/SmsData.kt b/app/src/main/java/com/bnyro/contacts/db/obj/SmsData.kt
index 640c7baf..535506a5 100644
--- a/app/src/main/java/com/bnyro/contacts/db/obj/SmsData.kt
+++ b/app/src/main/java/com/bnyro/contacts/db/obj/SmsData.kt
@@ -1,93 +1,16 @@
 package com.bnyro.contacts.db.obj
 
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.bnyro.contacts.util.Format
-import com.bnyro.contacts.util.addKeywords
 
 @Entity(tableName = "localSms")
 data class SmsData(
     @PrimaryKey(autoGenerate = true) var id: Long = 0,
-    @ColumnInfo val address: String = "",
-    @ColumnInfo val body: String = "",
-    @ColumnInfo val timestamp: Long = 0,
-    @ColumnInfo val threadId: Long = 0,
-    @ColumnInfo val type: Int = 0
-) {
-    val formatted: AnnotatedString
-        get() {
-            val text = body
-            val keywords = mutableListOf<Pair<Format, String>>().apply {
-                addKeywords(
-                    text,
-                    linkRegex,
-                    Format.LINK
-                )
-                addKeywords(
-                    text,
-                    emailRegex,
-                    Format.EMAIL
-                )
-                addKeywords(
-                    text,
-                    phoneRegex,
-                    Format.PHONE
-                )
-            }
-
-            return buildAnnotatedString {
-                append(text)
-                keywords.forEach { kw ->
-                    val (format, keyword) = kw
-                    val indexOf = text.indexOf(keyword)
-                    addStyle(
-                        style = SpanStyle(
-                            color = Color.Blue,
-                            textDecoration = when (format) {
-                                Format.LINK -> TextDecoration.Underline
-                                else -> TextDecoration.None
-                            }
-                        ),
-                        start = indexOf,
-                        end = indexOf + keyword.length
-                    )
-                    val link = when (format) {
-                        Format.LINK -> if (keyword.startsWith("http")) {
-                            keyword
-                        } else {
-                            "http://$keyword"
-                        }
-
-                        Format.PHONE ->
-                            "tel:$keyword"
-
-                        Format.EMAIL -> "mailto:$keyword"
-                    }
-                    addStringAnnotation(
-                        tag = format.name,
-                        annotation = link,
-                        start = indexOf,
-                        end = indexOf + keyword.length
-                    )
-                }
-            }
-        }
-
-    companion object {
-        private val linkRegex = Regex(
-            "(?<!@)(?<!\\S)((https?://)?[a-zA-Z0-9\\-]{2,}(\\.[a-zA-Z0-9]{2,})+)"
-        )
-        private val emailRegex = Regex(
-            "([A-Za-z0-9+_.-]+@(.+))"
-        )
-        private val phoneRegex = Regex(
-            "((\\+\\d{1,3}(\\s)?)?((\\(\\d{3}\\))|(\\d{3}))[-\\s]?\\d{3}[-\\s]?\\d{4})"
-        )
-    }
-}
+    @ColumnInfo var address: String = "",
+    @ColumnInfo var body: String = "",
+    @ColumnInfo var timestamp: Long = 0,
+    @ColumnInfo var threadId: Long = 0,
+    @ColumnInfo var type: Int = 0,
+    @ColumnInfo(defaultValue = "NULL") var simNumber: Int? = null
+)
diff --git a/app/src/main/java/com/bnyro/contacts/enums/ContactAttributes.kt b/app/src/main/java/com/bnyro/contacts/enums/ContactAttributes.kt
new file mode 100644
index 00000000..713bce6a
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/enums/ContactAttributes.kt
@@ -0,0 +1,183 @@
+package com.bnyro.contacts.enums
+
+import android.provider.ContactsContract
+import android.provider.ContactsContract.Intents
+import com.bnyro.contacts.R
+import com.bnyro.contacts.obj.ContactData
+import com.bnyro.contacts.obj.TranslatedType
+import com.bnyro.contacts.obj.ValueWithType
+import com.bnyro.contacts.util.CalendarUtils
+import com.bnyro.contacts.util.ContactsHelper
+
+abstract class ContactAttribute<T> {
+    abstract val stringRes: Int
+    abstract val androidValueColumn: String
+    abstract val androidContentType: String
+    abstract fun set(contact: ContactData, value: T)
+    abstract fun get(contact: ContactData): T
+    open fun display(contact: ContactData): T = get(contact)
+}
+
+abstract class StringAttribute : ContactAttribute<String?>() {
+    abstract val insertKey: String?
+}
+
+abstract class ListAttribute: ContactAttribute<List<ValueWithType>>() {
+    abstract val androidTypeColumn: String
+    abstract val types: List<TranslatedType>
+    abstract val insertKeys: List<Pair<String, String?>>
+    open val intentActionType: IntentActionType? = null
+}
+
+class Organization : StringAttribute() {
+    override val stringRes: Int = R.string.organization
+    override val insertKey: String = Intents.Insert.COMPANY
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Organization.COMPANY
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE
+
+    override fun set(contact: ContactData, value: String?) {
+        contact.organization = value
+    }
+
+    override fun get(contact: ContactData) = contact.organization
+}
+
+class Title : StringAttribute() {
+    override val stringRes: Int = R.string.title
+    override val insertKey: String = Intents.Insert.JOB_TITLE
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Organization.TITLE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE
+
+    override fun set(contact: ContactData, value: String?) {
+        contact.organization = value
+    }
+
+    override fun get(contact: ContactData) = contact.organization
+}
+
+class Nickname : StringAttribute() {
+    override val stringRes: Int = R.string.nick_name
+    override val insertKey: String? = null
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Nickname.NAME
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE
+
+    override fun set(contact: ContactData, value: String?) {
+        contact.nickName = value
+    }
+
+    override fun get(contact: ContactData) = contact.nickName
+}
+
+class Events : ListAttribute() {
+    override val stringRes: Int = R.string.event
+    override val insertKeys: List<Pair<String, String?>> = emptyList()
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Event.START_DATE
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.Event.TYPE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE
+
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.events = value
+    }
+
+    override fun get(contact: ContactData) = contact.events
+
+    override fun display(contact: ContactData) = super.display(contact).map {
+        it.copy(value = CalendarUtils.localizeIsoDate(it.value))
+    }
+
+    override val types: List<TranslatedType> = ContactsHelper.eventTypes
+}
+
+class Numbers : ListAttribute() {
+    override val stringRes: Int = R.string.phone_number
+    override val insertKeys: List<Pair<String, String?>> = listOf(
+        Intents.Insert.PHONE to Intents.Insert.PHONE_TYPE,
+        Intents.Insert.SECONDARY_PHONE to Intents.Insert.SECONDARY_PHONE,
+        Intents.Insert.TERTIARY_EMAIL to Intents.Insert.TERTIARY_EMAIL_TYPE
+    )
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Phone.NUMBER
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.Phone.TYPE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE
+    override val intentActionType = IntentActionType.DIAL
+
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.numbers = value
+    }
+
+    override fun get(contact: ContactData) = contact.numbers
+    override fun display(contact: ContactData) = super.display(contact).map {
+        ValueWithType(ContactsHelper.normalizePhoneNumber(it.value), it.type)
+    }
+
+    override val types: List<TranslatedType> = ContactsHelper.phoneNumberTypes
+}
+
+class Emails : ListAttribute() {
+    override val stringRes: Int = R.string.email
+    override val insertKeys: List<Pair<String, String?>> = listOf(
+        Intents.Insert.EMAIL to Intents.Insert.EMAIL_TYPE,
+        Intents.Insert.SECONDARY_EMAIL to Intents.Insert.SECONDARY_EMAIL_TYPE,
+        Intents.Insert.TERTIARY_EMAIL to Intents.Insert.TERTIARY_EMAIL_TYPE
+    )
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Email.ADDRESS
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.Email.TYPE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE
+    override val intentActionType = IntentActionType.EMAIL
+
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.emails = value
+    }
+
+    override fun get(contact: ContactData) = contact.emails
+
+    override val types: List<TranslatedType> = ContactsHelper.emailTypes
+}
+
+class Addresses : ListAttribute() {
+    override val stringRes: Int = R.string.address
+    override val insertKeys: List<Pair<String, String?>> = listOf(Intents.Insert.POSTAL to null)
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.StructuredPostal.TYPE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE
+    override val intentActionType = IntentActionType.ADDRESS
+
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.addresses = value
+    }
+
+    override fun get(contact: ContactData) = contact.addresses
+
+    override val types: List<TranslatedType> = ContactsHelper.addressTypes
+}
+
+class Notes : ListAttribute() {
+    override val stringRes: Int = R.string.note
+    override val insertKeys: List<Pair<String, String?>> = listOf(Intents.Insert.NOTES to null)
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Note.NOTE
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.Note.DATA2
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Note.CONTENT_ITEM_TYPE
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.notes = value
+    }
+
+    override fun get(contact: ContactData) = contact.notes
+
+    override val types: List<TranslatedType> = emptyList()
+}
+
+class Websites : ListAttribute() {
+    override val stringRes: Int = R.string.website
+    override val insertKeys: List<Pair<String, String?>> = emptyList()
+    override val androidValueColumn: String = ContactsContract.CommonDataKinds.Website.URL
+    override val androidTypeColumn: String = ContactsContract.CommonDataKinds.Website.TYPE
+    override val androidContentType: String = ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE
+    override val intentActionType = IntentActionType.WEBSITE
+
+    override fun set(contact: ContactData, value: List<ValueWithType>) {
+        contact.websites = value
+    }
+
+    override fun get(contact: ContactData) = contact.websites
+
+    override val types: List<TranslatedType> = ContactsHelper.websiteTypes
+}
diff --git a/app/src/main/java/com/bnyro/contacts/enums/ThemeMode.kt b/app/src/main/java/com/bnyro/contacts/enums/ThemeMode.kt
index 20ea1b51..fb86fd2a 100644
--- a/app/src/main/java/com/bnyro/contacts/enums/ThemeMode.kt
+++ b/app/src/main/java/com/bnyro/contacts/enums/ThemeMode.kt
@@ -3,7 +3,8 @@ package com.bnyro.contacts.enums
 enum class ThemeMode {
     SYSTEM,
     LIGHT,
-    DARK;
+    DARK,
+    AMOLED;
 
     companion object {
         fun fromInt(value: Int) = ThemeMode.values().first { it.ordinal == value }
diff --git a/app/src/main/java/com/bnyro/contacts/ext/Parcelable.kt b/app/src/main/java/com/bnyro/contacts/ext/Parcelable.kt
new file mode 100644
index 00000000..3f827a1b
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/ext/Parcelable.kt
@@ -0,0 +1,8 @@
+package com.bnyro.contacts.ext
+
+import android.content.Intent
+import androidx.core.content.IntentCompat
+
+inline fun <reified T> Intent.parcelable(key: String): T? {
+    return IntentCompat.getParcelableExtra(this, key, T::class.java)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/nav/NavContainer.kt b/app/src/main/java/com/bnyro/contacts/nav/NavContainer.kt
new file mode 100644
index 00000000..13762834
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/nav/NavContainer.kt
@@ -0,0 +1,129 @@
+package com.bnyro.contacts.nav
+
+import android.content.res.Configuration
+import androidx.activity.addCallback
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.NavigationRail
+import androidx.compose.material3.NavigationRailItem
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import androidx.navigation.compose.rememberNavController
+import com.bnyro.contacts.ui.activities.MainActivity
+
+val bottomNavItems = listOf(
+    NavRoutes.Phone,
+    NavRoutes.Contacts,
+    NavRoutes.Messages
+)
+
+@Composable
+fun NavContainer(
+    initialTabIndex: Int
+) {
+    val context = LocalContext.current
+    val navController = rememberNavController()
+
+    val initialTab = bottomNavItems[initialTabIndex.coerceIn(0, 1)]
+    var selectedRoute by remember {
+        mutableStateOf(initialTab)
+    }
+    LaunchedEffect(Unit) {
+        val activity = context as MainActivity
+        activity.onBackPressedDispatcher.addCallback {
+            if (selectedRoute != NavRoutes.Settings && selectedRoute != NavRoutes.About) {
+                activity.finish()
+            } else {
+                navController.popBackStack()
+            }
+        }
+    }
+
+    // listen for destination changes (e.g. back presses)
+    DisposableEffect(Unit) {
+        val listener = NavController.OnDestinationChangedListener { _, destination, _ ->
+            allRoutes.firstOrNull { it.route == destination.route?.split("/")?.first() }
+                ?.let { selectedRoute = it }
+        }
+        navController.addOnDestinationChangedListener(listener)
+
+        onDispose {
+            navController.removeOnDestinationChangedListener(listener)
+        }
+    }
+
+    val orientation = LocalConfiguration.current.orientation
+    Scaffold(
+        bottomBar = {
+            if (orientation == Configuration.ORIENTATION_PORTRAIT && bottomNavItems.contains(
+                    selectedRoute
+                )
+            ) {
+                NavigationBar(
+                    tonalElevation = 5.dp
+                ) {
+                    bottomNavItems.forEach {
+                        NavigationBarItem(
+                            label = {
+                                Text(stringResource(it.stringRes!!))
+                            },
+                            icon = {
+                                Icon(it.icon!!, null)
+                            },
+                            selected = it == selectedRoute,
+                            onClick = {
+                                selectedRoute = it
+                                navController.navigate(it.route)
+                            }
+                        )
+                    }
+                }
+            }
+        }
+    ) { pV ->
+        Row(
+            Modifier
+                .fillMaxSize()
+                .padding(pV)
+        ) {
+            if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                NavigationRail {
+                    bottomNavItems.forEach {
+                        NavigationRailItem(selected = it == selectedRoute,
+                            onClick = {
+                                selectedRoute = it
+                                navController.navigate(it.route)
+                            },
+                            icon = { Icon(it.icon!!, null) },
+                            label = {
+                                Text(stringResource(it.stringRes!!))
+                            })
+                    }
+                }
+            }
+            AppNavHost(
+                navController,
+                startDestination = initialTab,
+                modifier = Modifier
+                    .fillMaxSize()
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/nav/NavHost.kt b/app/src/main/java/com/bnyro/contacts/nav/NavHost.kt
new file mode 100644
index 00000000..14aed676
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/nav/NavHost.kt
@@ -0,0 +1,96 @@
+package com.bnyro.contacts.nav
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.navArgument
+import com.bnyro.contacts.ui.models.ContactsModel
+import com.bnyro.contacts.ui.models.DialerModel
+import com.bnyro.contacts.ui.models.SmsModel
+import com.bnyro.contacts.ui.models.ThemeModel
+import com.bnyro.contacts.ui.screens.AboutScreen
+import com.bnyro.contacts.ui.screens.CallLogsScreen
+import com.bnyro.contacts.ui.screens.ContactsPage
+import com.bnyro.contacts.ui.screens.SettingsScreen
+import com.bnyro.contacts.ui.screens.SmsListScreen
+import com.bnyro.contacts.ui.screens.SmsThreadScreen
+
+@Composable
+fun AppNavHost(
+    navController: NavHostController,
+    startDestination: NavRoutes,
+    modifier: Modifier = Modifier
+) {
+    val smsModel: SmsModel = viewModel(factory = SmsModel.Factory)
+    val contactsModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
+    val dialerModel: DialerModel = viewModel()
+    val themeModel: ThemeModel = viewModel()
+
+    val viewModelStoreOwner: ViewModelStoreOwner = LocalViewModelStoreOwner.current!!
+
+    NavHost(navController, startDestination = startDestination.route, modifier = modifier) {
+        composable(NavRoutes.About.route) {
+            AboutScreen {
+                navController.popBackStack()
+            }
+        }
+        composable(NavRoutes.Settings.route) {
+            SettingsScreen(themeModel = themeModel, smsModel = smsModel) {
+                navController.popBackStack()
+            }
+        }
+        composable(NavRoutes.Contacts.route) {
+            CompositionLocalProvider(LocalViewModelStoreOwner provides viewModelStoreOwner) {
+                ContactsPage(null,
+                    onNavigate = {
+                        navController.navigate(it.route)
+                    })
+            }
+        }
+        composable(NavRoutes.Phone.route) {
+            CompositionLocalProvider(LocalViewModelStoreOwner provides viewModelStoreOwner) {
+                CallLogsScreen(contactsModel, dialerModel, themeModel)
+            }
+        }
+        composable(NavRoutes.Messages.route) {
+            CompositionLocalProvider(LocalViewModelStoreOwner provides viewModelStoreOwner) {
+                SmsListScreen(
+                    smsModel = smsModel,
+                    contactsModel = contactsModel,
+                    scrollConnection = null,
+                    onNavigate = {
+                        navController.navigate(it.route)
+                    },
+                    onClickMessage = { address, contactData ->
+                        smsModel.currentContactData = contactData
+                        navController.navigate("${NavRoutes.MessageThread.route}/$address")
+                    }
+                )
+            }
+        }
+        composable(
+            "${NavRoutes.MessageThread.route}/{address}",
+            listOf(navArgument("address") { type = NavType.StringType })
+        ) {
+            val address = it.arguments?.getString("address")
+            CompositionLocalProvider(LocalViewModelStoreOwner provides viewModelStoreOwner) {
+                SmsThreadScreen(
+                    smsModel = smsModel,
+                    contactsModel = contactsModel,
+                    contactsData = remember { smsModel.currentContactData },
+                    address = address.orEmpty()
+                ) {
+                    navController.popBackStack()
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/nav/NavRoutes.kt b/app/src/main/java/com/bnyro/contacts/nav/NavRoutes.kt
new file mode 100644
index 00000000..d713c5b8
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/nav/NavRoutes.kt
@@ -0,0 +1,30 @@
+package com.bnyro.contacts.nav
+
+import androidx.annotation.StringRes
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Message
+import androidx.compose.material.icons.rounded.Person
+import androidx.compose.material.icons.rounded.Phone
+import androidx.compose.ui.graphics.vector.ImageVector
+import com.bnyro.contacts.R
+
+sealed class NavRoutes(
+    val route: String,
+    @StringRes val stringRes: Int? = null,
+    val icon: ImageVector? = null
+) {
+    object About : NavRoutes("about", null, null)
+    object Settings : NavRoutes("settings", null, null)
+    object Phone : NavRoutes("phone", R.string.dial, Icons.Rounded.Phone)
+    object Contacts : NavRoutes("contacts", R.string.contacts, Icons.Rounded.Person)
+    object Messages : NavRoutes("messages", R.string.messages, Icons.Rounded.Message)
+    object MessageThread : NavRoutes("message_thread", null, null)
+}
+
+val allRoutes = listOf(
+    NavRoutes.About,
+    NavRoutes.Settings,
+    NavRoutes.Contacts,
+    NavRoutes.Messages,
+    NavRoutes.MessageThread,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/obj/AccountType.kt b/app/src/main/java/com/bnyro/contacts/obj/AccountType.kt
new file mode 100644
index 00000000..3f035622
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/obj/AccountType.kt
@@ -0,0 +1,18 @@
+package com.bnyro.contacts.obj
+
+data class AccountType(
+    val name: String,
+    val type: String,
+) {
+    val identifier = "$type|$name"
+
+    companion object {
+        private const val ANDROID_ACCOUNT_TYPE = "com.android.contacts"
+        private const val ANDROID_ACCOUNT_NAME = "DEVICE"
+
+        val androidDefault = AccountType(
+            ANDROID_ACCOUNT_NAME,
+            ANDROID_ACCOUNT_TYPE
+        )
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/obj/ContactData.kt b/app/src/main/java/com/bnyro/contacts/obj/ContactData.kt
index b701f7a6..dc45cdf6 100644
--- a/app/src/main/java/com/bnyro/contacts/obj/ContactData.kt
+++ b/app/src/main/java/com/bnyro/contacts/obj/ContactData.kt
@@ -14,6 +14,7 @@ data class ContactData(
     var firstName: String? = null,
     var surName: String? = null,
     var nickName: String? = null,
+    var title: String? = null,
     var organization: String? = null,
     var photo: Bitmap? = null,
     var thumbnail: Bitmap? = null,
@@ -31,6 +32,8 @@ data class ContactData(
             SortOrder.FIRSTNAME -> displayName
             SortOrder.LASTNAME -> alternativeName
             SortOrder.NICKNAME -> nickName ?: displayName
+        }?.ifBlank {
+            organization ?: numbers.firstOrNull()?.value
         }
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/obj/SmsThread.kt b/app/src/main/java/com/bnyro/contacts/obj/SmsThread.kt
new file mode 100644
index 00000000..a8504bfc
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/obj/SmsThread.kt
@@ -0,0 +1,10 @@
+package com.bnyro.contacts.obj
+
+import com.bnyro.contacts.db.obj.SmsData
+
+data class SmsThread(
+    val threadId: Long,
+    val address: String,
+    val contactData: ContactData?,
+    val smsList: List<SmsData>
+)
diff --git a/app/src/main/java/com/bnyro/contacts/obj/ValueWithType.kt b/app/src/main/java/com/bnyro/contacts/obj/ValueWithType.kt
index 2e2e92f4..01ca0005 100644
--- a/app/src/main/java/com/bnyro/contacts/obj/ValueWithType.kt
+++ b/app/src/main/java/com/bnyro/contacts/obj/ValueWithType.kt
@@ -1,5 +1,20 @@
 package com.bnyro.contacts.obj
 
+/**
+ * A data class that represents a value with its type.
+ *
+ * @property value The value of the data.
+ * @property type The type of the data. This is the column index of the **TYPE**
+ *
+ * for example:
+ * - [Email][android.provider.ContactsContract.CommonDataKinds.Email]
+ * - [Phone][android.provider.ContactsContract.CommonDataKinds.Phone]
+ * - [StructuredPostal][android.provider.ContactsContract.CommonDataKinds.StructuredPostal]
+ * - [Provider][android.provider.ContactsContract.CommonDataKinds.Website]
+ * - [Event][android.provider.ContactsContract.CommonDataKinds.Event]
+ * - [Note][android.provider.ContactsContract.CommonDataKinds.Note]
+ * - [Organization][android.provider.ContactsContract.CommonDataKinds.Organization]
+ */
 data class ValueWithType(
     var value: String,
     var type: Int? = null
diff --git a/app/src/main/java/com/bnyro/contacts/receivers/CopyTextReceiver.kt b/app/src/main/java/com/bnyro/contacts/receivers/CopyTextReceiver.kt
new file mode 100644
index 00000000..26a3fab0
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/receivers/CopyTextReceiver.kt
@@ -0,0 +1,13 @@
+package com.bnyro.contacts.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.bnyro.contacts.util.ClipboardHelper
+
+class CopyTextReceiver: BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        val text = intent.getStringExtra(SmsReceiver.KEY_EXTRA_TEXT) ?: return
+        ClipboardHelper(context).save(text)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/receivers/DeleteSmsReceiver.kt b/app/src/main/java/com/bnyro/contacts/receivers/DeleteSmsReceiver.kt
index 881a6e33..877980c9 100644
--- a/app/src/main/java/com/bnyro/contacts/receivers/DeleteSmsReceiver.kt
+++ b/app/src/main/java/com/bnyro/contacts/receivers/DeleteSmsReceiver.kt
@@ -4,8 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationManagerCompat
-import com.bnyro.contacts.ui.activities.MainActivity
-import com.bnyro.contacts.util.SmsUtil
+import com.bnyro.contacts.App
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -13,16 +12,12 @@ import kotlinx.coroutines.launch
 class DeleteSmsReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         val smsId = intent.getLongExtra(SmsReceiver.KEY_EXTRA_SMS_ID, -1)
-        val threadId = intent.getLongExtra(SmsReceiver.KEY_EXTRA_THREAD_ID, -1)
         val notificationId = intent.getIntExtra(SmsReceiver.KEY_EXTRA_NOTIFICATION_ID, -1)
 
         NotificationManagerCompat.from(context).cancel(notificationId)
 
         CoroutineScope(Dispatchers.IO).launch {
-            MainActivity.smsModel?.deleteSms(context, smsId, threadId) ?: run {
-                // if the UI is not currently opened, only delete the SMS and don't touch the UI
-                SmsUtil.deleteMessage(context, smsId)
-            }
+            (context.applicationContext as App).smsRepo.deleteSms(context, smsId)
         }
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/receivers/SmsReceiver.kt b/app/src/main/java/com/bnyro/contacts/receivers/SmsReceiver.kt
index 8787c389..cc5867ce 100644
--- a/app/src/main/java/com/bnyro/contacts/receivers/SmsReceiver.kt
+++ b/app/src/main/java/com/bnyro/contacts/receivers/SmsReceiver.kt
@@ -10,15 +10,14 @@ import android.provider.Telephony
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.RemoteInput
+import com.bnyro.contacts.App
 import com.bnyro.contacts.R
 import com.bnyro.contacts.db.obj.SmsData
 import com.bnyro.contacts.enums.IntentActionType
-import com.bnyro.contacts.ui.activities.MainActivity
 import com.bnyro.contacts.util.IntentHelper
 import com.bnyro.contacts.util.NotificationHelper
 import com.bnyro.contacts.util.NotificationHelper.MESSAGES_CHANNEL_ID
 import com.bnyro.contacts.util.PermissionHelper
-import com.bnyro.contacts.util.SmsUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 
@@ -28,21 +27,24 @@ class SmsReceiver : BroadcastReceiver() {
         if (intent.action != SMS_DELIVER) return
 
         Telephony.Sms.Intents.getMessagesFromIntent(intent).forEach { message ->
-            val notificationId = message.timestampMillis.hashCode()
             val address = message.displayOriginatingAddress
             val body = message.displayMessageBody
             val timestamp = message.timestampMillis
+
             val threadId =
-                runBlocking(Dispatchers.IO) { SmsUtil.getOrCreateThreadId(context, address) }
+                runBlocking(Dispatchers.IO) {
+                    (context.applicationContext as App).smsRepo.getOrCreateThreadId(
+                        context,
+                        address
+                    )
+                }
             val bareSmsData =
-                SmsData(-1, address, body, timestamp, threadId, Telephony.Sms.MESSAGE_TYPE_INBOX)
+                SmsData(0, address, body, timestamp, threadId, Telephony.Sms.MESSAGE_TYPE_INBOX)
 
-            createNotification(context, notificationId, bareSmsData)
-            val smsData = runBlocking(Dispatchers.IO) {
-                SmsUtil.persistMessage(context, bareSmsData)
+            createNotification(context, bareSmsData.hashCode(), bareSmsData)
+            runBlocking(Dispatchers.IO) {
+                (context.applicationContext as App).smsRepo.persistSms(context, bareSmsData)
             }
-
-            MainActivity.smsModel?.addSmsToList(smsData)
         }
     }
 
@@ -60,7 +62,7 @@ class SmsReceiver : BroadcastReceiver() {
 
         val replyPendingIntent = PendingIntent.getBroadcast(
             context,
-            0,
+            notificationId + 1,
             replyIntent,
             PendingIntent.FLAG_MUTABLE
         )
@@ -80,9 +82,9 @@ class SmsReceiver : BroadcastReceiver() {
 
         val deletePendingIntent = PendingIntent.getBroadcast(
             context,
-            1,
+            notificationId + 2,
             deleteIntent,
-            PendingIntent.FLAG_MUTABLE
+            PendingIntent.FLAG_IMMUTABLE
         )
 
         val deleteMessageAction = NotificationCompat.Action.Builder(
@@ -95,12 +97,12 @@ class SmsReceiver : BroadcastReceiver() {
 
         val smsThreadPendingIntent = PendingIntent.getActivity(
             context,
-            1,
+            notificationId + 3,
             smsThreadIntent,
             PendingIntent.FLAG_IMMUTABLE
         )
 
-        val notification = NotificationCompat.Builder(context, MESSAGES_CHANNEL_ID)
+        val builder = NotificationCompat.Builder(context, MESSAGES_CHANNEL_ID)
             .setDefaults(Notification.DEFAULT_ALL)
             .setSmallIcon(R.drawable.ic_message_notification)
             .setPriority(NotificationCompat.PRIORITY_HIGH)
@@ -117,7 +119,26 @@ class SmsReceiver : BroadcastReceiver() {
             .setOnlyAlertOnce(true)
             .addAction(replyAction)
             .addAction(deleteMessageAction)
-            .build()
+
+        verificationCodeRegex.find(smsData.body)?.let { code ->
+            val copyIntent = Intent(context, CopyTextReceiver::class.java)
+                .putExtra(KEY_EXTRA_TEXT, code.value)
+
+            val copyPendingIntent = PendingIntent.getBroadcast(
+                context,
+                notificationId + 4,
+                copyIntent,
+                PendingIntent.FLAG_IMMUTABLE
+            )
+
+            val copyMessageAction = NotificationCompat.Action.Builder(
+                R.drawable.ic_delete,
+                "${context.getString(R.string.copy)} ${code.value}",
+                copyPendingIntent
+            ).build()
+
+            builder.addAction(copyMessageAction)
+        }
 
         if (!PermissionHelper.checkPermissions(
                 context,
@@ -126,7 +147,7 @@ class SmsReceiver : BroadcastReceiver() {
         ) {
             return
         }
-        NotificationManagerCompat.from(context).notify(notificationId, notification)
+        NotificationManagerCompat.from(context).notify(notificationId, builder.build())
     }
 
     companion object {
@@ -136,5 +157,8 @@ class SmsReceiver : BroadcastReceiver() {
         const val KEY_EXTRA_SMS_ID = "key_extra_sms_id"
         const val KEY_EXTRA_THREAD_ID = "key_extra_thread_id"
         const val KEY_EXTRA_NOTIFICATION_ID = "notification_id"
+        const val KEY_EXTRA_TEXT = "key_extra_text"
+
+        val verificationCodeRegex = Regex("(?<!\\d)\\d{6}(?!\\d)")
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/repo/DeviceContactsRepository.kt b/app/src/main/java/com/bnyro/contacts/repo/DeviceContactsRepository.kt
index f81f71e3..123b288f 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/DeviceContactsRepository.kt
+++ b/app/src/main/java/com/bnyro/contacts/repo/DeviceContactsRepository.kt
@@ -1,8 +1,10 @@
 package com.bnyro.contacts.repo
 
 import android.Manifest
+import android.accounts.AccountManager
 import android.annotation.SuppressLint
 import android.content.ContentProviderOperation
+import android.content.ContentResolver
 import android.content.ContentUris
 import android.content.Context
 import android.graphics.Bitmap
@@ -11,27 +13,25 @@ import android.net.Uri
 import android.provider.ContactsContract
 import android.provider.ContactsContract.AUTHORITY
 import android.provider.ContactsContract.CALLER_IS_SYNCADAPTER
-import android.provider.ContactsContract.CommonDataKinds.Email
-import android.provider.ContactsContract.CommonDataKinds.Event
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership
 import android.provider.ContactsContract.CommonDataKinds.Nickname
-import android.provider.ContactsContract.CommonDataKinds.Note
 import android.provider.ContactsContract.CommonDataKinds.Organization
 import android.provider.ContactsContract.CommonDataKinds.Phone
 import android.provider.ContactsContract.CommonDataKinds.Photo
 import android.provider.ContactsContract.CommonDataKinds.StructuredName
-import android.provider.ContactsContract.CommonDataKinds.StructuredPostal
-import android.provider.ContactsContract.CommonDataKinds.Website
 import android.provider.ContactsContract.Contacts
 import android.provider.ContactsContract.Data
 import android.provider.ContactsContract.RawContacts
 import androidx.annotation.RequiresPermission
 import com.bnyro.contacts.R
 import com.bnyro.contacts.enums.BackupType
+import com.bnyro.contacts.enums.ListAttribute
+import com.bnyro.contacts.enums.StringAttribute
 import com.bnyro.contacts.ext.intValue
 import com.bnyro.contacts.ext.longValue
 import com.bnyro.contacts.ext.notAName
 import com.bnyro.contacts.ext.stringValue
+import com.bnyro.contacts.obj.AccountType
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.obj.ContactsGroup
 import com.bnyro.contacts.obj.ValueWithType
@@ -45,7 +45,9 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
     override val label: String = context.getString(R.string.device)
 
     private val contentResolver = context.contentResolver
-    private val contactsUri = Data.CONTENT_URI
+    private val contentUri = Data.CONTENT_URI
+
+    private val authority = AUTHORITY
 
     private val projection = arrayOf(
         Data.RAW_CONTACT_ID,
@@ -54,8 +56,6 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
         Contacts.DISPLAY_NAME_ALTERNATIVE,
         StructuredName.GIVEN_NAME,
         StructuredName.FAMILY_NAME,
-        Nickname.NAME,
-        Organization.COMPANY,
         RawContacts.ACCOUNT_TYPE,
         RawContacts.ACCOUNT_NAME
     )
@@ -69,7 +69,7 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
 
         @Suppress("SameParameterValue")
         val cursor = contentResolver.query(
-            contactsUri,
+            contentUri,
             projection,
             null,
             null,
@@ -125,44 +125,21 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
             thumbnail = getContactPhotoThumbnail(contactId)
             photo = getContactPhoto(contactId) ?: thumbnail
             groups = getGroups(contactId, storedContactGroups)
-            nickName = getEntry(contactId, Nickname.CONTENT_ITEM_TYPE, Nickname.NAME)
-            organization = getEntry(contactId, Organization.CONTENT_ITEM_TYPE, Organization.COMPANY)
-            events = getExtras(
-                contactId,
-                Event.START_DATE,
-                Event.TYPE,
-                Event.CONTENT_ITEM_TYPE
-            )
-            numbers = getExtras(
-                contactId,
-                Phone.NUMBER,
-                Phone.TYPE,
-                Phone.CONTENT_ITEM_TYPE
-            )
-            emails = getExtras(
-                contactId,
-                Email.ADDRESS,
-                Email.TYPE,
-                Email.CONTENT_ITEM_TYPE
-            )
-            addresses = getExtras(
-                contactId,
-                StructuredPostal.FORMATTED_ADDRESS,
-                StructuredPostal.TYPE,
-                StructuredPostal.CONTENT_ITEM_TYPE
-            )
-            notes = getExtras(
-                contactId,
-                Note.NOTE,
-                Note.DATA2,
-                Note.CONTENT_ITEM_TYPE
-            )
-            websites = getExtras(
-                contactId,
-                Website.URL,
-                Website.TYPE,
-                Website.CONTENT_ITEM_TYPE
-            )
+
+            ContactsHelper.contactAttributesTypes.forEach { attribute ->
+                if (attribute is StringAttribute) {
+                    val dataStr = getEntry(contactId, attribute.androidContentType, attribute.androidValueColumn)
+                    attribute.set(this, dataStr)
+                } else if (attribute is ListAttribute) {
+                    val dataEntries = getExtras(
+                        contactId,
+                        attribute.androidValueColumn,
+                        attribute.androidTypeColumn,
+                        attribute.androidContentType
+                    )
+                    attribute.set(this, dataEntries)
+                }
+            }
         }
     }
 
@@ -187,8 +164,8 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
             ContentProviderOperation.newInsert(ContactsContract.Groups.CONTENT_URI).apply {
                 withValue(ContactsContract.Groups.TITLE, groupName)
                 withValue(ContactsContract.Groups.GROUP_VISIBLE, 1)
-                withValue(ContactsContract.Groups.ACCOUNT_NAME, ANDROID_CONTACTS_NAME)
-                withValue(ContactsContract.Groups.ACCOUNT_TYPE, ANDROID_ACCOUNT_TYPE)
+                withValue(ContactsContract.Groups.ACCOUNT_NAME, AccountType.androidDefault.name)
+                withValue(ContactsContract.Groups.ACCOUNT_TYPE, AccountType.androidDefault.type)
                 operations.add(build())
             }
 
@@ -272,7 +249,7 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
         val projection = arrayOf(Data.CONTACT_ID, valueIndex, typeIndex ?: "data2")
 
         contentResolver.query(
-            contactsUri,
+            contentUri,
             projection,
             "${Data.MIMETYPE} = ? AND ${Data.CONTACT_ID} = ?",
             arrayOf(itemType, contactId.toString()),
@@ -314,8 +291,8 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
             val lastChosenAccount = Preferences.getLastChosenAccount()
             val ops = listOfNotNull(
                 getCreateAction(
-                    contact.accountType ?: lastChosenAccount.first,
-                    contact.accountName ?: lastChosenAccount.second
+                    contact.accountType ?: lastChosenAccount.type,
+                    contact.accountName ?: lastChosenAccount.name
                 ),
                 getInsertAction(
                     StructuredName.CONTENT_ITEM_TYPE,
@@ -332,82 +309,32 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
                     StructuredName.FAMILY_NAME,
                     contact.surName.orEmpty()
                 ),
-                contact.nickName?.let {
-                    getInsertAction(
-                        Nickname.CONTENT_ITEM_TYPE,
-                        Nickname.NAME,
-                        it
-                    )
-                },
-                contact.organization?.let {
-                    getInsertAction(
-                        Organization.CONTENT_ITEM_TYPE,
-                        Organization.COMPANY,
-                        it
-                    )
-                },
                 contact.photo?.let {
                     getInsertAction(Photo.CONTENT_ITEM_TYPE, Photo.PHOTO, getBitmapBytes(it))
                 },
-                *contact.websites.map {
-                    getInsertAction(
-                        Website.CONTENT_ITEM_TYPE,
-                        Website.URL,
-                        it.value,
-                        Website.TYPE,
-                        it.type
-                    )
-                }.toTypedArray(),
-                *contact.numbers.map {
-                    getInsertAction(
-                        Phone.CONTENT_ITEM_TYPE,
-                        Phone.NUMBER,
-                        it.value,
-                        Phone.TYPE,
-                        it.type
-                    )
-                }.toTypedArray(),
-                *contact.emails.map {
-                    getInsertAction(
-                        Email.CONTENT_ITEM_TYPE,
-                        Email.ADDRESS,
-                        it.value,
-                        Email.TYPE,
-                        it.type
-                    )
-                }.toTypedArray(),
-                *contact.addresses.map {
-                    getInsertAction(
-                        StructuredPostal.CONTENT_ITEM_TYPE,
-                        StructuredPostal.FORMATTED_ADDRESS,
-                        it.value,
-                        StructuredPostal.TYPE,
-                        it.type
-                    )
-                }.toTypedArray(),
-                *contact.events.map {
-                    getInsertAction(
-                        Event.CONTENT_ITEM_TYPE,
-                        Event.START_DATE,
-                        it.value,
-                        Event.TYPE,
-                        it.type
-                    )
-                }.toTypedArray(),
-                *contact.notes.map {
-                    getInsertAction(
-                        Note.CONTENT_ITEM_TYPE,
-                        Note.NOTE,
-                        it.value
-                    )
-                }.toTypedArray(),
                 *contact.groups.map {
                     getInsertAction(
                         GroupMembership.CONTENT_ITEM_TYPE,
                         GroupMembership.GROUP_ROW_ID,
                         it.rowId.toString()
                     )
-                }.toTypedArray()
+                }.toTypedArray(),
+                *ContactsHelper.contactAttributesTypes.filterIsInstance<StringAttribute>().map { attribute ->
+                    attribute.get(contact)?.let {
+                        getInsertAction(attribute.androidContentType, attribute.androidValueColumn, it)
+                    }
+                }.toTypedArray(),
+                *ContactsHelper.contactAttributesTypes.filterIsInstance<ListAttribute>().map { attribute ->
+                    attribute.get(contact).map {
+                        getInsertAction(
+                            attribute.androidContentType,
+                            attribute.androidValueColumn,
+                            it.value,
+                            attribute.androidTypeColumn,
+                            it.type
+                        )
+                    }
+                }.flatten().toTypedArray()
             ).let { ArrayList(it) }
 
             contentResolver.applyBatch(AUTHORITY, ops)
@@ -421,7 +348,7 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
             val rawContactId = contact.rawContactId.toString()
 
             val selection = "${Data.RAW_CONTACT_ID} = ? AND ${Data.MIMETYPE} = ?"
-            ContentProviderOperation.newUpdate(contactsUri).apply {
+            ContentProviderOperation.newUpdate(contentUri).apply {
                 val selectionArgs = arrayOf(rawContactId, StructuredName.CONTENT_ITEM_TYPE)
                 withSelection(selection, selectionArgs)
                 withValue(StructuredName.GIVEN_NAME, contact.firstName)
@@ -430,77 +357,20 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
                 operations.add(build())
             }
 
-            operations.addAll(
-                getUpdateSingleAction(
-                    rawContactId,
-                    Nickname.CONTENT_ITEM_TYPE,
-                    Nickname.NAME,
-                    contact.nickName
-                )
-            )
-            operations.addAll(
-                getUpdateSingleAction(
-                    rawContactId,
-                    Organization.CONTENT_ITEM_TYPE,
-                    Organization.COMPANY,
-                    contact.organization
-                )
-            )
+            for (attribute in ContactsHelper.contactAttributesTypes) {
+                if (attribute is StringAttribute) {
+                    operations.addAll(getUpdateSingleAction(
+                        rawContactId, attribute.androidContentType,
+                        attribute.androidValueColumn, attribute.get(contact)
+                    ))
+                } else if (attribute is ListAttribute) {
+                    operations.addAll(getUpdateMultipleAction(
+                        rawContactId, attribute.androidContentType, attribute.get(contact),
+                        attribute.androidValueColumn, attribute.androidTypeColumn
+                    ))
+                }
+            }
 
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    Website.CONTENT_ITEM_TYPE,
-                    contact.websites,
-                    Website.URL,
-                    Website.TYPE
-                )
-            )
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    Phone.CONTENT_ITEM_TYPE,
-                    contact.numbers,
-                    Phone.NUMBER,
-                    Phone.TYPE
-                )
-            )
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    Email.CONTENT_ITEM_TYPE,
-                    contact.emails,
-                    Email.ADDRESS,
-                    Email.TYPE
-                )
-            )
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    StructuredPostal.CONTENT_ITEM_TYPE,
-                    contact.addresses,
-                    StructuredPostal.FORMATTED_ADDRESS,
-                    StructuredPostal.TYPE
-                )
-            )
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    Event.CONTENT_ITEM_TYPE,
-                    contact.events,
-                    Event.START_DATE,
-                    Event.TYPE
-                )
-            )
-            operations.addAll(
-                getUpdateMultipleAction(
-                    rawContactId,
-                    Note.CONTENT_ITEM_TYPE,
-                    contact.notes,
-                    Note.NOTE,
-                    null
-                )
-            )
             operations.addAll(
                 getUpdateMultipleAction(
                     rawContactId,
@@ -528,6 +398,14 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
         }
     }
 
+    fun getAccountTypes(): List<AccountType> {
+        val accounts = AccountManager.get(context).accounts.filter {
+            ContentResolver.getIsSyncable(it, authority) > 0 && ContentResolver.getSyncAutomatically(it, authority)
+        }
+
+        return listOf(AccountType.androidDefault) + accounts.map { AccountType(it.name, it.type) }
+    }
+
     private fun getCreateAction(accountType: String, accountName: String): ContentProviderOperation {
         return ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
             .withValue(RawContacts.ACCOUNT_TYPE, accountType)
@@ -543,7 +421,7 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
         type: Int? = null,
         rawContactId: Int? = null
     ): ContentProviderOperation {
-        return ContentProviderOperation.newInsert(contactsUri)
+        return ContentProviderOperation.newInsert(contentUri)
             .let { builder ->
                 // if creating a new contact, the previous contact id is going to be taken
                 // if updating an already existing contact, don't worry about the previous batch id
@@ -587,14 +465,14 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
         val selection = "${Data.RAW_CONTACT_ID} = ? AND ${Data.MIMETYPE} = ?"
         val selectionArgs = arrayOf(contactId, mimeType)
 
-        ContentProviderOperation.newDelete(contactsUri).apply {
+        ContentProviderOperation.newDelete(contentUri).apply {
             withSelection(selection, selectionArgs)
             operations.add(build())
         }
 
         // add new entries
         entries.forEach {
-            ContentProviderOperation.newInsert(contactsUri).apply {
+            ContentProviderOperation.newInsert(contentUri).apply {
                 withValue(Data.RAW_CONTACT_ID, contactId)
                 withValue(Data.MIMETYPE, mimeType)
                 withValue(valueIndex, it.value)
@@ -647,7 +525,7 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
     }
 
     private fun deletePhoto(rawContactId: Int): ContentProviderOperation {
-        return ContentProviderOperation.newDelete(contactsUri).apply {
+        return ContentProviderOperation.newDelete(contentUri).apply {
             val selection = "${Data.RAW_CONTACT_ID} = ? AND ${Data.MIMETYPE} = ?"
             val selectionArgs = arrayOf(rawContactId.toString(), Photo.CONTENT_ITEM_TYPE)
             withSelection(selection, selectionArgs)
@@ -656,7 +534,5 @@ class DeviceContactsRepository(private val context: Context) : ContactsRepositor
 
     companion object {
         const val MAX_PHOTO_SIZE = 700f
-        const val ANDROID_ACCOUNT_TYPE = "com.android.contacts"
-        const val ANDROID_CONTACTS_NAME = "DEVICE"
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/repo/DeviceSmsRepo.kt b/app/src/main/java/com/bnyro/contacts/repo/DeviceSmsRepo.kt
index ee2590d3..2767781a 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/DeviceSmsRepo.kt
+++ b/app/src/main/java/com/bnyro/contacts/repo/DeviceSmsRepo.kt
@@ -1,24 +1,57 @@
 package com.bnyro.contacts.repo
 
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.ContentResolver
 import android.content.ContentValues
 import android.content.Context
+import android.database.ContentObserver
+import android.net.Uri
+import android.os.Build
 import android.provider.Telephony
-import android.util.Log
+import androidx.annotation.RequiresPermission
 import com.bnyro.contacts.db.obj.SmsData
 import com.bnyro.contacts.ext.intValue
 import com.bnyro.contacts.ext.longValue
 import com.bnyro.contacts.ext.stringValue
+import com.bnyro.contacts.util.ContactsHelper
+import com.bnyro.contacts.util.PermissionHelper
 import com.bnyro.contacts.util.SmsUtil
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
 import kotlin.random.Random
 
 class DeviceSmsRepo : SmsRepository {
     private val contentUri = Telephony.Sms.CONTENT_URI
 
-    override suspend fun getSmsList(context: Context): List<SmsData> {
+    @SuppressLint("MissingPermission")
+    override fun getSmsStream(context: Context): Flow<List<SmsData>> {
+        return if (PermissionHelper.hasPermission(context, Manifest.permission.READ_SMS)) {
+            context.contentResolver.observe(contentUri).map {
+                getSmsList(context)
+            }
+        } else {
+            emptyFlow()
+        }
+    }
+
+    @RequiresPermission(Manifest.permission.READ_SMS)
+    private suspend fun getSmsList(context: Context): List<SmsData> = withContext(Dispatchers.IO) {
+        val simSlotMap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            SmsUtil.getSubscriptions(context)
+                .associateBy({ it.subscriptionId }, { it.simSlotIndex })
+        } else {
+            null
+        }
         context.contentResolver
-            .query(contentUri, null, null, null, null)
+            .query(contentUri, null, null, null, "date ASC")
             ?.use { cursor ->
-                if (!cursor.moveToFirst()) return emptyList()
+                if (!cursor.moveToFirst()) return@withContext emptyList()
 
                 val smsList = mutableListOf<SmsData>()
                 do {
@@ -28,17 +61,24 @@ class DeviceSmsRepo : SmsRepository {
                     val timestamp = cursor.longValue(Telephony.Sms.DATE) ?: 0
                     val body = cursor.stringValue(Telephony.Sms.BODY).orEmpty()
                     val type = cursor.intValue(Telephony.Sms.TYPE) ?: 0
+                    val simIndex = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                        cursor.intValue(Telephony.Sms.SUBSCRIPTION_ID)?.takeIf { it > 0 }?.let {
+                            simSlotMap?.get(it)
+                        }?.plus(1)
+                    } else {
+                        null
+                    }
 
-                    smsList.add(SmsData(id, address, body, timestamp, threadId, type))
+                    smsList.add(SmsData(id, address, body, timestamp, threadId, type, simIndex))
                 } while (cursor.moveToNext())
 
-                return smsList
+                return@withContext smsList
             }
 
-        return emptyList()
+        return@withContext emptyList()
     }
 
-    override suspend fun persistSms(context: Context, smsData: SmsData): SmsData {
+    override suspend fun persistSms(context: Context, smsData: SmsData) {
         val values = ContentValues()
         values.put(Telephony.Sms.ADDRESS, smsData.address)
         values.put(Telephony.Sms.BODY, smsData.body)
@@ -47,20 +87,7 @@ class DeviceSmsRepo : SmsRepository {
         values.put(Telephony.Sms.TYPE, smsData.type)
         values.put(Telephony.Sms.THREAD_ID, smsData.threadId)
 
-        val messageUri = context.contentResolver.insert(contentUri, values) ?: return smsData
-
-        Log.v("send_transaction", "inserted to uri: $messageUri")
-
-        context.contentResolver.query(
-            messageUri,
-            arrayOf(Telephony.Sms._ID),
-            null,
-            null,
-            null
-        )?.use {
-            if (it.moveToFirst()) smsData.id = it.longValue(Telephony.Sms._ID)!!
-        }
-        return smsData
+        context.contentResolver.insert(contentUri, values)
     }
 
     override suspend fun deleteSms(context: Context, id: Long) {
@@ -78,7 +105,7 @@ class DeviceSmsRepo : SmsRepository {
         )?.use { cursor ->
             while (cursor.moveToNext()) {
                 val id = cursor.longValue(Telephony.Sms._ID) ?: continue
-                SmsUtil.deleteMessage(context, id)
+                deleteSms(context, id)
             }
         }
     }
@@ -89,7 +116,7 @@ class DeviceSmsRepo : SmsRepository {
                 contentUri,
                 arrayOf(Telephony.Sms.THREAD_ID),
                 "${Telephony.Sms.ADDRESS} = ?",
-                arrayOf(address),
+                arrayOf(ContactsHelper.normalizePhoneNumber(address)),
                 null
             )
             ?.use {
@@ -101,3 +128,17 @@ class DeviceSmsRepo : SmsRepository {
         return Random.nextLong()
     }
 }
+
+fun ContentResolver.observe(uri: Uri) = callbackFlow {
+    val observer = object : ContentObserver(null) {
+        override fun onChange(selfChange: Boolean) {
+            trySend(selfChange)
+        }
+    }
+    registerContentObserver(uri, true, observer)
+    // trigger first.
+    trySend(false)
+    awaitClose {
+        unregisterContentObserver(observer)
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/repo/LocalContactsRepository.kt b/app/src/main/java/com/bnyro/contacts/repo/LocalContactsRepository.kt
index 685d1a41..d61006fa 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/LocalContactsRepository.kt
+++ b/app/src/main/java/com/bnyro/contacts/repo/LocalContactsRepository.kt
@@ -32,6 +32,7 @@ class LocalContactsRepository(context: Context) : ContactsRepository {
             firstName = contact.firstName,
             surName = contact.surName,
             nickName = contact.nickName,
+            title = contact.title,
             organization = contact.organization
         )
         val contactId = DatabaseHolder.Db.localContactsDao().insertContact(localContact)
@@ -86,6 +87,7 @@ class LocalContactsRepository(context: Context) : ContactsRepository {
                 firstName = it.contact.firstName,
                 surName = it.contact.surName,
                 nickName = it.contact.nickName,
+                title = it.contact.title,
                 organization = it.contact.organization,
                 photo = profileImage,
                 thumbnail = profileImage,
diff --git a/app/src/main/java/com/bnyro/contacts/repo/LocalSmsRepo.kt b/app/src/main/java/com/bnyro/contacts/repo/LocalSmsRepo.kt
index 0234890b..61fc5a35 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/LocalSmsRepo.kt
+++ b/app/src/main/java/com/bnyro/contacts/repo/LocalSmsRepo.kt
@@ -3,24 +3,24 @@ package com.bnyro.contacts.repo
 import android.content.Context
 import com.bnyro.contacts.db.DatabaseHolder
 import com.bnyro.contacts.db.obj.SmsData
+import com.bnyro.contacts.util.ContactsHelper
+import kotlinx.coroutines.flow.Flow
 import kotlin.random.Random
 
 class LocalSmsRepo : SmsRepository {
-    override suspend fun getSmsList(context: Context): List<SmsData> {
-        return DatabaseHolder.Db.localSmsDao().getAll()
-    }
+    override fun getSmsStream(context: Context): Flow<List<SmsData>> =
+        DatabaseHolder.Db.localSmsDao().getStream()
 
-    override suspend fun persistSms(context: Context, smsData: SmsData): SmsData {
-        val id = DatabaseHolder.Db.localSmsDao().createSms(smsData)
-        return smsData.copy(id = id)
+    override suspend fun persistSms(context: Context, smsData: SmsData) {
+        DatabaseHolder.Db.localSmsDao().createSms(smsData)
     }
 
     override suspend fun getOrCreateThreadId(context: Context, address: String): Long {
-        DatabaseHolder.Db.localSmsDao().getSmsByAddress(address).firstOrNull()?.let {
-            return it.threadId
-        }
-
-        return Random.nextLong()
+        return DatabaseHolder.Db.localSmsDao()
+            .getSmsByAddress(ContactsHelper.normalizePhoneNumber(address))
+            .firstOrNull()
+            ?.threadId
+            ?: Random.nextLong()
     }
 
     override suspend fun deleteSms(context: Context, id: Long) {
diff --git a/app/src/main/java/com/bnyro/contacts/repo/SmsRepository.kt b/app/src/main/java/com/bnyro/contacts/repo/SmsRepository.kt
index 9e4a61cb..88f250e8 100644
--- a/app/src/main/java/com/bnyro/contacts/repo/SmsRepository.kt
+++ b/app/src/main/java/com/bnyro/contacts/repo/SmsRepository.kt
@@ -2,10 +2,11 @@ package com.bnyro.contacts.repo
 
 import android.content.Context
 import com.bnyro.contacts.db.obj.SmsData
+import kotlinx.coroutines.flow.Flow
 
 interface SmsRepository {
-    suspend fun getSmsList(context: Context): List<SmsData>
-    suspend fun persistSms(context: Context, smsData: SmsData): SmsData
+    fun getSmsStream(context: Context): Flow<List<SmsData>>
+    suspend fun persistSms(context: Context, smsData: SmsData)
     suspend fun getOrCreateThreadId(context: Context, address: String): Long
     suspend fun deleteSms(context: Context, id: Long)
     suspend fun deleteThread(context: Context, threadId: Long)
diff --git a/app/src/main/java/com/bnyro/contacts/ui/activities/BaseActivity.kt b/app/src/main/java/com/bnyro/contacts/ui/activities/BaseActivity.kt
index 3eb30d07..171e9164 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/activities/BaseActivity.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/activities/BaseActivity.kt
@@ -1,13 +1,21 @@
 package com.bnyro.contacts.ui.activities
 
 import android.Manifest
+import android.app.role.RoleManager
+import android.content.Context
+import android.content.Intent
+import android.os.Build
 import android.os.Bundle
+import android.provider.Telephony
 import androidx.activity.ComponentActivity
 import androidx.activity.viewModels
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.get
 import com.bnyro.contacts.ui.models.ContactsModel
+import com.bnyro.contacts.ui.models.DialerModel
+import com.bnyro.contacts.ui.models.SmsModel
 import com.bnyro.contacts.ui.models.ThemeModel
+import com.bnyro.contacts.util.NotificationHelper
 import com.bnyro.contacts.util.PermissionHelper
 
 abstract class BaseActivity : ComponentActivity() {
@@ -15,17 +23,61 @@ abstract class BaseActivity : ComponentActivity() {
     val contactsModel by viewModels<ContactsModel> {
         ContactsModel.Factory
     }
+    val smsModel by viewModels<SmsModel> { SmsModel.Factory }
+    val dialerModel by viewModels<DialerModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val requiredPermissions =
+            smsPermissions + contactPermissions + NotificationHelper.notificationPermissions
+
+        requestDefaultSMSApp(this)
         PermissionHelper.checkPermissions(
             this,
-            arrayOf(
-                Manifest.permission.WRITE_CONTACTS,
-                Manifest.permission.READ_CONTACTS
-            )
+            requiredPermissions
         )
         val viewModelProvider = ViewModelProvider(this)
         themeModel = viewModelProvider.get()
     }
+
+    private fun requestDefaultSMSApp(context: Context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            val roleManager = context.getSystemService(RoleManager::class.java)
+            if (roleManager!!.isRoleAvailable(RoleManager.ROLE_SMS)) {
+                if (roleManager.isRoleHeld(RoleManager.ROLE_SMS)) {
+                    getSmsPermissions(context)
+                } else {
+                    val intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_SMS)
+                    context.startActivity(intent)
+                }
+            }
+        } else {
+            if (Telephony.Sms.getDefaultSmsPackage(context) == context.packageName) {
+                getSmsPermissions(context)
+            } else {
+                val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT)
+                intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, context.packageName)
+                context.startActivity(intent)
+            }
+        }
+    }
+
+    private fun getSmsPermissions(context: Context) {
+        PermissionHelper.checkPermissions(context, smsPermissions)
+    }
+
+    companion object {
+        private val smsPermissions = arrayOf(
+            Manifest.permission.SEND_SMS,
+            Manifest.permission.READ_SMS,
+            Manifest.permission.RECEIVE_SMS,
+            Manifest.permission.READ_PHONE_STATE
+        )
+        private val contactPermissions = arrayOf(
+            Manifest.permission.WRITE_CONTACTS,
+            Manifest.permission.READ_CONTACTS,
+            Manifest.permission.GET_ACCOUNTS,
+            Manifest.permission.READ_SYNC_SETTINGS
+        )
+    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/activities/MainActivity.kt b/app/src/main/java/com/bnyro/contacts/ui/activities/MainActivity.kt
index b22d0cb3..84c88dfe 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/activities/MainActivity.kt
@@ -3,22 +3,19 @@ package com.bnyro.contacts.ui.activities
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.os.Parcelable
 import android.provider.ContactsContract.Intents
 import android.provider.ContactsContract.QuickContact
-import android.util.Log
 import androidx.activity.compose.setContent
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.get
+import com.bnyro.contacts.ext.parcelable
+import com.bnyro.contacts.nav.NavContainer
 import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ValueWithType
+import com.bnyro.contacts.ui.components.ConfirmImportContactsDialog
 import com.bnyro.contacts.ui.components.dialogs.AddToContactDialog
-import com.bnyro.contacts.ui.models.ContactsModel
-import com.bnyro.contacts.ui.models.DialerModel
-import com.bnyro.contacts.ui.models.SmsModel
-import com.bnyro.contacts.ui.screens.MainAppContent
 import com.bnyro.contacts.ui.theme.ConnectYouTheme
 import com.bnyro.contacts.util.BackupHelper
+import com.bnyro.contacts.util.ContactsHelper
+import com.bnyro.contacts.util.IntentHelper
+import com.bnyro.contacts.util.Preferences
 import java.net.URLDecoder
 
 class MainActivity : BaseActivity() {
@@ -33,20 +30,23 @@ class MainActivity : BaseActivity() {
 
         contactsModel.initialContactId = getInitialContactId()
         contactsModel.initialContactData = getInsertContactData()
-        handleVcfShareAction(contactsModel)
 
-        smsModel = ViewModelProvider(this).get()
-        smsModel?.initialAddressAndBody = getInitialSmsAddressAndBody()
+        smsModel.initialAddressAndBody = getInitialSmsAddressAndBody()
 
-        dialerModel = ViewModelProvider(this).get()
-        dialerModel?.initialPhoneNumber = getInitialNumberToDial()
+        dialerModel.initialPhoneNumber = getInitialNumberToDial()
 
+        val initialTabIndex = dialerModel.initialPhoneNumber?.let { 0 }
+            ?: smsModel.initialAddressAndBody?.let { 1 }
+            ?: Preferences.getInt(Preferences.homeTabKey, 0)
         setContent {
             ConnectYouTheme(themeModel.themeMode) {
-                MainAppContent(smsModel!!, dialerModel!!)
+                NavContainer(initialTabIndex)
                 getInsertOrEditNumber()?.let {
                     AddToContactDialog(it)
                 }
+                getSharedVcfUri()?.let {
+                    ConfirmImportContactsDialog(contactsModel, it)
+                }
             }
         }
     }
@@ -54,34 +54,7 @@ class MainActivity : BaseActivity() {
     private fun getInsertContactData(): ContactData? {
         return when {
             intent?.action == Intent.ACTION_INSERT -> {
-                val name = intent.getStringExtra(Intents.Insert.NAME)
-                    ?: intent.getStringExtra(Intents.Insert.PHONETIC_NAME)
-                ContactData(
-                    displayName = name,
-                    firstName = name?.split(" ")?.firstOrNull(),
-                    surName = name?.split(" ", limit = 2)?.lastOrNull(),
-                    organization = intent.getStringExtra(Intents.Insert.COMPANY),
-                    numbers = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.PHONE)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    ),
-                    emails = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.EMAIL)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    ),
-                    notes = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.NOTES)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    ),
-                    addresses = listOfNotNull(
-                        intent.getStringExtra(Intents.Insert.POSTAL)?.let {
-                            ValueWithType(it, 0)
-                        }
-                    )
-                )
+                IntentHelper.extractContactFromIntent(intent)
             }
 
             intent?.getStringExtra("action") == "create" -> ContactData()
@@ -104,7 +77,7 @@ class MainActivity : BaseActivity() {
     }
 
     private fun getInitialSmsAddressAndBody(): Pair<String, String?>? {
-        if (intent?.action !in smsSendIntents) return null
+        if (intent?.action !in smsSendIntents || intent?.type in BackupHelper.vCardMimeTypes) return null
 
         val address = intent?.dataString
             ?.split(":")
@@ -114,7 +87,7 @@ class MainActivity : BaseActivity() {
             ?: return null
         val body = intent?.getStringExtra(Intent.EXTRA_TEXT)
 
-        return address.replace(ContactsModel.normalizeNumberRegex, "") to body
+        return ContactsHelper.normalizePhoneNumber(address) to body
     }
 
     private fun getInitialNumberToDial(): String? {
@@ -124,27 +97,15 @@ class MainActivity : BaseActivity() {
             .takeIf { !it.isNullOrBlank() }
     }
 
-    private fun handleVcfShareAction(contactsModel: ContactsModel) {
-        if (intent?.type !in BackupHelper.vCardMimeTypes) return
+    private fun getSharedVcfUri(): Uri? {
+        if (intent?.type !in BackupHelper.vCardMimeTypes) return null
+
         val uri = when (intent.action) {
-            Intent.ACTION_VIEW -> intent?.data
-            Intent.ACTION_SEND -> intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
+            Intent.ACTION_VIEW -> intent.data
+            Intent.ACTION_SEND -> intent.parcelable<Uri>(Intent.EXTRA_STREAM)
             else -> null
         }
 
-        uri?.let {
-            Log.d("VCF Intent", "Received a valid intent with uri : $it")
-            contactsModel.importVcf(this, it)
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        smsModel = null
-    }
-
-    companion object {
-        var smsModel: SmsModel? = null
-        var dialerModel: DialerModel? = null
+        return uri
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/activities/PickContactActivity.kt b/app/src/main/java/com/bnyro/contacts/ui/activities/PickContactActivity.kt
index d6f44a6e..11715fca 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/activities/PickContactActivity.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/activities/PickContactActivity.kt
@@ -2,9 +2,14 @@ package com.bnyro.contacts.ui.activities
 
 import android.app.Activity
 import android.content.ContentUris
+import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.provider.ContactsContract
+import android.provider.ContactsContract.CommonDataKinds.Email
+import android.provider.ContactsContract.CommonDataKinds.Phone
+import android.provider.ContactsContract.Data
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -33,10 +38,18 @@ import com.bnyro.contacts.ui.theme.ConnectYouTheme
 
 class PickContactActivity : BaseActivity() {
 
+    private var specialMimeType: String? = null
+
     @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        specialMimeType = when (intent.data) {
+            Email.CONTENT_URI -> Email.CONTENT_ITEM_TYPE
+            Phone.CONTENT_URI -> Phone.CONTENT_ITEM_TYPE
+            else -> null
+        }
+
         setContent {
             ConnectYouTheme(themeModel.themeMode) {
                 val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
@@ -94,14 +107,48 @@ class PickContactActivity : BaseActivity() {
         if (contact == null) {
             setResult(Activity.RESULT_CANCELED, Intent())
         } else {
-            val intent = Intent().apply {
-                data = ContentUris.withAppendedId(
+            val uri = when {
+                specialMimeType != null -> {
+                    val contactId = getContactMimeTypeId(
+                        this,
+                        contact.contactId.toString(),
+                        specialMimeType!!
+                    )
+                    Uri.withAppendedPath(Data.CONTENT_URI, contactId)
+                }
+
+                else -> ContentUris.withAppendedId(
                     ContactsContract.Contacts.CONTENT_URI,
                     contact.contactId
                 )
             }
+            val intent = Intent().apply {
+                data = uri
+                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }
             setResult(Activity.RESULT_OK, intent)
         }
         finish()
     }
+
+    private fun getContactMimeTypeId(
+        context: Context,
+        contactId: String,
+        mimeType: String
+    ): String {
+        val uri = Data.CONTENT_URI
+        val projection = arrayOf(Data._ID, Data.RAW_CONTACT_ID, Data.MIMETYPE)
+        val selection = "${Data.MIMETYPE} = ? AND ${Data.RAW_CONTACT_ID} = ?"
+        val selectionArgs = arrayOf(mimeType, contactId)
+
+        val cursor = context.contentResolver.query(uri, projection, selection, selectionArgs, null)
+        cursor?.use {
+            if (it.moveToFirst()) {
+                val index = it.getColumnIndex(Data._ID)
+                return it.getString(index)
+            }
+        }
+        return ""
+    }
+
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ConfirmImportContacts.kt b/app/src/main/java/com/bnyro/contacts/ui/components/ConfirmImportContacts.kt
new file mode 100644
index 00000000..da30908b
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/ConfirmImportContacts.kt
@@ -0,0 +1,32 @@
+package com.bnyro.contacts.ui.components
+
+import android.net.Uri
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.bnyro.contacts.R
+import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
+import com.bnyro.contacts.ui.models.ContactsModel
+
+@Composable
+fun ConfirmImportContactsDialog(contactsModel: ContactsModel, contactsUri: Uri) {
+    val context = LocalContext.current
+
+    var showDialog by remember {
+        mutableStateOf(true)
+    }
+
+    if (showDialog) {
+        ConfirmationDialog(
+            onDismissRequest = { showDialog = false },
+            title = stringResource(R.string.import_vcf),
+            text = stringResource(R.string.import_confirm)
+        ) {
+            contactsModel.importVcf(context, contactsUri)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactEditor.kt b/app/src/main/java/com/bnyro/contacts/ui/components/ContactEditor.kt
index af3a65cc..7c3afaf8 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactEditor.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/ContactEditor.kt
@@ -6,29 +6,46 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.Save
-import androidx.compose.material3.AlertDialog
+import androidx.compose.material.icons.outlined.Cases
+import androidx.compose.material.icons.outlined.Email
+import androidx.compose.material.icons.outlined.LocationOn
+import androidx.compose.material.icons.outlined.Note
+import androidx.compose.material.icons.outlined.Person2
+import androidx.compose.material.icons.outlined.Phone
+import androidx.compose.material.icons.outlined.Web
+import androidx.compose.material.icons.rounded.AddPhotoAlternate
+import androidx.compose.material.icons.rounded.ExpandLess
+import androidx.compose.material.icons.rounded.ExpandMore
 import androidx.compose.material3.Button
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
@@ -43,24 +60,23 @@ import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
+import com.bnyro.contacts.obj.AccountType
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.obj.ValueWithType
 import com.bnyro.contacts.ui.components.base.LabeledTextField
-import com.bnyro.contacts.ui.components.dialogs.DialogButton
 import com.bnyro.contacts.ui.components.dialogs.GroupsDialog
-import com.bnyro.contacts.ui.components.editor.DatePickerEditor
-import com.bnyro.contacts.ui.components.editor.TextFieldEditor
+import com.bnyro.contacts.ui.components.editor.EventFieldGroup
+import com.bnyro.contacts.ui.components.editor.TextFieldGroup
 import com.bnyro.contacts.ui.models.ContactsModel
 import com.bnyro.contacts.util.ContactsHelper
 import com.bnyro.contacts.util.ImageHelper
 import com.bnyro.contacts.util.Preferences
 
-@OptIn(ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun ContactEditor(
     modifier: Modifier = Modifier,
@@ -72,19 +88,17 @@ fun ContactEditor(
     val contactsModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
 
     fun List<ValueWithType>?.fillIfEmpty(): List<ValueWithType> {
-        return if (this.isNullOrEmpty()) {
-            listOf(ValueWithType("", 0))
-        } else {
-            this
+        if (this.isNullOrEmpty()) {
+            return listOf(ValueWithType("", 0))
         }
+
+        return this
     }
 
     fun List<MutableState<ValueWithType>>.clean(): List<ValueWithType> {
-        return this.filter { it.value.value.isNotBlank() }.map { it.value }
+        return this.filter { it.value.value.isNotBlank() }.map { it.value }.distinct()
     }
 
-    fun emptyMutable() = mutableStateOf(ValueWithType("", 0))
-
     var showAdvanced by remember {
         mutableStateOf(false)
     }
@@ -105,6 +119,10 @@ fun ContactEditor(
         mutableStateOf(contact?.nickName.orEmpty())
     }
 
+    val title = remember {
+        mutableStateOf(contact?.title.orEmpty())
+    }
+
     val organization = remember {
         mutableStateOf(contact?.organization.orEmpty())
     }
@@ -137,24 +155,20 @@ fun ContactEditor(
         mutableStateOf(false)
     }
 
-    var showAccountTypeDialog by remember {
-        mutableStateOf(false)
-    }
-
     var groups by remember {
         mutableStateOf(contact?.groups.orEmpty())
     }
 
     var selectedAccount by remember {
         val lastChosenAccount = Preferences.getLastChosenAccount()
-        mutableStateOf(
-            (contact?.accountType ?: lastChosenAccount.first) to
-                (contact?.accountName ?: lastChosenAccount.second)
-        )
+        val account = contact?.let {
+            AccountType(it.accountName.orEmpty(), it.accountType.orEmpty())
+        } ?: lastChosenAccount
+        mutableStateOf(account)
     }
 
     val availableAccounts = remember {
-        contactsModel.getAvailableAccounts()
+        contactsModel.getAvailableAccounts(context)
     }
 
     val uploadImage = rememberLauncherForActivityResult(
@@ -166,22 +180,98 @@ fun ContactEditor(
             }
     }
 
-    Box(
-        modifier = modifier.fillMaxSize()
-    ) {
+    Scaffold(
+        modifier = modifier.fillMaxSize(),
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = {
+                    val editedContact = (contact ?: ContactData()).also {
+                        it.firstName = firstName.value.trim()
+                        it.surName = surName.value.trim()
+                        it.nickName = nickName.value.takeIf { n -> n.isNotBlank() }?.trim()
+                        it.organization = organization.value.takeIf { o -> o.isNotBlank() }?.trim()
+                        it.title = title.value.takeIf { o -> o.isNotBlank() }?.trim()
+                        it.displayName = "${firstName.value.trim()} ${surName.value.trim()}"
+                        it.photo = profilePicture
+                        it.accountType = selectedAccount.type
+                        it.accountName = selectedAccount.name
+                        it.websites = websites.clean()
+                        it.numbers = phoneNumber.clean().map { number ->
+                            ValueWithType(ContactsHelper.normalizePhoneNumber(number.value), number.type)
+                        }
+                        it.emails = emails.clean()
+                        it.addresses = addresses.clean()
+                        it.events = events.clean()
+                        it.notes = notes.clean()
+                        it.groups = groups
+                    }
+                    onSave.invoke(editedContact)
+                }
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Save,
+                    contentDescription = null
+                )
+            }
+        }, topBar = {
+            if (isCreatingNewDeviceContact) {
+                TopAppBar(title = {
+                    var expanded by remember { mutableStateOf(false) }
+                    Row(
+                        Modifier
+                            .padding(8.dp)
+                            .clickable {
+                                expanded = true
+                            },
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Text(
+                            text = selectedAccount.name.ifBlank { selectedAccount.type }
+                        )
+                        Icon(
+                            imageVector = Icons.Default.ArrowDropDown,
+                            contentDescription = null
+                        )
+                    }
+
+                    DropdownMenu(
+                        expanded = expanded,
+                        onDismissRequest = { expanded = false }
+                    ) {
+                        availableAccounts.forEach {
+                            DropdownMenuItem(
+                                text = { Text(it.name) },
+                                onClick = {
+                                    selectedAccount = it
+                                    Preferences.edit {
+                                        putString(Preferences.lastChosenAccount, it.identifier)
+                                    }
+                                    expanded = false
+                                }
+                            )
+                        }
+                    }
+                })
+            }
+        }
+    ) { pV ->
         val scrollState = rememberScrollState()
 
         Column(
             modifier = Modifier
                 .fillMaxWidth()
+                .padding(pV)
+                .padding(horizontal = 8.dp)
                 .verticalScroll(scrollState),
-            horizontalAlignment = Alignment.CenterHorizontally
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(8.dp)
         ) {
             Box(
                 modifier = Modifier
                     .padding(top = 50.dp, bottom = 15.dp)
                     .size(180.dp)
-                    .clip(RoundedCornerShape(20.dp))
+                    .clip(if (profilePicture == null) CircleShape else RoundedCornerShape(20.dp))
+                    .background(MaterialTheme.colorScheme.primaryContainer)
                     .combinedClickable(
                         onClick = {
                             val request = PickVisualMediaRequest(
@@ -192,7 +282,8 @@ fun ContactEditor(
                         onLongClick = {
                             profilePicture = null
                         }
-                    )
+                    ),
+                contentAlignment = Alignment.Center
             ) {
                 profilePicture?.let {
                     Image(
@@ -203,56 +294,81 @@ fun ContactEditor(
                     )
                 } ?: run {
                     Icon(
-                        modifier = Modifier.fillMaxSize(),
-                        imageVector = Icons.Default.Person,
-                        contentDescription = null
+                        modifier = Modifier.size(48.dp),
+                        imageVector = Icons.Rounded.AddPhotoAlternate,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.onPrimaryContainer
                     )
                 }
             }
 
             LabeledTextField(
                 label = R.string.first_name,
-                state = firstName
+                state = firstName,
+                leadingIcon = {
+                    Icon(
+                        imageVector = Icons.Outlined.Person2,
+                        contentDescription = null
+                    )
+                }
             )
 
             LabeledTextField(
                 label = R.string.last_name,
-                state = surName
+                state = surName,
+                leadingIcon = {
+                    Icon(
+                        imageVector = Icons.Outlined.Person2,
+                        contentDescription = null
+                    )
+                }
             )
 
             AnimatedVisibility(showAdvanced) {
-                Column {
+                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
                     LabeledTextField(
                         label = R.string.nick_name,
-                        state = nickName
+                        state = nickName,
+                        leadingIcon = {
+                            Icon(
+                                imageVector = Icons.Outlined.Person2,
+                                contentDescription = null
+                            )
+                        }
                     )
                     LabeledTextField(
                         label = R.string.organization,
-                        state = organization
+                        state = organization,
+                        leadingIcon = {
+                            Icon(
+                                imageVector = Icons.Outlined.Cases,
+                                contentDescription = null
+                            )
+                        }
                     )
-                    websites.forEachIndexed { index, it ->
-                        TextFieldEditor(
-                            label = R.string.website,
-                            state = it,
-                            types = ContactsHelper.websiteTypes,
-                            keyboardType = KeyboardType.Uri,
-                            onDelete = {
-                                websites.removeAt(index)
-                            },
-                            showDeleteAction = websites.size > 1,
-                            moveToTop = {
-                                websites.add(0, it)
-                                websites.removeAt(index + 1)
-                            }
-                        ) {
-                            websites.add(emptyMutable())
+                    LabeledTextField(
+                        label = R.string.title,
+                        state = title,
+                        leadingIcon = {
+                            Icon(
+                                imageVector = Icons.Outlined.Cases,
+                                contentDescription = null
+                            )
                         }
-                    }
+                    )
+                    TextFieldGroup(
+                        items = websites,
+                        label = R.string.website,
+                        types = ContactsHelper.websiteTypes,
+                        addActionText = R.string.add_website,
+                        keyboardType = KeyboardType.Uri,
+                        leadingIcon = Icons.Outlined.Web
+                    )
                 }
             }
 
-            Button(
-                onClick = {
+            Row(
+                Modifier.clickable {
                     showAdvanced = !showAdvanced
                 }
             ) {
@@ -261,85 +377,49 @@ fun ContactEditor(
                         if (showAdvanced) R.string.show_less else R.string.show_more_fields
                     )
                 )
+                Icon(
+                    imageVector = if (showAdvanced) Icons.Rounded.ExpandLess else Icons.Rounded.ExpandMore,
+                    contentDescription = null
+                )
             }
 
-            phoneNumber.forEachIndexed { index, it ->
-                TextFieldEditor(
-                    label = R.string.phone,
-                    state = it,
-                    types = ContactsHelper.phoneNumberTypes,
-                    keyboardType = KeyboardType.Phone,
-                    onDelete = {
-                        phoneNumber.removeAt(index)
-                    },
-                    showDeleteAction = phoneNumber.size > 1,
-                    moveToTop = {
-                        phoneNumber.add(0, it)
-                        phoneNumber.removeAt(index + 1)
-                    }
-                ) {
-                    phoneNumber.add(emptyMutable())
-                }
-            }
-
-            emails.forEachIndexed { index, it ->
-                TextFieldEditor(
-                    label = R.string.email,
-                    state = it,
-                    types = ContactsHelper.emailTypes,
-                    keyboardType = KeyboardType.Email,
-                    onDelete = {
-                        emails.removeAt(index)
-                    },
-                    showDeleteAction = emails.size > 1
-                ) {
-                    emails.add(emptyMutable())
-                }
-            }
-
-            addresses.forEachIndexed { index, it ->
-                TextFieldEditor(
-                    label = R.string.address,
-                    state = it,
-                    types = ContactsHelper.addressTypes,
-                    imeAction = if (it == addresses.last()) ImeAction.Done else ImeAction.Next,
-                    onDelete = {
-                        addresses.removeAt(index)
-                    },
-                    showDeleteAction = addresses.size > 1
-                ) {
-                    addresses.add(emptyMutable())
-                }
-            }
+            TextFieldGroup(
+                items = phoneNumber,
+                label = R.string.phone,
+                addActionText = R.string.add_phone_number,
+                keyboardType = KeyboardType.Phone,
+                leadingIcon = Icons.Outlined.Phone,
+                types = ContactsHelper.phoneNumberTypes
+            )
+            TextFieldGroup(
+                items = emails,
+                label = R.string.email,
+                addActionText = R.string.add_e_mail,
+                keyboardType = KeyboardType.Email,
+                leadingIcon = Icons.Outlined.Email,
+                types = ContactsHelper.emailTypes
+            )
+            TextFieldGroup(
+                items = addresses,
+                label = R.string.address,
+                addActionText = R.string.add_address,
+                leadingIcon = Icons.Outlined.LocationOn,
+                types = ContactsHelper.addressTypes
+            )
 
-            events.forEachIndexed { index, it ->
-                DatePickerEditor(
-                    label = R.string.event,
-                    state = it,
-                    types = ContactsHelper.eventTypes,
-                    onDelete = {
-                        events.removeAt(index)
-                    },
-                    showDeleteAction = events.size > 1
-                ) {
-                    events.add(emptyMutable())
-                }
-            }
+            EventFieldGroup(
+                items = events,
+                label = R.string.event,
+                types = ContactsHelper.eventTypes,
+                addActionText = R.string.add_event
+            )
 
-            notes.forEachIndexed { index, it ->
-                TextFieldEditor(
-                    label = R.string.note,
-                    state = it,
-                    types = listOf(),
-                    imeAction = if (it == notes.last()) ImeAction.Done else ImeAction.Next,
-                    onDelete = {
-                        notes.removeAt(index)
-                    },
-                    showDeleteAction = notes.size > 1
-                ) {
-                    notes.add(emptyMutable())
-                }
-            }
+            TextFieldGroup(
+                items = notes,
+                label = R.string.note,
+                addActionText = R.string.add_note,
+                leadingIcon = Icons.Outlined.Note
+            )
 
             Column(
                 modifier = Modifier
@@ -353,56 +433,10 @@ fun ContactEditor(
                 ) {
                     Text(stringResource(R.string.manage_groups))
                 }
-
-                if (isCreatingNewDeviceContact && availableAccounts.isNotEmpty()) {
-                    Spacer(modifier = Modifier.width(10.dp))
-                    Button(
-                        onClick = {
-                            showAccountTypeDialog = true
-                        }
-                    ) {
-                        Text(
-                            text = "${stringResource(R.string.account_type)}: ${
-                                selectedAccount.second.ifBlank { selectedAccount.first }
-                            }"
-                        )
-                    }
-                }
             }
 
             Spacer(Modifier.height(30.dp))
         }
-
-        FloatingActionButton(
-            modifier = Modifier
-                .align(Alignment.BottomEnd)
-                .padding(16.dp),
-            onClick = {
-                val editedContact = (contact ?: ContactData()).also {
-                    it.firstName = firstName.value.trim()
-                    it.surName = surName.value.trim()
-                    it.nickName = nickName.value.takeIf { n -> n.isNotBlank() }?.trim()
-                    it.organization = organization.value.takeIf { o -> o.isNotBlank() }?.trim()
-                    it.displayName = "${firstName.value.trim()} ${surName.value.trim()}"
-                    it.photo = profilePicture
-                    it.accountType = selectedAccount.first
-                    it.accountName = selectedAccount.second
-                    it.websites = websites.clean()
-                    it.numbers = phoneNumber.clean()
-                    it.emails = emails.clean()
-                    it.addresses = addresses.clean()
-                    it.events = events.clean()
-                    it.notes = notes.clean()
-                    it.groups = groups
-                }
-                onSave.invoke(editedContact)
-            }
-        ) {
-            Icon(
-                imageVector = Icons.Default.Save,
-                contentDescription = null
-            )
-        }
     }
 
     if (showGroupsDialog) {
@@ -413,33 +447,4 @@ fun ContactEditor(
             groups = it
         }
     }
-
-    if (showAccountTypeDialog) {
-        AlertDialog(
-            onDismissRequest = { showAccountTypeDialog = false },
-            confirmButton = {
-                DialogButton(text = stringResource(R.string.cancel)) {
-                    showAccountTypeDialog = false
-                }
-            },
-            title = {
-                Text(text = stringResource(R.string.account_type))
-            },
-            text = {
-                LazyColumn(
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    items(availableAccounts) {
-                        ClickableText(text = it.second) {
-                            selectedAccount = it
-                            Preferences.edit {
-                                putString(Preferences.lastChosenAccount, "${it.first}|${it.second}")
-                            }
-                            showAccountTypeDialog = false
-                        }
-                    }
-                }
-            }
-        )
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactEntryGroup.kt b/app/src/main/java/com/bnyro/contacts/ui/components/ContactEntryGroup.kt
index 6078a194..1fb5a346 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactEntryGroup.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/ContactEntryGroup.kt
@@ -48,13 +48,13 @@ fun ContactEntryTextGroup(
     label: String,
     entries: List<String>,
     types: List<TranslatedType> = listOf(),
-    onClick: (ValueWithType) -> Unit = {}
+    onClick: (String) -> Unit = {}
 ) {
     ContactEntryGroup(
         label,
         entries.map { ValueWithType(it, null) },
         types,
         false,
-        onClick
+        onClick = { onClick.invoke(it.value) }
     )
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactsList.kt b/app/src/main/java/com/bnyro/contacts/ui/components/ContactsList.kt
index c7edff8a..86fd3d88 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactsList.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/ContactsList.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -15,7 +16,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.obj.FilterOptions
-import com.bnyro.contacts.ui.components.modifier.scrollbar
+import my.nanihadesuka.compose.LazyColumnScrollbar
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -43,46 +44,52 @@ fun ContactsList(
             it.getNameBySortOrder(filterOptions.sortOder)?.firstOrNull()?.uppercase()
         }
     }
-    LazyColumn(
-        state = state,
-        modifier = Modifier
-            .padding(end = 5.dp)
-            .scrollbar(state, false)
-            .let { modifier ->
-                scrollConnection?.let { modifier.nestedScroll(it) } ?: modifier
-            }
+    LazyColumnScrollbar(
+        listState = state,
+        thumbColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.5f),
+        thumbSelectedColor = MaterialTheme.colorScheme.primary,
+        thickness = 8.dp
     ) {
-        contactGroups.forEach { (firstLetter, groupedContacts) ->
-            stickyHeader {
-                CharacterHeader(firstLetter.orEmpty())
-            }
-            items(groupedContacts) {
-                ContactItem(
-                    modifier = Modifier.padding(horizontal = 10.dp),
-                    contact = it,
-                    sortOrder = filterOptions.sortOder,
-                    selected = selectedContacts.contains(it),
-                    onSinglePress = {
-                        if (selectedContacts.isEmpty()) {
-                            false
-                        } else {
-                            if (selectedContacts.contains(it)) {
-                                selectedContacts.remove(it)
+        LazyColumn(
+            state = state,
+            modifier = Modifier
+                .padding(end = 5.dp)
+                .let { modifier ->
+                    scrollConnection?.let { modifier.nestedScroll(it) } ?: modifier
+                }
+        ) {
+            contactGroups.forEach { (firstLetter, groupedContacts) ->
+                stickyHeader {
+                    CharacterHeader(firstLetter.orEmpty())
+                }
+                items(groupedContacts) {
+                    ContactItem(
+                        modifier = Modifier.padding(horizontal = 10.dp),
+                        contact = it,
+                        sortOrder = filterOptions.sortOder,
+                        selected = selectedContacts.contains(it),
+                        onSinglePress = {
+                            if (selectedContacts.isEmpty()) {
+                                false
                             } else {
-                                selectedContacts.add(it)
+                                if (selectedContacts.contains(it)) {
+                                    selectedContacts.remove(it)
+                                } else {
+                                    selectedContacts.add(it)
+                                }
+                                true
                             }
-                            true
+                        },
+                        onLongPress = {
+                            if (!selectedContacts.contains(it)) selectedContacts.add(it)
                         }
-                    },
-                    onLongPress = {
-                        if (!selectedContacts.contains(it)) selectedContacts.add(it)
-                    }
-                )
+                    )
+                }
             }
-        }
 
-        item {
-            Spacer(modifier = Modifier.height(10.dp))
+            item {
+                Spacer(modifier = Modifier.height(10.dp))
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/NumberPickerDialog.kt b/app/src/main/java/com/bnyro/contacts/ui/components/NumberPickerDialog.kt
index 287392d0..132622b0 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/NumberPickerDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/NumberPickerDialog.kt
@@ -21,22 +21,22 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
 import com.bnyro.contacts.enums.SortOrder
+import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.ui.components.base.ClickableIcon
 import com.bnyro.contacts.ui.components.dialogs.DialogButton
 import com.bnyro.contacts.ui.models.ContactsModel
 
 @Composable
 fun NumberPickerDialog(
+    contactsModel: ContactsModel,
     onDismissRequest: () -> Unit,
-    onNumberSelect: (number: String) -> Unit
+    onNumberSelect: (number: String, contactData: ContactData?) -> Unit,
 ) {
-    val contactsModel: ContactsModel = viewModel()
 
-    var numbersToSelectFrom by remember {
-        mutableStateOf(listOf<String>())
+    var numbersToSelectFrom: Pair<ContactData?, List<String>> by remember {
+        mutableStateOf(null to listOf())
     }
 
     AlertDialog(
@@ -71,7 +71,7 @@ fun NumberPickerDialog(
                             modifier = Modifier.padding(top = 3.dp),
                             icon = Icons.Default.Send
                         ) {
-                            onNumberSelect.invoke(numberInput)
+                            onNumberSelect.invoke(numberInput, null)
                         }
                     }
                     Spacer(modifier = Modifier.height(10.dp))
@@ -83,11 +83,11 @@ fun NumberPickerDialog(
                         selected = false,
                         onSinglePress = {
                             if (it.numbers.size > 1) {
-                                numbersToSelectFrom = it.numbers.map { num -> num.value }
+                                numbersToSelectFrom = it to it.numbers.map { num -> num.value }
                                 return@ContactItem true
                             }
 
-                            onNumberSelect.invoke(it.numbers.first().value)
+                            onNumberSelect.invoke(it.numbers.first().value, it)
                             onDismissRequest.invoke()
                             true
                         },
@@ -98,15 +98,15 @@ fun NumberPickerDialog(
         }
     )
 
-    if (numbersToSelectFrom.isNotEmpty()) {
+    if (numbersToSelectFrom.second.isNotEmpty()) {
         AlertDialog(
-            onDismissRequest = { numbersToSelectFrom = emptyList() },
+            onDismissRequest = { numbersToSelectFrom = null to emptyList() },
             text = {
                 LazyColumn {
-                    items(numbersToSelectFrom) {
+                    items(numbersToSelectFrom.second) {
                         ClickableText(text = it) {
-                            onNumberSelect.invoke(it)
-                            numbersToSelectFrom = emptyList()
+                            onNumberSelect.invoke(it, numbersToSelectFrom.first)
+                            numbersToSelectFrom = null to emptyList()
                             onDismissRequest.invoke()
                         }
                     }
@@ -114,7 +114,7 @@ fun NumberPickerDialog(
             },
             confirmButton = {
                 DialogButton(stringResource(R.string.cancel)) {
-                    numbersToSelectFrom = emptyList()
+                    numbersToSelectFrom = null to emptyList()
                 }
             }
         )
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ShareDialog.kt b/app/src/main/java/com/bnyro/contacts/ui/components/ShareDialog.kt
index 8213a9ce..98c8073c 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ShareDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/ShareDialog.kt
@@ -4,20 +4,23 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
+import com.bnyro.contacts.enums.ListAttribute
+import com.bnyro.contacts.enums.StringAttribute
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.ui.components.dialogs.DialogButton
 import com.bnyro.contacts.ui.models.ContactsModel
 import com.bnyro.contacts.util.BackupHelper
+import com.bnyro.contacts.util.ContactsHelper
 
 @Composable
 fun ShareDialog(
@@ -27,45 +30,46 @@ fun ShareDialog(
     val contactsModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
     val context = LocalContext.current
 
-    val shareName = remember { mutableStateOf(true) }
-    val sharePhoto = remember { mutableStateOf(true) }
-    val shareNickName = remember { mutableStateOf(true) }
-    val shareOrganization = remember { mutableStateOf(true) }
-    val shareWebsite = remember { mutableStateOf(true) }
-    val sharePhone = remember { mutableStateOf(true) }
-    val shareEmail = remember { mutableStateOf(true) }
-    val shareAddress = remember { mutableStateOf(true) }
-    val shareNote = remember { mutableStateOf(true) }
+    val baseOptions = remember {
+        listOf(R.string.name, R.string.photo)
+    }
 
-    val options = listOf(
-        R.string.name to shareName,
-        R.string.photo to sharePhoto,
-        R.string.nick_name to shareNickName,
-        R.string.organization to shareOrganization,
-        R.string.website to shareWebsite,
-        R.string.phone to sharePhone,
-        R.string.email to shareEmail,
-        R.string.address to shareAddress,
-        R.string.note to shareNote
-    )
+    val options = remember {
+         baseOptions + ContactsHelper.contactAttributesTypes.map { it.stringRes }
+    }
+
+    val selected = remember {
+        SnapshotStateList<Boolean>().apply {
+            for (i in options.indices) add(true)
+        }
+    }
 
     fun getContactData(): ContactData {
-        return contact.copy().apply {
-            if (!shareName.value) {
-                displayName = null
-                alternativeName = null
-                firstName = null
-                surName = null
+        val data = ContactData()
+
+        if (selected[0]) {
+            data.displayName = contact.displayName
+            data.alternativeName = contact.alternativeName
+            data.firstName = contact.firstName
+            data.surName = contact.surName
+        }
+        if (selected[1]) {
+            data.photo = contact.photo
+        }
+
+        ContactsHelper.contactAttributesTypes.forEachIndexed { index, contactAttribute ->
+            if (selected[index + baseOptions.size]) {
+                if (contactAttribute is StringAttribute) {
+                    val value = contactAttribute.get(contact)
+                    contactAttribute.set(data, value)
+                } else if (contactAttribute is ListAttribute) {
+                    val value = contactAttribute.get(contact)
+                    contactAttribute.set(data, value)
+                }
             }
-            if (!sharePhoto.value) photo = null
-            if (!shareNickName.value) nickName = null
-            if (!shareOrganization.value) organization = null
-            if (!shareAddress.value) addresses = emptyList()
-            if (!shareEmail.value) emails = emptyList()
-            if (!shareNote.value) notes = emptyList()
-            if (!sharePhone.value) numbers = emptyList()
-            if (!shareWebsite.value) websites = emptyList()
         }
+
+        return data
     }
 
     val openFilePicker = rememberLauncherForActivityResult(
@@ -83,8 +87,10 @@ fun ShareDialog(
         title = { Text(stringResource(R.string.share)) },
         text = {
             LazyColumn {
-                items(options) {
-                    ShareOption(title = it.first, isChecked = it.second)
+                itemsIndexed(options) { index, it ->
+                    ShareOption(title = it, isChecked = selected[index]) {
+                        selected[index] = it
+                    }
                 }
             }
         },
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ShareOption.kt b/app/src/main/java/com/bnyro/contacts/ui/components/ShareOption.kt
index 2be4edcb..5524d4ec 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ShareOption.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/ShareOption.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -17,13 +16,14 @@ import androidx.compose.ui.unit.dp
 @Composable
 fun ShareOption(
     @StringRes title: Int,
-    isChecked: MutableState<Boolean>
+    isChecked: Boolean,
+    onCheckedChange: (Boolean) -> Unit
 ) {
     Row(
         modifier = Modifier.fillMaxWidth(),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        Checkbox(checked = isChecked.value, onCheckedChange = { isChecked.value = it })
+        Checkbox(checked = isChecked, onCheckedChange = onCheckedChange)
         Spacer(modifier = Modifier.width(10.dp))
         Text(text = stringResource(title))
     }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/SmsThreadItem.kt b/app/src/main/java/com/bnyro/contacts/ui/components/SmsThreadItem.kt
new file mode 100644
index 00000000..1db135a9
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/SmsThreadItem.kt
@@ -0,0 +1,162 @@
+package com.bnyro.contacts.ui.components
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Person
+import androidx.compose.material3.DismissDirection
+import androidx.compose.material3.DismissValue
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SwipeToDismiss
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberDismissState
+import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.bnyro.contacts.R
+import com.bnyro.contacts.obj.ContactData
+import com.bnyro.contacts.obj.SmsThread
+import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
+import com.bnyro.contacts.ui.models.SmsModel
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SmsThreadItem(
+    smsModel: SmsModel,
+    thread: SmsThread,
+    onClick: (address: String, contactData: ContactData?) -> Unit
+) {
+    val context = LocalContext.current
+
+    var showDeleteThreadDialog by remember {
+        mutableStateOf(false)
+    }
+
+    val dismissState = rememberDismissState(
+        confirmValueChange = {
+            if (it == DismissValue.DismissedToEnd) {
+                showDeleteThreadDialog = true
+            }
+            return@rememberDismissState false
+        }
+    )
+
+    SwipeToDismiss(
+        modifier = Modifier.padding(horizontal = 10.dp, vertical = 5.dp),
+        state = dismissState,
+        background = {},
+        dismissContent = {
+            val shape = RoundedCornerShape(20.dp)
+
+            ElevatedCard(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clip(shape)
+                    .clickable {
+                        onClick.invoke(thread.address, thread.contactData)
+                    },
+                shape = shape
+            ) {
+                Row(
+                    modifier = Modifier.padding(
+                        horizontal = 10.dp,
+                        vertical = 5.dp
+                    ),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .size(58.dp)
+                            .clip(CircleShape)
+                            .background(
+                                MaterialTheme.colorScheme.primary,
+                                CircleShape
+                            ),
+                        contentAlignment = Alignment.Center
+                    ) {
+                        if (thread.contactData?.thumbnail != null) {
+                            Image(
+                                modifier = Modifier
+                                    .fillMaxSize()
+                                    .clip(CircleShape),
+                                bitmap = thread.contactData.thumbnail!!.asImageBitmap(),
+                                contentDescription = null,
+                                contentScale = ContentScale.Crop
+                            )
+                        } else {
+                            Image(
+                                modifier = Modifier
+                                    .padding(vertical = 12.dp)
+                                    .fillMaxSize(),
+                                imageVector = Icons.Default.Person,
+                                contentDescription = null,
+                                colorFilter = ColorFilter.tint(
+                                    MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                        10.dp
+                                    )
+                                )
+                            )
+                        }
+                    }
+                    Spacer(modifier = Modifier.width(10.dp))
+                    Column(
+                        modifier = Modifier.padding(10.dp)
+                    ) {
+                        Text(
+                            text = thread.contactData?.displayName ?: thread.address,
+                            color = MaterialTheme.colorScheme.primary,
+                            fontSize = 16.sp
+                        )
+                        Spacer(modifier = Modifier.height(3.dp))
+                        Text(
+                            // safe call to avoid crashes when re-rendering
+                            text = thread.smsList.lastOrNull()?.body.orEmpty(),
+                            maxLines = 2,
+                            fontSize = 14.sp,
+                            lineHeight = 18.sp
+                        )
+                    }
+                }
+            }
+        },
+        directions = setOf(DismissDirection.StartToEnd)
+    )
+
+    if (showDeleteThreadDialog) {
+        ConfirmationDialog(
+            onDismissRequest = { showDeleteThreadDialog = false },
+            title = stringResource(R.string.delete_thread),
+            text = stringResource(R.string.irreversible)
+        ) {
+            smsModel.deleteThread(context, thread.threadId)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/TopBarMoreMenu.kt b/app/src/main/java/com/bnyro/contacts/ui/components/TopBarMoreMenu.kt
new file mode 100644
index 00000000..23649415
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/TopBarMoreMenu.kt
@@ -0,0 +1,41 @@
+package com.bnyro.contacts.ui.components
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import com.bnyro.contacts.R
+import com.bnyro.contacts.ui.components.base.ClickableIcon
+import com.bnyro.contacts.ui.components.base.OptionMenu
+
+@Composable
+fun TopBarMoreMenu(
+    options: List<String> = emptyList(),
+    onOptionClick: (Int) -> Unit = {}
+) {
+    var expandedOptions by remember {
+        mutableStateOf(false)
+    }
+
+    ClickableIcon(
+        icon = Icons.Default.MoreVert,
+        contentDescription = R.string.more
+    ) {
+        expandedOptions = !expandedOptions
+    }
+
+    OptionMenu(
+        expanded = expandedOptions,
+        options = options,
+        onDismissRequest = {
+            expandedOptions = false
+        },
+        onSelect = {
+            onOptionClick(it)
+            expandedOptions = false
+        }
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/ElevatedTextInputField.kt b/app/src/main/java/com/bnyro/contacts/ui/components/base/ElevatedTextInputField.kt
new file mode 100644
index 00000000..4dc14bd5
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/base/ElevatedTextInputField.kt
@@ -0,0 +1,59 @@
+package com.bnyro.contacts.ui.components.base
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ElevatedTextInputField(
+    modifier: Modifier = Modifier,
+    query: String,
+    onQueryChange: (String) -> Unit,
+    enabled: Boolean = true,
+    placeholder: String? = null,
+    leadingIcon: ImageVector? = null,
+    imeAction: ImeAction = ImeAction.Default,
+    singleLine: Boolean = false,
+    focusRequester: FocusRequester = remember { FocusRequester() }
+) {
+    TextField(
+        modifier = modifier
+            .focusRequester(focusRequester),
+        value = query,
+        onValueChange = onQueryChange,
+        placeholder = { placeholder?.let { Text(it) } },
+        leadingIcon = {
+            leadingIcon?.let { Icon(imageVector = it, contentDescription = null) }
+        },
+        trailingIcon = {
+            if (query.isNotEmpty()) {
+                ClickableIcon(icon = Icons.Default.Close) {
+                    onQueryChange("")
+                }
+            }
+        },
+        shape = RoundedCornerShape(50),
+        colors = TextFieldDefaults.colors(
+            focusedIndicatorColor = Color.Transparent,
+            unfocusedIndicatorColor = Color.Transparent
+        ),
+        keyboardOptions = KeyboardOptions(imeAction = imeAction),
+        singleLine = singleLine,
+    )
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/base/LabeledTextField.kt b/app/src/main/java/com/bnyro/contacts/ui/components/base/LabeledTextField.kt
index bc997c0b..0410bebb 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/base/LabeledTextField.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/base/LabeledTextField.kt
@@ -1,26 +1,44 @@
 package com.bnyro.contacts.ui.components.base
 
 import androidx.annotation.StringRes
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.remember
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.unit.dp
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
+/**
+ * A composable function that creates a labeled text field.
+ *
+ * @param modifier The modifier to apply to the text field.
+ * @param label The resource id of the label to display above the text field.
+ * @param state The mutable state of the text field's value.
+ * @param keyboardType The keyboard type to use for the text field.
+ * @param imeAction The ime action to use for the text field.
+ * @param leadingIcon A composable function that returns the leading icon to display in the text field.
+ * @param trailingIcon A composable function that returns the trailing icon to display in the text field.
+ * @param interactionSource The interaction source for the text field.
+ * @param suffix A composable function that returns the suffix to display in the text field.
+ * @param shape The shape of the text field.
+ * @param onValueChange The function to call when the value of the text field changes.
+ */
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun LabeledTextField(
     modifier: Modifier = Modifier,
@@ -28,14 +46,17 @@ fun LabeledTextField(
     state: MutableState<String>,
     keyboardType: KeyboardType = KeyboardType.Text,
     imeAction: ImeAction = ImeAction.Next,
-    onValueChange: (String) -> Unit = {}
+    leadingIcon: @Composable (() -> Unit)? = null,
+    trailingIcon: @Composable (() -> Unit)? = null,
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+    suffix: @Composable (() -> Unit)? = null,
+    shape: Shape = RoundedCornerShape(50),
+    onValueChange: (String) -> Unit = {},
 ) {
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusManager = LocalFocusManager.current
-    OutlinedTextField(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(horizontal = 10.dp, vertical = 5.dp),
+    TextField(
+        modifier = modifier.fillMaxWidth(),
         value = state.value,
         onValueChange = {
             state.value = it
@@ -51,6 +72,15 @@ fun LabeledTextField(
                 focusManager.clearFocus()
             },
             onNext = { focusManager.moveFocus(FocusDirection.Next) }
+        ),
+        leadingIcon = leadingIcon,
+        trailingIcon = trailingIcon,
+        suffix = suffix,
+        interactionSource = interactionSource,
+        shape = shape,
+        colors = TextFieldDefaults.colors(
+            focusedIndicatorColor = Color.Transparent,
+            unfocusedIndicatorColor = Color.Transparent
         )
     )
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/conversation/Message.kt b/app/src/main/java/com/bnyro/contacts/ui/components/conversation/Message.kt
new file mode 100644
index 00000000..c8decce8
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/conversation/Message.kt
@@ -0,0 +1,230 @@
+package com.bnyro.contacts.ui.components.conversation
+
+import android.provider.Telephony
+import android.text.format.DateUtils
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.bnyro.contacts.R
+import com.bnyro.contacts.db.obj.SmsData
+import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
+import com.bnyro.contacts.ui.models.SmsModel
+import com.bnyro.contacts.util.generateAnnotations
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ColumnScope.Messages(
+    messages: List<SmsData>,
+    scrollState: LazyListState,
+    smsModel: SmsModel
+) {
+    LaunchedEffect(Unit) {
+        scrollState.scrollToItem(messages.size + 5)
+    }
+
+    val timestamped = messages.groupBy {
+        DateUtils.getRelativeDateTimeString(
+            LocalContext.current,
+            it.timestamp,
+            DateUtils.MINUTE_IN_MILLIS,
+            DateUtils.WEEK_IN_MILLIS,
+            DateUtils.FORMAT_ABBREV_ALL
+        ).split(", ").first()
+    }
+
+    LazyColumn(
+        state = scrollState,
+        modifier = Modifier
+            .fillMaxWidth()
+            .weight(1f)
+    ) {
+        timestamped.forEach { timestamp ->
+            item {
+                DayHeader(
+                    timestamp.key
+                )
+            }
+            items(items = timestamp.value) { smsData ->
+                val isUserMe = smsData.type in listOf(
+                    Telephony.Sms.MESSAGE_TYPE_DRAFT,
+                    Telephony.Sms.MESSAGE_TYPE_SENT,
+                    Telephony.Sms.MESSAGE_TYPE_OUTBOX
+                )
+                var showDeleteSmsDialog by remember {
+                    mutableStateOf(false)
+                }
+
+                val state = rememberDismissState(
+                    confirmValueChange = {
+                        if (it == DismissValue.DismissedToEnd) {
+                            showDeleteSmsDialog = true
+                        }
+                        return@rememberDismissState false
+                    }
+                )
+                SwipeToDismiss(
+                    state = state,
+                    background = {},
+                    dismissContent = {
+                        Message(
+                            msg = smsData,
+                            isUserMe = isUserMe
+                        )
+                    }
+                )
+                if (showDeleteSmsDialog) {
+                    val context = LocalContext.current
+                    ConfirmationDialog(
+                        onDismissRequest = { showDeleteSmsDialog = false },
+                        title = stringResource(R.string.delete_message),
+                        text = stringResource(R.string.irreversible)
+                    ) {
+                        smsModel.deleteSms(context, smsData.id, smsData.threadId)
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun Message(
+    msg: SmsData,
+    isUserMe: Boolean
+) {
+    Column(modifier = Modifier.padding(horizontal = 16.dp)) {
+        ChatItemBubble(msg, isUserMe)
+        Spacer(modifier = Modifier.height(4.dp))
+    }
+}
+
+private val leftChatBubbleShape = RoundedCornerShape(4.dp, 20.dp, 20.dp, 20.dp)
+private val rightChatBubbleShape = RoundedCornerShape(20.dp, 4.dp, 20.dp, 20.dp)
+
+@Composable
+fun DayHeader(dayString: String) {
+    Row(
+        modifier = Modifier
+            .padding(vertical = 8.dp, horizontal = 16.dp)
+            .height(16.dp)
+    ) {
+        DayHeaderLine()
+        Text(
+            text = dayString,
+            modifier = Modifier.padding(horizontal = 16.dp),
+            style = MaterialTheme.typography.labelSmall,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+        DayHeaderLine()
+    }
+}
+
+@Composable
+private fun RowScope.DayHeaderLine() {
+    Divider(
+        modifier = Modifier
+            .weight(1f)
+            .align(Alignment.CenterVertically),
+        color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f)
+    )
+}
+
+@Composable
+fun ChatItemBubble(
+    message: SmsData,
+    isUserMe: Boolean
+) {
+    val backgroundBubbleColor = if (isUserMe) {
+        MaterialTheme.colorScheme.surfaceColorAtElevation(100.dp)
+    } else {
+        MaterialTheme.colorScheme.surfaceColorAtElevation(10.dp)
+    }
+
+    val textColor =
+        MaterialTheme.colorScheme.primary
+
+    Row(
+        Modifier.fillMaxWidth(),
+        horizontalArrangement = if (isUserMe) Arrangement.End else Arrangement.Start,
+        verticalAlignment = Alignment.Bottom
+    ) {
+        Surface(
+            modifier = if (isUserMe) {
+                Modifier.padding(start = 40.dp)
+            } else {
+                Modifier.padding(
+                    end = 40.dp
+                )
+            },
+            color = backgroundBubbleColor,
+            shape = if (isUserMe) rightChatBubbleShape else leftChatBubbleShape
+        ) {
+            Column(modifier = Modifier.padding(16.dp)) {
+                ClickableMessage(
+                    smsData = message
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+                Row(Modifier.align(if (isUserMe) Alignment.Start else Alignment.End)) {
+                    Spacer(modifier = Modifier.width(8.dp))
+                    Text(
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = textColor,
+                        text = DateUtils.getRelativeDateTimeString(
+                            LocalContext.current,
+                            message.timestamp,
+                            DateUtils.MINUTE_IN_MILLIS,
+                            DateUtils.WEEK_IN_MILLIS,
+                            DateUtils.FORMAT_ABBREV_ALL
+                        ).split(", ")[1]
+                    )
+                    message.simNumber?.let {
+                        Spacer(modifier = Modifier.width(8.dp))
+                        Text(
+                            style = MaterialTheme.typography.bodyMedium,
+                            color = textColor,
+                            text = "SIM $it"
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun ClickableMessage(
+    smsData: SmsData
+) {
+    SelectionContainer {
+        val uriHandler = LocalUriHandler.current
+        val primary = MaterialTheme.colorScheme.primary
+
+        val formatted = remember {
+            generateAnnotations(smsData.body, primary)
+        }
+
+        ClickableText(
+            text = formatted,
+            style = MaterialTheme.typography.bodyLarge.copy(color = LocalContentColor.current),
+            onClick = { offset ->
+                val annotation =
+                    formatted.getStringAnnotations(offset, offset).firstOrNull()
+                annotation?.let {
+                    uriHandler.openUri(it.item)
+                }
+            }
+        )
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/AddToContactDialog.kt b/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/AddToContactDialog.kt
index dcf8eb1b..ad89b6bb 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/AddToContactDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/AddToContactDialog.kt
@@ -28,9 +28,7 @@ import com.bnyro.contacts.ui.screens.EditorScreen
 import kotlinx.coroutines.launch
 
 @Composable
-fun AddToContactDialog(
-    newNumber: String
-) {
+fun AddToContactDialog(newNumber: String) {
     val context = LocalContext.current
     val contactsModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
 
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/FilterDialog.kt b/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/FilterDialog.kt
index 08484974..2be3a40f 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/FilterDialog.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/dialogs/FilterDialog.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.bnyro.contacts.R
 import com.bnyro.contacts.enums.SortOrder
+import com.bnyro.contacts.obj.AccountType
 import com.bnyro.contacts.obj.ContactsGroup
 import com.bnyro.contacts.obj.FilterOptions
 import com.bnyro.contacts.ui.components.base.ChipSelector
@@ -21,7 +22,7 @@ import com.bnyro.contacts.ui.components.base.ChipSelector
 @Composable
 fun FilterDialog(
     initialFilters: FilterOptions,
-    availableAccountTypes: List<Pair<String, String>>,
+    availableAccountTypes: List<AccountType>,
     availableGroups: List<ContactsGroup>,
     onDismissRequest: () -> Unit,
     onFilterChanged: (FilterOptions) -> Unit
@@ -73,17 +74,16 @@ fun FilterDialog(
                     Spacer(modifier = Modifier.height(10.dp))
                     ChipSelector(
                         title = stringResource(R.string.account_type),
-                        entries = availableAccountTypes.map { it.second },
+                        entries = availableAccountTypes.map { it.type },
                         selections = availableAccountTypes.filter {
-                            !hiddenAccountNames.contains(it.first + "|" + it.second)
-                        }.map { it.second },
+                            !hiddenAccountNames.contains(it.identifier)
+                        }.map { it.type },
                         onSelectionChanged = { index, newValue ->
                             val selection = availableAccountTypes[index]
-                            val selectedAccountName = selection.first + "|" + selection.second
                             hiddenAccountNames = if (newValue) {
-                                hiddenAccountNames - selectedAccountName
+                                hiddenAccountNames - selection.identifier
                             } else {
-                                hiddenAccountNames + selectedAccountName
+                                hiddenAccountNames + selection.identifier
                             }
                         }
                     )
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/editor/DatePickerEditor.kt b/app/src/main/java/com/bnyro/contacts/ui/components/editor/DatePickerEditor.kt
index bde836a4..0a4433a6 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/editor/DatePickerEditor.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/editor/DatePickerEditor.kt
@@ -1,17 +1,29 @@
 package com.bnyro.contacts.ui.components.editor
 
 import androidx.annotation.StringRes
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material.icons.outlined.Event
+import androidx.compose.material.icons.rounded.Remove
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.DatePicker
 import androidx.compose.material3.DatePickerDialog
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.material3.rememberDatePickerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -20,8 +32,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -30,6 +44,7 @@ import com.bnyro.contacts.obj.TranslatedType
 import com.bnyro.contacts.obj.ValueWithType
 import com.bnyro.contacts.ui.components.dialogs.DialogButton
 import com.bnyro.contacts.util.CalendarUtils
+import java.util.TimeZone
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -39,80 +54,134 @@ fun DatePickerEditor(
     types: List<TranslatedType>,
     showDeleteAction: Boolean,
     onDelete: () -> Unit,
-    onCreateNew: () -> Unit
+    shape: Shape,
 ) {
-    val datePickerOffset = 1000 * 3600 * 23
+    val datePickerOffset = remember {
+        TimeZone.getDefault().rawOffset
+    }
 
     var showPicker by remember {
         mutableStateOf(false)
     }
     val datePickerState = rememberDatePickerState(
         runCatching {
-            CalendarUtils.dateToMillis(state.value.value)
-        }.getOrDefault(null)?.plus(datePickerOffset)
+            CalendarUtils.dateToMillis(state.value.value)?.plus(datePickerOffset)
+        }.getOrDefault(null)
     )
 
     LaunchedEffect(datePickerState.selectedDateMillis) {
         state.value.value = datePickerState.selectedDateMillis?.let {
-            CalendarUtils.millisToDate(it, CalendarUtils.isoDateFormat)
+            CalendarUtils.millisToDate(it.minus(datePickerOffset), CalendarUtils.isoDateFormat)
         }.orEmpty()
     }
 
-    EditorEntry(
-        state = state,
-        types = types,
-        onCreateNew = onCreateNew,
-        onDelete = onDelete,
-        showDeleteAction = showDeleteAction
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .defaultMinSize(
+                minWidth = TextFieldDefaults.MinWidth,
+                minHeight = TextFieldDefaults.MinHeight
+            )
+            .fillMaxWidth()
+            .clip(shape)
+            .background(MaterialTheme.colorScheme.surfaceVariant)
     ) {
+        Icon(
+            modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+            imageVector = Icons.Outlined.Event,
+            contentDescription = null,
+            tint = MaterialTheme.colorScheme.onSurfaceVariant
+        )
         Column(
             modifier = Modifier
                 .weight(1f)
-                .height(75.dp)
-                .padding(10.dp)
-                .clip(RoundedCornerShape(10.dp))
-                .clickable {
-                    showPicker = true
-                }
-                .padding(horizontal = 10.dp),
-            verticalArrangement = Arrangement.Center
+                .padding(vertical = 4.dp)
         ) {
             Text(
                 text = stringResource(label),
                 fontSize = 12.sp,
                 color = MaterialTheme.colorScheme.primary
             )
-            Text(
-                text = datePickerState.selectedDateMillis
-                    ?.let { CalendarUtils.millisToDate(it) }
+            OutlinedButton(
+                onClick = { showPicker = true },
+                colors = ButtonDefaults.outlinedButtonColors(contentColor = MaterialTheme.colorScheme.onSurfaceVariant)
+            ) {
+                Text(text = datePickerState.selectedDateMillis
+                    ?.let { CalendarUtils.millisToDate(it.minus(datePickerOffset)) }
                     ?.takeIf { state.value.value.isNotEmpty() }
-                    .orEmpty()
-            )
+                    ?: stringResource(R.string.date))
+            }
         }
 
-        if (showPicker) {
-            DatePickerDialog(
-                onDismissRequest = {
-                    showPicker = false
-                },
-                dismissButton = {
-                    DialogButton(text = stringResource(R.string.reset)) {
-                        state.value.value = ""
-                        showPicker = false
+        if (types.isNotEmpty()) {
+            var expanded by remember { mutableStateOf(false) }
+            Row(
+                Modifier
+                    .padding(horizontal = 8.dp)
+                    .clickable {
+                        expanded = true
+                    },
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = types.firstOrNull {
+                        it.id == state.value.type
+                    }?.title?.let { stringResource(it) }.orEmpty(),
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+                Icon(
+                    imageVector = Icons.Default.ArrowDropDown,
+                    contentDescription = null
+                )
+                DropdownMenu(
+                    expanded = expanded,
+                    onDismissRequest = { expanded = false }
+                ) {
+                    types.forEach {
+                        DropdownMenuItem(
+                            text = { Text(stringResource(id = it.title)) },
+                            onClick = {
+                                state.value = state.value.also { v -> v.type = it.id }
+                                expanded = false
+                            }
+                        )
                     }
-                },
-                confirmButton = {
-                    DialogButton(text = stringResource(R.string.okay)) {
-                        showPicker = false
-                    }
-                },
-                content = {
-                    DatePicker(
-                        state = datePickerState,
-                        title = {}
-                    )
                 }
-            )
+            }
         }
+        if (showDeleteAction) {
+            IconButton(onClick = { onDelete.invoke() }) {
+                Icon(
+                    imageVector = Icons.Rounded.Remove, contentDescription = stringResource(
+                        id = R.string.delete
+                    ), tint = MaterialTheme.colorScheme.error
+                )
+            }
+        }
+    }
+
+    if (showPicker) {
+        DatePickerDialog(
+            onDismissRequest = {
+                showPicker = false
+            },
+            dismissButton = {
+                DialogButton(text = stringResource(R.string.reset)) {
+                    state.value.value = ""
+                    showPicker = false
+                }
+            },
+            confirmButton = {
+                DialogButton(text = stringResource(R.string.okay)) {
+                    showPicker = false
+                }
+            },
+            content = {
+                DatePicker(
+                    state = datePickerState,
+                    title = {}
+                )
+            }
+        )
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/editor/EditorEntry.kt b/app/src/main/java/com/bnyro/contacts/ui/components/editor/EditorEntry.kt
deleted file mode 100644
index a07d5fd5..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/components/editor/EditorEntry.kt
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.bnyro.contacts.ui.components.editor
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Remove
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.RadioButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.TranslatedType
-import com.bnyro.contacts.obj.ValueWithType
-import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.dialogs.DialogButton
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun EditorEntry(
-    state: MutableState<ValueWithType>,
-    types: List<TranslatedType>,
-    showDeleteAction: Boolean,
-    onCreateNew: () -> Unit,
-    onDelete: () -> Unit,
-    moveToTop: () -> Unit = {},
-    content: @Composable RowScope.() -> Unit
-) {
-    var showTypesDialog by remember {
-        mutableStateOf(false)
-    }
-
-    Row(
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Row(
-            modifier = Modifier.weight(1f)
-        ) {
-            content.invoke(this)
-        }
-        Column(
-            modifier = Modifier.width(100.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            if (types.isNotEmpty()) {
-                Text(
-                    modifier = Modifier
-                        .offset(y = 10.dp)
-                        .clip(RoundedCornerShape(20.dp))
-                        .combinedClickable(
-                            onClick = {
-                                showTypesDialog = true
-                            },
-                            onLongClick = {
-                                moveToTop.invoke()
-                            }
-                        )
-                        .padding(10.dp),
-                    text = types.firstOrNull {
-                        it.id == state.value.type
-                    }?.title?.let { stringResource(it) }.orEmpty(),
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis
-                )
-            }
-            Row {
-                ClickableIcon(
-                    modifier = Modifier.offset(x = if (showDeleteAction) 5.dp else 0.dp),
-                    icon = Icons.Default.Add
-                ) {
-                    onCreateNew.invoke()
-                }
-                if (showDeleteAction) {
-                    ClickableIcon(
-                        modifier = Modifier.offset(x = (-5).dp),
-                        icon = Icons.Default.Remove
-                    ) {
-                        onDelete.invoke()
-                    }
-                }
-            }
-        }
-        Spacer(modifier = Modifier.width(5.dp))
-    }
-
-    if (showTypesDialog) {
-        AlertDialog(
-            onDismissRequest = {
-                showTypesDialog = false
-            },
-            confirmButton = {
-                DialogButton(text = stringResource(R.string.cancel)) {
-                    showTypesDialog = false
-                }
-            },
-            title = {
-                Text(stringResource(R.string.type))
-            },
-            text = {
-                LazyColumn {
-                    items(types) {
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .clip(RoundedCornerShape(20.dp))
-                                .clickable {
-                                    state.value = state.value.also { v -> v.type = it.id }
-                                    showTypesDialog = false
-                                }
-                        ) {
-                            RadioButton(selected = it.id == state.value.type, onClick = {
-                                state.value = state.value.also { v -> v.type = it.id }
-                                showTypesDialog = false
-                            })
-                            Spacer(modifier = Modifier.width(10.dp))
-                            Text(stringResource(it.title))
-                        }
-                    }
-                }
-            }
-        )
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/editor/EventFieldGroup.kt b/app/src/main/java/com/bnyro/contacts/ui/components/editor/EventFieldGroup.kt
new file mode 100644
index 00000000..63a0be22
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/editor/EventFieldGroup.kt
@@ -0,0 +1,66 @@
+package com.bnyro.contacts.ui.components.editor
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Add
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.bnyro.contacts.obj.TranslatedType
+import com.bnyro.contacts.obj.ValueWithType
+
+/**
+ * A composable function that creates a group of text fields.
+ *
+ * @param items The list of already filled fields as [ValueWithType] (if any).
+ * @param label The label for the text fields.
+ * @param addActionText The text for the add action button.
+ * @param types The list of supported dropdown items as [TranslatedType].
+ */
+@Composable
+fun EventFieldGroup(
+    items: SnapshotStateList<MutableState<ValueWithType>>,
+    @StringRes label: Int,
+    @StringRes addActionText: Int,
+    types: List<TranslatedType> = listOf(),
+) {
+    Column() {
+        with(items) {
+            forEachIndexed { index, it ->
+                DatePickerEditor(
+                    label = label,
+                    state = it,
+                    types = types,
+                    onDelete = {
+                        removeAt(index)
+                    },
+                    showDeleteAction = size > 1,
+                    shape = if (index == 0) RoundedCornerShape(50, 50, 0, 0) else RectangleShape
+                )
+            }
+            FilledTonalButton(
+                modifier = Modifier
+                    .fillMaxWidth(),
+                onClick = { add(mutableStateOf(ValueWithType("", 0))) },
+                shape = RoundedCornerShape(0, 0, 50, 50)
+            ) {
+                Icon(imageVector = Icons.Rounded.Add, contentDescription = null)
+                Spacer(modifier = Modifier.width(8.dp))
+                Text(text = stringResource(id = addActionText))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldEditor.kt b/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldEditor.kt
index 5272416f..a34a68f3 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldEditor.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldEditor.kt
@@ -1,18 +1,47 @@
 package com.bnyro.contacts.ui.components.editor
 
-import android.annotation.SuppressLint
 import androidx.annotation.StringRes
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material.icons.rounded.Remove
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
+import com.bnyro.contacts.R
 import com.bnyro.contacts.obj.TranslatedType
 import com.bnyro.contacts.obj.ValueWithType
 import com.bnyro.contacts.ui.components.base.LabeledTextField
 
-@SuppressLint("UnrememberedMutableState")
+/**
+ * A composable function that renders a text field with a dropdown menu to select the type and a button to delete the text field.
+ *
+ * @param label The label for the text field.
+ * @param state The state of the text field.
+ * @param types The list of types that can be selected.
+ * @param keyboardType The keyboard type for the text field.
+ * @param imeAction The ime action for the text field.
+ * @param showDeleteAction Whether or not to show the delete action.
+ * @param leadingIcon The leading icon for the text field.
+ * @param onDelete The function to call when the delete action is clicked.
+ * @param shape The shape of the text field.
+ */
 @Composable
 fun TextFieldEditor(
     @StringRes label: Int,
@@ -21,28 +50,68 @@ fun TextFieldEditor(
     keyboardType: KeyboardType = KeyboardType.Text,
     imeAction: ImeAction = ImeAction.Next,
     showDeleteAction: Boolean,
+    leadingIcon: @Composable (() -> Unit)? = null,
     onDelete: () -> Unit,
-    moveToTop: () -> Unit = {},
-    onCreateNew: () -> Unit
+    shape: Shape,
 ) {
-    val textState = mutableStateOf(state.value.value)
+    val textState = remember(state.value) { mutableStateOf(state.value.value) }
+    LabeledTextField(
+        label = label,
+        state = textState,
+        keyboardType = keyboardType,
+        imeAction = imeAction,
+        leadingIcon = leadingIcon,
+        trailingIcon = if (showDeleteAction) ({
+            IconButton(onClick = { onDelete.invoke() }) {
+                Icon(
+                    imageVector = Icons.Rounded.Remove, contentDescription = stringResource(
+                        id = R.string.delete
+                    ), tint = MaterialTheme.colorScheme.error
+                )
+            }
+        }) else {
+            null
+        },
+        suffix = if (types.isNotEmpty()) ({
+            var expanded by remember { mutableStateOf(false) }
+            Row(
+                Modifier
+                    .clickable {
+                        expanded = true
+                    },
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = types.firstOrNull {
+                        it.id == state.value.type
+                    }?.title?.let { stringResource(it) }.orEmpty()
+                )
+                Icon(
+                    imageVector = Icons.Default.ArrowDropDown,
+                    contentDescription = null
+                )
+            }
 
-    EditorEntry(
-        state = state,
-        types = types,
-        onDelete = onDelete,
-        onCreateNew = onCreateNew,
-        showDeleteAction = showDeleteAction,
-        moveToTop = moveToTop
+            DropdownMenu(
+                expanded = expanded,
+                onDismissRequest = { expanded = false }
+            ) {
+                types.forEach {
+                    DropdownMenuItem(
+                        text = { Text(stringResource(id = it.title)) },
+                        onClick = {
+                            state.value = state.value.also { v -> v.type = it.id }
+                            expanded = false
+                        }
+                    )
+                }
+            }
+        }) else {
+            null
+        }, shape = shape
     ) {
-        LabeledTextField(
-            modifier = Modifier.weight(1f),
-            label = label,
-            state = textState,
-            keyboardType = keyboardType,
-            imeAction = imeAction
-        ) {
-            state.value.value = it
-        }
+        state.value.value = it
     }
+
+
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldGroup.kt b/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldGroup.kt
new file mode 100644
index 00000000..140d5a62
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/ui/components/editor/TextFieldGroup.kt
@@ -0,0 +1,83 @@
+package com.bnyro.contacts.ui.components.editor
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Add
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import com.bnyro.contacts.obj.TranslatedType
+import com.bnyro.contacts.obj.ValueWithType
+
+/**
+ * A composable function that creates a group of text fields.
+ *
+ * @param items The list of already filled fields as [ValueWithType] (if any).
+ * @param label The label for the text fields.
+ * @param addActionText The text for the add action button.
+ * @param types The list of supported dropdown items as [TranslatedType].
+ * @param leadingIcon The leading icon for the text fields.
+ * @param keyboardType The keyboard type for the text fields.
+ */
+@Composable
+fun TextFieldGroup(
+    items: SnapshotStateList<MutableState<ValueWithType>>,
+    @StringRes label: Int,
+    @StringRes addActionText: Int,
+    types: List<TranslatedType> = listOf(),
+    leadingIcon: ImageVector,
+    keyboardType: KeyboardType = KeyboardType.Text,
+) {
+    Column() {
+        with(items) {
+            forEachIndexed { index, it ->
+                TextFieldEditor(
+                    label = label,
+                    state = it,
+                    types = types,
+                    keyboardType = keyboardType,
+                    imeAction = if (it == last()) ImeAction.Done else ImeAction.Next,
+                    onDelete = {
+                        removeAt(index)
+                    },
+                    showDeleteAction = size > 1,
+                    leadingIcon = {
+                        if (index == 0) {
+                            Icon(
+                                imageVector = leadingIcon,
+                                contentDescription = null
+                            )
+                        }
+                    },
+                    shape = if (index == 0) RoundedCornerShape(50, 50, 0, 0) else RectangleShape
+                )
+            }
+            FilledTonalButton(
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                    onClick = { add(mutableStateOf(ValueWithType("", 0))) },
+                    shape = RoundedCornerShape(0, 0, 50, 50)
+                ) {
+                    Icon(imageVector = Icons.Rounded.Add, contentDescription = null)
+                    Spacer(modifier = Modifier.width(8.dp))
+                    Text(text = stringResource(id = addActionText))
+                }
+        }
+    }
+}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/modifier/Scrollable.kt b/app/src/main/java/com/bnyro/contacts/ui/components/modifier/Scrollable.kt
deleted file mode 100644
index d5597c76..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/components/modifier/Scrollable.kt
+++ /dev/null
@@ -1,218 +0,0 @@
-package com.bnyro.contacts.ui.components.modifier
-
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawWithContent
-import androidx.compose.ui.geometry.CornerRadius
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-
-/**
- * Renders a scrollbar.
- *
- * <ul> <li> A scrollbar is composed of two components: a track and a knob. The knob moves across
- * the track <li> The scrollbar appears automatically when the user starts scrolling and disappears
- * after the scrolling is finished </ul>
- *
- * @param state The [LazyListState] that has been passed into the lazy list or lazy row
- * @param horizontal If `true`, this will be a horizontally-scrolling (left and right) scroll bar,
- * if `false`, it will be vertically-scrolling (up and down)
- * @param alignEnd If `true`, the scrollbar will appear at the "end" of the scrollable composable it
- * is decorating (at the right-hand side in left-to-right locales or left-hand side in right-to-left
- * locales, for the vertical scrollbars -or- the bottom for horizontal scrollbars). If `false`, the
- * scrollbar will appear at the "start" of the scrollable composable it is decorating (at the
- * left-hand side in left-to-right locales or right-hand side in right-to-left locales, for the
- * vertical scrollbars -or- the top for horizontal scrollbars)
- * @param thickness How thick/wide the track and knob should be
- * @param fixedKnobRatio If not `null`, the knob will always have this size, proportional to the
- * size of the track. You should consider doing this if the size of the items in the scrollable
- * composable is not uniform, to avoid the knob from oscillating in size as you scroll through the
- * list
- * @param knobCornerRadius The corner radius for the knob
- * @param trackCornerRadius The corner radius for the track
- * @param knobColor The color of the knob
- * @param trackColor The color of the track. Make it [Color.Transparent] to hide it
- * @param padding Edge padding to "squeeze" the scrollbar start/end in so it's not flush with the
- * contents of the scrollable composable it is decorating
- * @param visibleAlpha The alpha when the scrollbar is fully faded-in
- * @param hiddenAlpha The alpha when the scrollbar is fully faded-out. Use a non-`0` number to keep
- * the scrollbar from ever fading out completely
- * @param fadeInAnimationDurationMs The duration of the fade-in animation when the scrollbar appears
- * once the user starts scrolling
- * @param fadeOutAnimationDurationMs The duration of the fade-out animation when the scrollbar
- * disappears after the user is finished scrolling
- * @param fadeOutAnimationDelayMs Amount of time to wait after the user is finished scrolling before
- * the scrollbar begins its fade-out animation
- */
-@Composable
-fun Modifier.scrollbar(
-    state: LazyListState,
-    horizontal: Boolean,
-    alignEnd: Boolean = true,
-    thickness: Dp = 4.dp,
-    fixedKnobRatio: Float? = null,
-    knobCornerRadius: Dp = 4.dp,
-    trackCornerRadius: Dp = 2.dp,
-    knobColor: Color = MaterialTheme.colorScheme.primary,
-    trackColor: Color = Color.Transparent,
-    padding: Dp = 0.dp,
-    visibleAlpha: Float = 1f,
-    hiddenAlpha: Float = 0f,
-    fadeInAnimationDurationMs: Int = 150,
-    fadeOutAnimationDurationMs: Int = 500,
-    fadeOutAnimationDelayMs: Int = 1000
-): Modifier {
-    check(thickness > 0.dp) { "Thickness must be a positive integer." }
-    check(fixedKnobRatio == null || fixedKnobRatio < 1f) {
-        "A fixed knob ratio must be smaller than 1."
-    }
-    check(knobCornerRadius >= 0.dp) { "Knob corner radius must be greater than or equal to 0." }
-    check(trackCornerRadius >= 0.dp) { "Track corner radius must be greater than or equal to 0." }
-    check(hiddenAlpha <= visibleAlpha) { "Hidden alpha cannot be greater than visible alpha." }
-    check(fadeInAnimationDurationMs >= 0) {
-        "Fade in animation duration must be greater than or equal to 0."
-    }
-    check(fadeOutAnimationDurationMs >= 0) {
-        "Fade out animation duration must be greater than or equal to 0."
-    }
-    check(fadeOutAnimationDelayMs >= 0) {
-        "Fade out animation delay must be greater than or equal to 0."
-    }
-
-    val targetAlpha =
-        if (state.isScrollInProgress) {
-            visibleAlpha
-        } else {
-            hiddenAlpha
-        }
-    val animationDurationMs =
-        if (state.isScrollInProgress) {
-            fadeInAnimationDurationMs
-        } else {
-            fadeOutAnimationDurationMs
-        }
-    val animationDelayMs =
-        if (state.isScrollInProgress) {
-            0
-        } else {
-            fadeOutAnimationDelayMs
-        }
-
-    val alpha by
-        animateFloatAsState(
-            targetValue = targetAlpha,
-            animationSpec =
-            tween(delayMillis = animationDelayMs, durationMillis = animationDurationMs)
-        )
-
-    return drawWithContent {
-        drawContent()
-
-        state.layoutInfo.visibleItemsInfo.firstOrNull()?.let { firstVisibleItem ->
-            if (state.isScrollInProgress || alpha > 0f) {
-                // Size of the viewport, the entire size of the scrollable composable we are decorating with
-                // this scrollbar.
-                val viewportSize =
-                    if (horizontal) {
-                        size.width
-                    } else {
-                        size.height
-                    } - padding.toPx() * 2
-
-                // The size of the first visible item. We use this to estimate how many items can fit in the
-                // viewport. Of course, this works perfectly when all items have the same size. When they
-                // don't, the scrollbar knob size will grow and shrink as we scroll.
-                val firstItemSize = firstVisibleItem.size
-
-                // The *estimated* size of the entire scrollable composable, as if it's all on screen at
-                // once. It is estimated because it's possible that the size of the first visible item does
-                // not represent the size of other items. This will cause the scrollbar knob size to grow
-                // and shrink as we scroll, if the item sizes are not uniform.
-                val estimatedFullListSize = firstItemSize * state.layoutInfo.totalItemsCount
-
-                // The difference in position between the first pixels visible in our viewport as we scroll
-                // and the top of the fully-populated scrollable composable, if it were to show all the
-                // items at once. At first, the value is 0 since we start all the way to the top (or start
-                // edge). As we scroll down (or towards the end), this number will grow.
-                val viewportOffsetInFullListSpace =
-                    state.firstVisibleItemIndex * firstItemSize + state.firstVisibleItemScrollOffset
-
-                // Where we should render the knob in our composable.
-                val knobPosition =
-                    (viewportSize / estimatedFullListSize) * viewportOffsetInFullListSpace + padding.toPx()
-                // How large should the knob be.
-                val knobSize =
-                    fixedKnobRatio?.let { it * viewportSize }
-                        ?: ((viewportSize * viewportSize) / estimatedFullListSize)
-
-                // Draw the track
-                drawRoundRect(
-                    color = trackColor,
-                    topLeft =
-                    when {
-                        // When the scrollbar is horizontal and aligned to the bottom:
-                        horizontal && alignEnd -> Offset(
-                            padding.toPx(),
-                            size.height - thickness.toPx()
-                        )
-                        // When the scrollbar is horizontal and aligned to the top:
-                        horizontal && !alignEnd -> Offset(padding.toPx(), 0f)
-                        // When the scrollbar is vertical and aligned to the end:
-                        alignEnd -> Offset(size.width - thickness.toPx(), padding.toPx())
-                        // When the scrollbar is vertical and aligned to the start:
-                        else -> Offset(0f, padding.toPx())
-                    },
-                    size =
-                    if (horizontal) {
-                        Size(size.width - padding.toPx() * 2, thickness.toPx())
-                    } else {
-                        Size(thickness.toPx(), size.height - padding.toPx() * 2)
-                    },
-                    alpha = alpha,
-                    cornerRadius = CornerRadius(
-                        x = trackCornerRadius.toPx(),
-                        y = trackCornerRadius.toPx()
-                    )
-                )
-
-                // Draw the knob
-                drawRoundRect(
-                    color = knobColor,
-                    topLeft =
-                    when {
-                        // When the scrollbar is horizontal and aligned to the bottom:
-                        horizontal && alignEnd -> Offset(
-                            knobPosition,
-                            size.height - thickness.toPx()
-                        )
-                        // When the scrollbar is horizontal and aligned to the top:
-                        horizontal && !alignEnd -> Offset(knobPosition, 0f)
-                        // When the scrollbar is vertical and aligned to the end:
-                        alignEnd -> Offset(size.width - thickness.toPx(), knobPosition)
-                        // When the scrollbar is vertical and aligned to the start:
-                        else -> Offset(0f, knobPosition)
-                    },
-                    size =
-                    if (horizontal) {
-                        Size(knobSize, thickness.toPx())
-                    } else {
-                        Size(thickness.toPx(), knobSize)
-                    },
-                    alpha = alpha,
-                    cornerRadius = CornerRadius(
-                        x = knobCornerRadius.toPx(),
-                        y = knobCornerRadius.toPx()
-                    )
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/models/ContactsModel.kt b/app/src/main/java/com/bnyro/contacts/ui/models/ContactsModel.kt
index c41251af..e10dff10 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/models/ContactsModel.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/models/ContactsModel.kt
@@ -16,11 +16,13 @@ import com.bnyro.contacts.App
 import com.bnyro.contacts.R
 import com.bnyro.contacts.enums.ContactsSource
 import com.bnyro.contacts.ext.toast
+import com.bnyro.contacts.obj.AccountType
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.repo.ContactsRepository
 import com.bnyro.contacts.repo.DeviceContactsRepository
 import com.bnyro.contacts.repo.LocalContactsRepository
 import com.bnyro.contacts.ui.models.state.ContactListState
+import com.bnyro.contacts.util.ContactsHelper
 import com.bnyro.contacts.util.ExportHelper
 import com.bnyro.contacts.util.IntentHelper
 import com.bnyro.contacts.util.PermissionHelper
@@ -203,31 +205,25 @@ class ContactsModel(
     /**
      * Returns a list of account type to account name
      */
-    fun getAvailableAccounts(): List<Pair<String, String>> {
-        if (contacts.isEmpty()) {
-            return listOf(
-                DeviceContactsRepository.ANDROID_ACCOUNT_TYPE to DeviceContactsRepository.ANDROID_CONTACTS_NAME
-            )
-        }
-        return contacts.mapNotNull {
-            it.accountType?.let { type -> type to it.accountName.orEmpty() }
-        }.distinct().toMutableList()
+    fun getAvailableAccounts(context: Context): List<AccountType> {
+        if (!PermissionHelper.hasPermission(context, Manifest.permission.READ_SYNC_SETTINGS))
+            return listOf(AccountType.androidDefault)
+
+        return deviceContactsRepository.getAccountTypes()
     }
 
     fun getAvailableGroups() = contacts.map { it.groups }.flatten().distinct()
 
     fun getContactByNumber(number: String): ContactData? {
-        val normalizedNumber = number.replace(normalizeNumberRegex, "")
+        val normalizedNumber = ContactsHelper.normalizePhoneNumber(number)
         return contacts.firstOrNull {
             it.numbers.any { (value, _) ->
-                value.replace(normalizeNumberRegex, "") == normalizedNumber
+                ContactsHelper.normalizePhoneNumber(value) == normalizedNumber
             }
         }
     }
 
     companion object {
-        val normalizeNumberRegex = Regex("[-_ ]")
-
         val Factory = viewModelFactory {
             initializer {
                 val application = this[APPLICATION_KEY] as App
diff --git a/app/src/main/java/com/bnyro/contacts/ui/models/SmsModel.kt b/app/src/main/java/com/bnyro/contacts/ui/models/SmsModel.kt
index df963e44..0266ec13 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/models/SmsModel.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/models/SmsModel.kt
@@ -1,129 +1,75 @@
 package com.bnyro.contacts.ui.models
 
-import android.Manifest
 import android.annotation.SuppressLint
-import android.app.role.RoleManager
 import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.provider.Telephony
 import android.telephony.SubscriptionInfo
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY
 import androidx.lifecycle.viewModelScope
-import com.bnyro.contacts.db.obj.SmsData
-import com.bnyro.contacts.util.NotificationHelper
-import com.bnyro.contacts.util.PermissionHelper
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
+import com.bnyro.contacts.App
+import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.util.SmsUtil
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
-class SmsModel : ViewModel() {
-    val smsList = mutableStateListOf<SmsData>()
-    val smsGroups = mutableStateMapOf<Long, MutableList<SmsData>>()
+class SmsModel(val app: App) : ViewModel() {
+    var smsList = app.smsRepo.getSmsStream(context = app.applicationContext).stateIn(
+        viewModelScope,
+        started = SharingStarted.WhileSubscribed(5000L),
+        initialValue = listOf()
+    )
+
+    var currentContactData: ContactData? = null
 
     var initialAddressAndBody by mutableStateOf<Pair<String, String?>?>(null)
 
     var currentSubscription: SubscriptionInfo? = null
 
-    fun fetchSmsList(context: Context) {
-        val requiredPermissions = smsPermissions + NotificationHelper.notificationPermissions
-        if (!PermissionHelper.checkPermissions(context, requiredPermissions)) return
-
-        requestDefaultSMSApp(context)
-
-        viewModelScope.launch {
-            val tempSmsList = withContext(Dispatchers.IO) {
-                SmsUtil.getSmsList(context)
-            }
-
-            smsList.clear()
-            smsGroups.clear()
-
-            smsList.addAll(tempSmsList)
-            val groups = smsList.groupBy { it.threadId }
-                .map { (threadId, smsList) -> threadId to smsList.toMutableList() }
-            smsGroups.putAll(groups)
-        }
-    }
-
-    fun addSmsToList(sms: SmsData) {
-        smsList.add(sms)
-        if (smsGroups.containsKey(sms.threadId)) {
-            smsGroups[sms.threadId]?.add(sms)
-        } else {
-            smsGroups[sms.threadId] = mutableListOf(sms)
-        }
+    private fun updateSmsList() {
+        smsList = app.smsRepo.getSmsStream(context = app.applicationContext).stateIn(
+            viewModelScope,
+            started = SharingStarted.WhileSubscribed(5000L),
+            initialValue = listOf()
+        )
     }
 
     fun deleteSms(context: Context, id: Long, threadId: Long) {
-        smsList.removeAll { it.id == id }
-        smsGroups[threadId]?.removeAll { it.id == id }
         viewModelScope.launch(Dispatchers.IO) {
-            SmsUtil.deleteMessage(context, id)
+            app.smsRepo.deleteSms(context, id)
         }
     }
 
     fun deleteThread(context: Context, threadId: Long) {
-        smsList.removeAll { it.threadId == threadId }
-        smsGroups.remove(threadId)
         viewModelScope.launch(Dispatchers.IO) {
-            SmsUtil.deleteThread(context, threadId)
+            app.smsRepo.deleteThread(context, threadId)
         }
     }
 
     @SuppressLint("NewApi")
     fun sendSms(context: Context, address: String, body: String) {
-        viewModelScope.launch {
-            val sms = withContext(Dispatchers.IO) {
-                SmsUtil.sendSms(context, address, body, currentSubscription?.subscriptionId)
-            } ?: return@launch
-            addSmsToList(sms)
-        }
-    }
-
-    private fun requestDefaultSMSApp(context: Context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val roleManager = context.getSystemService(RoleManager::class.java)
-            if (roleManager!!.isRoleAvailable(RoleManager.ROLE_SMS)) {
-                if (roleManager.isRoleHeld(RoleManager.ROLE_SMS)) {
-                    getSmsPermissions(context)
-                } else {
-                    val intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_SMS)
-                    context.startActivity(intent)
-                }
-            }
-        } else {
-            if (Telephony.Sms.getDefaultSmsPackage(context) == context.packageName) {
-                getSmsPermissions(context)
-            } else {
-                val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT)
-                intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, context.packageName)
-                context.startActivity(intent)
-            }
+        viewModelScope.launch(Dispatchers.IO) {
+            SmsUtil.sendSms(context, address, body, currentSubscription?.subscriptionId)
         }
     }
 
-    private fun getSmsPermissions(context: Context) {
-        PermissionHelper.checkPermissions(context, smsPermissions)
-    }
-
-    fun refreshLocalSmsPreference(context: Context) {
-        SmsUtil.initSmsRepo()
-        fetchSmsList(context)
+    fun refreshLocalSmsPreference() {
+        app.initSmsRepo()
+        updateSmsList()
     }
 
     companion object {
-        private val smsPermissions = arrayOf(
-            Manifest.permission.SEND_SMS,
-            Manifest.permission.READ_SMS,
-            Manifest.permission.RECEIVE_SMS,
-            Manifest.permission.READ_PHONE_STATE
-        )
+        val Factory = viewModelFactory {
+            initializer {
+                val application = this[APPLICATION_KEY] as App
+                SmsModel(application)
+            }
+        }
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/AboutScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/AboutScreen.kt
index f2aaa9ea..3e40657d 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/AboutScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/screens/AboutScreen.kt
@@ -23,69 +23,68 @@ import com.bnyro.contacts.BuildConfig
 import com.bnyro.contacts.R
 import com.bnyro.contacts.ui.components.about.AboutRow
 import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun AboutScreen(onDismissRequest: () -> Unit) {
-    FullScreenDialog(onClose = onDismissRequest) {
-        Scaffold(
-            topBar = {
-                TopAppBar(
-                    title = {
-                        Text(stringResource(R.string.about))
-                    },
-                    navigationIcon = {
-                        ClickableIcon(
-                            icon = Icons.Default.ArrowBack,
-                            contentDescription = R.string.okay
-                        ) {
-                            onDismissRequest.invoke()
-                        }
+fun AboutScreen(onBackPress: () -> Unit) {
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(stringResource(R.string.about))
+                },
+                navigationIcon = {
+                    ClickableIcon(
+                        icon = Icons.Default.ArrowBack,
+                        contentDescription = R.string.okay
+                    ) {
+                        onBackPress.invoke()
                     }
-                )
-            }
-        ) { pV ->
-            Column(
-                modifier = Modifier.padding(pV),
-                horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-                Image(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(210.dp),
-                    painter = painterResource(R.drawable.ic_launcher_foreground),
-                    contentDescription = null
-                )
-                Divider(
-                    modifier = Modifier.fillMaxWidth()
-                        .height(2.dp)
-                )
-                Spacer(Modifier.height(10.dp))
-                AboutRow(
-                    title = stringResource(R.string.version),
-                    summary = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
-                )
-                AboutRow(
-                    title = "GitHub",
-                    url = "https://github.com/you-apps/ConnectYou/"
-                )
-                AboutRow(
-                    title = stringResource(R.string.author),
-                    summary = "You Apps",
-                    url = "https://github.com/you-apps/"
-                )
-                AboutRow(
-                    title = stringResource(R.string.translation),
-                    summary = "Weblate",
-                    url = "https://hosted.weblate.org/projects/you-apps/connect-you/"
-                )
-                AboutRow(
-                    title = stringResource(R.string.license),
-                    summary = "GPL-3.0",
-                    url = "https://www.gnu.org/licenses/gpl-3.0.html"
-                )
-            }
+                }
+            )
+        }
+    ) { pV ->
+        Column(
+            modifier = Modifier.padding(pV),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Image(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(210.dp),
+                painter = painterResource(R.drawable.ic_launcher_foreground),
+                contentDescription = null
+            )
+            Divider(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(2.dp)
+            )
+            Spacer(Modifier.height(10.dp))
+            AboutRow(
+                title = stringResource(R.string.version),
+                summary = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
+            )
+            AboutRow(
+                title = "GitHub",
+                url = "https://github.com/you-apps/ConnectYou/"
+            )
+            AboutRow(
+                title = stringResource(R.string.author),
+                summary = "You Apps",
+                url = "https://github.com/you-apps/"
+            )
+            AboutRow(
+                title = stringResource(R.string.translation),
+                summary = "Weblate",
+                url = "https://hosted.weblate.org/projects/you-apps/connect-you/"
+            )
+            AboutRow(
+                title = stringResource(R.string.license),
+                summary = "GPL-3.0",
+                url = "https://www.gnu.org/licenses/gpl-3.0.html"
+            )
         }
     }
+
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactSearchScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/ContactSearchScreen.kt
similarity index 51%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ContactSearchScreen.kt
rename to app/src/main/java/com/bnyro/contacts/ui/screens/ContactSearchScreen.kt
index fba08a5c..b9d154f9 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactSearchScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/screens/ContactSearchScreen.kt
@@ -1,17 +1,11 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.ui.screens
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Search
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -20,15 +14,16 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import com.bnyro.contacts.R
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.obj.FilterOptions
-import com.bnyro.contacts.ui.components.base.ClickableIcon
+import com.bnyro.contacts.ui.components.ContactsList
+import com.bnyro.contacts.ui.components.base.ElevatedTextInputField
 import com.bnyro.contacts.ui.components.base.FullScreenDialog
+import com.bnyro.contacts.util.ContactsHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
@@ -57,44 +52,23 @@ fun ContactSearchScreen(
         }
         LaunchedEffect(searchQuery) {
             withContext(Dispatchers.IO) {
-                val query = searchQuery.lowercase()
-                visibleContacts = contacts.filter {
-                    val contactInfoStrings = listOf(it.numbers, it.emails, it.addresses, it.notes, it.websites, it.events)
-                        .flatten()
-                        .map { (value, _) -> value } + listOf(it.organization, it.nickName, it.displayName)
-
-                    contactInfoStrings.filterNotNull().any { str ->
-                        str.lowercase().contains(query)
-                    }
-                }
+                visibleContacts = ContactsHelper.filter(contacts, searchQuery)
             }
         }
 
         Column(Modifier.fillMaxSize()) {
-            TextField(
+            ElevatedTextInputField(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = 8.dp)
-                    .padding(top = 8.dp)
-                    .focusRequester(focusRequester),
-                value = searchQuery,
-                onValueChange = { searchQuery = it },
-                placeholder = { Text(stringResource(id = R.string.search)) },
-                leadingIcon = {
-                    Icon(imageVector = Icons.Default.Search, contentDescription = null)
-                },
-                trailingIcon = {
-                    if (searchQuery.isNotEmpty()) {
-                        ClickableIcon(icon = Icons.Default.Close) {
-                            searchQuery = ""
-                        }
-                    }
-                },
-                shape = RoundedCornerShape(50),
-                colors = TextFieldDefaults.colors(
-                    focusedIndicatorColor = Color.Transparent,
-                    unfocusedIndicatorColor = Color.Transparent
-                )
+                    .padding(top = 8.dp),
+                query = searchQuery,
+                onQueryChange = { searchQuery = it },
+                leadingIcon = Icons.Default.Search,
+                placeholder = stringResource(id = R.string.search),
+                imeAction = ImeAction.Done,
+                focusRequester = focusRequester,
+                singleLine = true
             )
             ContactsList(
                 contacts = visibleContacts,
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactsPage.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/ContactsScreen.kt
similarity index 87%
rename from app/src/main/java/com/bnyro/contacts/ui/components/ContactsPage.kt
rename to app/src/main/java/com/bnyro/contacts/ui/screens/ContactsScreen.kt
index e1367496..e9b042ea 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/components/ContactsPage.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/screens/ContactsScreen.kt
@@ -1,5 +1,6 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.ui.screens
 
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.Crossfade
@@ -16,7 +17,6 @@ import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.CopyAll
 import androidx.compose.material.icons.filled.Create
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.MoveToInbox
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.Share
@@ -47,26 +47,26 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
 import com.bnyro.contacts.enums.ContactsSource
+import com.bnyro.contacts.nav.NavRoutes
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.obj.FilterOptions
+import com.bnyro.contacts.ui.components.ContactsList
+import com.bnyro.contacts.ui.components.NothingHere
+import com.bnyro.contacts.ui.components.TopBarMoreMenu
 import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.base.OptionMenu
 import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
 import com.bnyro.contacts.ui.components.dialogs.FilterDialog
 import com.bnyro.contacts.ui.components.dialogs.SimImportDialog
 import com.bnyro.contacts.ui.models.ContactsModel
 import com.bnyro.contacts.ui.models.state.ContactListState
-import com.bnyro.contacts.ui.screens.AboutScreen
-import com.bnyro.contacts.ui.screens.EditorScreen
-import com.bnyro.contacts.ui.screens.SettingsScreen
-import com.bnyro.contacts.ui.screens.SingleContactScreen
 import com.bnyro.contacts.util.BackupHelper
 import com.bnyro.contacts.util.Preferences
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ContactsPage(
-    scrollConnection: NestedScrollConnection?
+    scrollConnection: NestedScrollConnection?,
+    onNavigate: (NavRoutes) -> Unit
 ) {
     val viewModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
     val context = LocalContext.current
@@ -79,6 +79,10 @@ fun ContactsPage(
         mutableStateOf(viewModel.initialContactData)
     }
 
+    var showEditorScreen by remember {
+        mutableStateOf(false)
+    }
+
     var showDelete by remember {
         mutableStateOf(false)
     }
@@ -87,18 +91,10 @@ fun ContactsPage(
         mutableStateOf(FilterOptions.default())
     }
 
-    var showSettings by remember {
-        mutableStateOf(false)
-    }
-
     var showSearch by remember {
         mutableStateOf(false)
     }
 
-    var showAbout by remember {
-        mutableStateOf(false)
-    }
-
     var showFilterDialog by remember {
         mutableStateOf(false)
     }
@@ -122,7 +118,7 @@ fun ContactsPage(
         floatingActionButton = {
             FloatingActionButton(
                 onClick = {
-                    newContactToInsert = ContactData()
+                    showEditorScreen = true
                 }
             ) {
                 Icon(Icons.Default.Create, null)
@@ -130,10 +126,18 @@ fun ContactsPage(
         }
     ) { pv ->
         Column(
-            modifier = Modifier.padding(pv).fillMaxSize()
+            modifier = Modifier
+                .padding(pv)
+                .fillMaxSize()
         ) {
-            Crossfade(targetState = selectedContacts.isEmpty(), label = "main layout") { state ->
-                when (state) {
+            Crossfade(
+                targetState = selectedContacts.isEmpty(),
+                label = "main layout"
+            ) { selectionEmpty ->
+                BackHandler(enabled = !selectionEmpty) {
+                    selectedContacts.clear()
+                }
+                when (selectionEmpty) {
                     true -> {
                         TopAppBar(
                             title = {
@@ -179,9 +183,6 @@ fun ContactsPage(
                                 }
                             },
                             actions = {
-                                var expandedOptions by remember {
-                                    mutableStateOf(false)
-                                }
                                 ClickableIcon(
                                     icon = Icons.Default.Search,
                                     contentDescription = R.string.search
@@ -194,14 +195,7 @@ fun ContactsPage(
                                 ) {
                                     showFilterDialog = true
                                 }
-                                ClickableIcon(
-                                    icon = Icons.Default.MoreVert,
-                                    contentDescription = R.string.more
-                                ) {
-                                    expandedOptions = !expandedOptions
-                                }
-                                OptionMenu(
-                                    expanded = expandedOptions,
+                                TopBarMoreMenu(
                                     options = listOf(
                                         stringResource(R.string.import_vcf),
                                         stringResource(R.string.export_vcf),
@@ -209,11 +203,8 @@ fun ContactsPage(
                                         stringResource(R.string.settings),
                                         stringResource(R.string.about)
                                     ),
-                                    onDismissRequest = {
-                                        expandedOptions = false
-                                    },
-                                    onSelect = {
-                                        when (it) {
+                                    onOptionClick = { index ->
+                                        when (index) {
                                             0 -> {
                                                 importVcard.launch(BackupHelper.openMimeTypes)
                                             }
@@ -227,19 +218,19 @@ fun ContactsPage(
                                             }
 
                                             3 -> {
-                                                showSettings = true
+                                                onNavigate.invoke(NavRoutes.Settings)
                                             }
 
                                             4 -> {
-                                                showAbout = true
+                                                onNavigate.invoke(NavRoutes.About)
                                             }
                                         }
-                                        expandedOptions = false
                                     }
                                 )
                             }
                         )
                     }
+
                     false -> {
                         TopAppBar(
                             title = {
@@ -340,11 +331,12 @@ fun ContactsPage(
         }
     }
 
-    if (newContactToInsert != null) {
+    if (showEditorScreen || newContactToInsert != null) {
         EditorScreen(
             contact = newContactToInsert,
             onClose = {
                 newContactToInsert = null
+                showEditorScreen = false
             },
             isCreatingNewDeviceContact = (viewModel.contactsSource == ContactsSource.DEVICE),
             onSave = {
@@ -353,18 +345,6 @@ fun ContactsPage(
         )
     }
 
-    if (showSettings) {
-        SettingsScreen {
-            showSettings = false
-        }
-    }
-
-    if (showAbout) {
-        AboutScreen {
-            showAbout = false
-        }
-    }
-
     if (showDelete) {
         ConfirmationDialog(
             onDismissRequest = {
@@ -391,7 +371,7 @@ fun ContactsPage(
                 filterOptions = it
             },
             initialFilters = filterOptions,
-            availableAccountTypes = viewModel.getAvailableAccounts(),
+            availableAccountTypes = viewModel.getAvailableAccounts(context),
             availableGroups = viewModel.getAvailableGroups()
         )
     }
@@ -401,9 +381,4 @@ fun ContactsPage(
             showImportSimDialog = false
         }
     }
-    viewModel.initialContactData?.let {
-        SingleContactScreen(it) {
-            viewModel.initialContactData = null
-        }
-    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/EditorScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/EditorScreen.kt
index f95917ec..685b9391 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/EditorScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/screens/EditorScreen.kt
@@ -20,6 +20,7 @@ import com.bnyro.contacts.R
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.ui.components.ContactEditor
 import com.bnyro.contacts.ui.components.base.FullScreenDialog
+import com.bnyro.contacts.util.ContactsHelper
 
 @Composable
 fun EditorScreen(
@@ -60,7 +61,7 @@ fun EditorScreen(
             contact = contact?.copy(),
             isCreatingNewDeviceContact = isCreatingNewDeviceContact,
             onSave = {
-                if (it.displayName.orEmpty().isBlank()) {
+                if (ContactsHelper.isContactEmpty(it)) {
                     Toast.makeText(context, R.string.empty_name, Toast.LENGTH_SHORT).show()
                     return@ContactEditor
                 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/MainAppContent.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/MainAppContent.kt
deleted file mode 100644
index f28a4143..00000000
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/MainAppContent.kt
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.bnyro.contacts.ui.screens
-
-import android.annotation.SuppressLint
-import androidx.compose.animation.Crossfade
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Message
-import androidx.compose.material.icons.rounded.People
-import androidx.compose.material.icons.rounded.Phone
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.NavigationBar
-import androidx.compose.material3.NavigationBarItem
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clipToBounds
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.bnyro.contacts.R
-import com.bnyro.contacts.obj.NavBarItem
-import com.bnyro.contacts.ui.components.ContactsPage
-import com.bnyro.contacts.ui.models.ContactsModel
-import com.bnyro.contacts.ui.models.DialerModel
-import com.bnyro.contacts.ui.models.SmsModel
-import com.bnyro.contacts.ui.models.ThemeModel
-import com.bnyro.contacts.util.Preferences
-
-@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
-@Composable
-fun MainAppContent(smsModel: SmsModel, dialerModel: DialerModel) {
-    val themeModel: ThemeModel = viewModel()
-    val contactsModel: ContactsModel = viewModel(factory = ContactsModel.Factory)
-
-    val bottomBarHeight = 80.dp
-    val bottomBarHeightPx = LocalDensity.current.run { bottomBarHeight.toPx() }
-    var bottomBarOffset by remember { mutableFloatStateOf(0f) }
-
-    val nestedScrollConnection = remember {
-        object : NestedScrollConnection {
-            override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-                val newOffset = bottomBarOffset + available.y
-                bottomBarOffset = newOffset.coerceIn(-bottomBarHeightPx, 0f)
-                return Offset.Zero
-            }
-        }
-    }
-
-    val navItems = listOf(
-        NavBarItem(
-            stringResource(R.string.dial),
-            Icons.Rounded.Phone
-        ),
-        NavBarItem(
-            stringResource(R.string.contacts),
-            Icons.Rounded.People
-        ),
-        NavBarItem(
-            stringResource(R.string.messages),
-            Icons.Rounded.Message
-        )
-    )
-
-    var currentPage by remember {
-        mutableIntStateOf(
-            dialerModel.initialPhoneNumber?.let { 0 }
-                ?: smsModel.initialAddressAndBody?.let { 2 }
-                ?: Preferences.getInt(Preferences.homeTabKey, 1)
-        )
-    }
-
-    Scaffold(
-        bottomBar = {
-            NavigationBar(
-                modifier = if (themeModel.collapsableBottomBar) {
-                    Modifier
-                        .clipToBounds()
-                        .height(
-                            LocalDensity.current.run {
-                                (bottomBarHeightPx + bottomBarOffset).toDp()
-                            }
-                        )
-                } else {
-                    Modifier
-                },
-                tonalElevation = 10.dp
-            ) {
-                navItems.forEachIndexed { index, navItem ->
-                    NavigationBarItem(
-                        selected = (index == currentPage),
-                        onClick = {
-                            currentPage = index
-                        },
-                        icon = {
-                            Icon(navItem.icon, null)
-                        },
-                        label = {
-                            Text(navItem.label)
-                        }
-                    )
-                }
-            }
-        }
-    ) { pV ->
-        Surface(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(pV),
-            color = MaterialTheme.colorScheme.background
-        ) {
-            Crossfade(targetState = currentPage, label = "crossfade pager") { index ->
-                when (index) {
-                    0 -> CallLogsScreen(contactsModel, dialerModel, themeModel)
-
-                    1 -> ContactsPage(
-                        nestedScrollConnection.takeIf { themeModel.collapsableBottomBar }
-                    )
-
-                    2 -> SmsListScreen(smsModel, contactsModel)
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/SettingsScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/SettingsScreen.kt
index d3a85c25..7b9d89c5 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/SettingsScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/screens/SettingsScreen.kt
@@ -17,14 +17,11 @@ import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
 import com.bnyro.contacts.enums.ThemeMode
 import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
 import com.bnyro.contacts.ui.components.prefs.AutoBackupPref
 import com.bnyro.contacts.ui.components.prefs.BlockPreference
 import com.bnyro.contacts.ui.components.prefs.EncryptBackupsPref
@@ -36,97 +33,96 @@ import com.bnyro.contacts.util.Preferences
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SettingsScreen(onDismissRequest: () -> Unit) {
-    val themeModel: ThemeModel = viewModel()
-    val smsModel: SmsModel = viewModel()
+fun SettingsScreen(themeModel: ThemeModel, smsModel: SmsModel, onBackPress: () -> Unit) {
 
-    val context = LocalContext.current
+    val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
+        rememberTopAppBarState()
+    )
 
-    FullScreenDialog(onClose = onDismissRequest) {
-        val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
-            rememberTopAppBarState()
-        )
+    Scaffold(
+        modifier = Modifier.nestedScroll((scrollBehavior.nestedScrollConnection)),
+        topBar = {
+            LargeTopAppBar(
+                title = {
+                    Text(stringResource(R.string.settings))
+                },
+                navigationIcon = {
+                    ClickableIcon(
+                        icon = Icons.Default.ArrowBack,
+                        contentDescription = R.string.okay
+                    ) {
+                        onBackPress.invoke()
+                    }
+                },
+                scrollBehavior = scrollBehavior
+            )
+        }
+    ) { pV ->
+        val scrollState = rememberScrollState()
 
-        Scaffold(
-            modifier = Modifier.nestedScroll((scrollBehavior.nestedScrollConnection)),
-            topBar = {
-                LargeTopAppBar(
-                    title = {
-                        Text(stringResource(R.string.settings))
-                    },
-                    navigationIcon = {
-                        ClickableIcon(
-                            icon = Icons.Default.ArrowBack,
-                            contentDescription = R.string.okay
-                        ) {
-                            onDismissRequest.invoke()
-                        }
-                    },
-                    scrollBehavior = scrollBehavior
-                )
+        Column(
+            modifier = Modifier
+                .padding(pV)
+                .padding(horizontal = 16.dp)
+                .verticalScroll(scrollState)
+        ) {
+            SettingsCategory(title = stringResource(R.string.appearance))
+            Text(stringResource(R.string.theme))
+            BlockPreference(
+                preferenceKey = Preferences.themeKey,
+                entries = listOf(
+                    R.string.system,
+                    R.string.light,
+                    R.string.dark,
+                    R.string.amoled
+                ).map {
+                    stringResource(it)
+                }
+            ) {
+                themeModel.themeMode = ThemeMode.fromInt(it)
             }
-        ) { pV ->
-            val scrollState = rememberScrollState()
-
-            Column(
-                modifier = Modifier
-                    .padding(pV)
-                    .padding(horizontal = 16.dp)
-                    .verticalScroll(scrollState)
+            SwitchPref(
+                prefKey = Preferences.colorfulContactIconsKey,
+                title = stringResource(R.string.colorful_contact_icons)
             ) {
-                SettingsCategory(title = stringResource(R.string.appearance))
-                Text(stringResource(R.string.theme))
-                BlockPreference(
-                    preferenceKey = Preferences.themeKey,
-                    entries = listOf(R.string.system, R.string.light, R.string.dark).map {
-                        stringResource(it)
-                    }
-                ) {
-                    themeModel.themeMode = ThemeMode.fromInt(it)
-                }
-                SwitchPref(
-                    prefKey = Preferences.colorfulContactIconsKey,
-                    title = stringResource(R.string.colorful_contact_icons)
-                ) {
-                    themeModel.colorfulIcons = it
-                }
-                Divider(
-                    modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
-                    color = MaterialTheme.colorScheme.surfaceVariant
-                )
-                SettingsCategory(title = stringResource(R.string.messages))
-                SwitchPref(
-                    prefKey = Preferences.storeSmsLocallyKey,
-                    title = stringResource(R.string.private_sms_database),
-                    summary = stringResource(R.string.private_sms_database_desc)
-                ) {
-                    smsModel.refreshLocalSmsPreference(context)
-                }
-                Divider(
-                    modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
-                    color = MaterialTheme.colorScheme.surfaceVariant
-                )
-                SettingsCategory(title = stringResource(R.string.behavior))
-                Text(stringResource(R.string.start_tab))
-                BlockPreference(
-                    preferenceKey = Preferences.homeTabKey,
-                    entries = listOf(R.string.dial, R.string.contacts, R.string.messages).map {
-                        stringResource(it)
-                    }
-                )
-                SwitchPref(
-                    prefKey = Preferences.collapseBottomBarKey,
-                    title = stringResource(R.string.collapse_bottom_bar)
-                ) {
-                    themeModel.collapsableBottomBar = it
+                themeModel.colorfulIcons = it
+            }
+            Divider(
+                modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
+                color = MaterialTheme.colorScheme.surfaceVariant
+            )
+            SettingsCategory(title = stringResource(R.string.messages))
+            SwitchPref(
+                prefKey = Preferences.storeSmsLocallyKey,
+                title = stringResource(R.string.private_sms_database),
+                summary = stringResource(R.string.private_sms_database_desc)
+            ) {
+                smsModel.refreshLocalSmsPreference()
+            }
+            Divider(
+                modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
+                color = MaterialTheme.colorScheme.surfaceVariant
+            )
+            SettingsCategory(title = stringResource(R.string.behavior))
+            Text(stringResource(R.string.start_tab))
+            BlockPreference(
+                preferenceKey = Preferences.homeTabKey,
+                entries = listOf(R.string.dial, R.string.contacts, R.string.messages).map {
+                    stringResource(it)
                 }
-                Divider(
-                    modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
-                    color = MaterialTheme.colorScheme.surfaceVariant
-                )
-                AutoBackupPref()
-                EncryptBackupsPref()
+            )
+            SwitchPref(
+                prefKey = Preferences.collapseBottomBarKey,
+                title = stringResource(R.string.collapse_bottom_bar)
+            ) {
+                themeModel.collapsableBottomBar = it
             }
+            Divider(
+                modifier = Modifier.padding(top = 12.dp, bottom = 8.dp),
+                color = MaterialTheme.colorScheme.surfaceVariant
+            )
+            AutoBackupPref()
+            EncryptBackupsPref()
         }
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/SingleContactScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/SingleContactScreen.kt
index f195b55f..5db01eaa 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/SingleContactScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/screens/SingleContactScreen.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -17,7 +16,13 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.Call
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.filled.Message
+import androidx.compose.material.icons.filled.Share
+import androidx.compose.material.icons.filled.Shortcut
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
@@ -42,8 +47,10 @@ import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
 import com.bnyro.contacts.enums.IntentActionType
+import com.bnyro.contacts.enums.ListAttribute
+import com.bnyro.contacts.enums.Notes
+import com.bnyro.contacts.enums.StringAttribute
 import com.bnyro.contacts.obj.ContactData
-import com.bnyro.contacts.obj.ValueWithType
 import com.bnyro.contacts.ui.components.ContactEntryGroup
 import com.bnyro.contacts.ui.components.ContactEntryTextGroup
 import com.bnyro.contacts.ui.components.ContactProfilePicture
@@ -56,11 +63,10 @@ import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
 import com.bnyro.contacts.ui.components.dialogs.ShortcutDialog
 import com.bnyro.contacts.ui.components.shapes.curlyCornerShape
 import com.bnyro.contacts.ui.models.ContactsModel
-import com.bnyro.contacts.util.CalendarUtils
 import com.bnyro.contacts.util.ContactsHelper
 import com.bnyro.contacts.util.IntentHelper
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SingleContactScreen(contact: ContactData, onClose: () -> Unit) {
     val viewModel: ContactsModel = viewModel()
@@ -208,61 +214,26 @@ fun SingleContactScreen(contact: ContactData, onClose: () -> Unit) {
                     }
                 }
 
-                ContactEntryTextGroup(
-                    label = stringResource(R.string.nick_name),
-                    entries = listOfNotNull(contact.nickName)
-                )
-
-                ContactEntryTextGroup(
-                    label = stringResource(R.string.organization),
-                    entries = listOfNotNull(contact.organization)
-                )
-
-                ContactEntryGroup(
-                    label = stringResource(R.string.website),
-                    entries = contact.websites
-                ) {
-                    IntentHelper.launchAction(context, IntentActionType.WEBSITE, it.value)
-                }
-
-                ContactEntryGroup(
-                    label = stringResource(R.string.phone),
-                    entries = contact.numbers,
-                    types = ContactsHelper.phoneNumberTypes
-                ) {
-                    IntentHelper.launchAction(context, IntentActionType.DIAL, it.value)
-                }
-
-                ContactEntryGroup(
-                    label = stringResource(R.string.email),
-                    entries = contact.emails,
-                    types = ContactsHelper.emailTypes
-                ) {
-                    IntentHelper.launchAction(context, IntentActionType.EMAIL, it.value)
-                }
-
-                ContactEntryGroup(
-                    label = stringResource(R.string.address),
-                    entries = contact.addresses,
-                    types = ContactsHelper.addressTypes
-                ) {
-                    IntentHelper.launchAction(context, IntentActionType.ADDRESS, it.value)
+                for (attributesType in ContactsHelper.contactAttributesTypes) {
+                    if (attributesType is StringAttribute) {
+                        ContactEntryTextGroup(
+                            label = stringResource(attributesType.stringRes),
+                            entries = listOfNotNull(attributesType.display(contact))
+                        )
+                    } else if (attributesType is ListAttribute) {
+                        ContactEntryGroup(
+                            label = stringResource(attributesType.stringRes),
+                            entries = attributesType.display(contact),
+                            types = attributesType.types,
+                            useMarkdown = attributesType is Notes
+                        ) {
+                            attributesType.intentActionType?.let { intentActionType ->
+                                IntentHelper.launchAction(context, intentActionType, it.value)
+                            }
+                        }
+                    }
                 }
 
-                ContactEntryGroup(
-                    label = stringResource(R.string.event),
-                    entries = contact.events.map {
-                        ValueWithType(CalendarUtils.localizeIsoDate(it.value), it.type)
-                    },
-                    types = ContactsHelper.eventTypes
-                )
-
-                ContactEntryGroup(
-                    label = stringResource(R.string.note),
-                    entries = contact.notes,
-                    useMarkdown = true
-                )
-
                 ContactEntryTextGroup(
                     label = stringResource(R.string.groups),
                     entries = contact.groups.map { it.title }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsListScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/SmsListScreen.kt
index 27fec6b7..317ad026 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsListScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/screens/SmsListScreen.kt
@@ -1,214 +1,133 @@
 package com.bnyro.contacts.ui.screens
 
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Edit
-import androidx.compose.material.icons.filled.Person
-import androidx.compose.material3.DismissDirection
-import androidx.compose.material3.DismissValue
-import androidx.compose.material3.ElevatedCard
+import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SwipeToDismiss
 import androidx.compose.material3.Text
-import androidx.compose.material3.rememberDismissState
-import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.bnyro.contacts.R
+import com.bnyro.contacts.nav.NavRoutes
+import com.bnyro.contacts.obj.ContactData
+import com.bnyro.contacts.obj.SmsThread
 import com.bnyro.contacts.ui.components.NothingHere
 import com.bnyro.contacts.ui.components.NumberPickerDialog
-import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
+import com.bnyro.contacts.ui.components.SmsThreadItem
+import com.bnyro.contacts.ui.components.TopBarMoreMenu
+import com.bnyro.contacts.ui.components.base.ClickableIcon
 import com.bnyro.contacts.ui.models.ContactsModel
 import com.bnyro.contacts.ui.models.SmsModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SmsListScreen(smsModel: SmsModel, contactsModel: ContactsModel) {
-    val context = LocalContext.current
+fun SmsListScreen(
+    smsModel: SmsModel,
+    contactsModel: ContactsModel,
+    scrollConnection: NestedScrollConnection?,
+    onNavigate: (NavRoutes) -> Unit,
+    onClickMessage: (address: String, contactData: ContactData?) -> Unit
+) {
     var showNumberPicker by remember {
         mutableStateOf(false)
     }
-
-    var smsAddress by remember {
-        mutableStateOf<String?>(null)
+    var showSearch by remember {
+        mutableStateOf(false)
     }
 
     LaunchedEffect(Unit) {
-        smsModel.fetchSmsList(context)
-    }
-
-    Scaffold(floatingActionButton = {
-        FloatingActionButton(
-            onClick = {
-                showNumberPicker = true
-            }
-        ) {
-            Icon(Icons.Default.Edit, null)
+        smsModel.initialAddressAndBody?.let {
+            onClickMessage(it.first, null)
         }
-    }) { pv ->
-        if (smsModel.smsList.isNotEmpty()) {
-            LazyColumn(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(pv)
-            ) {
-                val smsGroups = smsModel.smsGroups.entries.toList()
-                    .sortedBy { (_, smsList) -> smsList.maxOf { it.timestamp } }
-                    .reversed()
-
-                items(smsGroups) { (threadId, smsList) ->
-                    var showThreadScreen by remember {
-                        mutableStateOf(false)
-                    }
-                    var showDeleteThreadDialog by remember {
-                        mutableStateOf(false)
+    }
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(text = stringResource(R.string.messages))
+                },
+                actions = {
+                    ClickableIcon(
+                        icon = Icons.Default.Search,
+                        contentDescription = R.string.search
+                    ) {
+                        showSearch = true
                     }
+                    TopBarMoreMenu(options = listOf(
+                        stringResource(R.string.settings),
+                        stringResource(R.string.about)
+                    ),
+                        onOptionClick = { index ->
+                            when (index) {
+                                0 -> {
+                                    onNavigate.invoke(NavRoutes.Settings)
+                                }
 
-                    // safe call to avoid crashes when re-rendering
-                    val address = smsList.firstOrNull()?.address.orEmpty()
-                    val contactData = contactsModel.getContactByNumber(address)
-
-                    val dismissState = rememberDismissState(
-                        confirmValueChange = {
-                            if (it == DismissValue.DismissedToEnd) {
-                                showDeleteThreadDialog = true
-                            }
-                            return@rememberDismissState false
-                        }
-                    )
-
-                    SwipeToDismiss(
-                        modifier = Modifier.padding(horizontal = 10.dp, vertical = 5.dp),
-                        state = dismissState,
-                        background = {},
-                        dismissContent = {
-                            val shape = RoundedCornerShape(20.dp)
-
-                            ElevatedCard(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .clip(shape)
-                                    .clickable {
-                                        showThreadScreen = true
-                                    },
-                                shape = shape
-                            ) {
-                                Row(
-                                    modifier = Modifier.padding(
-                                        horizontal = 10.dp,
-                                        vertical = 5.dp
-                                    ),
-                                    verticalAlignment = Alignment.CenterVertically
-                                ) {
-                                    Box(
-                                        modifier = Modifier
-                                            .size(58.dp)
-                                            .clip(CircleShape)
-                                            .background(
-                                                MaterialTheme.colorScheme.primary,
-                                                CircleShape
-                                            ),
-                                        contentAlignment = Alignment.Center
-                                    ) {
-                                        if (contactData?.thumbnail != null) {
-                                            Image(
-                                                modifier = Modifier
-                                                    .fillMaxSize()
-                                                    .clip(CircleShape),
-                                                bitmap = contactData.thumbnail!!.asImageBitmap(),
-                                                contentDescription = null,
-                                                contentScale = ContentScale.Crop
-                                            )
-                                        } else {
-                                            Image(
-                                                modifier = Modifier
-                                                    .padding(vertical = 12.dp)
-                                                    .fillMaxSize(),
-                                                imageVector = Icons.Default.Person,
-                                                contentDescription = null,
-                                                colorFilter = ColorFilter.tint(
-                                                    MaterialTheme.colorScheme.surfaceColorAtElevation(
-                                                        10.dp
-                                                    )
-                                                )
-                                            )
-                                        }
-                                    }
-                                    Spacer(modifier = Modifier.width(10.dp))
-                                    Column(
-                                        modifier = Modifier.padding(10.dp)
-                                    ) {
-                                        Text(
-                                            text = contactData?.displayName ?: address,
-                                            color = MaterialTheme.colorScheme.primary,
-                                            fontSize = 16.sp
-                                        )
-                                        Spacer(modifier = Modifier.height(3.dp))
-                                        Text(
-                                            // safe call to avoid crashes when re-rendering
-                                            text = smsList.firstOrNull()?.body.orEmpty(),
-                                            maxLines = 2,
-                                            fontSize = 14.sp,
-                                            lineHeight = 18.sp
-                                        )
-                                    }
+                                1 -> {
+                                    onNavigate.invoke(NavRoutes.About)
                                 }
                             }
-                        },
-                        directions = setOf(DismissDirection.StartToEnd)
+                        })
+                }
+            )
+        },
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = {
+                    showNumberPicker = true
+                }
+            ) {
+                Icon(Icons.Default.Edit, null)
+            }
+        }) { pv ->
+        val smsList by smsModel.smsList.collectAsState()
+        if (smsList.isNotEmpty()) {
+            val threadList = smsList.groupBy { it.threadId }
+                .map { (threadId, smsList) ->
+                    val address = smsList.first().address
+                    SmsThread(
+                        threadId = threadId,
+                        contactData = contactsModel.getContactByNumber(address),
+                        address = address,
+                        smsList = smsList
                     )
+                }
+                .sortedBy { thread -> thread.smsList.maxOf { it.timestamp } }
+                .reversed()
 
-                    if (showThreadScreen) {
-                        SmsThreadScreen(smsModel, contactData, address) {
-                            showThreadScreen = false
-                        }
-                    }
-
-                    if (showDeleteThreadDialog) {
-                        ConfirmationDialog(
-                            onDismissRequest = { showDeleteThreadDialog = false },
-                            title = stringResource(R.string.delete_thread),
-                            text = stringResource(R.string.irreversible)
-                        ) {
-                            smsModel.deleteThread(context, threadId)
-                        }
+            LazyColumn(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(pv)
+                    .let { modifier ->
+                        scrollConnection?.let { modifier.nestedScroll(it) } ?: modifier
                     }
+            ) {
+                items(threadList) { thread ->
+                    SmsThreadItem(smsModel, thread, onClick = onClickMessage)
                 }
             }
+            if (showSearch) {
+                SmsSearchScreen(smsModel, threadList, { showSearch = false }, onClickMessage)
+            }
         } else {
             Column(Modifier.padding(pv)) {
                 NothingHere()
@@ -217,25 +136,10 @@ fun SmsListScreen(smsModel: SmsModel, contactsModel: ContactsModel) {
 
         if (showNumberPicker) {
             NumberPickerDialog(
+                contactsModel,
                 onDismissRequest = { showNumberPicker = false },
-                onNumberSelect = {
-                    smsAddress = it
-                }
+                onNumberSelect = onClickMessage
             )
         }
-
-        smsAddress?.let {
-            val contactData = contactsModel.getContactByNumber(it)
-            SmsThreadScreen(smsModel, contactData, it) {
-                smsAddress = null
-            }
-        }
-
-        smsModel.initialAddressAndBody?.let {
-            val contactData = contactsModel.getContactByNumber(it.first)
-            SmsThreadScreen(smsModel, contactData, it.first) {
-                smsModel.initialAddressAndBody = null
-            }
-        }
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsSearchScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/SmsSearchScreen.kt
new file mode 100644
index 00000000..e2e97fed
--- /dev/null
+++ b/app/src/main/java/com/bnyro/contacts/ui/screens/SmsSearchScreen.kt
@@ -0,0 +1,94 @@
+package com.bnyro.contacts.ui.screens
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.unit.dp
+import com.bnyro.contacts.R
+import com.bnyro.contacts.obj.ContactData
+import com.bnyro.contacts.obj.SmsThread
+import com.bnyro.contacts.ui.components.SmsThreadItem
+import com.bnyro.contacts.ui.components.base.ElevatedTextInputField
+import com.bnyro.contacts.ui.components.base.FullScreenDialog
+import com.bnyro.contacts.ui.models.SmsModel
+import com.bnyro.contacts.util.ContactsHelper
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.withContext
+
+@Composable
+fun SmsSearchScreen(
+    smsModel: SmsModel,
+    threadList: List<SmsThread>,
+    onDismissRequest: () -> Unit,
+    onClickMessage: (address: String, contactData: ContactData?) -> Unit
+) {
+    FullScreenDialog(onDismissRequest) {
+        val focusRequester = remember {
+            FocusRequester()
+        }
+
+        LaunchedEffect(Unit) {
+            delay(100)
+            focusRequester.requestFocus()
+        }
+
+        var searchQuery by remember {
+            mutableStateOf("")
+        }
+        var visibleThreads by remember {
+            mutableStateOf(threadList)
+        }
+
+        LaunchedEffect(searchQuery) {
+            withContext(Dispatchers.IO) {
+                val query = searchQuery.lowercase()
+
+                visibleThreads = threadList.filter {
+                    it.address.lowercase().contains(query) || it.contactData?.let { contact ->
+                        ContactsHelper.matches(contact, query)
+                    } ?: false || it.smsList.any { sms -> sms.body.lowercase().contains(query) }
+                }
+            }
+        }
+
+        Column(Modifier.fillMaxSize()) {
+            ElevatedTextInputField(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 8.dp)
+                    .padding(top = 8.dp),
+                query = searchQuery,
+                onQueryChange = { searchQuery = it },
+                leadingIcon = Icons.Default.Search,
+                placeholder = stringResource(id = R.string.search),
+                imeAction = ImeAction.Done,
+                focusRequester = focusRequester,
+                singleLine = true
+            )
+            LazyColumn(
+                modifier = Modifier
+                    .fillMaxSize()
+            ) {
+                items(visibleThreads) { thread ->
+                    SmsThreadItem(smsModel, thread, onClickMessage)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsThreadScreen.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/SmsThreadScreen.kt
index 9149e243..de664b24 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/screens/SmsThreadScreen.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/screens/SmsThreadScreen.kt
@@ -2,9 +2,6 @@ package com.bnyro.contacts.ui.screens
 
 import android.annotation.SuppressLint
 import android.os.Build
-import android.provider.Telephony
-import android.text.format.DateUtils
-import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -16,33 +13,22 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.PersonAddAlt1
 import androidx.compose.material.icons.filled.Send
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.DismissDirection
-import androidx.compose.material3.DismissValue
-import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.PlainTooltipBox
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SearchBar
-import androidx.compose.material3.SwipeToDismiss
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.rememberDismissState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -50,19 +36,17 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.bnyro.contacts.R
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.ui.components.base.ClickableIcon
-import com.bnyro.contacts.ui.components.base.FullScreenDialog
+import com.bnyro.contacts.ui.components.base.ElevatedTextInputField
+import com.bnyro.contacts.ui.components.conversation.Messages
+import com.bnyro.contacts.ui.components.dialogs.AddToContactDialog
 import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
+import com.bnyro.contacts.ui.models.ContactsModel
 import com.bnyro.contacts.ui.models.SmsModel
 import com.bnyro.contacts.util.SmsUtil
 
@@ -71,20 +55,16 @@ import com.bnyro.contacts.util.SmsUtil
 @Composable
 fun SmsThreadScreen(
     smsModel: SmsModel,
-    contactData: ContactData?,
+    contactsModel: ContactsModel,
     address: String,
     initialText: String = "",
+    contactsData: ContactData? = null,
     onClose: () -> Unit
 ) {
     val context = LocalContext.current
 
-    val threadId = smsModel.smsList.firstOrNull { it.address == address }?.threadId
-    val smsList =
-        threadId?.let { smsModel.smsGroups[threadId]?.sortedBy { it.timestamp } } ?: listOf()
-    val lazyListState = rememberLazyListState()
-    var showContactScreen by remember {
-        mutableStateOf(false)
-    }
+    val allSmsList by smsModel.smsList.collectAsState()
+    val smsList = allSmsList.filter { it.address == address }
     val subscriptions = remember {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
             SmsUtil.getSubscriptions(context)
@@ -93,217 +73,134 @@ fun SmsThreadScreen(
         }
     }
 
-    FullScreenDialog(onClose = onClose) {
-        Scaffold(
-            topBar = {
-                TopAppBar(
-                    title = {
-                        val interactionSource = remember {
-                            MutableInteractionSource()
-                        }
-                        PlainTooltipBox(
-                            tooltip = { Text(address) }
-                        ) {
-                            Text(
-                                modifier = Modifier
-                                    .tooltipTrigger()
-                                    .clickable(interactionSource, null) {
-                                        if (contactData != null) showContactScreen = true
-                                    },
-                                text = contactData?.displayName ?: address
-                            )
-                        }
-                    },
-                    navigationIcon = {
-                        ClickableIcon(
-                            icon = Icons.Default.ArrowBack,
-                            contentDescription = R.string.okay
-                        ) {
-                            onClose.invoke()
-                        }
-                    }
-                )
-            }
-        ) { pV ->
-            Column(
-                modifier = Modifier
-                    .padding(pV)
-            ) {
-                LazyColumn(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .weight(1f),
-                    state = lazyListState
-                ) {
-                    items(smsList) { smsData ->
-                        var showDeleteSmsDialog by remember {
-                            mutableStateOf(false)
-                        }
+    val contactData = remember {
+        contactsData ?: contactsModel.getContactByNumber(address)
+    }
 
-                        val state = rememberDismissState(
-                            confirmValueChange = {
-                                if (it == DismissValue.DismissedToEnd) {
-                                    showDeleteSmsDialog = true
-                                }
-                                return@rememberDismissState false
-                            }
-                        )
-                        val isSender = smsData.type in listOf(
-                            Telephony.Sms.MESSAGE_TYPE_DRAFT,
-                            Telephony.Sms.MESSAGE_TYPE_SENT,
-                            Telephony.Sms.MESSAGE_TYPE_OUTBOX
-                        )
-                        val defaultCornerRadius = 12.dp
-                        val edgedCornerRadius = 3.dp
-                        val messageSidePadding = 70.dp
+    var showContactScreen by remember {
+        mutableStateOf(false)
+    }
+    var showAddToContactDialog by remember {
+        mutableStateOf(false)
+    }
 
-                        val messageAlignment = if (isSender) Alignment.End else Alignment.Start
-                        SwipeToDismiss(
-                            modifier = Modifier.align(messageAlignment),
-                            state = state,
-                            background = {},
-                            dismissContent = {
-                                ElevatedCard(
-                                    modifier = Modifier
-                                        .padding(horizontal = 10.dp, vertical = 5.dp)
-                                        .padding(
-                                            start = if (isSender) messageSidePadding else 0.dp,
-                                            end = if (!isSender) messageSidePadding else 0.dp
-                                        )
-                                        .fillMaxWidth(),
-                                    shape = RoundedCornerShape(
-                                        bottomEnd = if (isSender) edgedCornerRadius else defaultCornerRadius,
-                                        bottomStart = if (isSender) defaultCornerRadius else edgedCornerRadius,
-                                        topEnd = defaultCornerRadius,
-                                        topStart = defaultCornerRadius
-                                    ),
-                                    elevation = CardDefaults.elevatedCardElevation(
-                                        defaultElevation = if (isSender) 20.dp else 5.dp
-                                    )
-                                ) {
-                                    Column(
-                                        modifier = Modifier.padding(12.dp)
-                                    ) {
-                                        SelectionContainer {
-                                            val uriHandler = LocalUriHandler.current
-                                            ClickableText(
-                                                text = smsData.formatted,
-                                                style = TextStyle.Default.copy(
-                                                    color = MaterialTheme.colorScheme.onBackground,
-                                                    fontSize = 15.sp
-                                                ),
-                                                onClick = { offset ->
-                                                    val annotation =
-                                                        smsData.formatted.getStringAnnotations(
-                                                            offset,
-                                                            offset
-                                                        ).firstOrNull()
-                                                    annotation?.let {
-                                                        uriHandler.openUri(it.item)
-                                                    }
-                                                }
-                                            )
-                                        }
-                                        Spacer(modifier = Modifier.height(4.dp))
-                                        Text(
-                                            modifier = Modifier.align(messageAlignment),
-                                            fontSize = 14.sp,
-                                            color = MaterialTheme.colorScheme.primary,
-                                            text = DateUtils.getRelativeTimeSpanString(
-                                                smsData.timestamp
-                                            )
-                                                .toString()
-                                        )
-                                    }
-                                }
-                            },
-                            directions = setOf(DismissDirection.StartToEnd)
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    val interactionSource = remember {
+                        MutableInteractionSource()
+                    }
+                    PlainTooltipBox(
+                        tooltip = { Text(address) }
+                    ) {
+                        Text(
+                            modifier = Modifier
+                                .tooltipTrigger()
+                                .clickable(interactionSource, null) {
+                                    if (contactData != null) showContactScreen = true
+                                },
+                            text = contactData?.displayName ?: address
                         )
-
-                        if (showDeleteSmsDialog) {
-                            ConfirmationDialog(
-                                onDismissRequest = { showDeleteSmsDialog = false },
-                                title = stringResource(R.string.delete_message),
-                                text = stringResource(R.string.irreversible)
-                            ) {
-                                smsModel.deleteSms(context, smsData.id, smsData.threadId)
-                            }
+                    }
+                },
+                navigationIcon = {
+                    ClickableIcon(
+                        icon = Icons.Default.ArrowBack,
+                        contentDescription = R.string.okay
+                    ) {
+                        onClose.invoke()
+                    }
+                },
+                actions = {
+                    if (contactData == null) {
+                        ClickableIcon(icon = Icons.Default.PersonAddAlt1) {
+                            showAddToContactDialog = true
                         }
                     }
                 }
+            )
+        }
+    ) { pV ->
+        Column(
+            modifier = Modifier
+                .padding(pV)
+        ) {
+            val state = rememberLazyListState()
+            Messages(messages = smsList, scrollState = state, smsModel = smsModel)
 
-                Spacer(modifier = Modifier.height(10.dp))
-                if (subscriptions != null && subscriptions.size >= 2) {
-                    var currentSub by remember { mutableIntStateOf(0) }
-                    LaunchedEffect(Unit) {
-                        currentSub = 0
+            Spacer(modifier = Modifier.height(10.dp))
+            if (subscriptions != null && subscriptions.size >= 2) {
+                var currentSub by remember { mutableIntStateOf(0) }
+                LaunchedEffect(Unit) {
+                    currentSub = 0
+                    smsModel.currentSubscription = subscriptions[currentSub]
+                }
+                Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
+                    OutlinedButton(onClick = {
+                        currentSub = if (currentSub == 0) 1 else 0
                         smsModel.currentSubscription = subscriptions[currentSub]
-                    }
-                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
-                        OutlinedButton(onClick = {
-                            currentSub = if (currentSub == 0) 1 else 0
-                            smsModel.currentSubscription = subscriptions[currentSub]
-                        }) {
-                            Text(
-                                text = "SIM ${subscriptions[currentSub].simSlotIndex + 1} - ${subscriptions[currentSub].displayName}"
-                            )
-                        }
+                    }) {
+                        Text(
+                            text = "SIM ${subscriptions[currentSub].simSlotIndex + 1} - ${subscriptions[currentSub].displayName}"
+                        )
                     }
                 }
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(start = 10.dp, end = 5.dp, bottom = 20.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    var text by remember {
-                        mutableStateOf(initialText)
-                    }
-                    val focusRequester = remember {
-                        FocusRequester()
-                    }
-
-                    SearchBar(
-                        modifier = Modifier
-                            .weight(1f)
-                            .focusRequester(focusRequester),
-                        query = text,
-                        onQueryChange = { text = it },
-                        placeholder = {
-                            Text(stringResource(R.string.send))
-                        },
-                        onSearch = {},
-                        active = false,
-                        onActiveChange = {},
-                        content = {}
-                    )
+            }
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 10.dp, end = 5.dp, bottom = 20.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                var showConfirmSendMultipleSmsDialog by remember {
+                    mutableStateOf(false)
+                }
 
-                    Spacer(modifier = Modifier.width(8.dp))
+                var text by remember {
+                    mutableStateOf(initialText)
+                }
 
-                    FilledIconButton(
-                        modifier = Modifier.size(48.dp),
-                        onClick = {
-                            if (text.isBlank()) return@FilledIconButton
-                            if (!SmsUtil.isShortEnoughForSms(text)) {
-                                Toast.makeText(
-                                    context,
-                                    R.string.message_too_long,
-                                    Toast.LENGTH_SHORT
-                                )
-                                    .show()
-                                return@FilledIconButton
-                            }
+                ElevatedTextInputField(
+                    modifier = Modifier.weight(1f),
+                    query = text,
+                    onQueryChange = { text = it },
+                    placeholder = stringResource(R.string.send)
+                )
 
-                            smsModel.sendSms(context, address, text)
+                Spacer(modifier = Modifier.width(8.dp))
 
-                            text = ""
-                            focusRequester.freeFocus()
+                FilledIconButton(
+                    modifier = Modifier.size(48.dp),
+                    onClick = {
+                        if (text.isBlank()) return@FilledIconButton
+                        if (!SmsUtil.isShortEnoughForSms(text)) {
+                            showConfirmSendMultipleSmsDialog = true
+                            return@FilledIconButton
                         }
+
+                        smsModel.sendSms(context, address, text)
+
+                        text = ""
+                    }
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Send,
+                        contentDescription = stringResource(R.string.send)
+                    )
+                }
+
+                if (showConfirmSendMultipleSmsDialog) {
+                    ConfirmationDialog(
+                        onDismissRequest = { showConfirmSendMultipleSmsDialog = false },
+                        title = stringResource(R.string.message_too_long),
+                        text = stringResource(R.string.send_message_as_multiple)
                     ) {
-                        Icon(
-                            imageVector = Icons.Default.Send,
-                            contentDescription = stringResource(R.string.send)
-                        )
+                        SmsUtil.splitSmsText(text).forEach {
+                            smsModel.sendSms(context, address, it)
+                        }
+
+                        text = ""
                     }
                 }
             }
@@ -315,4 +212,8 @@ fun SmsThreadScreen(
             showContactScreen = false
         }
     }
+
+    if (showAddToContactDialog) {
+        AddToContactDialog(newNumber = address)
+    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/theme/Theme.kt b/app/src/main/java/com/bnyro/contacts/ui/theme/Theme.kt
index e46101f6..71adea1d 100644
--- a/app/src/main/java/com/bnyro/contacts/ui/theme/Theme.kt
+++ b/app/src/main/java/com/bnyro/contacts/ui/theme/Theme.kt
@@ -3,14 +3,10 @@ package com.bnyro.contacts.ui.theme
 import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
@@ -40,15 +36,24 @@ fun ConnectYouTheme(
     val darkTheme = when (themeMode) {
         ThemeMode.LIGHT -> false
         ThemeMode.DARK -> true
+        ThemeMode.AMOLED -> false
         else -> isSystemInDarkTheme()
     }
 
+    val amoledDark = themeMode == ThemeMode.AMOLED
+
     val colorScheme = when {
         dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
             val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+            if (darkTheme) dynamicDarkColorScheme(context)
+            else if (amoledDark) dynamicDarkColorScheme(context).copy(
+                background = Color.Black,
+                surface = Color.Black
+            ) else dynamicLightColorScheme(context)
         }
+
         darkTheme -> DarkColorScheme
+        amoledDark -> DarkColorScheme.copy(background = Color.Black, surface = Color.Black)
         else -> LightColorScheme
     }
 
@@ -62,7 +67,7 @@ fun ConnectYouTheme(
                 WindowCompat.getInsetsController(
                     activity.window,
                     view
-                ).isAppearanceLightStatusBars = !darkTheme
+                ).isAppearanceLightStatusBars = !darkTheme && !amoledDark
                 WindowCompat.getInsetsController(
                     activity.window,
                     view
diff --git a/app/src/main/java/com/bnyro/contacts/util/CalendarUtils.kt b/app/src/main/java/com/bnyro/contacts/util/CalendarUtils.kt
index 99a0ca5f..c5ce5209 100644
--- a/app/src/main/java/com/bnyro/contacts/util/CalendarUtils.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/CalendarUtils.kt
@@ -17,7 +17,8 @@ object CalendarUtils {
     private val localizedFormat get() = DateFormat.getDateInstance()
 
     fun millisToDate(milliSeconds: Long, formatter: DateFormat = localizedFormat): String {
-        val calendar: Calendar = Calendar.getInstance()
+        val calendar = Calendar.getInstance()
+        calendar.clear(Calendar.ZONE_OFFSET)
         calendar.timeInMillis = milliSeconds
         return formatter.format(calendar.time)
     }
diff --git a/app/src/main/java/com/bnyro/contacts/util/ClipboardHelper.kt b/app/src/main/java/com/bnyro/contacts/util/ClipboardHelper.kt
index bc536358..f42c1970 100644
--- a/app/src/main/java/com/bnyro/contacts/util/ClipboardHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/ClipboardHelper.kt
@@ -8,7 +8,7 @@ import android.widget.Toast
 import com.bnyro.contacts.R
 
 class ClipboardHelper(private val context: Context) {
-    val clipboard: ClipboardManager =
+    private val clipboard: ClipboardManager =
         context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
 
     fun save(text: String) {
diff --git a/app/src/main/java/com/bnyro/contacts/util/ContactsHelper.kt b/app/src/main/java/com/bnyro/contacts/util/ContactsHelper.kt
index 72c2338d..d177728f 100644
--- a/app/src/main/java/com/bnyro/contacts/util/ContactsHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/ContactsHelper.kt
@@ -2,7 +2,18 @@ package com.bnyro.contacts.util
 
 import android.provider.ContactsContract
 import com.bnyro.contacts.R
+import com.bnyro.contacts.enums.Addresses
+import com.bnyro.contacts.enums.Emails
+import com.bnyro.contacts.enums.Events
+import com.bnyro.contacts.enums.Nickname
+import com.bnyro.contacts.enums.Notes
+import com.bnyro.contacts.enums.Numbers
+import com.bnyro.contacts.enums.Organization
+import com.bnyro.contacts.enums.Title
+import com.bnyro.contacts.enums.Websites
+import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.obj.TranslatedType
+import com.google.i18n.phonenumbers.PhoneNumberUtil
 import ezvcard.parameter.AddressType
 import ezvcard.parameter.EmailType
 import ezvcard.parameter.TelephoneType
@@ -75,6 +86,11 @@ object ContactsHelper {
         TranslatedType(ContactsContract.CommonDataKinds.Website.TYPE_OTHER, R.string.other)
     )
 
+    val contactAttributesTypes = listOf(
+        Nickname(), Title(), Organization(),
+        Numbers(), Addresses(), Emails(), Events(), Websites(), Notes()
+    )
+
     fun splitFullName(displayName: String?): Pair<String, String> {
         val displayNameParts = displayName.orEmpty().split(" ")
         return when {
@@ -93,4 +109,34 @@ object ContactsHelper {
             }
         }
     }
+
+    fun normalizePhoneNumber(number: String): String {
+        val phoneUtil = PhoneNumberUtil.getInstance()
+        val phoneNumber = runCatching { phoneUtil.parse(number, null) }
+            .getOrElse { return number }
+        return phoneUtil.format(phoneNumber, PhoneNumberUtil.PhoneNumberFormat.INTERNATIONAL)
+    }
+
+    fun matches(contactData: ContactData, query: String): Boolean {
+        val contactInfoStrings = listOf(contactData.numbers, contactData.emails, contactData.addresses, contactData.notes, contactData.websites, contactData.events)
+            .flatten()
+            .map { (value, _) -> value } + listOf(contactData.organization, contactData.nickName, contactData.displayName)
+
+        return contactInfoStrings.filterNotNull().any { str ->
+            str.lowercase().contains(query)
+        }
+    }
+
+    fun filter(contacts: List<ContactData>, searchQuery: String): List<ContactData> {
+        val query = searchQuery.lowercase()
+
+        return contacts.filter { matches(it, query) }
+    }
+
+    fun isContactEmpty(contactData: ContactData): Boolean {
+        val stringProperties = listOf(contactData.firstName, contactData.surName, contactData.nickName, contactData.organization)
+        val listProperties = listOf(contactData.numbers, contactData.emails, contactData.events, contactData.addresses, contactData.notes)
+
+        return stringProperties.none { !it.isNullOrBlank() } && listProperties.flatten().isEmpty()
+    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/util/IntentHelper.kt b/app/src/main/java/com/bnyro/contacts/util/IntentHelper.kt
index 2a6ee4ce..cc9d9f82 100644
--- a/app/src/main/java/com/bnyro/contacts/util/IntentHelper.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/IntentHelper.kt
@@ -8,6 +8,11 @@ import android.provider.ContactsContract
 import androidx.core.net.toUri
 import com.bnyro.contacts.R
 import com.bnyro.contacts.enums.IntentActionType
+import com.bnyro.contacts.enums.ListAttribute
+import com.bnyro.contacts.enums.StringAttribute
+import com.bnyro.contacts.obj.ContactData
+import com.bnyro.contacts.obj.TranslatedType
+import com.bnyro.contacts.obj.ValueWithType
 
 object IntentHelper {
     fun launchAction(context: Context, type: IntentActionType, argument: String) {
@@ -67,4 +72,47 @@ object IntentHelper {
         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
         context.startActivity(intent)
     }
+
+    fun extractContactFromIntent(intent: Intent): ContactData {
+        val name = intent.getStringExtra(ContactsContract.Intents.Insert.NAME)
+            ?: intent.getStringExtra(ContactsContract.Intents.Insert.PHONETIC_NAME)
+
+        val data = ContactData(
+            displayName = name,
+            firstName = name?.split(" ")?.firstOrNull(),
+            surName = name?.split(" ", limit = 2)?.lastOrNull(),
+        )
+
+        ContactsHelper.contactAttributesTypes.forEach { attribute ->
+                if (attribute is StringAttribute) {
+                    attribute.set(data, intent.getStringExtra(attribute.insertKey))
+                } else if (attribute is ListAttribute) {
+                    val values = attribute.insertKeys.mapNotNull { insertKey ->
+                        extractIntentValue(intent, insertKey.first, insertKey.second)
+                    }
+                    attribute.set(data, values)
+                }
+            }
+
+        return data
+    }
+
+    private fun extractIntentValue(
+        intent: Intent,
+        key: String,
+        typeKey: String? = null,
+        types: List<TranslatedType> = emptyList()
+    ): ValueWithType? {
+        val entry = intent.getStringExtra(key) ?: return null
+
+        val type = if (typeKey != null) {
+            val typeIdentifier = intent.getStringExtra(typeKey)
+
+            types.firstOrNull {
+                it.vcardType?.value?.uppercase() == typeIdentifier
+            }?.id
+        } else null
+
+        return ValueWithType(entry, type ?: 0)
+    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/util/Preferences.kt b/app/src/main/java/com/bnyro/contacts/util/Preferences.kt
index c538349f..7464feea 100644
--- a/app/src/main/java/com/bnyro/contacts/util/Preferences.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/Preferences.kt
@@ -8,7 +8,7 @@ import androidx.compose.runtime.SnapshotMutationPolicy
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import com.bnyro.contacts.enums.BackupType
-import com.bnyro.contacts.repo.DeviceContactsRepository
+import com.bnyro.contacts.obj.AccountType
 
 object Preferences {
     private const val prefFile = "preferences"
@@ -47,15 +47,15 @@ object Preferences {
         return BackupType.fromInt(getInt(backupTypeKey, BackupType.NONE.ordinal))
     }
 
-    fun getLastChosenAccount(): Pair<String, String> {
+    fun getLastChosenAccount(): AccountType {
         getString(lastChosenAccount, "")
             .takeIf { !it.isNullOrBlank() }
             ?.let {
                 val split = it.split("|")
-                return split.first() to split.last()
+                return AccountType(split.last(), split.first())
             }
 
-        return DeviceContactsRepository.ANDROID_ACCOUNT_TYPE to DeviceContactsRepository.ANDROID_CONTACTS_NAME
+        return AccountType.androidDefault
     }
 }
 
diff --git a/app/src/main/java/com/bnyro/contacts/util/SmsUtil.kt b/app/src/main/java/com/bnyro/contacts/util/SmsUtil.kt
index a0c62b93..9c70dcf6 100644
--- a/app/src/main/java/com/bnyro/contacts/util/SmsUtil.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/SmsUtil.kt
@@ -7,32 +7,19 @@ import android.provider.Telephony
 import android.telephony.SmsManager
 import android.telephony.SubscriptionInfo
 import android.telephony.SubscriptionManager
+import android.util.Log
 import android.widget.Toast
 import androidx.annotation.RequiresApi
+import com.bnyro.contacts.App
 import com.bnyro.contacts.R
 import com.bnyro.contacts.db.obj.SmsData
-import com.bnyro.contacts.repo.DeviceSmsRepo
-import com.bnyro.contacts.repo.LocalSmsRepo
-import com.bnyro.contacts.repo.SmsRepository
 import java.lang.Character.UnicodeBlock
 import java.util.Calendar
 
 object SmsUtil {
-    private const val MAX_CHAR_LIMIT = 160
+    const val MAX_CHAR_LIMIT = 160
     private const val MAX_CHAR_LIMIT_WITH_UNICODE = 70
 
-    lateinit var smsRepo: SmsRepository
-
-    fun initSmsRepo() {
-        smsRepo = if (Preferences.getBoolean(Preferences.storeSmsLocallyKey, false)) {
-            LocalSmsRepo()
-        } else {
-            DeviceSmsRepo()
-        }
-    }
-
-    suspend fun getSmsList(context: Context) = smsRepo.getSmsList(context)
-
     private fun getSmsManager(subscriptionId: Int?): SmsManager {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1 && subscriptionId != null) {
             @Suppress("DEPRECATION")
@@ -56,49 +43,32 @@ object SmsUtil {
         address: String,
         body: String,
         subscriptionId: Int? = null
-    ): SmsData? {
+    ) {
+        Log.d("Send SMS", body)
         if (!ConnectionHelper.hasSignalForSms(context)) {
             Toast.makeText(context, R.string.connection_error, Toast.LENGTH_LONG).show()
-            return null
+            return
         }
 
         getSmsManager(subscriptionId)
             .sendTextMessage(address, null, body, null, null)
 
+        val smsRepo = (context.applicationContext as App).smsRepo
         val timestamp = Calendar.getInstance().timeInMillis
-        val threadId = getOrCreateThreadId(context, address)
+        val threadId =
+            smsRepo.getOrCreateThreadId(context, address)
 
         val smsData = SmsData(
-            -1,
+            0,
             address,
             body,
             timestamp,
             threadId,
             Telephony.Sms.MESSAGE_TYPE_SENT
         )
-        persistMessage(context, smsData)
-
-        return smsData
+        smsRepo.persistSms(context, smsData)
     }
 
-    suspend fun deleteMessage(context: Context, id: Long) = smsRepo.deleteSms(context, id)
-
-    suspend fun deleteThread(context: Context, threadId: Long) = smsRepo.deleteThread(
-        context,
-        threadId
-    )
-
-    suspend fun persistMessage(context: Context, smsData: SmsData) = smsRepo.persistSms(
-        context,
-        smsData
-    )
-
-    suspend fun getOrCreateThreadId(context: Context, address: String) =
-        smsRepo.getOrCreateThreadId(
-            context,
-            address
-        )
-
     fun isShortEnoughForSms(text: String): Boolean {
         if (text.length > MAX_CHAR_LIMIT) return false
 
@@ -109,4 +79,28 @@ object SmsUtil {
 
         return true
     }
+
+    fun splitSmsText(text: String): List<String> {
+        var currentIndex = 0
+        val splits = mutableListOf<String>()
+
+        while (currentIndex < text.length) {
+            var fullPart =
+                text.substring(currentIndex, minOf(currentIndex + MAX_CHAR_LIMIT, text.length))
+
+            if (isShortEnoughForSms(fullPart)) {
+                currentIndex += MAX_CHAR_LIMIT
+            } else {
+                fullPart = text.substring(
+                    currentIndex,
+                    minOf(currentIndex + MAX_CHAR_LIMIT_WITH_UNICODE, text.length)
+                )
+                currentIndex += MAX_CHAR_LIMIT_WITH_UNICODE
+            }
+
+            splits.add(fullPart)
+        }
+
+        return splits
+    }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/util/TextFormatUtils.kt b/app/src/main/java/com/bnyro/contacts/util/TextFormatUtils.kt
index 77fbe618..94a4c5de 100644
--- a/app/src/main/java/com/bnyro/contacts/util/TextFormatUtils.kt
+++ b/app/src/main/java/com/bnyro/contacts/util/TextFormatUtils.kt
@@ -1,5 +1,11 @@
 package com.bnyro.contacts.util
 
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextDecoration
+
 enum class Format {
     LINK, EMAIL, PHONE
 }
@@ -15,3 +21,70 @@ fun MutableList<Pair<Format, String>>.addKeywords(
         results = results.next()
     }
 }
+
+fun generateAnnotations(text: String, color: Color): AnnotatedString {
+    val keywords = mutableListOf<Pair<Format, String>>().apply {
+        addKeywords(
+            text,
+            linkRegex,
+            Format.LINK
+        )
+        addKeywords(
+            text,
+            emailRegex,
+            Format.EMAIL
+        )
+        addKeywords(
+            text,
+            phoneRegex,
+            Format.PHONE
+        )
+    }
+
+    return buildAnnotatedString {
+        append(text)
+        keywords.forEach { kw ->
+            val (format, keyword) = kw
+            val indexOf = text.indexOf(keyword)
+            addStyle(
+                style = SpanStyle(
+                    color = color,
+                    textDecoration = when (format) {
+                        Format.LINK -> TextDecoration.Underline
+                        else -> TextDecoration.None
+                    }
+                ),
+                start = indexOf,
+                end = indexOf + keyword.length
+            )
+            val link = when (format) {
+                Format.LINK -> if (keyword.startsWith("http")) {
+                    keyword
+                } else {
+                    "http://$keyword"
+                }
+
+                Format.PHONE ->
+                    "tel:$keyword"
+
+                Format.EMAIL -> "mailto:$keyword"
+            }
+            addStringAnnotation(
+                tag = format.name,
+                annotation = link,
+                start = indexOf,
+                end = indexOf + keyword.length
+            )
+        }
+    }
+}
+
+val linkRegex = Regex(
+    "(?<!@)(?<!\\S)((https?://)?[a-zA-Z0-9\\-]{2,}(\\.[a-zA-Z0-9]{2,})+(/[^\\s/]+)*)"
+)
+val emailRegex = Regex(
+    "([A-Za-z0-9+_.-]+@([\\w-]+\\.)+[\\w-]{2,4})"
+)
+val phoneRegex = Regex(
+    "((\\+\\d{1,3}(\\s)?)?((\\(\\d{3}\\))|(\\d{3}))[-\\s]?\\d{3}[-\\s]?\\d{4})"
+)
diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
new file mode 100644
index 00000000..d5a3ddc9
--- /dev/null
+++ b/app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale=en-US
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 4e7ec9cf..2b694d41 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="irreversible">هل أنت متأكد؟ هذا لا يمكن التراجع عنه.</string>
+    <string name="irreversible">هل أنت متأكد؟ هذا لا يمكن التراجع عنه!</string>
     <string name="email">البريد الإلكترونيُّ</string>
     <string name="other">أخرى</string>
     <string name="car">سيَّارة</string>
@@ -55,7 +55,7 @@
     <string name="dark">داكن</string>
     <string name="auto_backup">نسخ احتياطيٌّ تلقائيٌّ</string>
     <string name="choose_dir">المسار</string>
-    <string name="none">لا شيء</string>
+    <string name="none">لاشيء</string>
     <string name="both">كلاهما</string>
     <string name="manage_groups">أدر المجموعات</string>
     <string name="delete_group">حذف المجموعة للجميع</string>
@@ -107,4 +107,13 @@
     <string name="delete_message">حذف الرسالة</string>
     <string name="private_sms_database_desc">سيتم تخزين الرسائل النصية داخل التطبيق فقط ولن يكون من الممكن الوصول إليها في التطبيقات الأخرى.</string>
     <string name="phone_number">رقم الهاتف</string>
+    <string name="send_message_as_multiple">هل تريد إرسال الرسالة كرسائل أصغر متعددة؟</string>
+    <string name="add_website">أضف موقعًا إلكترونيًا</string>
+    <string name="add_phone_number">إضافة رقم الهاتف</string>
+    <string name="add_e_mail">إضافة البريد الإلكتروني</string>
+    <string name="add_address">اضف عنوان</string>
+    <string name="add_note">اضف ملاحظة</string>
+    <string name="add_event">أضف حدثًا</string>
+    <string name="date">‪التاريخ</string>
+    <string name="import_confirm">هل ترغب في استيراد ملف VCF المحدد؟</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index cca38121..321a1b50 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="search" tools:ignore="PrivateResource">Пошук</string>
-    <string name="irreversible">Вы ўпэўнены\? Гэтае дзеянне немагчыма адмяніць.</string>
+    <string name="irreversible">Вы ўпэўнены? Гэтае дзеянне немагчыма адмяніць!</string>
     <string name="cancel">Адмена</string>
     <string name="okay">ОК</string>
     <string name="reset">Скід</string>
@@ -98,7 +98,13 @@
     <string name="messages">Паведамлення</string>
     <string name="send">Адправіць паведамленне</string>
     <string name="reply">Адказаць</string>
-    <string name="connection_error">Памылка злучэння! Не забудзьцеся адключыць рэжым палёту!</string>
+    <string name="connection_error">Не атрымалася злучыцца. Пераканайцеся, што рэжым палёту выключаны.</string>
     <string name="contacts">Кантакты</string>
     <string name="message_too_long">Паведамленне занадта доўгае!</string>
+    <string name="save">Захаваць</string>
+    <string name="delete_thread">Выдаліць галінку</string>
+    <string name="private_sms_database">База дадзеных прыватных SMS</string>
+    <string name="delete_message">Выдаліць паведамленне</string>
+    <string name="private_sms_database_desc">SMS будзе захоўвацца толькі ў праграме і не будзе даступны ў іншых праграмах.</string>
+    <string name="phone_number">Нумар тэлефона</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
new file mode 100644
index 00000000..97aac223
--- /dev/null
+++ b/app/src/main/res/values-ca/strings.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="backup_password">Contrasenya</string>
+    <string name="about">Quant a</string>
+    <string name="license">Llicència</string>
+    <string name="author">Autor</string>
+    <string name="version">Versió</string>
+    <string name="translation">Traducció</string>
+    <string name="add_website">Afegeix un lloc web</string>
+    <string name="add_phone_number">Afegeix un número de telèfon</string>
+    <string name="add_e_mail">Afegeix un correu electrònic</string>
+    <string name="add_address">Afegeix una adreça</string>
+    <string name="add_note">Afegeix una nota</string>
+    <string name="add_event">Afegeix un esdeveniment</string>
+    <string name="date">Data</string>
+    <string name="search" tools:ignore="PrivateResource">Cerca</string>
+    <string name="copied">S\'ha copiat al porta-retalls</string>
+    <string name="delete_contact">Suprimeix el contacte</string>
+    <string name="irreversible">Esteu segur? No es pot desfer.</string>
+    <string name="cancel">Cancel·la</string>
+    <string name="okay">D\'acord</string>
+    <string name="reset">Restableix</string>
+    <string name="create_contact">Crea un contacte</string>
+    <string name="retry">Reintenta</string>
+    <string name="share">Comparteix</string>
+    <string name="add_to_contact">Afegeix a un contacte</string>
+    <string name="new_contact">Nou contacte</string>
+    <string name="create_shortcut">Crea una drecera</string>
+    <string name="dial">Marca</string>
+    <string name="message">Missatge</string>
+    <string name="contact">Contacte</string>
+    <string name="contacts">Contactes</string>
+    <string name="edit">Edita</string>
+    <string name="filter">Filtre</string>
+    <string name="more">Més</string>
+    <string name="show_more_fields">Mostra més camps</string>
+    <string name="show_less">Mostra menys</string>
+    <string name="pick_contact">Escull un contacte</string>
+    <string name="save">Desa</string>
+    <string name="empty_name">El nom no pot estar buit.</string>
+    <string name="import_success">Importat.</string>
+    <string name="export_success">Exportat.</string>
+    <string name="nothing_here">No hi ha res aquí.</string>
+    <string name="phone">Telèfon</string>
+    <string name="email">Correu electrònic</string>
+    <string name="address">Adreça</string>
+    <string name="event">Esdeveniment</string>
+    <string name="website">Lloc web</string>
+    <string name="photo">Foto</string>
+    <string name="phone_number">Número de telèfon</string>
+    <string name="sort_order">Ordre de classificació</string>
+    <string name="account_type">Tipus de compte</string>
+    <string name="name">Nom</string>
+    <string name="first_name">Nom</string>
+    <string name="last_name">Cognom</string>
+    <string name="nick_name">Àlies</string>
+    <string name="organization">Organització</string>
+    <string name="type">Tipus</string>
+    <string name="home">Domicili</string>
+    <string name="work">Feina</string>
+    <string name="mobile">Mòbil</string>
+    <string name="other">Altres</string>
+    <string name="custom">Personalitzat</string>
+    <string name="car">Cotxe</string>
+    <string name="fax_home">Fax de casa</string>
+    <string name="fax_work">Fax de la feina</string>
+    <string name="assistant">Assistent</string>
+    <string name="birthday">Aniversari</string>
+    <string name="anniversary">Aniversari (de casament)</string>
+    <string name="note">Nota</string>
+    <string name="homepage">Pàgina principal</string>
+    <string name="ftp">FTP</string>
+    <string name="blog">Blog</string>
+    <string name="manage_groups">Gestiona els grups</string>
+    <string name="delete_group">Suprimeix el grup per a tothom</string>
+    <string name="title">Títol</string>
+    <string name="new_group">Nou</string>
+    <string name="group_already_exists">El grup ja existeix</string>
+    <string name="groups">Grups</string>
+    <string name="device">Dispositiu</string>
+    <string name="local">Local</string>
+    <string name="copy">Copia</string>
+    <string name="move">Mou</string>
+    <string name="delete">Suprimeix</string>
+    <string name="selected">%1$s seleccionats</string>
+    <string name="messages">Missatges</string>
+    <string name="send">Envia</string>
+    <string name="reply">Respon</string>
+    <string name="connection_error">No s\'ha pogut connectar. Assegureu-vos que el mode avió està desactivat.</string>
+    <string name="message_too_long">El missatge és massa llarg.</string>
+    <string name="send_message_as_multiple">Voleu enviar el missatge en múltiples missatges més petits?</string>
+    <string name="private_sms_database">Base de dades de SMS privada</string>
+    <string name="private_sms_database_desc">L\'SMS només s\'emmagatzemarà dins l\'aplicació i no serà accessible per altres aplicacions.</string>
+    <string name="delete_thread">Suprimeix el fil de conversa</string>
+    <string name="delete_message">Suprimeix el missatge</string>
+    <string name="import_vcf">Importa vCard</string>
+    <string name="export_vcf">Exporta vCard</string>
+    <string name="import_sim">Importa des de la SIM</string>
+    <string name="import_confirm">Voleu importar l\'arxiu VCF seleccionat?</string>
+    <string name="settings">Configuració</string>
+    <string name="start_tab">Pestanya d\'inici</string>
+    <string name="theme">Tema</string>
+    <string name="system">Sistema</string>
+    <string name="light">Clar</string>
+    <string name="dark">Fosc</string>
+    <string name="auto_backup">Còpia de seguretat automàtica</string>
+    <string name="backup_interval">Interval de còpia de seguretat</string>
+    <string name="max_backup_amount">Quantitat màxima de còpies de seguretat</string>
+    <string name="choose_dir">Directori</string>
+    <string name="both">Tots dos</string>
+    <string name="none">Cap</string>
+    <string name="misc">Miscel·lània</string>
+    <string name="collapse_bottom_bar">Redueix la barra inferior en desplaçar-se</string>
+    <string name="colorful_contact_icons">Icones de contacte acolorides</string>
+    <string name="behavior">Comportament</string>
+    <string name="appearance">Aspecte</string>
+    <string name="backup">Còpia de seguretat</string>
+    <string name="encrypt_backups">Xifra les còpies de seguretat amb zip</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 35f3800e..04c6f764 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -16,7 +16,7 @@
     <string name="translation">Překlad</string>
     <string name="choose_dir">Adresář</string>
     <string name="reset">Obnovit</string>
-    <string name="irreversible">Opravdu\? Tato akce je nevratná.</string>
+    <string name="irreversible">Opravdu? Tato akce je nevratná!</string>
     <string name="okay">Okay</string>
     <string name="address">Adresa</string>
     <string name="event">Událost</string>
@@ -107,4 +107,13 @@
     <string name="delete_message">Odstranit zprávu</string>
     <string name="private_sms_database_desc">Zprávy SMS budou ukládány pouze do této aplikace a nebudou k nim mít přístup ostatní aplikace.</string>
     <string name="phone_number">Číslo mobilu</string>
+    <string name="send_message_as_multiple">Chcete odeslat zprávu jako několik menších?</string>
+    <string name="add_note">Přidat poznámku</string>
+    <string name="add_event">Přidat událost</string>
+    <string name="add_e_mail">Přidat e-mail</string>
+    <string name="add_address">Přidat adresu</string>
+    <string name="add_website">Přidat webové stránky</string>
+    <string name="add_phone_number">Přidat telefonní číslo</string>
+    <string name="date">Datum</string>
+    <string name="import_confirm">Chcete importovat vybraný soubor VCF?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
new file mode 100644
index 00000000..5e8d443d
--- /dev/null
+++ b/app/src/main/res/values-da/strings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="copied">Kopieret til udklipsholder</string>
+    <string name="cancel">Annullér</string>
+    <string name="reset">Nulstil</string>
+    <string name="retry">Prøv igen</string>
+    <string name="new_contact">Ny kontakt</string>
+    <string name="create_shortcut">Opret genvej</string>
+    <string name="dial">Ring</string>
+    <string name="contact">Kontakt</string>
+    <string name="contacts">Kontakter</string>
+    <string name="filter">Filtrér</string>
+    <string name="more">Mere</string>
+    <string name="save">Gem</string>
+    <string name="empty_name">Navn kan ikke være tomt!</string>
+    <string name="import_success">Importeret.</string>
+    <string name="phone">Telefon</string>
+    <string name="phone_number">Telefonnummer</string>
+    <string name="first_name">Fornavn</string>
+    <string name="last_name">Efternavn</string>
+    <string name="organization">Organisation</string>
+    <string name="home">Hjem</string>
+    <string name="assistant">Assistent</string>
+    <string name="anniversary">Årsdag</string>
+    <string name="note">Note</string>
+    <string name="new_group">Ny</string>
+    <string name="group_already_exists">Gruppe eksisterer allerede</string>
+    <string name="groups">Grupper</string>
+    <string name="device">Enhed</string>
+    <string name="local">Lokal</string>
+    <string name="copy">Kopiér</string>
+    <string name="move">Flyt</string>
+    <string name="delete">Slet</string>
+    <string name="connection_error">Kunne ikke oprette forbindelse. Sørg for, at flytilstand er slået fra.</string>
+    <string name="private_sms_database">Privat SMS-database</string>
+    <string name="private_sms_database_desc">SMS\'en gemmes kun i appen og er ikke tilgængelig i andre apps.</string>
+    <string name="delete_thread">Slet tråd</string>
+    <string name="export_vcf">Eksportér vCard</string>
+    <string name="settings">Indstillinger</string>
+    <string name="backup_interval">Backup-interval</string>
+    <string name="collapse_bottom_bar">Skjul bundlinjen ved scroll</string>
+    <string name="search" tools:ignore="PrivateResource">Søg</string>
+    <string name="delete_contact">Slet kontakt</string>
+    <string name="irreversible">Er du sikker? Dette kan ikke fortrydes!</string>
+    <string name="share">Del</string>
+    <string name="okay">Okay</string>
+    <string name="create_contact">Opret kontakt</string>
+    <string name="add_to_contact">Føj til kontakt</string>
+    <string name="show_more_fields">Vis flere felter</string>
+    <string name="message">Besked</string>
+    <string name="edit">Redigér</string>
+    <string name="max_backup_amount">Maks. antal backups</string>
+    <string name="author">Autor</string>
+    <string name="choose_dir">Mappe</string>
+    <string name="misc">Diverse</string>
+    <string name="both">Begge</string>
+    <string name="none">Ingen</string>
+    <string name="behavior">Adfærd</string>
+    <string name="colorful_contact_icons">Farverige kontakt-ikoner</string>
+    <string name="backup">Backup</string>
+    <string name="appearance">Udseende</string>
+    <string name="license">Licens</string>
+    <string name="encrypt_backups">Kryptér backups som ZIP</string>
+    <string name="backup_password">Adgangskode</string>
+    <string name="about">Om</string>
+    <string name="version">Version</string>
+    <string name="add_phone_number">Tilføj Telefonnummer</string>
+    <string name="translation">Oversættelse</string>
+    <string name="add_e_mail">Tilføj E-mail</string>
+    <string name="add_address">Tilføj Adresse</string>
+    <string name="add_website">Tilføj Hjemmeside</string>
+    <string name="add_note">Tilføj Note</string>
+    <string name="add_event">Tilføj Begivenhed</string>
+    <string name="date">Dato</string>
+    <string name="show_less">Vis mindre</string>
+    <string name="pick_contact">Vælg kontakt</string>
+    <string name="export_success">Eksporteret.</string>
+    <string name="nothing_here">Intet her.</string>
+    <string name="email">E-mail</string>
+    <string name="address">Adresse</string>
+    <string name="website">Hjemmeside</string>
+    <string name="event">Begivenhed</string>
+    <string name="photo">Foto</string>
+    <string name="sort_order">Sortér efter</string>
+    <string name="account_type">Kontotype</string>
+    <string name="name">Navn</string>
+    <string name="nick_name">Kaldenavn</string>
+    <string name="other">Andet</string>
+    <string name="type">Type</string>
+    <string name="work">Arbejde</string>
+    <string name="mobile">Mobil</string>
+    <string name="birthday">Fødselsdag</string>
+    <string name="car">Bil</string>
+    <string name="custom">Brugerdefineret</string>
+    <string name="homepage">Startside</string>
+    <string name="ftp">FTP</string>
+    <string name="manage_groups">Administrér grupper</string>
+    <string name="blog">Blog</string>
+    <string name="delete_group">Slet gruppe for alle</string>
+    <string name="title">Titel</string>
+    <string name="messages">Beskeder</string>
+    <string name="selected">%1$s valgt</string>
+    <string name="send">Send besked</string>
+    <string name="reply">Svar</string>
+    <string name="message_too_long">Besked er for lang!</string>
+    <string name="send_message_as_multiple">Vil du sende beskeden som flere mindre?</string>
+    <string name="delete_message">Slet besked</string>
+    <string name="import_vcf">Importér vCard</string>
+    <string name="import_sim">Importér fra SIM</string>
+    <string name="import_confirm">Vil du importere den valgte VCF-fil?</string>
+    <string name="theme">Tema</string>
+    <string name="system">System</string>
+    <string name="light">Lys</string>
+    <string name="dark">Mørk</string>
+    <string name="auto_backup">Automatisk backup</string>
+    <string name="start_tab">Start-fane</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 03710494..8b444d6e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -102,4 +102,9 @@
     <string name="send">Nachricht senden</string>
     <string name="messages">Nachrichten</string>
     <string name="connection_error">Verbindungsfehler! Stellen sie sicher, dass der Flugmodus ausgeschaltet ist!</string>
+    <string name="phone_number">Telefonnummer</string>
+    <string name="delete_thread">Unterhaltung löschen</string>
+    <string name="delete_message">Nachricht löschen</string>
+    <string name="private_sms_database">Private SMS Datenbank</string>
+    <string name="save">Speichern</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 72fb85db..815d50ad 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -11,11 +11,11 @@
     <string name="email">Correo electrónico</string>
     <string name="address">Dirección</string>
     <string name="event">Evento</string>
-    <string name="sort_order">Ordenación</string>
+    <string name="sort_order">Ordenar por</string>
     <string name="first_name">Nombre</string>
     <string name="last_name">Apellido</string>
     <string name="type">Tipo</string>
-    <string name="home">Inicio</string>
+    <string name="home">Casa</string>
     <string name="car">Coche</string>
     <string name="assistant">Asistente</string>
     <string name="birthday">Cumpleaños</string>
@@ -38,7 +38,7 @@
     <string name="system">Sistema</string>
     <string name="backup_interval">Intervalo de copia de seguridad</string>
     <string name="colorful_contact_icons">Iconos de contacto de colores</string>
-    <string name="irreversible">¿Estás seguro\? Esto no se puede deshacer.</string>
+    <string name="irreversible">¿Estás seguro? ¡Esto no se puede deshacer!</string>
     <string name="share">Compartir</string>
     <string name="about">Acerca de</string>
     <string name="license">Licencia</string>
@@ -71,7 +71,7 @@
     <string name="collapse_bottom_bar">Contraer la barra inferior al desplazarse</string>
     <string name="misc">Varios</string>
     <string name="create_shortcut">Crear un acceso directo</string>
-    <string name="dial">Dial</string>
+    <string name="dial">Llamar</string>
     <string name="message">Mensaje</string>
     <string name="new_contact">Nuevo contacto</string>
     <string name="contact">Contacto</string>
@@ -98,7 +98,7 @@
     <string name="messages">Mensajes</string>
     <string name="send">Enviar un mensaje</string>
     <string name="reply">Responder</string>
-    <string name="connection_error">No se ha podido conectar. Asegúrate de que el modo avión está desactivado.</string>
+    <string name="connection_error">No se ha podido conectar. Por favor, asegúrate de que el modo avión está desactivado.</string>
     <string name="contacts">Contactos</string>
     <string name="message_too_long">¡El mensaje es demasiado largo!</string>
     <string name="save">Guardar</string>
@@ -107,4 +107,13 @@
     <string name="delete_message">Borrar el mensaje</string>
     <string name="private_sms_database_desc">Los SMS sólo se almacenarán dentro de la aplicación y no serán accesibles en otras aplicaciones.</string>
     <string name="phone_number">Número de teléfono</string>
+    <string name="send_message_as_multiple">¿Quieres enviar el mensaje en varios más pequeños?</string>
+    <string name="add_phone_number">Añadir un número de teléfono</string>
+    <string name="add_website">Añadir página web</string>
+    <string name="add_e_mail">Añadir correo electrónico</string>
+    <string name="add_address">Añadir dirección</string>
+    <string name="add_event">Añadir evento</string>
+    <string name="add_note">Añadir nota</string>
+    <string name="date">Fecha</string>
+    <string name="import_confirm">¿Desea importar el archivo VCF seleccionado?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
new file mode 100644
index 00000000..d0302cba
--- /dev/null
+++ b/app/src/main/res/values-et/strings.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="search" tools:ignore="PrivateResource">Otsi</string>
+    <string name="copied">Kopeeritud lõikelauale</string>
+    <string name="delete_contact">Kustuta kontakt</string>
+    <string name="irreversible">Kas sa oled kindel? Seda tegevust ei saa tagasi pöörata!</string>
+    <string name="reset">Lähtesta</string>
+    <string name="create_contact">Lisa kontakt</string>
+    <string name="retry">Proovi uuesti</string>
+    <string name="share">Jaga</string>
+    <string name="add_to_contact">Lisa kontaktile</string>
+    <string name="new_contact">Uus kontakt</string>
+    <string name="dial">Helista</string>
+    <string name="message">Sõnum</string>
+    <string name="contact">Kontakt</string>
+    <string name="cancel">Katkesta</string>
+    <string name="okay">Sobib</string>
+    <string name="create_shortcut">Loo otsetee</string>
+    <string name="contacts">Inimesed</string>
+    <string name="edit">Muuda</string>
+    <string name="filter">Filtreeri</string>
+    <string name="more">Veel</string>
+    <string name="show_more_fields">Näita täiendavaid välju</string>
+    <string name="show_less">Näita vähem</string>
+    <string name="pick_contact">Vali kontakt</string>
+    <string name="save">Salvesta</string>
+    <string name="empty_name">Nime väli ei saa olla tühi!</string>
+    <string name="import_success">Importimine õnnestus.</string>
+    <string name="email">E-posti aadress</string>
+    <string name="address">Aadress</string>
+    <string name="event">Sündmus</string>
+    <string name="phone_number">Telefoninumber</string>
+    <string name="sort_order">Sortimise järjekord</string>
+    <string name="account_type">Konto tüüp</string>
+    <string name="name">Nimi</string>
+    <string name="first_name">Eesnimi</string>
+    <string name="last_name">Perenimi</string>
+    <string name="nick_name">Hüüdnimi</string>
+    <string name="organization">Organisatsioon</string>
+    <string name="type">Tüüp</string>
+    <string name="work">Töö</string>
+    <string name="mobile">Mobiiltelefon</string>
+    <string name="other">Muu</string>
+    <string name="custom">Kohandatud</string>
+    <string name="car">Auto</string>
+    <string name="fax_home">Telefaks kodus</string>
+    <string name="fax_work">Telefaks tööl</string>
+    <string name="assistant">Abiline</string>
+    <string name="birthday">Sünnipäev</string>
+    <string name="anniversary">Aastapäev</string>
+    <string name="note">Märkus</string>
+    <string name="homepage">Avaleht</string>
+    <string name="ftp">FTP</string>
+    <string name="blog">Ajaveeb</string>
+    <string name="manage_groups">Halda gruppe</string>
+    <string name="delete_group">Eemalda grupp kõigilt</string>
+    <string name="title">Pealkiri</string>
+    <string name="new_group">Uus</string>
+    <string name="group_already_exists">Selline grupp on juba olemas</string>
+    <string name="groups">Grupid</string>
+    <string name="local">Kohalik andmekogu</string>
+    <string name="copy">Kopeeri</string>
+    <string name="move">Teisalda</string>
+    <string name="delete">Kustuta</string>
+    <string name="selected">%1$s valitud</string>
+    <string name="messages">Sõnumid</string>
+    <string name="connection_error">Ühenduse loomine ei õnnestunud. Palun kontrolli, et lennurežiim ei oleks kasutusel.</string>
+    <string name="message_too_long">Sõnum on liiga pikk!</string>
+    <string name="send_message_as_multiple">Kas sa soovi selle sõnumi saata mitme väiksema sõnumina?</string>
+    <string name="private_sms_database_desc">SMS-sõnumid salvestatakse vaid selles rakenduses ja pole muudele rakendustele kättesaadavad.</string>
+    <string name="delete_message">Kustuta sõnum</string>
+    <string name="import_vcf">Impordi vCard vormingus kontakt</string>
+    <string name="export_vcf">Ekspordi vCard vormingus kontakt</string>
+    <string name="import_sim">Impordi kontaktkirjed SIM-kaardilt</string>
+    <string name="settings">Seadistused</string>
+    <string name="start_tab">Esimesena kuvatav sisuleht</string>
+    <string name="theme">Teema</string>
+    <string name="dark">Tume kujundus</string>
+    <string name="auto_backup">Kasuta automaatset varundust</string>
+    <string name="backup_interval">Varunduse välp</string>
+    <string name="max_backup_amount">Varukoopiate arv</string>
+    <string name="choose_dir">Kaust</string>
+    <string name="both">Mõlemad</string>
+    <string name="none">Pole kasutusel</string>
+    <string name="misc">Muud</string>
+    <string name="collapse_bottom_bar">Vertikaalsel kerimisel lappa alumine riba kokku</string>
+    <string name="colorful_contact_icons">Kasuta kontaktide juures värvilisi ikoone</string>
+    <string name="behavior">Tegevused</string>
+    <string name="appearance">Välimus</string>
+    <string name="backup">Varukoopia</string>
+    <string name="encrypt_backups">Krüpti varukoopia zip-failina</string>
+    <string name="backup_password">Salasõna</string>
+    <string name="license">Litsents</string>
+    <string name="author">Autor</string>
+    <string name="version">Versioon</string>
+    <string name="translation">Tõlked</string>
+    <string name="add_website">Lisa veebisait</string>
+    <string name="add_phone_number">Lisa telefoninumber</string>
+    <string name="add_e_mail">Lisa e-posti aadress</string>
+    <string name="add_address">Lisa aadress</string>
+    <string name="add_note">Lisa märkus</string>
+    <string name="add_event">Lisa sündmus</string>
+    <string name="date">Kuupäev</string>
+    <string name="nothing_here">Siin pole mitte midagi.</string>
+    <string name="export_success">Eksportimine õnnestus.</string>
+    <string name="phone">Telefon</string>
+    <string name="website">Veebisait</string>
+    <string name="photo">Foto</string>
+    <string name="home">Kodu</string>
+    <string name="send">Saada sõnum</string>
+    <string name="reply">Vasta</string>
+    <string name="device">Seade</string>
+    <string name="private_sms_database">Privaatne SMS-sõnumite andmekogu</string>
+    <string name="delete_thread">Kustuta jutulõng</string>
+    <string name="system">Süsteemi kujundus</string>
+    <string name="light">Hele kujundus</string>
+    <string name="about">Rakenduse teave</string>
+    <string name="import_confirm">Kas sa soovid importida valitud VCF-faili?</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 6f8db568..0d6a5f54 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -8,7 +8,7 @@
     <string name="retry">تلاش دوباره</string>
     <string name="about">درباره ما</string>
     <string name="cancel">انصراف</string>
-    <string name="irreversible">آیا مطمئن هستید؟ این کار برگشت‌ناپذیر است.</string>
+    <string name="irreversible">آیا مطمئن هستید؟ این کار برگشت‌ناپذیر است!</string>
     <string name="okay">باشه</string>
     <string name="search" tools:ignore="PrivateResource">جستجو</string>
     <string name="share">هم‌رسانی</string>
@@ -21,4 +21,99 @@
     <string name="settings">تنظیمات</string>
     <string name="author">نویسنده</string>
     <string name="system">سامانه</string>
+    <string name="message_too_long">پیام شما بسیار بلند است!</string>
+    <string name="backup">پشتیبان گیری</string>
+    <string name="type">نوع</string>
+    <string name="photo">تصویر</string>
+    <string name="name">نام</string>
+    <string name="max_backup_amount">بیشینه تعداد پشتیبان گیری ها</string>
+    <string name="choose_dir">مسیر</string>
+    <string name="version">نسخه</string>
+    <string name="appearance">ظاهر</string>
+    <string name="backup_password">رمز</string>
+    <string name="add_to_contact">افزودن به مخاطبین</string>
+    <string name="create_shortcut">ایجاد میان بر</string>
+    <string name="dial">تماس</string>
+    <string name="message">پیام</string>
+    <string name="contact">مخاطب</string>
+    <string name="edit">ویرایش</string>
+    <string name="filter">پالایه</string>
+    <string name="more">بیشتر</string>
+    <string name="show_more_fields">نمایش جستار های بیشتر</string>
+    <string name="empty_name">نام نمی تواند خالی باشد!</string>
+    <string name="export_success">برون بُرد شد.</string>
+    <string name="import_success">درون بُرد شد.</string>
+    <string name="home">خانه</string>
+    <string name="work">پیشه</string>
+    <string name="mobile">شماره تلفن</string>
+    <string name="other">دیگر</string>
+    <string name="local">برزنی</string>
+    <string name="pick_contact">انتخاب مخاطب</string>
+    <string name="website">وبسایت</string>
+    <string name="fax_work">فاکس محل کار</string>
+    <string name="assistant">دستیار</string>
+    <string name="organization">سازمان</string>
+    <string name="import_sim">درون بردن از سیم کارت</string>
+    <string name="both">هر دو</string>
+    <string name="license">مجوز</string>
+    <string name="contacts">مخاطبین</string>
+    <string name="birthday">زادروز</string>
+    <string name="sort_order">چینش</string>
+    <string name="anniversary">سالگرد</string>
+    <string name="homepage">صفحه نخست</string>
+    <string name="add_website">افزودن وبسایت</string>
+    <string name="add_phone_number">افزودن شماره تلفن</string>
+    <string name="add_e_mail">افزودن ایمیل</string>
+    <string name="add_note">افزودن یادداشت</string>
+    <string name="add_event">افزودن رویداد</string>
+    <string name="date">تاریخ</string>
+    <string name="show_less">نمایش کمتر</string>
+    <string name="save">ذخیره</string>
+    <string name="car">ماشین</string>
+    <string name="fax_home">فاکس خانه</string>
+    <string name="event">رویداد</string>
+    <string name="connection_error">متصل نشد. خواهشمند است از خاموش بودن حالت هواپیما مطمئن شوید.</string>
+    <string name="send_message_as_multiple">آیا می خواهید پیام را با چند پیام کوتاه تر بفرستید؟</string>
+    <string name="private_sms_database_desc">این پیامک تنها درون این برنامه ذخیره می شود و در برنامه های دیگر غیرقابل دسترس است.</string>
+    <string name="new_group">نو</string>
+    <string name="reply">پاسخ</string>
+    <string name="device">دستگاه</string>
+    <string name="auto_backup">پشتیبان گیری (بکاپ) خودکار</string>
+    <string name="misc">متفرقه (بقیه)</string>
+    <string name="behavior">رفتار</string>
+    <string name="encrypt_backups">رمزگذاری پشتیبان گیری به عنوان فایل زیپ</string>
+    <string name="add_address">افزودن نشانی</string>
+    <string name="import_vcf">درون بردن vCard</string>
+    <string name="export_vcf">برون بردن vCard</string>
+    <string name="start_tab">آغاز برگه</string>
+    <string name="backup_interval">فاصله پشتیبان گیری ها</string>
+    <string name="none">هیچ کدام</string>
+    <string name="colorful_contact_icons">رگارنگ کردن پرتره مخاطبین</string>
+    <string name="blog">وبلاگ</string>
+    <string name="manage_groups">مدیریت گروه ها</string>
+    <string name="delete_group">پاک کردن گروه برای همه</string>
+    <string name="title">سر تیتر</string>
+    <string name="group_already_exists">گروه از پیش وجود دارد</string>
+    <string name="groups">گروه ها</string>
+    <string name="nothing_here">اینجا چیزی نیست.</string>
+    <string name="phone">تلفن</string>
+    <string name="email">ایمیل</string>
+    <string name="address">نشانی</string>
+    <string name="phone_number">شماره تلفن</string>
+    <string name="account_type">نوع حساب</string>
+    <string name="first_name">نام</string>
+    <string name="last_name">نام خانوادگی</string>
+    <string name="nick_name">آوازه</string>
+    <string name="custom">سفارشی</string>
+    <string name="note">یادداشت</string>
+    <string name="ftp">جابجا کردن با FTP</string>
+    <string name="delete_thread">پاک کردن گفت و گو</string>
+    <string name="move">جابجا</string>
+    <string name="selected">%1$s انتخاب شده</string>
+    <string name="delete_message">پاک کردن پیامک</string>
+    <string name="messages">پیام ها</string>
+    <string name="send">فرستادن پیامک</string>
+    <string name="private_sms_database">دیتابیس پیامک خصوصی</string>
+    <string name="collapse_bottom_bar">فروریختن کادر پایینی هنگام پیمایش</string>
+    <string name="import_confirm">آیا میخواهید فایل VCF انتخاب شده را درون بری کنید؟</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index da25726c..e7d2110c 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="copied">Kopioitu leikepöydälle</string>
-    <string name="irreversible">Oletko varma\? Tätä ei voi perua.</string>
+    <string name="irreversible">Oletko varma? Tätä ei voi perua!</string>
     <string name="cancel">Peru</string>
     <string name="okay">OK</string>
     <string name="reset">Nollaa</string>
@@ -107,4 +107,13 @@
     <string name="private_sms_database">Yksityinen SMS-tietokanta</string>
     <string name="encrypt_backups">Salaa varmuuskopiot Zip-tiedostossa</string>
     <string name="private_sms_database_desc">SMS tallennetaan vain tässä sovelluksessa, eikä muut sovellukset pääse siihen käsiksi.</string>
+    <string name="send_message_as_multiple">Haluatko lähettää viestin useampana pienempänä viestinä?</string>
+    <string name="add_phone_number">Lisää puhelinnumero</string>
+    <string name="add_website">Lisää verkkosivusto</string>
+    <string name="add_e_mail">Lisää sähköposti</string>
+    <string name="add_address">Lisää osoite</string>
+    <string name="add_event">Lisää tapahtuma</string>
+    <string name="date">Päiväys</string>
+    <string name="add_note">Lisää muistiinpano</string>
+    <string name="import_confirm">Haluatko tuoda valitun VCF-tiedoston?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 54e30dc3..c2e5c541 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -6,8 +6,8 @@
     <string name="address">Adresse</string>
     <string name="event">Évènement</string>
     <string name="first_name">Prénom</string>
-    <string name="last_name">Nom de famille</string>
-    <string name="author">Auteur</string>
+    <string name="last_name">Nom de Famille</string>
+    <string name="author">Auteur·e</string>
     <string name="version">Version</string>
     <string name="translation">Traduction</string>
     <string name="app_name">Connect You</string>
@@ -44,10 +44,10 @@
     <string name="nothing_here">Rien ici.</string>
     <string name="copy">Copier</string>
     <string name="move">Déplacer</string>
-    <string name="settings">Paramètres</string>
+    <string name="settings">Réglages</string>
     <string name="start_tab">Onglet de démarrage</string>
     <string name="delete">Supprimer</string>
-    <string name="choose_dir">Choisir un répertoire</string>
+    <string name="choose_dir">Choisir un Répertoire</string>
     <string name="sort_order">Ordre de tri</string>
     <string name="account_type">Type de compte</string>
     <string name="note">Note</string>
@@ -55,7 +55,7 @@
     <string name="system">Système</string>
     <string name="light">Clair</string>
     <string name="dark">Sombre</string>
-    <string name="auto_backup">Sauvegarde automatique</string>
+    <string name="auto_backup">Sauvegarde Automatique</string>
     <string name="both">Les deux</string>
     <string name="none">Aucun</string>
     <string name="edit">Modifier</string>
@@ -71,7 +71,7 @@
     <string name="blog">Blog</string>
     <string name="new_group">Nouveau</string>
     <string name="selected">%1$s sélectionné</string>
-    <string name="backup_interval">Intervalle de sauvegarde</string>
+    <string name="backup_interval">Intervalle de Sauvegarde</string>
     <string name="max_backup_amount">Nombre maximal de sauvegardes</string>
     <string name="message">Message</string>
     <string name="new_contact">Nouveau contact</string>
@@ -91,4 +91,30 @@
     <string name="name">Nom</string>
     <string name="import_sim">Importer depuis une SIM</string>
     <string name="behavior">Comportement</string>
+    <string name="reply">Répondre</string>
+    <string name="save">Sauvegarder</string>
+    <string name="delete_thread">Supprimer la discussion</string>
+    <string name="private_sms_database">Base de données SMS privée</string>
+    <string name="delete_message">Effacer le message</string>
+    <string name="appearance">Apparence</string>
+    <string name="encrypt_backups">Chiffrer les sauvegardes sous format zip</string>
+    <string name="message_too_long">Le message est trop long !</string>
+    <string name="contacts">Contacts</string>
+    <string name="send">Send message</string>
+    <string name="backup">Sauvegarde</string>
+    <string name="private_sms_database_desc">Les SMS ne seront stockés que dans l\'application et ne seront pas accessibles dans d\'autres applications.</string>
+    <string name="pick_contact">Choisir le contact</string>
+    <string name="messages">Messages</string>
+    <string name="phone_number">N° de téléphone</string>
+    <string name="backup_password">Mot de passe</string>
+    <string name="connection_error">Impossible de se connecter. Veuillez vous assurer que le mode avion est désactivé.</string>
+    <string name="send_message_as_multiple">Souhaitez-vous envoyer le message sous la forme de plusieurs petits messages ?</string>
+    <string name="import_confirm">Voulez-vous importer le fichier VCF sélectionné ?</string>
+    <string name="add_website">Ajouter un site Web</string>
+    <string name="add_event">Ajouter un évènement</string>
+    <string name="date">Date</string>
+    <string name="add_phone_number">Ajouter un numéro de téléphone</string>
+    <string name="add_e_mail">Ajouter une adresse mail</string>
+    <string name="add_address">Ajouter une adresse</string>
+    <string name="add_note">Ajouter une note</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 42eab5ef..099d7f66 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -9,7 +9,7 @@
     <string name="okay">Si</string>
     <string name="copied">Copiado ao portapapeis</string>
     <string name="delete_contact">Eliminar contacto</string>
-    <string name="irreversible">Continuar\? A decisión non ten volta.</string>
+    <string name="irreversible">Continuar? A decisión non ten volta!</string>
     <string name="share">Compartir</string>
     <string name="create_shortcut">Crear atallo</string>
     <string name="dial">Marcar</string>
@@ -107,4 +107,13 @@
     <string name="delete_message">Eliminar mensaxe</string>
     <string name="private_sms_database_desc">Os SMS vanse gardar dentro da app e as outras apps non poden acceder a eles.</string>
     <string name="phone_number">Número de teléfono</string>
+    <string name="send_message_as_multiple">Queres enviar a mensaxe en forma de varios máis pequenos?</string>
+    <string name="add_website">Engadir Sitio web</string>
+    <string name="add_phone_number">Engadir número telf</string>
+    <string name="add_note">Engadir nota</string>
+    <string name="add_e_mail">Engadir correo</string>
+    <string name="add_address">Engadir enderezo</string>
+    <string name="add_event">Engadir evento</string>
+    <string name="date">Data</string>
+    <string name="import_confirm">Queres importar o ficheiro VCF seleccionado?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
new file mode 100644
index 00000000..5b96fa21
--- /dev/null
+++ b/app/src/main/res/values-hi/strings.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="irreversible">क्या आप निश्चित हैं? इसे पूर्ववत नहीं किया जा सकता!</string>
+    <string name="cancel">रद्द करें</string>
+    <string name="new_contact">नया संपर्क</string>
+    <string name="create_contact">संपर्क बनाएं</string>
+    <string name="dial">डायल</string>
+    <string name="message">संदेश</string>
+    <string name="phone">फोन</string>
+    <string name="address">पता</string>
+    <string name="organization">संगठन</string>
+    <string name="home">घर</string>
+    <string name="anniversary">वर्षगांठ</string>
+    <string name="note">टिप्पणी</string>
+    <string name="blog">ब्लॉग</string>
+    <string name="ftp">FTP</string>
+    <string name="homepage">मुखपृष्ठ</string>
+    <string name="manage_groups">समूह प्रबंधित करें</string>
+    <string name="delete_group">सभी के लिए समूह हटाएं</string>
+    <string name="group_already_exists">समूह पहले से मौजूद है</string>
+    <string name="send_message_as_multiple">क्या आप संदेश को अनेक छोटे-छोटे रूपों में भेजना चाहते हैं?</string>
+    <string name="start_tab">प्रारंभ टैब</string>
+    <string name="auto_backup">स्वचालित बैकअप</string>
+    <string name="max_backup_amount">बैकअप की अधिकतम मात्रा</string>
+    <string name="colorful_contact_icons">रंगीन संपर्क चिह्न</string>
+    <string name="translation">अनुवाद</string>
+    <string name="import_vcf">vCard आयात करें</string>
+    <string name="import_confirm">क्या आप चयनित VCF फ़ाइल आयात करना चाहते हैं?</string>
+    <string name="copied">क्लिपबोर्ड पर कॉपी किया गया</string>
+    <string name="delete_contact">संपर्क हटाएँ</string>
+    <string name="okay">ठीक है</string>
+    <string name="reset">रीसेट</string>
+    <string name="retry">पुन: प्रयास</string>
+    <string name="share">शेयर</string>
+    <string name="add_to_contact">संपर्क में जोडें</string>
+    <string name="create_shortcut">शॉर्टकट बनाएं</string>
+    <string name="contact">संपर्क</string>
+    <string name="contacts">संपर्क</string>
+    <string name="edit">संपादित करें</string>
+    <string name="filter">फिल्टर</string>
+    <string name="more">अधिक</string>
+    <string name="show_more_fields">और फ़ील्ड दिखाएं</string>
+    <string name="show_less">कम दिखाएं</string>
+    <string name="pick_contact">संपर्क चुनें</string>
+    <string name="save">सहेजें</string>
+    <string name="empty_name">नाम खाली नहीं हो सकता!</string>
+    <string name="import_success">आयातित।</string>
+    <string name="export_success">निर्यात किया गया।</string>
+    <string name="nothing_here">यहाँ कुछ नहीं।</string>
+    <string name="email">ई-मेल</string>
+    <string name="event">आयोजन</string>
+    <string name="website">वेबसाइट</string>
+    <string name="photo">तस्वीर</string>
+    <string name="phone_number">फोन नंबर</string>
+    <string name="sort_order">क्रमबद्ध करें</string>
+    <string name="account_type">खाते का प्रकार</string>
+    <string name="name">नाम</string>
+    <string name="first_name">पहला नाम</string>
+    <string name="nick_name">उपनाम</string>
+    <string name="last_name">अंतिम नाम</string>
+    <string name="type">प्रकार</string>
+    <string name="work">कार्य</string>
+    <string name="mobile">मोबाइल</string>
+    <string name="other">अन्य</string>
+    <string name="custom">कस्टम</string>
+    <string name="car">कार</string>
+    <string name="fax_home">घर फैक्स</string>
+    <string name="fax_work">फैक्स कार्य</string>
+    <string name="assistant">सहायक</string>
+    <string name="birthday">जन्मदिन</string>
+    <string name="title">शीर्षक</string>
+    <string name="new_group">नया</string>
+    <string name="groups">समूह</string>
+    <string name="device">डिवाइस</string>
+    <string name="local">स्थानीय</string>
+    <string name="copy">कॉपी</string>
+    <string name="move">स्थान परिवर्तन</string>
+    <string name="delete">हटाएं</string>
+    <string name="selected">%1$s चयनित</string>
+    <string name="messages">संदेश</string>
+    <string name="send">संदेश भेजें</string>
+    <string name="reply">उत्तर</string>
+    <string name="connection_error">कनेक्ट नहीं हो सका। कृपया सुनिश्चित करें कि हवाई जहाज़ मोड बंद है।</string>
+    <string name="message_too_long">संदेश बहुत लंबा है!</string>
+    <string name="private_sms_database">निजी SMS डेटाबेस</string>
+    <string name="delete_thread">थ्रेड मिटाएं</string>
+    <string name="delete_message">संदेश हटाएं</string>
+    <string name="settings">सेटिंग्स</string>
+    <string name="theme">थीम</string>
+    <string name="system">सिस्टम</string>
+    <string name="light">हल्की</string>
+    <string name="dark">गहरी</string>
+    <string name="backup_interval">बैकअप अंतराल</string>
+    <string name="choose_dir">डॉयरेक्टरी</string>
+    <string name="both">दोनों</string>
+    <string name="none">कोई नहीं</string>
+    <string name="misc">विविध</string>
+    <string name="collapse_bottom_bar">स्क्रॉल पर निचली पट्टी को संक्षिप्त करें</string>
+    <string name="behavior">व्यवहार</string>
+    <string name="appearance">दिखावट</string>
+    <string name="backup">बैकअप</string>
+    <string name="backup_password">पासवर्ड</string>
+    <string name="about">बारे में</string>
+    <string name="license">लाइसेंस</string>
+    <string name="author">लेखक</string>
+    <string name="version">संस्करण</string>
+    <string name="add_website">वेबसाइट जोड़ें</string>
+    <string name="add_phone_number">फोन नंबर डालें</string>
+    <string name="private_sms_database_desc">SMS केवल ऐप के भीतर संग्रहीत किया जाएगा और अन्य ऐप्स में पहुंच योग्य नहीं होगा।</string>
+    <string name="export_vcf">vCard निर्यात करें</string>
+    <string name="import_sim">SIM से आयात करें</string>
+    <string name="encrypt_backups">बैकअप को zip के रूप में एन्क्रिप्ट करें</string>
+    <string name="add_e_mail">ई-मेल जोड़ें</string>
+    <string name="add_address">पता जोड़ें</string>
+    <string name="add_note">टिप्पणी जोड़ें</string>
+    <string name="add_event">कार्यक्रम जोड़ें</string>
+    <string name="date">तारीख</string>
+    <string name="search" tools:ignore="PrivateResource">खोजें</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
new file mode 100644
index 00000000..812874d7
--- /dev/null
+++ b/app/src/main/res/values-ia/strings.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="behavior">Comportamento</string>
+    <string name="save">Salveguardar</string>
+    <string name="filter">Filtrar</string>
+    <string name="reset">Reinitialisar</string>
+    <string name="message">Message</string>
+    <string name="add_to_contact">Adder al contacto</string>
+    <string name="website">Sito web</string>
+    <string name="nothing_here">Nihil hic.</string>
+    <string name="new_contact">Nove contacto</string>
+    <string name="email">E-mail</string>
+    <string name="edit">Modificar</string>
+    <string name="copy">Copiar</string>
+    <string name="none">Necun</string>
+    <string name="delete_contact">Deler le contacto</string>
+    <string name="phone">Telephono</string>
+    <string name="create_contact">Crear contacto</string>
+    <string name="contacts">Contactos</string>
+    <string name="event">Evento</string>
+    <string name="retry">Retentar</string>
+    <string name="contact">Contacto</string>
+    <string name="show_more_fields">Monstrar plus de campos</string>
+    <string name="empty_name">Le nomine non pote esser vacue!</string>
+    <string name="license">Licentia</string>
+    <string name="about">A proposito de</string>
+    <string name="more">Plus</string>
+    <string name="translation">Traduction</string>
+    <string name="address">Adresse</string>
+    <string name="cancel">Cancellar</string>
+    <string name="okay">OK</string>
+    <string name="pick_contact">Seliger un contacto</string>
+    <string name="show_less">Monstrar minus</string>
+    <string name="settings">Parametros</string>
+    <string name="create_shortcut">Crear un accesso directe</string>
+    <string name="system">Systema</string>
+    <string name="share">Compartir</string>
+    <string name="reply">Responder</string>
+    <string name="device">Apparato</string>
+    <string name="both">Ambe</string>
+    <string name="import_sim">Importar ab un carta SIM</string>
+    <string name="ftp">FTP</string>
+    <string name="delete_message">Deler message</string>
+    <string name="theme">Thema</string>
+    <string name="type">Typo</string>
+    <string name="appearance">Apparentia</string>
+    <string name="import_vcf">Importar vCard</string>
+    <string name="backup_interval">Intervallo de copias de securitate</string>
+    <string name="light">Clar</string>
+    <string name="delete">Deler</string>
+    <string name="message_too_long">Le message es troppo longe!</string>
+    <string name="version">Version</string>
+    <string name="selected">%1$s seligite</string>
+    <string name="start_tab">Scheda de initio</string>
+    <string name="copied">Copiate al area de transferentia</string>
+    <string name="send">Inviar un message</string>
+    <string name="other">Altere</string>
+    <string name="choose_dir">Directorio</string>
+    <string name="backup">Copia de securitate</string>
+    <string name="local">Local</string>
+    <string name="dark">Obscur</string>
+    <string name="search" tools:ignore="PrivateResource">Cercar</string>
+    <string name="new_group">Nove</string>
+    <string name="messages">Messages</string>
+    <string name="auto_backup">Copia de securitate automatic</string>
+    <string name="author">Autor</string>
+    <string name="account_type">Typo de conto</string>
+    <string name="backup_password">Contrasigno</string>
+    <string name="export_vcf">Exportar vCard</string>
+    <string name="custom">Personalisate</string>
+    <string name="title">Titulo</string>
+    <string name="fax_work">Fax de travalio</string>
+    <string name="birthday">Die natal</string>
+    <string name="name">Nomine</string>
+    <string name="organization">Organisation</string>
+    <string name="work">Travalio</string>
+    <string name="car">Automobile</string>
+    <string name="irreversible">Es tu secur? Isto non potera esser disfacite!</string>
+    <string name="phone_number">Numero de telephono</string>
+    <string name="anniversary">Anniversario</string>
+    <string name="mobile">Mobile</string>
+    <string name="sort_order">Ordinar</string>
+    <string name="max_backup_amount">Numero maxime de copias de securitate</string>
+    <string name="assistant">Assistente</string>
+    <string name="move">Displaciar</string>
+    <string name="delete_thread">Deler le topico</string>
+    <string name="private_sms_database">Base de datos private de SMS</string>
+    <string name="manage_groups">Gerer le gruppos</string>
+    <string name="photo">Photo</string>
+    <string name="last_name">Supernomine</string>
+    <string name="private_sms_database_desc">Le SMS solmente essera immagazinate intra del application e non essera accessibile in altere applicationes.</string>
+    <string name="blog">Blog</string>
+    <string name="nick_name">Pseudonymo</string>
+    <string name="delete_group">Deler le gruppo pro totos</string>
+    <string name="groups">Gruppos</string>
+    <string name="first_name">Prenomine</string>
+    <string name="group_already_exists">Le gruppo jam existe</string>
+    <string name="import_success">Importate.</string>
+    <string name="connection_error">Non pote connecter se. Assecura te de haber le modo aeroplano disactivate.</string>
+    <string name="note">Nota</string>
+    <string name="homepage">Pagina personal</string>
+    <string name="export_success">Exportate.</string>
+    <string name="misc">Miscellanea</string>
+    <string name="fax_home">Fax de casa</string>
+    <string name="collapse_bottom_bar">Collaber le barra inferior al rolar</string>
+    <string name="encrypt_backups">Cryptar copias de securitate como formato zip</string>
+    <string name="home">Casa</string>
+    <string name="colorful_contact_icons">Icones de contacto colorate</string>
+    <string name="send_message_as_multiple">Desira tu inviar le message como plure messages plus minor?</string>
+    <string name="dial">Telephonar</string>
+    <string name="add_website">Adder sito web</string>
+    <string name="add_phone_number">Adder numero de telephono</string>
+    <string name="add_e_mail">Adder E-mail</string>
+    <string name="add_address">Adder adresse</string>
+    <string name="add_note">Adder nota</string>
+    <string name="date">Data</string>
+    <string name="add_event">Adder evento</string>
+    <string name="import_confirm">Desira tu importar le file VCF seligite?</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
new file mode 100644
index 00000000..e8fa4002
--- /dev/null
+++ b/app/src/main/res/values-in/strings.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="irreversible">Yakin? Tindakan ini tidak dapat dibatalkan!</string>
+    <string name="cancel">Batal</string>
+    <string name="okay">Oke</string>
+    <string name="reset">Atur ulang</string>
+    <string name="create_contact">Buat kontak</string>
+    <string name="retry">Coba lagi</string>
+    <string name="share">Bagikan</string>
+    <string name="new_contact">Kontak baru</string>
+    <string name="create_shortcut">Buat jalan pintas</string>
+    <string name="dial">Telepon</string>
+    <string name="message">Pesan</string>
+    <string name="contact">Kontak</string>
+    <string name="filter">Filter</string>
+    <string name="more">Lainnya</string>
+    <string name="show_more_fields">Tampilkan kolom lainnya</string>
+    <string name="show_less">Tampilkan lebih sedikit</string>
+    <string name="pick_contact">Pilih kontak</string>
+    <string name="save">Simpan</string>
+    <string name="empty_name">Kolom nama tidak boleh kosong!</string>
+    <string name="import_success">Telah diimpor.</string>
+    <string name="export_success">Telah diekspor.</string>
+    <string name="nothing_here">Tidak ada apa pun di sini.</string>
+    <string name="phone">Telepon</string>
+    <string name="address">Alamat</string>
+    <string name="event">Peristiwa</string>
+    <string name="website">Situs web</string>
+    <string name="photo">Foto</string>
+    <string name="phone_number">Nomor telepon</string>
+    <string name="sort_order">Urutan urut</string>
+    <string name="account_type">Jenis akun</string>
+    <string name="first_name">Nama depan</string>
+    <string name="last_name">Nama belakang</string>
+    <string name="nick_name">Julukan</string>
+    <string name="organization">Organisasi</string>
+    <string name="type">Jenis</string>
+    <string name="home">Rumah</string>
+    <string name="work">Kerja</string>
+    <string name="mobile">Ponsel</string>
+    <string name="other">Lainnya</string>
+    <string name="custom">Kustom</string>
+    <string name="car">Mobil</string>
+    <string name="fax_home">Faks rumah</string>
+    <string name="fax_work">Faks kerja</string>
+    <string name="assistant">Asisten</string>
+    <string name="birthday">Ulang tahun</string>
+    <string name="edit">Sunting</string>
+    <string name="homepage">Layar depan</string>
+    <string name="ftp">FTP</string>
+    <string name="blog">Blog</string>
+    <string name="manage_groups">Atur kelompok</string>
+    <string name="delete_group">Hapus kelompok untuk semua</string>
+    <string name="new_group">Baru</string>
+    <string name="group_already_exists">Kelompok dengan nama ini sudah ada</string>
+    <string name="groups">Kelompok</string>
+    <string name="local">Lokal</string>
+    <string name="copy">Salin</string>
+    <string name="move">Pindah</string>
+    <string name="delete">Hapus</string>
+    <string name="selected">%1$s dipilih</string>
+    <string name="messages">Pesan</string>
+    <string name="send">Kirim pesan</string>
+    <string name="reply">Balas</string>
+    <string name="connection_error">Tidak dapat tersambung. Pastikan mode pesawat sedang tidak aktif.</string>
+    <string name="message_too_long">Pesan ini terlalu panjang!</string>
+    <string name="send_message_as_multiple">Apakah Anda ingin mengirimkan pesan panjang ini menjadi sejumlah pesan pendek?</string>
+    <string name="private_sms_database">Basis data SMS pribadi</string>
+    <string name="delete_thread">Hapus utas</string>
+    <string name="delete_message">Hapus pesan</string>
+    <string name="import_vcf">Impor vCard</string>
+    <string name="export_vcf">Ekspor vCard</string>
+    <string name="import_sim">Impor dari kartu SIM</string>
+    <string name="import_confirm">Apakah Anda ingin mengimpor berkas VCF yang dipilih?</string>
+    <string name="start_tab">Tab mulai</string>
+    <string name="theme">Tema</string>
+    <string name="system">Sistem</string>
+    <string name="light">Cerah</string>
+    <string name="dark">Gelap</string>
+    <string name="auto_backup">Simpan data cadangan secara otomatis</string>
+    <string name="backup_interval">Jangka waktu data cadangan</string>
+    <string name="misc">Serbaneka</string>
+    <string name="collapse_bottom_bar">Tutup bilah bawah saat menggulir</string>
+    <string name="colorful_contact_icons">Ikon kontak berwarna-warni</string>
+    <string name="behavior">Tindakan</string>
+    <string name="appearance">Penampilan</string>
+    <string name="backup">Data cadangan</string>
+    <string name="encrypt_backups">Enkripsi data cadangan dalam format ZIP</string>
+    <string name="backup_password">Kata sandi</string>
+    <string name="about">Tentang</string>
+    <string name="license">Lisensi</string>
+    <string name="search" tools:ignore="PrivateResource">Cari</string>
+    <string name="author">Pencipta</string>
+    <string name="version">Versi</string>
+    <string name="translation">Terjemahan</string>
+    <string name="add_e_mail">Tambah surel</string>
+    <string name="add_website">Tambah situs web</string>
+    <string name="add_phone_number">Tambah nomor telepon</string>
+    <string name="add_address">Tambah alamat</string>
+    <string name="add_note">Tambah catatan</string>
+    <string name="add_event">Tambah peristiwa</string>
+    <string name="date">Tanggal</string>
+    <string name="copied">Salin ke papan klip</string>
+    <string name="delete_contact">Hapus kontak</string>
+    <string name="add_to_contact">Tambahkan ke kontak</string>
+    <string name="contacts">Kontak</string>
+    <string name="email">Surel</string>
+    <string name="name">Nama</string>
+    <string name="anniversary">Hari ulang tahun</string>
+    <string name="note">Catatan</string>
+    <string name="title">Judul</string>
+    <string name="device">Perangkat</string>
+    <string name="settings">Pengaturan</string>
+    <string name="private_sms_database_desc">SMS ini hanya akan disimpan di dalam aplikasi ini dan tidak dapat diakses pada aplikasi lainnya.</string>
+    <string name="both">Keduanya</string>
+    <string name="max_backup_amount">Jumlah maksimal data cadangan yang diizinkan</string>
+    <string name="choose_dir">Direktori</string>
+    <string name="none">Tidak ada</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b2d03381..af09ab3d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -4,7 +4,7 @@
     <string name="search" tools:ignore="PrivateResource">Cerca</string>
     <string name="share">Condividi</string>
     <string name="phone">Telefono</string>
-    <string name="irreversible">Sei sicuro\? Quest\'azione non può essere annullata.</string>
+    <string name="irreversible">Sei sicuro? Quest\'azione non può essere annullata!</string>
     <string name="export_success">Esportato.</string>
     <string name="cancel">Annulla</string>
     <string name="create_contact">Crea un contatto</string>
@@ -52,7 +52,7 @@
     <string name="light">Chiaro</string>
     <string name="dark">Scuro</string>
     <string name="auto_backup">Backup automatico</string>
-    <string name="choose_dir">Scegli la cartella</string>
+    <string name="choose_dir">Cartella</string>
     <string name="both">Entrambi</string>
     <string name="none">Nessuno</string>
     <string name="sort_order">Ordina per</string>
@@ -93,4 +93,27 @@
     <string name="behavior">Comportamento</string>
     <string name="appearance">Aspetto</string>
     <string name="backup">Backup</string>
+    <string name="reply">Rispondi</string>
+    <string name="save">Salva</string>
+    <string name="message_too_long">Il messaggio è troppo lungo!</string>
+    <string name="contacts">Contatti</string>
+    <string name="send">Invia messaggio</string>
+    <string name="messages">Messaggi</string>
+    <string name="phone_number">Numero di telefono</string>
+    <string name="backup_password">Password</string>
+    <string name="connection_error">Impossibile connettersi. Assicurati che la modalità aereo sia disattivata.</string>
+    <string name="send_message_as_multiple">Vuoi inviare il messaggio come messaggi più piccoli?</string>
+    <string name="delete_message">Elimina messaggio</string>
+    <string name="encrypt_backups">Crittografa i backup come zip</string>
+    <string name="add_address">Aggiungi indirizzo</string>
+    <string name="add_event">Aggiungi evento</string>
+    <string name="add_website">Aggiungi sito web</string>
+    <string name="add_phone_number">Aggiungi numero di telefono</string>
+    <string name="add_e_mail">Aggiungi email</string>
+    <string name="add_note">Aggiungi nota</string>
+    <string name="date">Data</string>
+    <string name="private_sms_database">Database SMS privato</string>
+    <string name="private_sms_database_desc">Gli SMS saranno memorizzati solo all\'interno di quest\'app e non saranno accessibili in altre app.</string>
+    <string name="delete_thread">Elimina thread</string>
+    <string name="import_confirm">Vuoi importare il file VCF selezionato?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index be6c81d8..9f9a4b2a 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="irreversible">להמשיך\? זה בלתי הפיך.</string>
+    <string name="irreversible">להמשיך? זה בלתי הפיך!</string>
     <string name="retry">ניסיון חוזר</string>
     <string name="add_to_contact">הוספה לאיש קשר</string>
     <string name="new_contact">איש קשר חדש</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
new file mode 100644
index 00000000..ae6f1282
--- /dev/null
+++ b/app/src/main/res/values-my/strings.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="copied">ကလစ်ဘုတ် သို့ ကူးယူပြီးပါပြီ</string>
+    <string name="add_to_contact">အဆက်အသွယ်ထဲသို့ ထည့်မည်</string>
+    <string name="delete_contact">အဆက်အသွယ် ကိုဖျက်မည်</string>
+    <string name="irreversible">သေချာပါသလား?ပြန်လည်လုပ်ဆောင်၍မရပါ</string>
+    <string name="cancel">ပယ်ဖျက်မည်</string>
+    <string name="retry">ထပ်ကြိုးစားပါ</string>
+    <string name="new_contact">အဆက်အသွယ်သစ်</string>
+    <string name="share">မျှဝေမည်</string>
+    <string name="create_shortcut">ရှော့ကတ်ဖန်တီးမည်</string>
+    <string name="dial">ဖုန်း</string>
+    <string name="message">စာ</string>
+    <string name="contact">အဆက်အသွယ်</string>
+    <string name="contacts">အဆက်အသွယ်များ</string>
+    <string name="edit">ပြုပြင်မည်</string>
+    <string name="filter">စစ်ထုတ်ရန်</string>
+    <string name="show_less">လျှော့၍ပြပါ</string>
+    <string name="pick_contact">အဆက်အသွယ်ကိုရွေးမည်</string>
+    <string name="save">သိမ်းမည်</string>
+    <string name="empty_name">အမည်ပေးရန်လိုသည်!</string>
+    <string name="show_more_fields">ပို၍ပြပါ</string>
+    <string name="import_success">ထည့်သွင်းပြီး။</string>
+    <string name="export_success">ထုတ်ပြီး။</string>
+    <string name="phone_number">ဖုန်းနံပါတ်</string>
+    <string name="type">အမျိုးအစား</string>
+    <string name="sort_order">အစီအစဥ်</string>
+    <string name="account_type">အကောင့်အမျိုးအစား</string>
+    <string name="name">အမည်</string>
+    <string name="work">အလုပ်</string>
+    <string name="ftp">အက်ဖ်တီပီ</string>
+    <string name="mobile">မိုဘိုင်း</string>
+    <string name="other">အခြား</string>
+    <string name="custom">စိတ်ကြိုက်</string>
+    <string name="car">ကား</string>
+    <string name="manage_groups">အုပ်စုများကိုစီမံမည်</string>
+    <string name="delete_group">အားလုံးအတွက်အုပ်စုကိုဖျက်မည်</string>
+    <string name="new_group">အသစ်</string>
+    <string name="groups">အုပ်စုများ</string>
+    <string name="device">စက်</string>
+    <string name="copy">ကူးယူမည်</string>
+    <string name="messages">စာများ</string>
+    <string name="send">စာပို့မည်</string>
+    <string name="group_already_exists">အုပ်စုရှိပြီးသား</string>
+    <string name="connection_error">အဲပလိန်းမုဒ်ပိတ်ရန်လိုသည်။</string>
+    <string name="okay">အိုကေ</string>
+    <string name="reset">ပြန်စမည်</string>
+    <string name="create_contact">အဆက်အသွယ်ထည့်မည်</string>
+    <string name="more">ပို၍</string>
+    <string name="nothing_here">ဘာမှမရှိပါ။</string>
+    <string name="phone">ဖုန်း</string>
+    <string name="email">အီးမေးလ်</string>
+    <string name="address">လိပ်စာ</string>
+    <string name="event">အဖြစ်အပျက်</string>
+    <string name="website">ဝဘ်ဆိုဒ်</string>
+    <string name="photo">ပုံ</string>
+    <string name="first_name">အမည် အစ</string>
+    <string name="last_name">အမည် အဆုံး</string>
+    <string name="nick_name">အမည်ပြောင်</string>
+    <string name="organization">အဖွဲ့အစည်း</string>
+    <string name="home">အိမ်</string>
+    <string name="fax_home">အိမ် ဖက်</string>
+    <string name="fax_work">အလုပ် ဖက်</string>
+    <string name="assistant">လက်ထောက်</string>
+    <string name="birthday">မွေးနေ့</string>
+    <string name="anniversary">နှစ်ပတ်လည်</string>
+    <string name="note">မှတ်စု</string>
+    <string name="homepage">အဓိက</string>
+    <string name="blog">ဘလောဘ့်</string>
+    <string name="title">ခေါင်းစဥ်</string>
+    <string name="local">အတွင်း</string>
+    <string name="move">ရွှေ့မည်</string>
+    <string name="delete">ဖျက်မည်</string>
+    <string name="selected">%1$s ရွေးထား</string>
+    <string name="reply">စာပြန်မည်</string>
+    <string name="message_too_long">စာရှည်လွန်းသည်!</string>
+    <string name="send_message_as_multiple">စာကိုသေးငယ်တဲ့စာစုများအဖြစ်ပို့ချင်ပါသလား။</string>
+    <string name="private_sms_database">လုံခြုံသောစာသိမ်းဆည်းရာ</string>
+    <string name="delete_thread">စာစုကိုဖျက်ရန်</string>
+    <string name="delete_message">စာကိုဖျက်မည်</string>
+    <string name="import_vcf">ဗွီကတ်ထည့်မည်</string>
+    <string name="settings">ဆက်တင်များ</string>
+    <string name="theme">သင်း</string>
+    <string name="light">အလင်း</string>
+    <string name="dark">အမှောင်</string>
+    <string name="auto_backup">အလိုအလျောက်မှတ်တမ်းတင်ခြင်း</string>
+    <string name="max_backup_amount">အများဆုံးထားရှိမည့်မှတ်တမ်းများ</string>
+    <string name="choose_dir">ဖိုင်လမ်းကြောင်း</string>
+    <string name="both">နှစ်ခုလုံး</string>
+    <string name="none">တစ်ခုမျှမဟုတ်</string>
+    <string name="misc">အမ်အိုင်အက်စ်စီ</string>
+    <string name="backup_password">စကားဝှက်</string>
+    <string name="about">အကြောင်း</string>
+    <string name="author">ဖန်တီးသူ</string>
+    <string name="version">ဗားရှင်း</string>
+    <string name="add_website">ဝဘ်ဆိုဒ်ထည့်မည်</string>
+    <string name="add_phone_number">ဖုန်းနံပါတ်ထည့်မည်</string>
+    <string name="add_address">လိပ်စာထည့်မည်</string>
+    <string name="add_note">မှတ်စုထည့်မည်</string>
+    <string name="date">ရက်စွဲ</string>
+    <string name="search" tools:ignore="PrivateResource">ရှာမည်</string>
+    <string name="private_sms_database_desc">SMS ကိုအက်ပလီကေးရှင်းတွင်သာသိမ်းဆည်းထားပြီးအခြားအက်ပ်များတွင်မတွေ့နိုင်ပါ။</string>
+    <string name="export_vcf">ဗွီကတ်ထုတ်မည်</string>
+    <string name="system">စနစ်</string>
+    <string name="import_sim">ဆင်းမှသွင်းမည်</string>
+    <string name="start_tab">တက်ဘ်ဖွင့်ရန်</string>
+    <string name="backup_interval">မှတ်တမ်းတင်မှုကြားကာလ</string>
+    <string name="behavior">အပြုအမူ</string>
+    <string name="collapse_bottom_bar">အောက်ဘားတန်းအားဝှက်ထားပါ</string>
+    <string name="colorful_contact_icons">ရောင်စုံအိုင်ကွန်များ</string>
+    <string name="appearance">အသွင်အပြင်</string>
+    <string name="backup">မှတ်တမ်း</string>
+    <string name="encrypt_backups">မှတ်တမ်းဝှက်များကိုဖိုင်ချုံ့သိမ်းမည်</string>
+    <string name="translation">ဘာသာပြန်</string>
+    <string name="add_e_mail">အီးမေးလ်ထည့်မည်</string>
+    <string name="add_event">အဖြစ်အပျက်ထည့်မည်</string>
+    <string name="license">လိုင်စင်</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
index 230a2184..08b1835f 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@@ -14,7 +14,7 @@
     <string name="birthday">ଜନ୍ମଦିନ</string>
     <string name="anniversary">ବାର୍ଷିକୀ</string>
     <string name="export_vcf">VCard ରପ୍ତାନି କରନ୍ତୁ</string>
-    <string name="about">ଵିଷୟରେ</string>
+    <string name="about">ସମ୍ବନ୍ଧରେ</string>
     <string name="license">ଲାଇସେନ୍ସ</string>
     <string name="author">ଲେଖକ</string>
     <string name="version">ସଂସ୍କରଣ</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 2fd8d046..ac2e418c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2,7 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="last_name">Nazwisko</string>
     <string name="type">Typ</string>
-    <string name="home">Główny ekran</string>
+    <string name="home">Dom</string>
     <string name="search" tools:ignore="PrivateResource">Szukaj</string>
     <string name="copied">Skopiowano do schowka</string>
     <string name="delete_contact">Usuń kontakt</string>
@@ -21,7 +21,7 @@
     <string name="empty_name">Nazwa nie może być pusta!</string>
     <string name="import_success">Zaimportowano.</string>
     <string name="export_success">Wyeksportowano.</string>
-    <string name="nothing_here">Nic tutaj nie ma.</string>
+    <string name="nothing_here">Nie ma tu nic.</string>
     <string name="phone">Telefon</string>
     <string name="email">E-mail</string>
     <string name="address">Adres</string>
@@ -41,7 +41,7 @@
     <string name="anniversary">Rocznica</string>
     <string name="note">Notatka</string>
     <string name="manage_groups">Zarządzaj grupami</string>
-    <string name="delete_group">Usuń grupę globalnie</string>
+    <string name="delete_group">Usuń grupę dla wszystkich</string>
     <string name="title">Tytuł</string>
     <string name="new_group">Nowe</string>
     <string name="group_already_exists">Grupa już istnieje</string>
@@ -94,7 +94,7 @@
     <string name="send">Wyślij wiadomość</string>
     <string name="photo">Zdjęcie</string>
     <string name="show_more_fields">Pokaż więcej pól</string>
-    <string name="backup">Kopia</string>
+    <string name="backup">Kopia zapasowa</string>
     <string name="more">Więcej</string>
     <string name="private_sms_database_desc">SMS będą przechowywane wyłącznie w aplikacji i nie będą dostępne w innych aplikacjach.</string>
     <string name="blog">Blog</string>
@@ -106,4 +106,14 @@
     <string name="backup_password">Hasło</string>
     <string name="connection_error">Nie można się połączyć. Upewnij się, czy tryb samolotowy jest wyłączony.</string>
     <string name="homepage">Strona główna</string>
+    <string name="website">Strona internetowa</string>
+    <string name="send_message_as_multiple">Czy chcesz wysłać wiadomość jako kilka mniejszych wiadomości?</string>
+    <string name="add_website">Dodaj stronę</string>
+    <string name="add_phone_number">Dodaj numer telefonu</string>
+    <string name="add_e_mail">Dodaj adres e-mail</string>
+    <string name="add_address">Dodaj adres</string>
+    <string name="add_note">Dodaj notatkę</string>
+    <string name="add_event">Dodaj wydarzenie</string>
+    <string name="date">Data</string>
+    <string name="import_confirm">Czy chcesz zaimportować wybrany plik VCF?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 77893e35..81568705 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -9,7 +9,7 @@
     <string name="search" tools:ignore="PrivateResource">Pesquisa</string>
     <string name="copied">Copiado para a área de transferência</string>
     <string name="delete_contact">Excluir contato</string>
-    <string name="irreversible">Você tem certeza\? Isso não pode ser desfeito.</string>
+    <string name="irreversible">Você tem certeza? Isso não pode ser desfeito!</string>
     <string name="cancel">Cancelar</string>
     <string name="okay">Ok</string>
     <string name="reset">Redefinir</string>
@@ -107,4 +107,13 @@
     <string name="phone_number">Número de telefone</string>
     <string name="backup_password">Senha</string>
     <string name="connection_error">Não foi possível conectar. Por favor, verifique se o modo avião está desligado.</string>
+    <string name="import_confirm">Você quer importar o arquivo VCF selecionado?</string>
+    <string name="add_website">Adicionar Website</string>
+    <string name="add_phone_number">Adicionar número de telefone</string>
+    <string name="add_e_mail">Adicionar Email</string>
+    <string name="add_address">Adicionar Endereço</string>
+    <string name="add_note">Adicionar Observação</string>
+    <string name="add_event">Adicionar Evento</string>
+    <string name="date">Data</string>
+    <string name="send_message_as_multiple">Você quer enviar a mensagem como múltiplas mensagens pequenas?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 1602a4ad..4148c55b 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -5,7 +5,7 @@
     <string name="search" tools:ignore="PrivateResource">Pesquisar</string>
     <string name="copied">Copiado para a área de transferência</string>
     <string name="delete_contact">Eliminar contacto</string>
-    <string name="irreversible">Tem a certeza\? Isto não pode ser desfeito.</string>
+    <string name="irreversible">Tem a certeza? Isto não pode ser desfeito!</string>
     <string name="cancel">Cancelar</string>
     <string name="create_contact">Criar contacto</string>
     <string name="reset">Repor</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8ce64850..586eb363 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -7,7 +7,7 @@
     <string name="fax_work">Рабочий факс</string>
     <string name="anniversary">Юбилей</string>
     <string name="version">Версия</string>
-    <string name="irreversible">Вы уверены\? Это действие невозможно отменить.</string>
+    <string name="irreversible">Вы уверены? Это действие невозможно отменить!</string>
     <string name="cancel">Отмена</string>
     <string name="okay">Ок</string>
     <string name="reset">Сброс</string>
@@ -53,7 +53,7 @@
     <string name="dark">Тёмная</string>
     <string name="auto_backup">Автоматическое резервное копирование</string>
     <string name="both">В оба расположения</string>
-    <string name="none">Отключить</string>
+    <string name="none">Откл.</string>
     <string name="delete">Удалить</string>
     <string name="choose_dir">Папка</string>
     <string name="manage_groups">Управление группами</string>
@@ -107,4 +107,13 @@
     <string name="delete_message">Удалить сообщение</string>
     <string name="private_sms_database_desc">SMS будут сохранены внутри приложения и не будут доступны другим приложениям.</string>
     <string name="phone_number">Номер телефона</string>
+    <string name="send_message_as_multiple">Разбить сообщение на несколько маленьких перед отправкой?</string>
+    <string name="add_event">Добавить событие</string>
+    <string name="add_website">Добавить веб-сайт</string>
+    <string name="add_phone_number">Добавить номер телефона</string>
+    <string name="add_e_mail">Добавить эл. почту</string>
+    <string name="add_note">Добавить примечание</string>
+    <string name="add_address">Добавить адрес</string>
+    <string name="date">Дата</string>
+    <string name="import_confirm">Импортировать выбранный VCF файл?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 834fd923..79bcfaae 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -5,7 +5,7 @@
     <string name="search" tools:ignore="PrivateResource">Претрага</string>
     <string name="copied">Копирано у привремену меморију</string>
     <string name="delete_contact">Избриши контакт</string>
-    <string name="irreversible">Да ли сте сигурни\? Ово се не може поништити.</string>
+    <string name="irreversible">Да ли сте сигурни? Ово се не може поништити!</string>
     <string name="cancel">Откажи</string>
     <string name="okay">У реду</string>
     <string name="reset">Ресетуј</string>
@@ -118,4 +118,13 @@
     <string name="delete_message">Избриши поруку</string>
     <string name="private_sms_database_desc">SMS ће бити сачуван само у апликацији и неће бити доступан у другим апликацијама.</string>
     <string name="phone_number">Број телефона</string>
+    <string name="send_message_as_multiple">Желите ли да пошаљете поруку као више мањих порука?</string>
+    <string name="add_phone_number">Додај број телефона</string>
+    <string name="add_e_mail">Додај имејл</string>
+    <string name="date">Датум</string>
+    <string name="add_address">Додај адресу</string>
+    <string name="add_event">Додај догађај</string>
+    <string name="add_website">Додај веб-сајт</string>
+    <string name="add_note">Додај белешку</string>
+    <string name="import_confirm">Желите ли да увезете изабрани VCF фајл?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
new file mode 100644
index 00000000..92479679
--- /dev/null
+++ b/app/src/main/res/values-sv/strings.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="behavior">Beteende</string>
+    <string name="reply">Svara</string>
+    <string name="save">Spara</string>
+    <string name="device">Enhet</string>
+    <string name="title">Titel</string>
+    <string name="filter">Filtrera</string>
+    <string name="reset">Återställ</string>
+    <string name="import_sim">Importera från SIM-kort</string>
+    <string name="ftp">FTP</string>
+    <string name="assistant">Assistent</string>
+    <string name="message">Meddela</string>
+    <string name="move">Flytta</string>
+    <string name="fax_work">Fax arbete</string>
+    <string name="add_to_contact">Lägg till i kontakt</string>
+    <string name="website">Webbplats</string>
+    <string name="fax_home">Fax hem</string>
+    <string name="delete_message">Ta bort meddelande</string>
+    <string name="nothing_here">Ingenting här.</string>
+    <string name="new_contact">Ny kontakt</string>
+    <string name="birthday">Födelsedag</string>
+    <string name="email">E-post</string>
+    <string name="edit">Redigera</string>
+    <string name="copy">Kopiera</string>
+    <string name="none">Ingen</string>
+    <string name="theme">Tema</string>
+    <string name="type">Typ</string>
+    <string name="appearance">Utseende</string>
+    <string name="name">Namn</string>
+    <string name="import_vcf">Importera vCard</string>
+    <string name="delete_contact">Ta bort kontakt</string>
+    <string name="organization">Organisation</string>
+    <string name="light">Ljust</string>
+    <string name="manage_groups">Hantera grupper</string>
+    <string name="phone">Telefon</string>
+    <string name="delete">Ta bort</string>
+    <string name="create_contact">Skapa kontakt</string>
+    <string name="message_too_long">Meddelandet är för långt!</string>
+    <string name="version">Version</string>
+    <string name="selected">%1$s vald</string>
+    <string name="contacts">Kontakter</string>
+    <string name="copied">Kopiera till urklippet</string>
+    <string name="send">Skicka meddelande</string>
+    <string name="retry">Försök igen</string>
+    <string name="other">Övrigt</string>
+    <string name="contact">Kontakt</string>
+    <string name="photo">Foto</string>
+    <string name="show_more_fields">Visa fler fält</string>
+    <string name="work">Arbete</string>
+    <string name="backup">Säkerhetskopiera</string>
+    <string name="license">Licens</string>
+    <string name="car">Bil</string>
+    <string name="about">Om</string>
+    <string name="local">Lokalt</string>
+    <string name="more">Mer</string>
+    <string name="translation">Översättning</string>
+    <string name="address">Adress</string>
+    <string name="last_name">Efternamn</string>
+    <string name="dark">Mörkt</string>
+    <string name="home">Hem</string>
+    <string name="cancel">Avbryt</string>
+    <string name="irreversible">Är du säker? Detta kan inte ångras!</string>
+    <string name="blog">Blogg</string>
+    <string name="nick_name">Smeknamn</string>
+    <string name="colorful_contact_icons">Färgglada kontaktikoner</string>
+    <string name="search" tools:ignore="PrivateResource">Sök</string>
+    <string name="delete_group">Ta bort grupp för alla</string>
+    <string name="new_group">Ny</string>
+    <string name="groups">Grupper</string>
+    <string name="pick_contact">Välj kontakt</string>
+    <string name="messages">Meddelanden</string>
+    <string name="first_name">Förnamn</string>
+    <string name="auto_backup">Automatisk säkerhetskopiering</string>
+    <string name="show_less">Visa mindre</string>
+    <string name="settings">Inställningar</string>
+    <string name="phone_number">Telefonnummer</string>
+    <string name="group_already_exists">Gruppen finns redan</string>
+    <string name="author">Skapare</string>
+    <string name="create_shortcut">Skapa genväg</string>
+    <string name="import_success">Importerad.</string>
+    <string name="anniversary">Jubileum</string>
+    <string name="account_type">Kontotyp</string>
+    <string name="backup_password">Lösenord</string>
+    <string name="system">System</string>
+    <string name="connection_error">Kunde inte ansluta. Kontrollera att flygplansläget är avstängt.</string>
+    <string name="share">Dela</string>
+    <string name="export_vcf">Exportera vCard</string>
+    <string name="mobile">Mobil</string>
+    <string name="dial">Ring</string>
+    <string name="custom">Anpassad</string>
+    <string name="note">Anteckning</string>
+    <string name="export_success">Exporterad.</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 3594491c..54154197 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -34,7 +34,7 @@
     <string name="phone">Telefon</string>
     <string name="app_name">Connect You</string>
     <string name="copied">Panoya kopyalandı</string>
-    <string name="irreversible">Emin misin\? Bu geri alınamaz.</string>
+    <string name="irreversible">Emin misiniz? Bu geri alınamaz!</string>
     <string name="cancel">İptal</string>
     <string name="search" tools:ignore="PrivateResource">Arama</string>
     <string name="okay">Tamam</string>
@@ -108,4 +108,13 @@
     <string name="delete_message">Mesajı sil</string>
     <string name="private_sms_database_desc">SMS\'ler yalnızca uygulama içinde saklanacak ve diğer uygulamalardan erişilemeyecektir.</string>
     <string name="phone_number">Telefon numarası</string>
+    <string name="send_message_as_multiple">Mesajı birden fazla küçük mesaj olarak göndermek istiyor musunuz?</string>
+    <string name="add_website">Web Sitesi Ekle</string>
+    <string name="add_e_mail">E-posta Adresi Ekle</string>
+    <string name="add_address">Adres Ekle</string>
+    <string name="add_phone_number">Telefon Numarası Ekle</string>
+    <string name="add_note">Not Ekle</string>
+    <string name="add_event">Etkinlik Ekle</string>
+    <string name="date">Tarih</string>
+    <string name="import_confirm">Seçilen vCard\'ı içe aktarmak istiyor musunuz?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 92305399..02d2f982 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -8,7 +8,7 @@
     <string name="copied">Скопійовано в буфер обміну</string>
     <string name="empty_name">Ім’я не може бути порожнім!</string>
     <string name="fax_home">Факс дому</string>
-    <string name="irreversible">Ви впевнені\? Це не можна відмінити.</string>
+    <string name="irreversible">Ви впевнені? Це не можна відмінити!</string>
     <string name="create_contact">Створити контакт</string>
     <string name="share">Поділитися</string>
     <string name="retry">Спробувати знову</string>
@@ -108,4 +108,13 @@
     <string name="delete_message">Видалити повідомлення</string>
     <string name="private_sms_database_desc">SMS зберігатимуться лише у застосунку і не будуть доступні в інших застосунках.</string>
     <string name="phone_number">Номер телефону</string>
+    <string name="send_message_as_multiple">Ви хочете надіслати повідомлення кількома меншими?</string>
+    <string name="add_website">Додати вебсайт</string>
+    <string name="add_phone_number">Додати номер телефону</string>
+    <string name="add_e_mail">Додати пошту</string>
+    <string name="add_address">Додати адресу</string>
+    <string name="date">Дата</string>
+    <string name="add_note">Додати примітку</string>
+    <string name="add_event">Додати подію</string>
+    <string name="import_confirm">Ви хочете імпортувати вибраний VCF-файл?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index facc35bd..4e6c197d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -11,7 +11,7 @@
     <string name="search" tools:ignore="PrivateResource">搜索</string>
     <string name="copied">已复制到剪贴板</string>
     <string name="delete_contact">删除联系人</string>
-    <string name="irreversible">你确定吗？此操作无法撤销。</string>
+    <string name="irreversible">你确定吗？此操作无法撤销！</string>
     <string name="cancel">取消</string>
     <string name="okay">确定</string>
     <string name="reset">重设</string>
@@ -107,4 +107,13 @@
     <string name="delete_message">删除消息</string>
     <string name="private_sms_database_desc">短信将仅保存在此应用内并阻止其他应用访问。</string>
     <string name="phone_number">电话号码</string>
+    <string name="send_message_as_multiple">你想将消息分为多个更小的消息发送吗？</string>
+    <string name="add_website">添加网站</string>
+    <string name="add_phone_number">添加电话号码</string>
+    <string name="add_note">添加备注</string>
+    <string name="date">日期</string>
+    <string name="add_e_mail">添加电子邮件</string>
+    <string name="add_address">添加地址</string>
+    <string name="add_event">添加事件</string>
+    <string name="import_confirm">您是否要导入选定的 VCF 文件？</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..7b7fa396
--- /dev/null
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="save">儲存</string>
+    <string name="filter">篩選</string>
+    <string name="reset">重設</string>
+    <string name="message">訊息</string>
+    <string name="add_to_contact">新增至聯絡人</string>
+    <string name="new_contact">新的聯絡人</string>
+    <string name="edit">編輯</string>
+    <string name="delete_contact">移除聯絡人</string>
+    <string name="create_contact">建立聯絡人</string>
+    <string name="contacts">聯絡人</string>
+    <string name="copied">已複製到剪貼簿</string>
+    <string name="retry">重試</string>
+    <string name="contact">聯絡人</string>
+    <string name="more">更多</string>
+    <string name="cancel">取消</string>
+    <string name="irreversible">您確定嗎？這個動作無法復原！</string>
+    <string name="okay">確認</string>
+    <string name="search" tools:ignore="PrivateResource">搜尋</string>
+    <string name="show_less">顯示較少</string>
+    <string name="create_shortcut">建立捷徑</string>
+    <string name="share">分享</string>
+    <string name="dial">撥號</string>
+    <string name="website">網站</string>
+    <string name="nothing_here">這裡什麼都沒有。</string>
+    <string name="email">電子郵件</string>
+    <string name="phone">電話</string>
+    <string name="event">事件</string>
+    <string name="photo">圖片</string>
+    <string name="show_more_fields">顯示更多欄位</string>
+    <string name="empty_name">名稱不能是空的</string>
+    <string name="address">地址</string>
+    <string name="pick_contact">選擇聯絡人</string>
+    <string name="phone_number">電話號碼</string>
+    <string name="import_success">已匯入。</string>
+    <string name="export_success">已匯出。</string>
+    <string name="account_type">帳戶類型</string>
+    <string name="name">名稱</string>
+    <string name="first_name">名字</string>
+    <string name="last_name">姓氏</string>
+    <string name="organization">組織</string>
+    <string name="type">類型</string>
+    <string name="other">其他</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ea5cfe76..0edea99b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="search" tools:ignore="PrivateResource">Search</string>
     <string name="copied">Copied to clipboard</string>
     <string name="delete_contact">Delete contact</string>
-    <string name="irreversible">Are you sure\? This can\'t be undone.</string>
+    <string name="irreversible">Are you sure? This can\'t be undone!</string>
     <string name="cancel">Cancel</string>
     <string name="okay">Okay</string>
     <string name="reset">Reset</string>
@@ -84,6 +84,7 @@
     <string name="reply">Reply</string>
     <string name="connection_error">Could not connect. Please ensure airplane mode is off.</string>
     <string name="message_too_long">Message is too long!</string>
+    <string name="send_message_as_multiple">Do you want to send the message as multiple smaller ones?</string>
     <string name="private_sms_database">Private SMS Database</string>
     <string name="private_sms_database_desc">The SMS will only be stored within the app and not be accessible in other apps.</string>
     <string name="delete_thread">Delete thread</string>
@@ -100,6 +101,7 @@
     <string name="import_vcf">Import vCard</string>
     <string name="export_vcf">Export vCard</string>
     <string name="import_sim">Import from SIM</string>
+    <string name="import_confirm">Do you want to import the selected VCF file?</string>
     <!-- Settings -->
     <string name="settings">Settings</string>
     <string name="start_tab">Start tab</string>
@@ -127,6 +129,14 @@
     <string name="author">Author</string>
     <string name="version">Version</string>
     <string name="translation">Translation</string>
+    <string name="add_website">Add Website</string>
+    <string name="add_phone_number">Add Phone number</string>
+    <string name="add_e_mail">Add E-mail</string>
+    <string name="add_address">Add Address</string>
+    <string name="add_note">Add Note</string>
+    <string name="add_event">Add Event</string>
+    <string name="date">Date</string>
+    <string name="amoled">Amoled</string>
     <string name="calls">Calls</string>
     <string name="decline">Decline</string>
     <string name="accept">Accept</string>
diff --git a/app/src/test/java/com/bnyro/contacts/ExampleUnitTest.kt b/app/src/test/java/com/bnyro/contacts/ExampleUnitTest.kt
index 6471e642..a4c616e1 100644
--- a/app/src/test/java/com/bnyro/contacts/ExampleUnitTest.kt
+++ b/app/src/test/java/com/bnyro/contacts/ExampleUnitTest.kt
@@ -1,6 +1,8 @@
 package com.bnyro.contacts
 
+import com.bnyro.contacts.receivers.SmsReceiver
 import com.bnyro.contacts.util.CalendarUtils
+import com.bnyro.contacts.util.SmsUtil
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
@@ -13,7 +15,38 @@ class ExampleUnitTest {
     @Test
     fun dateConversion() {
         val date = "2023-05-09"
-        val str = CalendarUtils.dateToMillis(date)
-        assertEquals(date, CalendarUtils.millisToDate(str.toString(), CalendarUtils.isoDateFormat))
+        val millis = CalendarUtils.dateToMillis(date)!!
+        assertEquals(date, CalendarUtils.millisToDate(millis, CalendarUtils.isoDateFormat))
+    }
+
+    @Test
+    fun splitLongSms() {
+        val text =
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ornare lectus sit amet est placerat in egestas. Lectus sit amet est placerat. Molestie a iaculis at erat pellentesque adipiscing commodo elit. Sociis natoque penatibus et magnis dis parturient montes. Non enim praesent elementum facilisis leo vel fringilla est. Ut morbi tincidunt augue interdum velit euismod. Pharetra massa massa ultricies mi quis hendrerit. At erat pellentesque adipiscing commodo elit at imperdiet. Risus commodo viverra maecenas accumsan lacus vel facilisis volutpat est. In hac habitasse platea dictumst quisque sagittis purus. Netus et malesuada fames ac turpis egestas sed tempus. Neque volutpat ac tincidunt vitae semper quis lectus. Dui faucibus in ornare quam viverra.\n" +
+                "\n" +
+                "Tempor id eu nisl nunc mi ipsum. Nulla porttitor massa id neque aliquam vestibulum morbi. Sit amet nulla facilisi morbi tempus iaculis urna id. Aliquet bibendum enim facilisis gravida. Velit scelerisque in dictum non consectetur a erat. Sit amet facilisis magna etiam tempor orci eu lobortis. Vulputate enim nulla aliquet porttitor lacus luctus. Ipsum nunc aliquet bibendum enim facilisis gravida neque convallis. Luctus accumsan tortor posuere ac ut consequat semper viverra. Cras adipiscing enim eu turpis egestas pretium aenean pharetra magna. Tristique sollicitudin nibh sit amet commodo nulla facilisi nullam vehicula. Montes nascetur ridiculus mus mauris vitae ultricies leo integer malesuada. Nulla facilisi nullam vehicula ipsum. Turpis egestas sed tempus urna et. Leo integer malesuada nunc vel. Aliquet nec ullamcorper sit amet risus nullam eget felis. Consequat nisl vel pretium lectus quam id leo. Magnis dis parturient montes nascetur ridiculus mus mauris vitae ultricies.\n" +
+                "\n" +
+                "In nisl nisi scelerisque eu ultrices vitae auctor eu. Eu nisl nunc mi ipsum faucibus vitae aliquet nec ullamcorper. Dictum varius duis at consectetur lorem donec massa. Purus in mollis nunc sed id semper. Euismod nisi porta lorem mollis aliquam ut. Aliquam eleifend mi in nulla posuere sollicitudin aliquam ultrices sagittis. Volutpat maecenas volutpat blandit aliquam etiam erat. Velit laoreet id donec ultrices tincidunt arcu non sodales neque. Vel elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi. Viverra mauris in aliquam sem fringilla ut morbi tincidunt augue.\n" +
+                "\n" +
+                "Viverra orci sagittis eu volutpat odio facilisis mauris. Mi eget mauris pharetra et ultrices neque ornare aenean euismod. Facilisis leo vel fringilla est. Vulputate odio ut enim blandit volutpat maecenas. Volutpat commodo sed egestas egestas fringilla phasellus faucibus scelerisque eleifend. Risus at ultrices mi tempus imperdiet nulla. Praesent elementum facilisis leo vel. Eros in cursus turpis massa tincidunt dui ut. Elit ullamcorper dignissim cras tincidunt lobortis feugiat vivamus. Nulla aliquet porttitor lacus luctus accumsan tortor posuere. Vestibulum rhoncus est pellentesque elit ullamcorper dignissim cras tincidunt lobortis. Quis blandit turpis cursus in hac habitasse platea dictumst. Id aliquet risus feugiat in. Condimentum mattis pellentesque id nibh tortor id. Ac tortor dignissim convallis aenean et tortor at risus viverra. Vehicula ipsum a arcu cursus vitae congue mauris rhoncus.\n" +
+                "\n" +
+                "Porttitor rhoncus dolor purus non. Vel elit scelerisque mauris pellentesque. Semper auctor neque vitae tempus quam. Elementum nibh tellus molestie nunc non blandit massa enim nec. Dictum non consectetur a erat nam at lectus. Vestibulum sed arcu non odio euismod lacinia. Semper auctor neque vitae tempus quam pellentesque nec nam aliquam. Massa placerat duis ultricies lacus sed turpis. Arcu non odio euismod lacinia at quis risus sed vulputate. Mauris in aliquam sem fringilla. Odio tempor orci dapibus ultrices in iaculis. Nec ultrices dui sapien eget mi proin. Nisi quis eleifend quam adipiscing. Morbi tristique senectus et netus et. Neque laoreet suspendisse interdum consectetur.\n" +
+                "\n" +
+                "Nunc lobortis mattis aliquam faucibus purus in. Augue eget arcu dictum varius duis. Et egestas quis ipsum suspendisse ultrices gravida dictum fusce. Sodales ut etiam sit amet nisl purus. Viverra orci sagittis eu volutpat odio facilisis mauris sit. Turpis cursus in hac habitasse platea. Aenean euismod elementum nisi quis eleifend. Sagittis id consectetur purus ut faucibus pulvinar elementum integer. Turpis egestas pretium aenean pharetra magna ac placerat vestibulum. Et malesuada fames ac turpis egestas sed. Velit egestas dui id ornare arcu odio ut sem. Ut enim blandit volutpat maecenas. Et netus et malesuada fames ac turpis egestas. Cursus eget nunc scelerisque viverra. Eros donec ac odio tempor. Suscipit tellus mauris a diam."
+
+        SmsUtil.splitSmsText(text).forEach {
+            assert(it.length <= SmsUtil.MAX_CHAR_LIMIT)
+        }
+    }
+
+    @Test
+    fun matchVerificationCodeRegex() {
+        val test1 = "Hello World,123456. That's it."
+        val test2 = "Hello World, 123456 . That's it."
+        val test3 = "Hello World, 23456 . That's it."
+
+        assertEquals("123456", SmsReceiver.verificationCodeRegex.find(test1)?.value)
+        assertEquals("123456", SmsReceiver.verificationCodeRegex.find(test2)?.value)
+        assertEquals(null, SmsReceiver.verificationCodeRegex.find(test3)?.value)
     }
 }
diff --git a/app/src/test/java/com/bnyro/contacts/RegexTest.kt b/app/src/test/java/com/bnyro/contacts/RegexTest.kt
new file mode 100644
index 00000000..d094deea
--- /dev/null
+++ b/app/src/test/java/com/bnyro/contacts/RegexTest.kt
@@ -0,0 +1,60 @@
+package com.bnyro.contacts
+
+import com.bnyro.contacts.util.emailRegex
+import com.bnyro.contacts.util.linkRegex
+import com.bnyro.contacts.util.phoneRegex
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class RegexTests {
+
+    @Test
+    fun linkRegex() {
+        val regex = linkRegex
+
+        // Valid Links
+        assertTrue(regex.matches("www.google.com"))
+        assertTrue(regex.matches("https://www.google.com"))
+        assertTrue(regex.matches("http://www.example.com/path/to/file"))
+        assertTrue(regex.matches("example.com/path/to/file"))
+        assertTrue(regex.matches("http://www.example.com/path/to/file?t=123&v=1g"))
+        assertTrue(regex.matches("example.com/path/to/file?t=1234&v=5"))
+        assertTrue(regex.matches("github.com/you-apps/RecordYou"))
+
+        // Invalid Links
+        assertFalse(regex.matches("ftp.mozilla.org/pub/firefox/releases/"))
+        assertFalse(regex.matches("ftp://ftp.mozilla.org/pub/firefox/releases/"))
+    }
+
+    @Test
+    fun emailRegex() {
+        val regex = emailRegex
+
+        // Valid E-mails
+        assertTrue(regex.matches("john.doe@example.com"))
+        assertTrue(regex.matches("john.doe@is-a.dev"))
+        assertTrue(regex.matches("jane_doe@example.net"))
+        assertTrue(regex.matches("test+test@example.org"))
+
+        // Invalid E-mails
+        assertFalse(regex.matches("johndoe@example"))
+        assertFalse(regex.matches("janedoe@example."))
+        assertFalse(regex.matches("test@example"))
+    }
+
+    @Test
+    fun phoneRegex() {
+        val regex = phoneRegex
+
+        // Valid Phone Numbers
+        assertTrue(regex.matches("+1 555 555 5555"))
+        assertTrue(regex.matches("5555555555"))
+        assertTrue(regex.matches("(555) 555-5555"))
+        assertTrue(regex.matches("555-555-5555"))
+
+        // Invalid Phone Numbers
+        assertFalse(regex.matches("123 456 789"))
+        assertFalse(regex.matches("+123 456 7890"))
+    }
+}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index f4e65b8b..f08f5d79 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,7 @@ buildscript {
     val compose_version by extra("1.5.0-beta01")
 } // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "7.4.2" apply false
-    id("com.android.library") version "7.4.2" apply false
+    id("com.android.application") version "8.2.2" apply false
+    id("com.android.library") version "8.2.2" apply false
     id("org.jetbrains.kotlin.android") version "1.8.10" apply false
 }
diff --git a/gradle.properties b/gradle.properties
index 3c5031eb..a2e90d87 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c4308c8e..a586e9e2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Jan 24 15:00:58 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1db13926..e824c721 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,6 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven("https://jitpack.io")
     }
 }
 rootProject.name = "Connect You"