diff --git a/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt
index e725634348..0e29f0feb2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/dms/NewMessageFragment.kt
@@ -31,7 +31,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.launch
 import network.loki.messenger.R
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index 9c08898f33..e3b7e68583 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -118,12 +118,6 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         super.onCreate(savedInstanceState, isReady)
         binding = ActivitySettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
-
-        binding.composeView.setContent {
-            AppTheme {
-                Buttons()
-            }
-        }
     }
 
     override fun onStart() {
@@ -137,6 +131,12 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
             publicKeyTextView.text = hexEncodedPublicKey
             versionTextView.text = String.format(getString(R.string.version_s), "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
         }
+
+        binding.composeView.setContent {
+            AppTheme {
+                Buttons()
+            }
+        }
     }
 
     private fun getDisplayName(): String =
@@ -379,7 +379,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                     return true
                 }
             }
-            return false;
+            return false
         }
     }