diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
index da12568ed4..e242d6e6b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.conversation.v2.messages
 
 import android.content.Context
 import android.content.res.ColorStateList
+import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.text.util.Linkify
 import android.util.AttributeSet
@@ -141,11 +142,11 @@ class VisibleMessageContentView : LinearLayout {
 
         @ColorInt
         fun getTextColor(context: Context, message: MessageRecord): Int {
-            val uiMode = UiModeUtilities.getUserSelectedUiMode(context)
+            val isDayUiMode = UiModeUtilities.isDayUiMode(context)
             val colorID = if (message.isOutgoing) {
-                if (uiMode == UiMode.NIGHT) R.color.black else R.color.white
+                if (isDayUiMode) R.color.white else R.color.black
             } else {
-                if (uiMode == UiMode.NIGHT) R.color.white else R.color.black
+                if (isDayUiMode) R.color.black else R.color.white
             }
             return context.resources.getColorWithID(colorID, context.theme)
         }
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5928d5687f..110ac1dfe2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -18,7 +18,7 @@
         <item name="android:colorBackground">@color/default_background_start</item>
         <item name="android:navigationBarColor">@color/compose_view_background</item>
 
-        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>
         <item name="actionBarWidgetTheme">@null</item>
         <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
         <item name="actionBarStyle">@style/Widget.Session.ActionBar</item>