diff --git a/res/drawable-hdpi/ic_launcher_background.png b/res/drawable-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..239ffd7b7d30db42c447552e08274c33fd54e738
Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_background.png differ
diff --git a/res/drawable-hdpi/ic_launcher_foreground.png b/res/drawable-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..239ffd7b7d30db42c447552e08274c33fd54e738
Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-mdpi/ic_launcher_background.png b/res/drawable-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..65cb629deefefbce402cc6d8c040dc2eddd5802e
Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_background.png differ
diff --git a/res/drawable-mdpi/ic_launcher_foreground.png b/res/drawable-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..42874a238179ce72e1c7258ef09d1420c527e238
Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-xhdpi/ic_launcher_background.png b/res/drawable-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..d838054772d607aad73b6c5dc275f9ef7e65ea9d
Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_background.png differ
diff --git a/res/drawable-xhdpi/ic_launcher_foreground.png b/res/drawable-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..50491f94231a7cdb9a7be0e86e58df57d30519bb
Binary files /dev/null and b/res/drawable-xhdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher_background.png b/res/drawable-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..cea07e4079c23a77303aa5c510b7856436b1e6b0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_background.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher_foreground.png b/res/drawable-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..cea07e4079c23a77303aa5c510b7856436b1e6b0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable-xxxhdpi/ic_launcher_background.png b/res/drawable-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000000000000000000000000000000000000..76adc8615d51c03f89fb044399d15b18a031c755
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher_background.png differ
diff --git a/res/drawable-xxxhdpi/ic_launcher_foreground.png b/res/drawable-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..76adc8615d51c03f89fb044399d15b18a031c755
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index fc4823054e0e3af053a38aecf3b95f595ab454d3..0000000000000000000000000000000000000000
--- a/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M77,51C77,59.837 70,63 61,63C52,63 45,59.837 45,51C45,38.163 52,31 61,31C70,31 77,38.163 77,51Z"
-      android:fillColor="#4D84E9"/>
-  <path
-      android:pathData="M71,49C68.569,50.255 64.821,51 61,51C57.179,51 53.431,50.255 51,49C52.093,52.47 54.333,57 61,57C67.667,57 69.907,52.47 71,49Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 686ffa2b53b156a4f10f9ff3c8e061b36ebf17df..0000000000000000000000000000000000000000
--- a/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M64,64C64,72.837 57,76 48,76C39,76 32,72.837 32,64C32,51.163 39,44 48,44C57,44 64,51.163 64,64Z"
-        android:fillColor="#193057"/>
-    <path
-        android:pathData="M58,62C55.569,63.255 51.821,64 48,64C44.179,64 40.431,63.255 38,62C39.093,65.47 41.333,70 48,70C54.667,70 56.907,65.47 58,62Z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
-</vector>
diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index fc64ec074b28902023890de67a69e7fb62712691..0000000000000000000000000000000000000000
--- a/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M70.724,57.809C72.696,56.509 74,54.485 74,51C74,45.112 72.398,40.856 70.086,38.125C67.803,35.43 64.654,34 61,34C57.346,34 54.197,35.43 51.915,38.125C51.199,38.97 50.551,39.962 49.998,41.102C49.341,41.034 48.674,41 48,41C47.579,41 47.161,41.013 46.747,41.04C49.369,34.518 54.693,31 61,31C70,31 77,38.163 77,51C77,57.753 72.912,61.193 66.967,62.439C66.924,61.405 66.836,60.4 66.706,59.425C68.305,59.057 69.654,58.515 70.724,57.809ZM64.076,50.84C64.882,52.37 65.53,54.051 66.009,55.867C68.942,54.302 70.245,51.398 71,49C69.23,49.914 66.762,50.557 64.076,50.84Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M48,76C57,76 64,72.837 64,64C64,51.163 57,44 48,44C39,44 32,51.163 32,64C32,72.837 39,76 48,76ZM48,64C51.821,64 55.569,63.255 58,62C56.907,65.47 54.667,70 48,70C41.333,70 39.093,65.47 38,62C40.431,63.255 44.179,64 48,64Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/res/layout/account_selector_list_item_condensed.xml b/res/layout/account_selector_list_item_condensed.xml
index ae9172603327a82d53e80620c9330ca3e5a8e7ba..a7de3c02378bafd74d67787b1b2996441804302a 100644
--- a/res/layout/account_selector_list_item_condensed.xml
+++ b/res/layout/account_selector_list_item_condensed.xml
@@ -38,19 +38,9 @@
             android:layout_marginRight="8dip"
             android:layout_marginEnd="8dip"
             android:textSize="16sp"
-            android:textColor="@color/contacts_text_color"
+            android:textColor="?android:attr/textColorPrimary"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:singleLine="true"
             android:ellipsize="end"/>
-
-        <TextView android:id="@android:id/text2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="24dp"
-            android:textSize="14sp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
-            android:singleLine="true"
-            android:ellipsize="end"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/dialog_title.xml b/res/layout/dialog_title.xml
index 45f5f736769e60c7b92c7cc540fb9da390f1d4a1..63fcf0b23270121d92fd4d3fe7c9d17cef52def4 100644
--- a/res/layout/dialog_title.xml
+++ b/res/layout/dialog_title.xml
@@ -22,7 +22,7 @@
     android:paddingStart="24dp"
     android:paddingEnd="24dp"
     android:textSize="20sp"
-    android:textColor="@color/contacts_text_color"
+    android:textColor="?android:attr/textColorPrimary"
     android:textAlignment="viewStart"
     android:fontFamily="sans-serif-medium"
     android:ellipsize="end"
diff --git a/res/layout/expanding_entry_card_item.xml b/res/layout/expanding_entry_card_item.xml
index dbbeee5fa4a703e119844f2977db4ffb468c2aaa..c044428d57168df7c0123fbc4128da3e20f0022f 100644
--- a/res/layout/expanding_entry_card_item.xml
+++ b/res/layout/expanding_entry_card_item.xml
@@ -67,24 +67,29 @@
         android:layout_marginEnd="@dimen/expanding_entry_card_item_sub_header_icon_margin_right"
         android:layout_marginBottom="@dimen/expanding_entry_card_item_sub_header_icon_margin_bottom" />
 
-    <TextView
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/text"
         android:layout_below="@+id/sub_header"
-        android:layout_toEndOf="@+id/icon_text"
-        android:layout_toStartOf="@+id/third_icon"
-        android:textAlignment="viewStart"
-        android:textColor="@color/quickcontact_entry_sub_header_text_color" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/icon_text"
         android:layout_toEndOf="@+id/icon"
-        android:layout_below="@+id/sub_header"
-        android:layout_marginTop="@dimen/expanding_entry_card_item_text_icon_margin_top"
-        android:layout_marginEnd="@dimen/expanding_entry_card_item_text_icon_margin_right" />
+        android:orientation="horizontal"
+        android:gravity="center"
+        >
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/icon_text"
+            android:layout_marginEnd="@dimen/expanding_entry_card_item_text_icon_margin_right" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/text"
+            android:textAlignment="viewStart"
+            android:textColor="@color/quickcontact_entry_sub_header_text_color" />
+
+    </LinearLayout>
 
      <ImageView
          android:id="@+id/third_icon"
