diff --git a/app/build.gradle b/app/build.gradle
index db6336453..1f36a62ed 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -143,6 +143,7 @@ ext {
     androidxCameraVersion = "1.1.0"
     coilKtVersion = "2.2.2"
     daggerVersion = "2.44.2"
+    emojiVersion = "1.2.0"
     lifecycleVersion = '2.5.1'
     okhttpVersion = "4.10.0"
     materialDialogsVersion = "3.3.0"
@@ -178,7 +179,10 @@ dependencies {
     implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "com.vanniktech:emoji-google:0.15.0"
-    implementation group: 'androidx.emoji', name: 'emoji-bundled', version: '1.1.0'
+    implementation "androidx.emoji2:emoji2:${emojiVersion}"
+    implementation "androidx.emoji2:emoji2-bundled:${emojiVersion}"
+    implementation "androidx.emoji2:emoji2-views:${emojiVersion}"
+    implementation "androidx.emoji2:emoji2-views-helper:${emojiVersion}"
     implementation 'org.michaelevans.colorart:library:0.0.3'
     implementation "androidx.work:work-runtime:${workVersion}"
     implementation "androidx.work:work-rxjava2:${workVersion}"
@@ -245,7 +249,7 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'com.github.wooplr:Spotlight:1.3'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
-    implementation 'com.github.nextcloud-deps:ChatKit:0.3.1'
+    implementation 'com.github.nextcloud-deps:ChatKit:0.4.0'
 
     implementation 'joda-time:joda-time:2.12.2'
     implementation "io.coil-kt:coil:${coilKtVersion}"
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java
index 78fbac71e..b618d9518 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java
@@ -33,7 +33,7 @@ import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding;
 import com.nextcloud.talk.models.json.chat.ChatMessage;
 
 import androidx.core.content.ContextCompat;
-import androidx.emoji.widget.EmojiTextView;
+import androidx.emoji2.widget.EmojiTextView;
 
 public class IncomingPreviewMessageViewHolder extends PreviewMessageViewHolder {
     private final ItemCustomIncomingPreviewMessageBinding binding;
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java
index 82778e9dd..c6f746427 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java
@@ -33,7 +33,7 @@ import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding;
 import com.nextcloud.talk.models.json.chat.ChatMessage;
 
 import androidx.core.content.ContextCompat;
-import androidx.emoji.widget.EmojiTextView;
+import androidx.emoji2.widget.EmojiTextView;
 
 public class OutcomingPreviewMessageViewHolder extends PreviewMessageViewHolder {
 
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt
index cfd4be17b..2759f0bbc 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt
@@ -42,7 +42,7 @@ import android.widget.PopupMenu
 import android.widget.ProgressBar
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.content.ContextCompat
-import androidx.emoji.widget.EmojiTextView
+import androidx.emoji2.widget.EmojiTextView
 import autodagger.AutoInjector
 import com.google.android.material.card.MaterialCardView
 import com.nextcloud.talk.R
diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt
index de58edb28..a37b24303 100644
--- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt
+++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt
@@ -31,8 +31,8 @@ import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.P
 import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.emoji.bundled.BundledEmojiCompatConfig
-import androidx.emoji.text.EmojiCompat
+import androidx.emoji2.bundled.BundledEmojiCompatConfig
+import androidx.emoji2.text.EmojiCompat
 import androidx.lifecycle.LifecycleObserver
 import androidx.multidex.MultiDex
 import androidx.multidex.MultiDexApplication
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 1648429dd..c44e91890 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -81,8 +81,8 @@ import androidx.core.content.FileProvider
 import androidx.core.content.PermissionChecker
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.widget.doAfterTextChanged
-import androidx.emoji.text.EmojiCompat
-import androidx.emoji.widget.EmojiTextView
+import androidx.emoji2.text.EmojiCompat
+import androidx.emoji2.widget.EmojiTextView
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt
index 20ecc0e17..6fd2425ce 100644
--- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt
+++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt
@@ -45,7 +45,7 @@ import androidx.core.app.Person
 import androidx.core.app.RemoteInput
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
-import androidx.emoji.text.EmojiCompat
+import androidx.emoji2.text.EmojiCompat
 import androidx.work.Data
 import androidx.work.Worker
 import androidx.work.WorkerParameters
diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
index 5d9970468..a917c63f6 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
@@ -129,7 +129,7 @@ class TalkSpecificViewThemeUtils @Inject constructor(
         }
     }
 
-    fun colorContactChatItemName(contactName: androidx.emoji.widget.EmojiTextView) {
+    fun colorContactChatItemName(contactName: androidx.emoji2.widget.EmojiTextView) {
         withScheme(contactName) { scheme ->
             contactName.setTextColor(scheme.onPrimaryContainer)
         }
diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
index a4ab68ed7..50303a506 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
@@ -82,7 +82,7 @@ import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.emoji.text.EmojiCompat;
+import androidx.emoji2.text.EmojiCompat;
 import coil.Coil;
 import coil.request.ImageRequest;
 import coil.target.Target;
diff --git a/app/src/main/java/com/nextcloud/talk/utils/EmojiTextInputEditText.java b/app/src/main/java/com/nextcloud/talk/utils/EmojiTextInputEditText.java
index e1111ec83..71490da5e 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/EmojiTextInputEditText.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/EmojiTextInputEditText.java
@@ -25,7 +25,8 @@ import android.util.AttributeSet;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 
-import androidx.emoji.widget.EmojiEditTextHelper;
+import androidx.annotation.NonNull;
+import androidx.emoji2.viewsintegration.EmojiEditTextHelper;
 
 import com.google.android.material.textfield.TextInputEditText;
 
@@ -57,7 +58,7 @@ public class EmojiTextInputEditText extends TextInputEditText {
     }
 
     @Override
-    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+    public InputConnection onCreateInputConnection(@NonNull EditorInfo outAttrs) {
         InputConnection inputConnection = super.onCreateInputConnection(outAttrs);
         return getEmojiEditTextHelper().onCreateInputConnection(inputConnection, outAttrs);
     }
diff --git a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
index 098c2dceb..03d0bf3f1 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
@@ -32,7 +32,7 @@ import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.core.content.FileProvider
-import androidx.emoji.widget.EmojiTextView
+import androidx.emoji2.widget.EmojiTextView
 import androidx.work.Data
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkInfo
diff --git a/app/src/main/java/com/nextcloud/talk/utils/ImageEmojiEditText.kt b/app/src/main/java/com/nextcloud/talk/utils/ImageEmojiEditText.kt
index fcd102819..602b57a2f 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ImageEmojiEditText.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/ImageEmojiEditText.kt
@@ -28,7 +28,7 @@ import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputConnection
 import androidx.core.view.inputmethod.EditorInfoCompat
 import androidx.core.view.inputmethod.InputConnectionCompat
-import androidx.emoji.widget.EmojiEditText
+import androidx.emoji2.widget.EmojiEditText
 import com.nextcloud.talk.utils.Mimetype.IMAGE_GIF
 import com.nextcloud.talk.utils.Mimetype.IMAGE_JPEG
 import com.nextcloud.talk.utils.Mimetype.IMAGE_PNG
@@ -47,9 +47,9 @@ class ImageEmojiEditText : EmojiEditText {
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
 
     @Suppress("Detekt.TooGenericExceptionCaught")
-    override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection {
+    override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection? {
 
-        val ic: InputConnection = super.onCreateInputConnection(editorInfo)
+        val ic: InputConnection? = super.onCreateInputConnection(editorInfo)
 
         EditorInfoCompat.setContentMimeTypes(editorInfo, arrayOf(IMAGE_GIF, IMAGE_JPEG, IMAGE_PNG))
 
@@ -73,6 +73,6 @@ class ImageEmojiEditText : EmojiEditText {
                 }
             }
 
-        return InputConnectionCompat.createWrapper(ic, editorInfo, callback)
+        return InputConnectionCompat.createWrapper(ic!!, editorInfo, callback)
     }
 }
diff --git a/app/src/main/res/layout/account_item.xml b/app/src/main/res/layout/account_item.xml
index 8668dbcb9..a5322ef05 100644
--- a/app/src/main/res/layout/account_item.xml
+++ b/app/src/main/res/layout/account_item.xml
@@ -67,7 +67,7 @@
             android:paddingStart="3dp"
             android:paddingEnd="0dp">
 
-            <androidx.emoji.widget.EmojiTextView
+            <androidx.emoji2.widget.EmojiTextView
                 android:id="@+id/user_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/controller_conversation_info.xml b/app/src/main/res/layout/controller_conversation_info.xml
index 53d8fd534..fbd75b6fa 100644
--- a/app/src/main/res/layout/controller_conversation_info.xml
+++ b/app/src/main/res/layout/controller_conversation_info.xml
@@ -68,7 +68,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <androidx.emoji.widget.EmojiTextView
+                    <androidx.emoji2.widget.EmojiTextView
                         android:id="@+id/display_name_text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -98,7 +98,7 @@
                 apc:cardElevation="0dp"
                 tools:visibility="visible">
 
-                <androidx.emoji.widget.EmojiTextView
+                <androidx.emoji2.widget.EmojiTextView
                     android:id="@+id/description_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/controller_profile.xml b/app/src/main/res/layout/controller_profile.xml
index f401adaf3..a2e1c7f69 100644
--- a/app/src/main/res/layout/controller_profile.xml
+++ b/app/src/main/res/layout/controller_profile.xml
@@ -40,7 +40,7 @@
             android:transitionName="userAvatar.transitionTag"
             android:contentDescription="@string/avatar" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@+id/userinfo_fullName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/controller_settings.xml b/app/src/main/res/layout/controller_settings.xml
index 306880842..51a53dd90 100644
--- a/app/src/main/res/layout/controller_settings.xml
+++ b/app/src/main/res/layout/controller_settings.xml
@@ -59,7 +59,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <androidx.emoji.widget.EmojiTextView
+            <androidx.emoji2.widget.EmojiTextView
                 android:id="@+id/display_name_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/current_account_item.xml b/app/src/main/res/layout/current_account_item.xml
index e8ccf5c34..d859c9835 100644
--- a/app/src/main/res/layout/current_account_item.xml
+++ b/app/src/main/res/layout/current_account_item.xml
@@ -78,7 +78,7 @@
             android:paddingStart="3dp"
             android:paddingEnd="0dp">
 
-            <androidx.emoji.widget.EmojiTextView
+            <androidx.emoji2.widget.EmojiTextView
                 android:id="@+id/user_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_poll_main.xml b/app/src/main/res/layout/dialog_poll_main.xml
index d583b2905..825ea267d 100644
--- a/app/src/main/res/layout/dialog_poll_main.xml
+++ b/app/src/main/res/layout/dialog_poll_main.xml
@@ -39,7 +39,7 @@
             android:src="@drawable/ic_baseline_bar_chart_24"
             app:tint="@color/high_emphasis_menu_icon" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@+id/message_poll_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_incoming_link_preview_message.xml b/app/src/main/res/layout/item_custom_incoming_link_preview_message.xml
index 637b5c218..7af3fb055 100644
--- a/app/src/main/res/layout/item_custom_incoming_link_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_link_preview_message.xml
@@ -56,7 +56,7 @@
             layout="@layout/item_message_quote"
             android:visibility="gone" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@+id/messageAuthor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
             android:textSize="12sp"
             tools:text="Jane Doe" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_incoming_location_message.xml b/app/src/main/res/layout/item_custom_incoming_location_message.xml
index a27e1a8e0..624d60cee 100644
--- a/app/src/main/res/layout/item_custom_incoming_location_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_location_message.xml
@@ -61,7 +61,7 @@
             android:layout_width="400dp"
             android:layout_height="200dp" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@+id/messageAuthor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
             android:textColor="@color/textColorMaxContrast"
             android:textSize="12sp" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_incoming_poll_message.xml b/app/src/main/res/layout/item_custom_incoming_poll_message.xml
index 9282d616b..cd58658c7 100644
--- a/app/src/main/res/layout/item_custom_incoming_poll_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_poll_message.xml
@@ -53,7 +53,7 @@
             layout="@layout/item_message_quote"
             android:visibility="gone" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@+id/messageAuthor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -76,7 +76,7 @@
                 android:src="@drawable/ic_baseline_bar_chart_24"
                 app:tint="@color/high_emphasis_menu_icon" />
 
-            <androidx.emoji.widget.EmojiTextView
+            <androidx.emoji2.widget.EmojiTextView
                 android:id="@+id/message_poll_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_incoming_preview_message.xml b/app/src/main/res/layout/item_custom_incoming_preview_message.xml
index 5f306cb47..798ebcd9a 100644
--- a/app/src/main/res/layout/item_custom_incoming_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_preview_message.xml
@@ -121,7 +121,7 @@
                         tools:visibility="visible" />
                 </FrameLayout>
 
-                <androidx.emoji.widget.EmojiTextView
+                <androidx.emoji2.widget.EmojiTextView
                     android:id="@+id/contact_name"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -145,7 +145,7 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_incoming_text_message.xml b/app/src/main/res/layout/item_custom_incoming_text_message.xml
index c62d4b9e9..fe6ac95ed 100644
--- a/app/src/main/res/layout/item_custom_incoming_text_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_text_message.xml
@@ -54,7 +54,7 @@
             layout="@layout/item_message_quote"
             android:visibility="gone" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@+id/messageAuthor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -66,7 +66,7 @@
             android:textSize="12sp"
             tools:text="Jane Doe" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_incoming_voice_message.xml b/app/src/main/res/layout/item_custom_incoming_voice_message.xml
index 34436d7e9..9d4b614a8 100644
--- a/app/src/main/res/layout/item_custom_incoming_voice_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_voice_message.xml
@@ -57,7 +57,7 @@
             layout="@layout/item_message_quote"
             android:visibility="gone" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@+id/messageAuthor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_outcoming_link_preview_message.xml b/app/src/main/res/layout/item_custom_outcoming_link_preview_message.xml
index 924ad8553..a16988010 100644
--- a/app/src/main/res/layout/item_custom_outcoming_link_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_link_preview_message.xml
@@ -48,7 +48,7 @@
             layout="@layout/item_message_quote"
             android:visibility="gone" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_outcoming_location_message.xml b/app/src/main/res/layout/item_custom_outcoming_location_message.xml
index bb8ad318a..d82b6e486 100644
--- a/app/src/main/res/layout/item_custom_outcoming_location_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_location_message.xml
@@ -51,7 +51,7 @@
             android:layout_width="400dp"
             android:layout_height="200dp" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_outcoming_poll_message.xml b/app/src/main/res/layout/item_custom_outcoming_poll_message.xml
index 7518406b2..84be0c3b6 100644
--- a/app/src/main/res/layout/item_custom_outcoming_poll_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_poll_message.xml
@@ -58,7 +58,7 @@
                 android:src="@drawable/ic_baseline_bar_chart_24"
                 app:tint="@color/high_emphasis_text" />
 
-            <androidx.emoji.widget.EmojiTextView
+            <androidx.emoji2.widget.EmojiTextView
                 android:id="@+id/message_poll_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_outcoming_preview_message.xml b/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
index 4e487d32c..6d2dd6b7c 100644
--- a/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
@@ -111,7 +111,7 @@
                         tools:visibility="visible" />
                 </FrameLayout>
 
-                <androidx.emoji.widget.EmojiTextView
+                <androidx.emoji2.widget.EmojiTextView
                     android:id="@+id/contact_name"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -135,7 +135,7 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_custom_outcoming_text_message.xml b/app/src/main/res/layout/item_custom_outcoming_text_message.xml
index fd586726f..9298f5035 100644
--- a/app/src/main/res/layout/item_custom_outcoming_text_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_text_message.xml
@@ -46,7 +46,7 @@
             layout="@layout/item_message_quote"
             android:visibility="gone" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_message_quote.xml b/app/src/main/res/layout/item_message_quote.xml
index e4b7e4775..07ed0d414 100644
--- a/app/src/main/res/layout/item_message_quote.xml
+++ b/app/src/main/res/layout/item_message_quote.xml
@@ -38,7 +38,7 @@
         android:layout_marginEnd="8dp"
         android:background="@color/high_emphasis_text" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/quotedMessageAuthor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
             app:layout_wrapBefore="true"
             tools:src="@tools:sample/backgrounds/scenic" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@+id/quotedMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_reactions_tab.xml b/app/src/main/res/layout/item_reactions_tab.xml
index 1e813ed3c..9c6bb3e66 100644
--- a/app/src/main/res/layout/item_reactions_tab.xml
+++ b/app/src/main/res/layout/item_reactions_tab.xml
@@ -25,7 +25,7 @@
     android:layout_height="wrap_content"
     android:gravity="center">
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/reaction_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_system_message.xml b/app/src/main/res/layout/item_system_message.xml
index db27523d1..e9be2aa08 100644
--- a/app/src/main/res/layout/item_system_message.xml
+++ b/app/src/main/res/layout/item_system_message.xml
@@ -42,7 +42,7 @@
         app:flexWrap="wrap"
         app:justifyContent="flex_end">
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@+id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/reaction_item.xml b/app/src/main/res/layout/reaction_item.xml
index 42067c54f..62784b6d3 100644
--- a/app/src/main/res/layout/reaction_item.xml
+++ b/app/src/main/res/layout/reaction_item.xml
@@ -43,7 +43,7 @@
         android:textSize="@dimen/bottom_sheet_text_size"
         tools:text="Participant Name" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/reaction"
         android:layout_width="48dp"
         android:layout_height="48dp"
diff --git a/app/src/main/res/layout/reference_inside_message.xml b/app/src/main/res/layout/reference_inside_message.xml
index 5363d38e4..d3d1ee07f 100644
--- a/app/src/main/res/layout/reference_inside_message.xml
+++ b/app/src/main/res/layout/reference_inside_message.xml
@@ -33,7 +33,7 @@
         android:background="@color/low_emphasis_text"
         tools:layout_height="100dp" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/referenceName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
         tools:text="Name of Website"
         tools:visibility="visible" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/referenceDescription"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -63,7 +63,7 @@
         tools:text="Description of Website"
         tools:visibility="visible" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/referenceLink"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/rv_item_contact.xml b/app/src/main/res/layout/rv_item_contact.xml
index 4abb3ecee..58b92a849 100644
--- a/app/src/main/res/layout/rv_item_contact.xml
+++ b/app/src/main/res/layout/rv_item_contact.xml
@@ -42,7 +42,7 @@
         android:src="@drawable/ic_check_black_24dp"
         app:tint="@color/colorPrimary" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/name_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/rv_item_conversation_info_participant.xml b/app/src/main/res/layout/rv_item_conversation_info_participant.xml
index 494a1c608..b3d1d994f 100644
--- a/app/src/main/res/layout/rv_item_conversation_info_participant.xml
+++ b/app/src/main/res/layout/rv_item_conversation_info_participant.xml
@@ -57,7 +57,7 @@
         app:layout_constraintEnd_toEndOf="@+id/avatar_view"
         tools:src="@drawable/emoji_one_category_smileysandpeople"/>
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/name_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
         app:layout_constraintTop_toTopOf="@+id/avatar_view"
         tools:text="Jane Doe" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/conversation_info_status_message"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -88,7 +88,7 @@
         app:layout_constraintTop_toBottomOf="@+id/name_text"
         tools:text="this is a very long status message. server allows only 81 chars here. 0123456789" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/secondary_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index b60da2708..1f1f0db8c 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -72,7 +72,7 @@
         android:layout_marginTop="6dp"
         android:layout_toEndOf="@id/dialogAvatarFrameLayout">
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@id/dialogLastMessage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -121,7 +121,7 @@
         android:textSize="14sp"
         tools:text="yesterday" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@id/dialogName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/rv_item_search_message.xml b/app/src/main/res/layout/rv_item_search_message.xml
index 5710944b5..e30eb7ba9 100644
--- a/app/src/main/res/layout/rv_item_search_message.xml
+++ b/app/src/main/res/layout/rv_item_search_message.xml
@@ -45,7 +45,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/conversation_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Message title goes here" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/message_excerpt"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/shared_item_list.xml b/app/src/main/res/layout/shared_item_list.xml
index 5fc4fc879..fbaf93331 100644
--- a/app/src/main/res/layout/shared_item_list.xml
+++ b/app/src/main/res/layout/shared_item_list.xml
@@ -63,7 +63,7 @@
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/preview_container">
 
-        <androidx.emoji.widget.EmojiTextView
+        <androidx.emoji2.widget.EmojiTextView
             android:id="@+id/file_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"