diff --git a/app/build.gradle b/app/build.gradle
index 2e3f15d9d8..b1d9fc176c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -112,7 +112,6 @@ dependencies {
     def preference_version = "1.0.0"
     def work_version = "2.0.1"
     def exif_version = "1.0.0"
-    def emoji_version = "1.0.0"
     def billingclient_version = "1.2.2"
     def javamail_version = "1.6.3"
     def jsoup_version = "1.11.3"
@@ -170,10 +169,6 @@ dependencies {
     // https://mvnrepository.com/artifact/androidx.exifinterface/exifinterface
     implementation "androidx.exifinterface:exifinterface:$exif_version"
 
-    // https://mvnrepository.com/artifact/androidx.emoji
-    implementation "androidx.emoji:emoji:$emoji_version"
-    implementation "androidx.emoji:emoji-bundled:$emoji_version"
-
     // https://developer.android.com/google/play/billing/billing_library_releases_notes
     implementation "com.android.billingclient:billing:$billingclient_version"
 
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index a75daee5db..947c2470b1 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -38,8 +38,6 @@ import android.preference.PreferenceManager;
 import android.webkit.CookieManager;
 
 import androidx.annotation.RequiresApi;
-import androidx.emoji.bundled.BundledEmojiCompatConfig;
-import androidx.emoji.text.EmojiCompat;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -93,15 +91,9 @@ public class ApplicationEx extends Application {
         });
 
         createNotificationChannels();
-
-        EmojiCompat.Config config = new BundledEmojiCompatConfig(this);
-        EmojiCompat.init(config);
-
         if (Helper.hasWebView(this))
             CookieManager.getInstance().setAcceptCookie(false);
-
         MessageHelper.setSystemProperties();
-
         Core.init(this);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/EditTextCompose.java b/app/src/main/java/eu/faircode/email/EditTextCompose.java
index 11cc4a2e78..e0c9749e41 100644
--- a/app/src/main/java/eu/faircode/email/EditTextCompose.java
+++ b/app/src/main/java/eu/faircode/email/EditTextCompose.java
@@ -4,9 +4,9 @@ import android.content.Context;
 import android.os.Build;
 import android.util.AttributeSet;
 
-import androidx.emoji.widget.EmojiEditText;
+import androidx.appcompat.widget.AppCompatEditText;
 
-public class EditTextCompose extends EmojiEditText {
+public class EditTextCompose extends AppCompatEditText {
     public EditTextCompose(Context context) {
         super(context);
     }
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 8060a5bbc9..3311409c54 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -239,7 +239,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tvSignature" />
 
-            <androidx.emoji.widget.EmojiTextView
+            <TextView
                 android:id="@+id/tvReference"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index cb5fc7b587..290ff97553 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -556,7 +556,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/barrier_body" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <TextView
             android:id="@+id/tvBody"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 6336bd1bde..588b50772d 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -548,7 +548,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/barrier_body" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <TextView
             android:id="@+id/tvBody"
             android:layout_width="0dp"
             android:layout_height="wrap_content"