diff --git a/app/build.gradle b/app/build.gradle
index f1bd17ff..5b9e799d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:3c6ffa6f87'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:cf120f1fa8'
     implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
     implementation 'com.github.tibbi:android-smsmms:33fcaf94d9'
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 55d2a1fe..e970f7f4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -169,7 +169,12 @@ class ThreadActivity : SimpleActivity() {
             }
         }
 
-        val bottomBarColor = getBottomNavigationBackgroundColor()
+        val bottomBarColor = if (baseConfig.isUsingSystemTheme) {
+            resources.getColor(R.color.you_bottom_bar_color)
+        } else {
+            getBottomNavigationBackgroundColor()
+        }
+
         thread_send_message_holder.setBackgroundColor(bottomBarColor)
         updateNavigationBarColor(bottomBarColor)
     }