diff --git a/res/layout/quickcontact_content.xml b/res/layout/quickcontact_content.xml
index b6cff4b14c081a1bea8f3a2fda69972309b72a57..736767805ee775f27c36a9e0d0224fb50c6718bd 100644
--- a/res/layout/quickcontact_content.xml
+++ b/res/layout/quickcontact_content.xml
@@ -42,6 +42,12 @@
             android:visibility="gone"
             cardview:cardCornerRadius="@dimen/expanding_entry_card_card_corner_radius" />
 
+        <com.android.contacts.quickcontact.ExpandingEntryCardView
+            style="@style/ExpandingEntryCardStyle"
+            android:id="@+id/labels_card"
+            android:visibility="gone"
+            cardview:cardCornerRadius="@dimen/expanding_entry_card_card_corner_radius" />
+
         <com.android.contacts.quickcontact.ExpandingEntryCardView
             style="@style/ExpandingEntryCardStyle"
             android:id="@+id/recent_card"
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index b58c81ff94fc2cd9353409539d491f43b91966a5..56997834a190049c28519917ec39da2e220e0d01 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright (C) 2024 Murena SAS
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
diff --git a/res/values-de/e_strings.xml b/res/values-de/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6bf4239408ed3cca11a08b86c9dd8a637293036a
--- /dev/null
+++ b/res/values-de/e_strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  --><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="menu_export_type_title">Exportiere vCard-Version</string>
+    <string name="preferences_about_app">Kontakte ist eine Abänderung von LineageOS Kontakte</string>
+    <string name="preferences_source_code">Quellcode</string>
+    <string name="preferences_app_info_title">Information über Kontakte</string>
+    <string name="preferences_authors">Autoren</string>
+    <string name="preferences_licence">Lizenz</string>
+    <string name="preferences_app_info">Kontakte ist eine quelloffene App für Android</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/e_strings.xml b/res/values-fr/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..92cc2b1fd3580b78daece6cc988d26839fda43b6
--- /dev/null
+++ b/res/values-fr/e_strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="menu_export_type_title">Version d\'export de la vCard</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-is/e_strings.xml b/res/values-is/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..76fbe8cec557a788e22ce33ad038484398ce4098
--- /dev/null
+++ b/res/values-is/e_strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  --><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="menu_export_type_title">Flytja út vCard útgáfu</string>
+    <string name="preferences_source_code">Grunnkóði</string>
+    <string name="preferences_licence">Notkunarleyfi</string>
+    <string name="preferences_app_info">Contacts er tengiliðaforrit með opnum grunnkóða fyrir Android</string>
+    <string name="preferences_about_app">Contacts tengiliðaforritið er kvíslað frá LineageOS Contacts</string>
+    <string name="preferences_authors">Höfundar</string>
+    <string name="preferences_app_info_title">Upplýsingar um tengiliði</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/e_strings.xml b/res/values-it/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a0ca73d9902d80d62b1a381de7c83fe143ec5b23
--- /dev/null
+++ b/res/values-it/e_strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  --><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="menu_export_type_title">Esporta in formato vCard</string>
+    <string name="preferences_authors">Autori</string>
+    <string name="preferences_source_code">Codice sorgente</string>
+    <string name="preferences_licence">Licenza</string>
+    <string name="preferences_app_info_title">Info su Contatti</string>
+    <string name="preferences_app_info">Contatti è una App open source per Android</string>
+    <string name="preferences_about_app">Contatti è un fork di LineageOS Contacts</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-ja/e_strings.xml b/res/values-ja/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..282ec11e97ed0fbd279c3e4c2b89903b85767a81
--- /dev/null
+++ b/res/values-ja/e_strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="preferences_authors">作者</string>
+    <string name="preferences_source_code">ソースコード</string>
+    <string name="preferences_licence">ライセンス</string>
+    <string name="preferences_app_info_title">連絡先情報</string>
+    <string name="menu_export_type_title">vCardバージョンをエクスポート</string>
+    <string name="preferences_about_app">ContactsはLineageOS Contactsのフォークです</string>
+    <string name="preferences_app_info">Contactsはアンドロイド用のオープンソースのアプリケーションです</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-nb-rNO/e_strings.xml b/res/values-nb-rNO/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ad05d0075ad92c8091ec60e204be04a6e130ab1e
--- /dev/null
+++ b/res/values-nb-rNO/e_strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="preferences_about_app">Kontakter er en videreutvikling av LineageOS Contacts</string>
+    <string name="preferences_authors">Utviklere</string>
+    <string name="preferences_source_code">Kildekode</string>
+    <string name="preferences_licence">Lisens</string>
+    <string name="preferences_app_info_title">Informasjon om Kontakter</string>
+    <string name="preferences_app_info">Kontakter er en åpen kildekode-applikasjon for Android</string>
+    <string name="menu_export_type_title">Eksporter vCard-versjon</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-nl/e_strings.xml b/res/values-nl/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5c0f88da5e5e30efce2ac97d75d220b7fedd4edd
--- /dev/null
+++ b/res/values-nl/e_strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  --><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="menu_export_type_title">Exporteer vCard versie</string>
+    <string name="preferences_about_app">Contacten is gebaseerd op LineageOS Contacts</string>
+    <string name="preferences_source_code">Broncode</string>
+    <string name="preferences_app_info_title">Informatie over Contacten</string>
+    <string name="preferences_authors">Auteurs</string>
+    <string name="preferences_licence">Licentie</string>
+    <string name="preferences_app_info">Contacten is een open source app voor Android</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/e_strings.xml b/res/values-ru/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d1e7b3f4ffd4a0ae05e5fd7e4f6c29dbf81fe046
--- /dev/null
+++ b/res/values-ru/e_strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="menu_export_type_title">Экспорт vCard версии</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-sv/e_strings.xml b/res/values-sv/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2ff1d99d3813e91285f05d5789ad34198897a390
--- /dev/null
+++ b/res/values-sv/e_strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  --><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="menu_export_type_title">Exportera vCard-version</string>
+    <string name="preferences_about_app">Kontakter är avgrenad från LineageOS Kontakter</string>
+    <string name="preferences_authors">Upphovsmän</string>
+    <string name="preferences_source_code">Källkod</string>
+    <string name="preferences_licence">Licens</string>
+    <string name="preferences_app_info_title">Information om Kontakter</string>
+    <string name="preferences_app_info">Kontakter är en app med öppen källkod för Android</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-uk/e_strings.xml b/res/values-uk/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..71e42678b174026855bdbf2e33c296b8da05e0c1
--- /dev/null
+++ b/res/values-uk/e_strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="preferences_about_app">Застосунок створений на основі LineageOS Contacts</string>
+    <string name="preferences_source_code">Вихідний код</string>
+    <string name="preferences_authors">Автори</string>
+    <string name="preferences_licence">Ліцензія</string>
+    <string name="preferences_app_info_title">Контактні дані</string>
+    <string name="menu_export_type_title">Експорт vCard версії</string>
+    <string name="preferences_app_info">Контакти - це додаток з відкритим кодом для Android</string>
+</resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9bd8bbe2b901b65990977ef6c2320056b414aa0d..25841b3899cd46095cbbe3359eecaf5b859db545 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -143,7 +143,7 @@
     <dimen name="expanding_entry_card_item_padding_start">20dp</dimen>
     <dimen name="expanding_entry_card_item_padding_end">8dp</dimen>
     <dimen name="expanding_entry_card_item_padding_top">13dp</dimen>
