diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt
index 3a3e1c5c2..1d3aec4ce 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt
@@ -225,9 +225,9 @@ class MessagesConversationAdapter(
         private const val ITEM_LOAD_OLDER_INDICATOR = 4
 
         private fun Context.getIncomingMessageColor(): ColorStateList {
-            val foregroundColor = ThemeUtils.getColorForeground(this)
+            val defaultBubbleColor = ThemeUtils.getColorFromAttribute(this, R.attr.messageBubbleColor)
             val themeColor = Chameleon.getOverrideTheme(this, ChameleonUtils.getActivity(this)).colorAccent
-            val normalColor = ThemeUtils.getOptimalAccentColor(themeColor, foregroundColor)
+            val normalColor = ColorUtils.compositeColors(ColorUtils.setAlphaComponent(themeColor, 0x33), defaultBubbleColor)
             val pressedColor = if (ColorUtils.calculateLuminance(normalColor) < 0.1) {
                 ColorUtils.compositeColors(0x20FFFFFF, normalColor)
             } else {