diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 279cc7a7ab..9426119c56 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1081,7 +1081,7 @@ public class Helper {
         // https://developer.android.com/guide/topics/ui/look-and-feel/darktheme#configuration_changes
         int uiMode = context.getResources().getConfiguration().uiMode;
         Log.i("UI mode=0x" + Integer.toHexString(uiMode));
-        return ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0);
+        return ((uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES);
     }
 
     static boolean isDarkTheme(Context context) {
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index c714ed01a5..bd2664522b 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -1695,9 +1695,7 @@ public class Log {
         int uiMode = context.getResources().getConfiguration().uiMode;
         sb.append(String.format("UI mode: 0x"))
                 .append(Integer.toHexString(uiMode))
-                .append(" night")
-                .append(" no=").append((uiMode & Configuration.UI_MODE_NIGHT_NO) != 0)
-                .append(" yes=").append((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0)
+                .append(" night=").append(Helper.isNight(context))
                 .append("\r\n");
 
         sb.append("Transliterate: ")