-    <dimen name="expanding_entry_card_item_padding_bottom">16dp</dimen>
+    <dimen name="expanding_entry_card_item_padding_bottom">13dp</dimen>
     <dimen name="expanding_entry_card_item_image_spacing">27dp</dimen>
 
     <!-- Dimensions for a button in ExpandingEntryCardView -->
diff --git a/res/values/e_arrays.xml b/res/values/e_arrays.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a38cce56ce220eb09b4fdd4a9b123da167ba3f12
--- /dev/null
+++ b/res/values/e_arrays.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 MURENA SAS
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <string-array name="menu_vcf_export_types" translatable="false">
+        <item>@string/menu_export_type_vcf_21</item>
+        <item>@string/menu_export_type_vcf_30</item>
+        <item>@string/menu_export_type_vcf_40</item>
+    </string-array>
+
+    <string-array name="menu_vcf_export_values" translatable="false">
+        <item>@string/menu_export_type_vcf_21_value</item>
+        <item>@string/menu_export_type_vcf_30_value</item>
+        <item>@string/menu_export_type_vcf_40_value</item>
+    </string-array>
+</resources>
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f5ffa90eb6c708e1cd784a057eb8a49cdf46cd07
--- /dev/null
+++ b/res/values/e_strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- About App -->
+    <string name="preferences_about_app">Contacts is forked from LineageOS Contacts</string>
+
+    <!-- Authors -->
+    <string name="preferences_authors">Authors</string>
+
+    <!-- Source Code-->
+    <string name="preferences_source_code">Source code</string>
+
+    <!-- License -->
+    <string name="preferences_licence">Licence</string>
+
+    <!-- Contact Information -->
+    <string name="preferences_app_info_title">Contacts information</string>
+    <string name="preferences_app_info">Contacts is an open source App for Android</string>
+
+    <!-- VCF Export -->
+    <string name="menu_export_type_title">Export vCard version</string>
+    <string name="menu_export_type_vcf_21" translatable="false">VCF 2.1</string>
+    <string name="menu_export_type_vcf_30" translatable="false">VCF 3.0</string>
+    <string name="menu_export_type_vcf_40" translatable="false">VCF 4.0</string>
+    <string name="menu_export_type_vcf_21_value" translatable="false">v21_generic</string>
+    <string name="menu_export_type_vcf_30_value" translatable="false">v30_generic</string>
+    <string name="menu_export_type_vcf_40_value" translatable="false">v40_generic</string>
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d31ce80da46e2ec7e3ee40e375ad536fc8dca232..5473705d2492f070ed152b924e3a7f7fbf4b27f4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -289,7 +289,7 @@
         <item name="android:windowCloseOnTouchOutside">true</item>
     </style>
 
-    <style name="ContactEditorAccountsChangedActivityTheme" parent="@android:style/Theme.Material.Light.Dialog.NoActionBar.MinWidth">
+    <style name="ContactEditorAccountsChangedActivityTheme" parent="Theme.AppCompat.DayNight.Dialog.MinWidth">
         <item name="android:windowCloseOnTouchOutside">true</item>
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
diff --git a/res/xml/preference_about.xml b/res/xml/preference_about.xml
index a109db68ed657688ffda3cbf1d005e05ff93fa03..9258a60d751cd79d425444b638dbe33ebb1224fc 100644
--- a/res/xml/preference_about.xml
+++ b/res/xml/preference_about.xml
@@ -15,11 +15,37 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+            android:icon="@null"
+            android:key="contacts_info"
+            android:summary="@string/preferences_app_info"
+            android:title="@string/preferences_app_info_title" />
+
     <Preference
             android:icon="@null"
             android:key="@string/pref_build_version_key"
             android:title="@string/about_build_version"/>
 
+    <Preference
+            android:icon="@null"
+            android:key="about_app"
+            android:title="@string/preferences_about_app" />
+
+    <Preference
+            android:icon="@null"
+            android:key="license"
+            android:title="@string/preferences_licence" />
+
+    <Preference
+            android:icon="@null"
+            android:key="authors"
+            android:title="@string/preferences_authors" />
+
+    <Preference
+            android:icon="@null"
+            android:key="source_code"
+            android:title="@string/preferences_source_code" />
+
     <Preference
             android:icon="@null"
             android:key="@string/pref_open_source_licenses_key"
diff --git a/res/xml/preference_display_options.xml b/res/xml/preference_display_options.xml
index 9987250878c2de282e4f8053aa136b7571444772..d232d8c364fcd98bc8e199c7d85007a0efc219eb 100644
--- a/res/xml/preference_display_options.xml
+++ b/res/xml/preference_display_options.xml
@@ -65,6 +65,14 @@
         android:key="export"
         android:title="@string/menu_export"/>
 
+    <ListPreference
+        android:icon="@null"
+        android:key="exportToVcfType"
+        android:entries="@array/menu_vcf_export_types"
+        android:entryValues="@array/menu_vcf_export_values"
+        android:defaultValue="v40_generic"
+        android:title="@string/menu_export_type_title"/>
+
     <Preference
         android:icon="@null"
         android:key="blockedNumbers"
diff --git a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
index 01336c63700b2256318ce1e32df838db9d4b8db1..d6b485dfb6f416158f047aac044de69432b1acfb 100644
--- a/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
@@ -70,7 +70,7 @@ public class ContactEditorAccountsChangedActivity extends Activity
     private final OnClickListener mAddAccountClickListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
-            final Intent intent = ImplicitIntentsUtil.getIntentForAddingGoogleAccount();
+            final Intent intent = ImplicitIntentsUtil.getIntentForAddingAccount();
             startActivityForResult(intent, SUBACTIVITY_ADD_NEW_ACCOUNT);
         }
     };
