diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index fa1fd24e1f..c62de6be84 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1466,6 +1466,10 @@ public class Helper {
         return "OPPO".equalsIgnoreCase(Build.MANUFACTURER);
     }
 
+    static boolean isVivo() {
+        return "vivo".equalsIgnoreCase(Build.MANUFACTURER);
+    }
+
     static boolean isRealme() {
         return "realme".equalsIgnoreCase(Build.MANUFACTURER);
     }
@@ -1478,6 +1482,10 @@ public class Helper {
         return "sony".equalsIgnoreCase(Build.MANUFACTURER);
     }
 
+    static boolean isUnihertz() {
+        return "Unihertz".equalsIgnoreCase(Build.MANUFACTURER);
+    }
+
     static boolean isSurfaceDuo() {
         return (isSurfaceDuo2() ||
                 ("Microsoft".equalsIgnoreCase(Build.MANUFACTURER) && "Surface Duo".equals(Build.MODEL)));
@@ -1524,10 +1532,11 @@ public class Helper {
                 isWiko() ||
                 isLenovo() ||
                 isOppo() ||
-                // Vivo
+                isVivo() ||
                 isRealme() ||
                 isBlackview() ||
-                isSony());
+                isSony() ||
+                isUiThread());
     }
 
     static boolean isAggressivelyKilling() {