diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
index b1f4fdbed2..9d9c350218 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
@@ -78,9 +78,9 @@ public class FromTextView extends SimpleEmojiTextView {
 
     setText(builder);
 
-    if      (recipient.isBlocked())                          setCompoundDrawablesRelativeWithIntrinsicBounds(getBlocked(), null, null, null);
-    else if (RemoteConfig.getShowChatFolders() && isPinned)  setCompoundDrawablesRelativeWithIntrinsicBounds(getPinned(), null, null, null);
-    else                                                     setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0);
+    if      (recipient.isBlocked())                           setCompoundDrawablesRelativeWithIntrinsicBounds(getBlocked(), null, null, null);
+    else if (RemoteConfig.getInlinePinnedChats() && isPinned) setCompoundDrawablesRelativeWithIntrinsicBounds(getPinned(), null, null, null);
+    else                                                      setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0);
   }
 
   private Drawable getBlocked() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
index a1d69e9dbc..ebdae5c37c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
@@ -193,7 +193,7 @@ abstract class ConversationListDataSource implements PagedDataSource<Long, Conve
         totalCount++;
       }
 
-      if (!RemoteConfig.getShowChatFolders() && pinnedCount != 0) {
+      if (!RemoteConfig.getInlinePinnedChats() && pinnedCount != 0) {
         if (unpinnedCount != 0) {
           totalCount += 2;
         } else {
@@ -209,7 +209,7 @@ abstract class ConversationListDataSource implements PagedDataSource<Long, Conve
       List<Cursor> cursors       = new ArrayList<>(5);
       long         originalLimit = limit;
 
-      if (!RemoteConfig.getShowChatFolders() && offset == 0 && hasPinnedHeader()) {
+      if (!RemoteConfig.getInlinePinnedChats() && offset == 0 && hasPinnedHeader()) {
         MatrixCursor pinnedHeaderCursor = new MatrixCursor(ConversationReader.HEADER_COLUMN);
         pinnedHeaderCursor.addRow(ConversationReader.PINNED_HEADER);
         cursors.add(pinnedHeaderCursor);
@@ -220,7 +220,7 @@ abstract class ConversationListDataSource implements PagedDataSource<Long, Conve
       cursors.add(pinnedCursor);
       limit -= pinnedCursor.getCount();
 
-      if (!RemoteConfig.getShowChatFolders() && offset == 0 && hasUnpinnedHeader()) {
+      if (!RemoteConfig.getInlinePinnedChats() && offset == 0 && hasUnpinnedHeader()) {
         MatrixCursor unpinnedHeaderCursor = new MatrixCursor(ConversationReader.HEADER_COLUMN);
         unpinnedHeaderCursor.addRow(ConversationReader.UNPINNED_HEADER);
         cursors.add(unpinnedHeaderCursor);
@@ -250,7 +250,7 @@ abstract class ConversationListDataSource implements PagedDataSource<Long, Conve
 
     @VisibleForTesting
     int getHeaderOffset() {
-      if (RemoteConfig.getShowChatFolders()) {
+      if (RemoteConfig.getInlinePinnedChats()) {
         return 0;
       } else {
         return (hasPinnedHeader() ? 1 : 0) + (hasUnpinnedHeader() ? 1 : 0);
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 f2c2a70842..aa01619798 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/RemoteConfig.kt
@@ -1111,6 +1111,14 @@ object RemoteConfig {
     hotSwappable = true
   )
 
+  /** Whether or not to use the new pinned chat UI. */
+  @JvmStatic
+  val inlinePinnedChats: Boolean by remoteBoolean(
+    key = "android.inlinePinnedChats",
+    defaultValue = false,
+    hotSwappable = true
+  )
+
   @JvmStatic
   @get:JvmName("newCallUi")
   val newCallUi: Boolean by remoteBoolean(
diff --git a/app/src/test/java/org/thoughtcrime/securesms/conversationlist/UnarchivedConversationListDataSourceTest.java b/app/src/test/java/org/thoughtcrime/securesms/conversationlist/UnarchivedConversationListDataSourceTest.java
index 01cd1aa65f..f84d4144e5 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/conversationlist/UnarchivedConversationListDataSourceTest.java
+++ b/app/src/test/java/org/thoughtcrime/securesms/conversationlist/UnarchivedConversationListDataSourceTest.java
@@ -62,7 +62,7 @@ public class UnarchivedConversationListDataSourceTest {
 
     when(SignalDatabase.threads()).thenReturn(threadTable);
     when(AppDependencies.getDatabaseObserver()).thenReturn(mock(DatabaseObserver.class));
-    when(RemoteConfig.getShowChatFolders()).thenReturn(true);
+    when(RemoteConfig.getInlinePinnedChats()).thenReturn(true);
 
     allChatsFolder = setupAllChatsFolder();
     testSubject = new ConversationListDataSource.UnarchivedConversationListDataSource(allChatsFolder, ConversationFilter.OFF, false);