@@ -171,35 +171,10 @@ public class ContactEditorAccountsChangedActivity extends Activity
                 }
             });
         } else {
-            // If the user has 0 writable accounts, we will just show the user a message with 2
-            // possible action buttons.
-            view = View.inflate(this,
-                    R.layout.contact_editor_accounts_changed_activity_with_text, null);
-
-            final TextView textView = (TextView) view.findViewById(R.id.text);
-            final Button leftButton = (Button) view.findViewById(R.id.left_button);
-            final Button rightButton = (Button) view.findViewById(R.id.right_button);
-
-            textView.setText(getString(R.string.contact_editor_prompt_zero_accounts));
-
-            // This button allows the user to continue editing the contact as a phone-only
-            // local contact.
-            leftButton.setText(getString(android.R.string.cancel));
-            leftButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    // Remember that the user wants to create local contacts, so the user is not
-                    // prompted again with this activity.
-                    saveAccountAndReturnResult(AccountWithDataSet.getLocalAccount(
-                            ContactEditorAccountsChangedActivity.this));
-                    finish();
-                }
-            });
-
-            // This button allows the user to add a new account to the device and return to
-            // this app afterwards.
-            rightButton.setText(getString(R.string.add_account));
-            rightButton.setOnClickListener(mAddAccountClickListener);
+            // If the user has 0 writable accounts, default to device contact
+            view = new View(this);
+            saveAccountAndReturnResult(AccountWithDataSet.getNullAccount());
+            finish();
         }
 
         if (mDialog != null && mDialog.isShowing()) {
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 62dc48ef447ac1f952ad586d40c554e44f4f924a..deaa1b13b5b73da94cdf8cd8963c0e40db390850 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -104,6 +104,7 @@ import com.google.common.util.concurrent.Futures;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -140,6 +141,9 @@ public class PeopleActivity extends AppCompatContactsActivity implements
     private static final String KEY_CONTACTS_VIEW = "contactsView";
     private static final String KEY_NEW_GROUP_ACCOUNT = "newGroupAccount";
 
+    public static final String ACTION_OPEN_GROUP_FROM_CONTACT = "openGroupFromContact";
+    public static final String EXTRA_GROUP_ID = "groupId";
+
     private static final long DRAWER_CLOSE_DELAY = 300L;
 
     private ContactsIntentResolver mIntentResolver;
@@ -157,6 +161,8 @@ public class PeopleActivity extends AppCompatContactsActivity implements
 
     private boolean mShouldSwitchToGroupView;
 
+    private boolean mGroupOpenedFromContact = false;
+
     private ContactsView mCurrentView;
 
     private CoordinatorLayout mLayoutRoot;
@@ -419,12 +425,34 @@ public class PeopleActivity extends AppCompatContactsActivity implements
             Log.d(Constants.PERFORMANCE_TAG, "PeopleActivity.onCreate finish");
         }
         getWindow().setBackgroundDrawable(null);
+
+        openProvidedGroupFromContact(getIntent());
+    }
+
+    private void openProvidedGroupFromContact(Intent intent) {
+        if (intent == null) {
+            return;
+        }
+        final String action = intent.getAction();
+        if (Objects.equals(action, ACTION_OPEN_GROUP_FROM_CONTACT)) {
+            long groupId = intent.getLongExtra(EXTRA_GROUP_ID, -1);
+            if (groupId != -1) {
+                onGroupMenuItemClicked(groupId);
+                mGroupOpenedFromContact = true;
+            }
+        }
     }
 
     @SuppressWarnings("MissingSuperCall") // TODO: Fix me
     @Override
     protected void onNewIntent(Intent intent) {
         final String action = intent.getAction();
+
+        openProvidedGroupFromContact(intent);
+        if (isGroupOpenedFromContact()) {
+            return;
+        }
+
         if (GroupUtil.ACTION_CREATE_GROUP.equals(action)) {
             mGroupUri = intent.getData();
             if (mGroupUri == null) {
@@ -802,6 +830,11 @@ public class PeopleActivity extends AppCompatContactsActivity implements
             return;
         }
 
+        if (isGroupOpenedFromContact()) {
+            finish();
+            return;
+        }
+
         // Handle the back event in "second level".
         if (isGroupView()) {
             onBackPressedGroupView();
@@ -1246,6 +1279,10 @@ public class PeopleActivity extends AppCompatContactsActivity implements
         return mCurrentView == ContactsView.GROUP_VIEW;
     }
 
+    public boolean isGroupOpenedFromContact() {
+        return mGroupOpenedFromContact;
+    }
+
     protected boolean isAssistantView() {
         return mCurrentView == ContactsView.ASSISTANT;
     }
diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index 755800aa5d5a1b5fc5009ad2500ffc293f869764..6e8d793f835d88c869144652cc855f782eb8d1ec 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -794,7 +794,7 @@ public class RawContactEditorView extends LinearLayout implements View.OnClickLi
         }
 
         // If we're saving a new contact and there are multiple accounts, add the account selector.
-        if (mHasNewContact && !mIsUserProfile && mAccounts.size() > 1) {
+        if (mHasNewContact && mAccounts.size() > 1) {
             addAccountSelector(mCurrentRawContactDelta);
         }
     }
diff --git a/src/com/android/contacts/list/ContactsUnavailableFragment.java b/src/com/android/contacts/list/ContactsUnavailableFragment.java
index 048ce62e360d1b88d4feb343969ed7f93b1e6ea4..299a18455058a001bc8427eabc19c9c2badd08a6 100644
--- a/src/com/android/contacts/list/ContactsUnavailableFragment.java
+++ b/src/com/android/contacts/list/ContactsUnavailableFragment.java
@@ -131,7 +131,7 @@ public class ContactsUnavailableFragment extends Fragment implements OnClickList
     public void onClick(View v) {
         final int id = v.getId();
         if (id == R.id.add_account_button) {
-            final Intent intent = ImplicitIntentsUtil.getIntentForAddingGoogleAccount();
+            final Intent intent = ImplicitIntentsUtil.getIntentForAddingAccount();
             ImplicitIntentsUtil.startActivityOutsideApp(getActivity(), intent);
 
         } else if (id == R.id.import_contacts_button) {
diff --git a/src/com/android/contacts/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java
index 253097bac892724b1e4b9fbd4ccc868e7ba0cb4b..7cb86572021fc5b10ad9c782ef710ca4b94a3379 100644
--- a/src/com/android/contacts/model/AccountTypeManager.java
+++ b/src/com/android/contacts/model/AccountTypeManager.java
@@ -597,12 +597,29 @@ class AccountTypeManagerImpl extends AccountTypeManager
                     result.add(
                             typeProvider.getTypeForAccount(account).wrapAccount(mContext, account));
                 }
+
+                filterDuplicateAccounts(result);
+
                 AccountInfo.sortAccounts(null, result);
                 return result;
             }
         }, MoreExecutors.directExecutor());
     }
 
