diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
index 2b79608ae1..65a262b598 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
@@ -60,29 +60,27 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch
 
       dividerPref()
 
-      if (RemoteConfig.showChatFolders) {
-        sectionHeaderPref(R.string.ChatsSettingsFragment__chat_folders)
+      sectionHeaderPref(R.string.ChatsSettingsFragment__chat_folders)
 
-        if (state.folderCount == 0) {
-          clickPref(
-            title = DSLSettingsText.from(R.string.ChatsSettingsFragment__add_chat_folder),
-            onClick = {
-              Navigation.findNavController(requireView()).safeNavigate(R.id.action_chatsSettingsFragment_to_chatFoldersFragment)
-            }
-          )
-        } else {
-          clickPref(
-            title = DSLSettingsText.from(R.string.ChatsSettingsFragment__add_edit_chat_folder),
-            summary = DSLSettingsText.from(resources.getQuantityString(R.plurals.ChatsSettingsFragment__d_folder, state.folderCount, state.folderCount)),
-            onClick = {
-              Navigation.findNavController(requireView()).safeNavigate(R.id.action_chatsSettingsFragment_to_chatFoldersFragment)
-            }
-          )
-        }
-
-        dividerPref()
+      if (state.folderCount == 0) {
+        clickPref(
+          title = DSLSettingsText.from(R.string.ChatsSettingsFragment__add_chat_folder),
+          onClick = {
+            Navigation.findNavController(requireView()).safeNavigate(R.id.action_chatsSettingsFragment_to_chatFoldersFragment)
+          }
+        )
+      } else {
+        clickPref(
+          title = DSLSettingsText.from(R.string.ChatsSettingsFragment__add_edit_chat_folder),
+          summary = DSLSettingsText.from(resources.getQuantityString(R.plurals.ChatsSettingsFragment__d_folder, state.folderCount, state.folderCount)),
+          onClick = {
+            Navigation.findNavController(requireView()).safeNavigate(R.id.action_chatsSettingsFragment_to_chatFoldersFragment)
+          }
+        )
       }
 
+      dividerPref()
+
       sectionHeaderPref(R.string.ChatsSettingsFragment__keyboard)
 
       switchPref(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 1cbe841508..72b771fbea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -304,7 +304,6 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
     fab.setVisibility(View.VISIBLE);
     cameraFab.setVisibility(View.VISIBLE);
-    chatFolderList.setVisibility(RemoteConfig.getShowChatFolders() ? View.VISIBLE : View.GONE);
 
     contactSearchMediator = new ContactSearchMediator(this,
                                                       Collections.emptySet(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
index aa01619798..afa94ab86b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
@@ -1106,7 +1106,7 @@ object RemoteConfig {
   /** Whether or not to show chat folders. */
   @JvmStatic
   val showChatFolders: Boolean by remoteBoolean(
-    key = "android.showChatFolders",
+    key = "android.showChatFolders.2",
     defaultValue = false,
     hotSwappable = true
   )
@@ -1114,7 +1114,7 @@ object RemoteConfig {
   /** Whether or not to use the new pinned chat UI. */
   @JvmStatic
   val inlinePinnedChats: Boolean by remoteBoolean(
-    key = "android.inlinePinnedChats",
+    key = "android.inlinePinnedChats.2",
     defaultValue = false,
     hotSwappable = true
   )
diff --git a/app/src/main/res/layout/conversation_list_fragment.xml b/app/src/main/res/layout/conversation_list_fragment.xml
index ed589763ab..45ab831aa0 100644
--- a/app/src/main/res/layout/conversation_list_fragment.xml
+++ b/app/src/main/res/layout/conversation_list_fragment.xml
@@ -39,6 +39,8 @@
         android:minHeight="52dp"
         android:clipToPadding="false"
         android:paddingStart="16dp"
+        android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/banner_barrier" />