+    private void filterDuplicateAccounts(List<AccountInfo> accountList) {
+        final List<AccountInfo> uniqueList = new ArrayList<>();
+
+        for (AccountInfo resultInfo: accountList) {
+            final boolean isPresent = uniqueList.stream().anyMatch(resultInfo::sameAccount);
+            if (!isPresent) {
+                uniqueList.add(resultInfo);
+            }
+        }
+
+        accountList.clear();
+        accountList.addAll(uniqueList);
+    }
+
     @Override
     public ListenableFuture<List<AccountInfo>> filterAccountsAsync(
             final Predicate<AccountInfo> filter) {
diff --git a/src/com/android/contacts/model/GroupMembershipTools.java b/src/com/android/contacts/model/GroupMembershipTools.java
new file mode 100644
index 0000000000000000000000000000000000000000..5d506b31c6e4de8cc78883861ec7d256245a0886
--- /dev/null
+++ b/src/com/android/contacts/model/GroupMembershipTools.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2019-2023  E FOUNDATION
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.android.contacts.model;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+
+public class GroupMembershipTools {
+
+    public boolean isTypeGroupMembership(String mimeType) {
+        return ContactsContract.CommonDataKinds.GroupMembership.CONTENT_ITEM_TYPE.equals(mimeType);
+    }
+
+    public String getGroupTitle(Context context, long groupId) {
+        final Uri groupUri = ContactsContract.Groups.CONTENT_URI;
+
+        final String[] projection = new String[]{
+                ContactsContract.Groups._ID,
+                ContactsContract.Groups.TITLE,
+        };
+        final String selection = ContactsContract.Groups.AUTO_ADD + " = ? AND " + ContactsContract.Groups.FAVORITES + " = ?";
+        final String[] selectionArgs = new String[]{"0", "0"};
+
+        try {
+            Cursor groupCursor = context.getContentResolver().query(groupUri, projection, selection, selectionArgs, null, null);
+            if (groupCursor.moveToFirst()) {
+                do {
+                    final int groupIdColumnIndex = groupCursor.getColumnIndex(ContactsContract.Groups._ID);
+                    final int groupTitleColumnIndex = groupCursor.getColumnIndex(ContactsContract.Groups.TITLE);
+                    if (groupIdColumnIndex == -1 || groupTitleColumnIndex == -1) {
+                        groupCursor.close();
+                        return null;
+                    }
+                    final long id = groupCursor.getLong(groupIdColumnIndex);
+                    final String title = groupCursor.getString(groupTitleColumnIndex);
+                    if (groupId == id) {
+                        groupCursor.close();
+                        return title;
+                    }
+                } while (groupCursor.moveToNext());
+            }
+            groupCursor.close();
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+}
diff --git a/src/com/android/contacts/model/account/AccountComparator.java b/src/com/android/contacts/model/account/AccountComparator.java
index 70ccf494fb78694222497e7e2d1827d3f1e87f96..8bc8fbbf76707a9b6121630f02d3df900d1f3b9a 100644
--- a/src/com/android/contacts/model/account/AccountComparator.java
+++ b/src/com/android/contacts/model/account/AccountComparator.java
@@ -38,13 +38,13 @@ public class AccountComparator implements Comparator<AccountWithDataSet> {
             return -1;
         } else if (a.name == null || a.type == null) {
             return 1;
-        } else if (isWritableGoogleAccount(a) && a.equals(mDefaultAccount)) {
+        } else if (isWritableEAccount(a) && a.equals(mDefaultAccount)) {
             return -1;
-        } else if (isWritableGoogleAccount(b) && b.equals(mDefaultAccount)) {
+        } else if (isWritableEAccount(b) && b.equals(mDefaultAccount)) {
             return 1;
-        } else if (isWritableGoogleAccount(a) && !isWritableGoogleAccount(b)) {
+        } else if (isWritableEAccount(a) && !isWritableEAccount(b)) {
             return -1;
-        } else if (isWritableGoogleAccount(b) && !isWritableGoogleAccount(a)) {
+        } else if (isWritableEAccount(b) && !isWritableEAccount(a)) {
             return 1;
         } else {
             int diff = a.name.compareToIgnoreCase(b.name);
@@ -65,7 +65,7 @@ public class AccountComparator implements Comparator<AccountWithDataSet> {
         }
     }
 
-    private static boolean isWritableGoogleAccount(AccountWithDataSet account) {
-        return GoogleAccountType.ACCOUNT_TYPE.equals(account.type) && account.dataSet == null;
+    private static boolean isWritableEAccount(AccountWithDataSet account) {
+        return "foundation.e.accountmanager.eelo.address_book".equals(account.type) && account.dataSet == null;
     }
 }
diff --git a/src/com/android/contacts/preference/AboutPreferenceFragment.java b/src/com/android/contacts/preference/AboutPreferenceFragment.java
index 378948033ac42c95473a48016d3e2f765935a76d..272cd043988243a4690a68ecde2396972d0bbca1 100644
--- a/src/com/android/contacts/preference/AboutPreferenceFragment.java
+++ b/src/com/android/contacts/preference/AboutPreferenceFragment.java
@@ -35,8 +35,13 @@ import com.android.contacts.activities.LicenseActivity;
  */
 public class AboutPreferenceFragment extends PreferenceFragment {
 
-    public static final String PRIVACY_POLICY_URL = "http://www.google.com/policies/privacy";
-    public static final String TERMS_OF_SERVICE_URL = "http://www.google.com/policies/terms";
+    public static final String BUILD_VERSION_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/releases";
+    public static final String ABOUT_APP_URL = "https://github.com/LineageOS/android_packages_apps_Contacts";
+    public static final String LICENSE_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-r/NOTICE";
+    public static final String AUTHORS_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts";
+    public static final String SOURCE_CODE_URL = "https://gitlab.e.foundation/e/os/android_packages_apps_Contacts";
+    public static final String PRIVACY_POLICY_URL = "https://e.foundation/legal-notice-privacy/";
+    public static final String TERMS_OF_SERVICE_URL = "https://e.foundation/legal-notice-privacy/";
 
     public static AboutPreferenceFragment newInstance() {
         return new AboutPreferenceFragment();
@@ -60,12 +65,14 @@ public class AboutPreferenceFragment extends PreferenceFragment {
             // Nothing
         }
 
-        final Preference licensePreference = findPreference(
-                getString(R.string.pref_open_source_licenses_key));
-        licensePreference.setIntent(new Intent(getActivity(), LicenseActivity.class));
-
+        final Preference buildVersionPreference = findPreference("pref_build_version");
+        final Preference aboutAppPreference = findPreference("about_app");
+        final Preference licensePreference = findPreference("license");
+        final Preference authorsPreference = findPreference("authors");
+        final Preference sourceCodePreference = findPreference("source_code");
         final Preference privacyPolicyPreference = findPreference("pref_privacy_policy");
         final Preference termsOfServicePreference = findPreference("pref_terms_of_service");
+        final Preference openSourceLicensePreference = findPreference(getString(R.string.pref_open_source_licenses_key));
 
         final Preference.OnPreferenceClickListener listener =
                 new Preference.OnPreferenceClickListener() {
@@ -76,6 +83,18 @@ public class AboutPreferenceFragment extends PreferenceFragment {
                         startActivityForUrl(PRIVACY_POLICY_URL);
                     } else if (preference == termsOfServicePreference) {
                         startActivityForUrl(TERMS_OF_SERVICE_URL);
+                    } else if (preference == buildVersionPreference) {
+                        startActivityForUrl(BUILD_VERSION_URL);
+                    } else if (preference == aboutAppPreference) {
+                        startActivityForUrl(ABOUT_APP_URL);
+                    } else if (preference == licensePreference) {
+                        startActivityForUrl(LICENSE_URL);
+                    } else if (preference == authorsPreference) {
+                        startActivityForUrl(AUTHORS_URL);
+                    } else if (preference == sourceCodePreference) {
+                        startActivityForUrl(SOURCE_CODE_URL);
+                    } else if (preference == openSourceLicensePreference) {
+                        startActivity(new Intent(getActivity(), LicenseActivity.class));
                     }
                 } catch (ActivityNotFoundException ex) {
                     Toast.makeText(getContext(), getString(R.string.url_open_error_toast),
@@ -85,6 +104,12 @@ public class AboutPreferenceFragment extends PreferenceFragment {
             }
         };
 
+        buildVersionPreference.setOnPreferenceClickListener(listener);
+        aboutAppPreference.setOnPreferenceClickListener(listener);
+        licensePreference.setOnPreferenceClickListener(listener);
+        authorsPreference.setOnPreferenceClickListener(listener);
+        sourceCodePreference.setOnPreferenceClickListener(listener);
+        openSourceLicensePreference.setOnPreferenceClickListener(listener);
         privacyPolicyPreference.setOnPreferenceClickListener(listener);
         termsOfServicePreference.setOnPreferenceClickListener(listener);
     }
diff --git a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
index d462a0ee04a0cdf8128745abb8703cfb1b54b242..5ed14d8862541273b1bc5051cf0ca46e87447e60 100644
--- a/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
+++ b/src/com/android/contacts/quickcontact/ExpandingEntryCardView.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.ColorFilter;
+import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -617,6 +618,18 @@ public class ExpandingEntryCardView extends CardView {
                             thirdIcon.mutate();
                             thirdIcon.setColorFilter(mThemeColorFilter);
                         }
+                        Drawable textIcon = entry.getTextIcon();
+                        if (textIcon != null) {
+                            textIcon.mutate();
+                            if (entry.shouldApplyColor()) {
+                                textIcon.setColorFilter(mThemeColorFilter);
+                            } else {
+                                final int textColor =
+                                        getResources().getColor(R.color.quickcontact_entry_sub_header_text_color);
+                                textIcon.setColorFilter(textColor, PorterDuff.Mode.SRC_ATOP);
+                            }
+                            textIcon.setAlpha(200);
+                        }
                     }
                 }
             }
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index bff805c64904aa513dd22ee1bacdabfb0f2ccbfe..172481c72437da2cb2460894b1ffbf9c2351416e 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -109,6 +109,7 @@ import com.android.contacts.ShortcutIntentBuilder;
 import com.android.contacts.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
 import com.android.contacts.activities.ContactEditorActivity;
 import com.android.contacts.activities.ContactSelectionActivity;
+import com.android.contacts.activities.PeopleActivity;
 import com.android.contacts.activities.RequestPermissionsActivity;
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.compat.EventCompat;
@@ -131,6 +132,7 @@ import com.android.contacts.logging.ScreenEvent.ScreenType;
 import com.android.contacts.model.AccountTypeManager;
 import com.android.contacts.model.Contact;
 import com.android.contacts.model.ContactLoader;
+import com.android.contacts.model.GroupMembershipTools;
 import com.android.contacts.model.RawContact;
 import com.android.contacts.model.account.AccountType;
 import com.android.contacts.model.dataitem.CustomDataItem;
@@ -138,6 +140,7 @@ import com.android.contacts.model.dataitem.DataItem;
 import com.android.contacts.model.dataitem.DataKind;
 import com.android.contacts.model.dataitem.EmailDataItem;
 import com.android.contacts.model.dataitem.EventDataItem;
+import com.android.contacts.model.dataitem.GroupMembershipDataItem;
 import com.android.contacts.model.dataitem.ImDataItem;
 import com.android.contacts.model.dataitem.NicknameDataItem;
 import com.android.contacts.model.dataitem.NoteDataItem;
@@ -281,6 +284,7 @@ public class QuickContactActivity extends ContactsActivity {
 
     private QuickContactImageView mPhotoView;
     private ExpandingEntryCardView mContactCard;
+    private ExpandingEntryCardView mLabelsCard;
     private ExpandingEntryCardView mNoContactDetailsCard;
     private ExpandingEntryCardView mAboutCard;
 
@@ -337,7 +341,6 @@ public class QuickContactActivity extends ContactsActivity {
             Event.CONTENT_ITEM_TYPE,
             Relation.CONTENT_ITEM_TYPE,
             Im.CONTENT_ITEM_TYPE,
-            GroupMembership.CONTENT_ITEM_TYPE,
             Identity.CONTENT_ITEM_TYPE,
             CustomDataItem.MIMETYPE_CUSTOM_FIELD,
             Note.CONTENT_ITEM_TYPE);
@@ -354,6 +357,8 @@ public class QuickContactActivity extends ContactsActivity {
 
     private static final String FRAGMENT_TAG_SELECT_ACCOUNT = "select_account_fragment";
 
+    private static final GroupMembershipTools groupMembershipTools = new GroupMembershipTools();
+
     final OnClickListener mEntryClickHandler = new OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -700,6 +705,7 @@ public class QuickContactActivity extends ContactsActivity {
         mScroller = (MultiShrinkScroller) findViewById(R.id.multiscroller);
 
         mContactCard = (ExpandingEntryCardView) findViewById(R.id.communication_card);
+        mLabelsCard = (ExpandingEntryCardView) findViewById(R.id.labels_card);
         mNoContactDetailsCard = (ExpandingEntryCardView) findViewById(R.id.no_contact_data_card);
         mAboutCard = (ExpandingEntryCardView) findViewById(R.id.about_card);
 
@@ -710,6 +716,9 @@ public class QuickContactActivity extends ContactsActivity {
         mAboutCard.setOnClickListener(mEntryClickHandler);
         mAboutCard.setOnCreateContextMenuListener(mEntryContextMenuListener);
 
+        mLabelsCard.setOnClickListener(mEntryClickHandler);
+        mLabelsCard.setOnCreateContextMenuListener(mEntryContextMenuListener);
+
         mPhotoView = (QuickContactImageView) findViewById(R.id.photo);
         final View transparentView = findViewById(R.id.transparent_view);
         if (mScroller != null) {
@@ -1029,6 +1038,7 @@ public class QuickContactActivity extends ContactsActivity {
         mOnlyOneEmail = emailDataItems != null && emailDataItems.size() == 1;
 
         populateContactAndAboutCard(cp2DataCardModel, /* shouldAddPhoneticName */ true);
+        populateLabelsCard(mCachedCp2DataCardModel);
     }
 
     private void showActivity() {
@@ -1069,6 +1079,7 @@ public class QuickContactActivity extends ContactsActivity {
         if (mHasIntentLaunched) {
             mHasIntentLaunched = false;
             populateContactAndAboutCard(mCachedCp2DataCardModel, /* shouldAddPhoneticName */ false);
+            populateLabelsCard(mCachedCp2DataCardModel);
         }
 
         maybeShowProgressDialog();
@@ -1180,6 +1191,31 @@ public class QuickContactActivity extends ContactsActivity {
         Trace.endSection();
     }
 
+    private void populateLabelsCard(Cp2DataCardModel cp2DataCardModel) {
+        mCachedCp2DataCardModel = cp2DataCardModel;
+        if (mHasIntentLaunched || cp2DataCardModel == null) {
+            return;
+        }
+
+        final List<List<Entry>> labelEntries = cp2DataCardModel.labelEntries;
+        final String cardTitle = getString(R.string.groupsLabel);
+
+        mLabelsCard.setTitle(cardTitle);
+        mLabelsCard.initialize(labelEntries,
+                /* numInitialVisibleEntries = */ 1,
+                /* isExpanded = */ true,
+                /* isAlwaysExpanded = */ true,
+                mExpandingEntryCardViewListener,
+                mScroller);
+
+        if (labelEntries.size() > 0) {
+            mLabelsCard.setVisibility(View.VISIBLE);
+            return;
+        }
+
+        mLabelsCard.setVisibility(View.GONE);
+    }
+
     /**
      * Create a card that shows "Add email" and "Add phone number" entries in grey.
      * When contact is a SIM contact, only shows "Add phone number".
@@ -1272,7 +1308,7 @@ public class QuickContactActivity extends ContactsActivity {
                     dataItem.setDataKind(dataKind);
 
                     final boolean hasData = !TextUtils.isEmpty(dataItem.buildDataString(this,
-                            dataKind));
+                            dataKind)) || groupMembershipTools.isTypeGroupMembership(mimeType);
 
                     if (isMimeExcluded(mimeType) || !hasData) continue;
                 } else if (!tachyonEnabled) {
@@ -1300,8 +1336,17 @@ public class QuickContactActivity extends ContactsActivity {
          */
         final List<List<DataItem>> dataItemsList = new ArrayList<>();
         for (List<DataItem> mimeTypeDataItems : dataItemsMap.values()) {
-            // Remove duplicate data items
-            Collapser.collapseList(mimeTypeDataItems, this);
+            if (mimeTypeDataItems.isEmpty()) {
+                continue;
+            }
+
+            String mimeType = mimeTypeDataItems.get(0).getMimeType();
+
+            if (!groupMembershipTools.isTypeGroupMembership(mimeType)) {
+                // Remove duplicate data items
+                Collapser.collapseList(mimeTypeDataItems, this);
+            }
+
             // Sort within mimetype
             Collections.sort(mimeTypeDataItems, mWithinMimeTypeDataItemComparator);
             // Add to the list of data item lists
@@ -1318,6 +1363,7 @@ public class QuickContactActivity extends ContactsActivity {
 
         final List<List<Entry>> contactCardEntries = new ArrayList<>();
         final List<List<Entry>> aboutCardEntries = buildAboutCardEntries(dataItemsMap);
+        final List<List<Entry>> labelCardEntries = new ArrayList<>();
         final MutableString aboutCardName = new MutableString();
 
         for (int i = 0; i < dataItemsList.size(); ++i) {
@@ -1326,6 +1372,12 @@ public class QuickContactActivity extends ContactsActivity {
             if (SORTED_ABOUT_CARD_MIMETYPES.contains(topDataItem.getMimeType())) {
                 // About card mimetypes are built in buildAboutCardEntries, skip here
                 continue;
+            } else if (groupMembershipTools.isTypeGroupMembership(topDataItem.getMimeType())) {
+                List<Entry> labelEntries = dataItemsToEntries(dataItemsByMimeType,
+                        aboutCardName);
+                if (labelEntries.size() > 0) {
+                    labelCardEntries.add(labelEntries);
+                }
             } else {
                 List<Entry> contactEntries = dataItemsToEntries(dataItemsList.get(i),
                         aboutCardName);
@@ -1341,6 +1393,7 @@ public class QuickContactActivity extends ContactsActivity {
         dataModel.customAboutCardName = aboutCardName.value;
         dataModel.aboutCardEntries = aboutCardEntries;
         dataModel.contactCardEntries = contactCardEntries;
+        dataModel.labelEntries = labelCardEntries;
         dataModel.dataItemsMap = dataItemsMap;
         dataModel.areAllRawContactsSimAccounts = data.areAllRawContactsSimAccounts(this);
         return dataModel;
@@ -1380,6 +1433,7 @@ public class QuickContactActivity extends ContactsActivity {
         public Map<String, List<DataItem>> dataItemsMap;
         public List<List<Entry>> aboutCardEntries;
         public List<List<Entry>> contactCardEntries;
+        public List<List<Entry>> labelEntries;
         public String customAboutCardName;
         public boolean areAllRawContactsSimAccounts;
     }
@@ -1678,7 +1732,7 @@ public class QuickContactActivity extends ContactsActivity {
                 }
                 primaryContentDescription.append(header);
                 alternateIntent =
-                        StructuredPostalUtils.getViewPostalAddressDirectionsIntent(postalAddress);
+                        StructuredPostalUtils.getViewPostalAddressIntent(postalAddress);
                 alternateIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.DIRECTIONS);
                 alternateIcon = context.getDrawable(R.drawable.quantum_ic_directions_vd_theme_24);
                 alternateContentDescription.append(res.getString(
@@ -1723,6 +1777,24 @@ public class QuickContactActivity extends ContactsActivity {
                     aboutCardName.value = res.getString(R.string.about_card_title);
                 }
             }
+        } else if (dataItem instanceof GroupMembershipDataItem) {
+
+            final GroupMembershipDataItem group = (GroupMembershipDataItem) dataItem;
+            String groupTitle = groupMembershipTools.getGroupTitle(context, group.getGroupRowId());
+
+            if (!TextUtils.isEmpty(groupTitle)) {
+                text = groupTitle;
+                textIcon = res.getDrawable(R.drawable.quantum_ic_label_vd_theme_24);
+
+                entryContextMenuInfo = new EntryContextMenuInfo(text,
+                        res.getString(R.string.groupsLabel), dataItem.getMimeType(),
+                        dataItem.getId(), dataItem.isSuperPrimary());
+
+                intent = new Intent(context, PeopleActivity.class)
+                        .setAction(PeopleActivity.ACTION_OPEN_GROUP_FROM_CONTACT)
+                        .putExtra(PeopleActivity.EXTRA_GROUP_ID, group.getGroupRowId());
+            }
+
         } else if (CallUtil.isTachyonEnabled(context) && MIMETYPE_TACHYON.equals(
                 dataItem.getMimeType())) {
             // Skip these actions. They will be placed by the phone number.
@@ -2064,6 +2136,7 @@ public class QuickContactActivity extends ContactsActivity {
                 new PorterDuffColorFilter(mColorFilterColor, PorterDuff.Mode.SRC_ATOP);
         mContactCard.setColorAndFilter(mColorFilterColor, mColorFilter);
         mAboutCard.setColorAndFilter(mColorFilterColor, mColorFilter);
+        mLabelsCard.setColorAndFilter(mColorFilterColor, mColorFilter);
     }
 
     private void updateStatusBarColor() {
diff --git a/src/com/android/contacts/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java
index 2b226d0a101b596db8f954bfa4e3bdcf4b49f9e8..4cf2a88c8545ff21c9ded63260adc7197d2d9dda 100644
--- a/src/com/android/contacts/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/util/AccountSelectionUtil.java
@@ -116,7 +116,6 @@ public class AccountSelectionUtil {
                 }
 
                 final TextView text1 = (TextView) convertView.findViewById(android.R.id.text1);
-                final TextView text2 = (TextView) convertView.findViewById(android.R.id.text2);
                 final ImageView icon = (ImageView) convertView.findViewById(android.R.id.icon);
 
                 final AccountWithDataSet account = this.getItem(position);
@@ -124,10 +123,7 @@ public class AccountSelectionUtil {
                         account.type, account.dataSet);
                 final Context context = getContext();
 
-                text1.setText(accountType.getDisplayLabel(context));
-                text2.setText(account.name);
-                text2.setVisibility(context.getPackageName().equals(account.type) ?
-                        View.GONE : View.VISIBLE);
+                text1.setText(account.name);
                 icon.setImageDrawable(accountType.getDisplayIcon(getContext()));
 
                 return convertView;
diff --git a/src/com/android/contacts/util/AccountsListAdapter.java b/src/com/android/contacts/util/AccountsListAdapter.java
index cc80b7985f9f551e5afb0b8e0831909004dda175..63f9935cdd5cd6f9fae2be5bab6860e0f466592e 100644
--- a/src/com/android/contacts/util/AccountsListAdapter.java
+++ b/src/com/android/contacts/util/AccountsListAdapter.java
@@ -90,13 +90,9 @@ public final class AccountsListAdapter extends BaseAdapter {
                         R.layout.account_selector_list_item_condensed, parent, false);
 
         final TextView text1 = (TextView) resultView.findViewById(android.R.id.text1);
-        final TextView text2 = (TextView) resultView.findViewById(android.R.id.text2);
         final ImageView icon = (ImageView) resultView.findViewById(android.R.id.icon);
 
-        text1.setText(mAccounts.get(position).getTypeLabel());
-        text2.setText(mAccounts.get(position).getNameLabel());
-        text2.setVisibility(mAccounts.get(position).getNameLabel().equals(
-                mAccounts.get(position).getTypeLabel()) ? View.GONE : View.VISIBLE);
+        text1.setText(mAccounts.get(position).getNameLabel());
 
         icon.setImageDrawable(mAccounts.get(position).getIcon());
 
diff --git a/src/com/android/contacts/util/StructuredPostalUtils.java b/src/com/android/contacts/util/StructuredPostalUtils.java
index 6e46176ca8986d6e7be6199a3b90aa19291223f3..59d38ea43505e2f5e77793050d87d8a871a35aa4 100644
--- a/src/com/android/contacts/util/StructuredPostalUtils.java
+++ b/src/com/android/contacts/util/StructuredPostalUtils.java
@@ -30,12 +30,4 @@ public class StructuredPostalUtils {
     public static Uri getPostalAddressUri(String postalAddress) {
         return Uri.parse("geo:0,0?q=" + Uri.encode(postalAddress));
     }
-
-    public static Intent getViewPostalAddressDirectionsIntent(String postalAddress) {
-        return new Intent(Intent.ACTION_VIEW, getPostalAddressDirectionsUri(postalAddress));
-    }
-
-    public static Uri getPostalAddressDirectionsUri(String postalAddress) {
-        return Uri.parse("https://maps.google.com/maps?daddr=" + Uri.encode(postalAddress));
-    }
 }
diff --git a/src/com/android/contacts/vcard/ExportProcessor.java b/src/com/android/contacts/vcard/ExportProcessor.java
index fd5134c389ebe7215a6f3a181db6ccdf1dec8401..199249e6ac37d75d5f581211e438dc886da283ff 100755
--- a/src/com/android/contacts/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -15,25 +15,29 @@
  */
 package com.android.contacts.vcard;
 
+import static com.android.vcard.VCardConfig.VCARD_TYPE_V21_GENERIC;
+import static com.android.vcard.VCardConfig.VCARD_TYPE_V30_GENERIC;
+import static com.android.vcard.VCardConfig.VCARD_TYPE_V40_GENERIC;
+
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Message;
+import android.preference.PreferenceManager;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.RawContactsEntity;
-import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.android.contacts.R;
 import com.android.contactsbind.FeedbackHelper;
 import com.android.vcard.VCardComposer;
-import com.android.vcard.VCardConfig;
 
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
@@ -41,6 +45,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Class for processing one export request from a user. Dropped after exporting requested Uri(s).
@@ -50,6 +56,11 @@ public class ExportProcessor extends ProcessorBase {
     private static final String LOG_TAG = "VCardExport";
     private static final boolean DEBUG = VCardService.DEBUG;
 
+    private static final String KEY_EXPORT_TYPE = "exportToVcfType";
+    private static final String VCARD_TYPE_V21_GENERIC_STR = "v21_generic";
+    private static final String VCARD_TYPE_V30_GENERIC_STR = "v30_generic";
+    private static final String VCARD_TYPE_V40_GENERIC_STR = "v40_generic";
+
     private final VCardService mService;
     private final ContentResolver mResolver;
     private final NotificationManager mNotificationManager;
@@ -139,14 +150,16 @@ public class ExportProcessor extends ProcessorBase {
                 return;
             }
 
-            final String exportType = request.exportType;
-            final int vcardType;
-            if (TextUtils.isEmpty(exportType)) {
-                vcardType = VCardConfig.getVCardTypeFromString(
-                        mService.getString(R.string.config_export_vcard_type));
-            } else {
-                vcardType = VCardConfig.getVCardTypeFromString(exportType);
-            }
+            Map<String, Integer> sVCardTypeMap = new HashMap<>();
+            sVCardTypeMap.put(VCARD_TYPE_V21_GENERIC_STR, VCARD_TYPE_V21_GENERIC);
+            sVCardTypeMap.put(VCARD_TYPE_V30_GENERIC_STR, VCARD_TYPE_V30_GENERIC);
+            sVCardTypeMap.put(VCARD_TYPE_V40_GENERIC_STR, VCARD_TYPE_V40_GENERIC);
+
+            final SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(
+                    mService.getApplicationContext());
+            final String defVcfType = pref.getString(KEY_EXPORT_TYPE,
+                    VCARD_TYPE_V40_GENERIC_STR);
+            final int vcardType = sVCardTypeMap.get(defVcfType);
 
             composer = new VCardComposer(mService, vcardType, true);