diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
index 17b29dfcf2..f69beb0336 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
@@ -39,6 +39,7 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
   private static final int TYPE_CLEAR_FILTER_FOOTER = 6;
   private static final int TYPE_CLEAR_FILTER_EMPTY  = 7;
   private static final int TYPE_CHAT_FOLDER_EMPTY   = 8;
+  private static final int TYPE_EMPTY_ARCHIVED      = 9;
 
   private enum Payload {
     TYPING_INDICATOR,
@@ -113,6 +114,9 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
     } else if (viewType == TYPE_HEADER) {
       View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.dsl_section_header, parent, false);
       return new HeaderViewHolder(v);
+    } else if (viewType == TYPE_EMPTY_ARCHIVED) {
+      View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.conversation_list_archived_empty_state, parent, false);
+      return new HeaderViewHolder(v);
     } else if (viewType == TYPE_EMPTY) {
       View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.conversation_list_empty_state, parent, false);
       return new HeaderViewHolder(v);
@@ -240,6 +244,8 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
         return TYPE_CHAT_FOLDER_EMPTY;
       case THREAD:
         return TYPE_THREAD;
+      case ARCHIVED_EMPTY:
+        return TYPE_EMPTY_ARCHIVED;
       case EMPTY:
         return TYPE_EMPTY;
       default:
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 ebdae5c37c..93b917084c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
@@ -115,6 +115,8 @@ abstract class ConversationListDataSource implements PagedDataSource<Long, Conve
         return Collections.singletonList(new Conversation(ConversationReader.buildThreadRecordForType(Conversation.Type.CONVERSATION_FILTER_EMPTY,
                                                                                                       0,
                                                                                                       showConversationFooterTip)));
+      } else if (this instanceof ArchivedConversationListDataSource) {
+        return Collections.singletonList(new Conversation(ConversationReader.buildThreadRecordForType(Conversation.Type.ARCHIVED_EMPTY, 0, false)));
       } else if (chatFolder.getFolderType() != ChatFolderRecord.FolderType.ALL) {
         return Collections.singletonList(new Conversation(ConversationReader.buildThreadRecordForType(Conversation.Type.CHAT_FOLDER_EMPTY, 0, false)));
       } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/Conversation.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/Conversation.java
index cbf359b096..04f4563a6d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/Conversation.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/Conversation.java
@@ -46,6 +46,7 @@ public class Conversation {
     CONVERSATION_FILTER_FOOTER,
     CONVERSATION_FILTER_EMPTY,
     CHAT_FOLDER_EMPTY,
-    EMPTY
+    ARCHIVED_EMPTY,
+    EMPTY,
   }
 }
diff --git a/app/src/main/res/layout/conversation_list_archived_empty_state.xml b/app/src/main/res/layout/conversation_list_archived_empty_state.xml
new file mode 100644
index 0000000000..861eade7d6
--- /dev/null
+++ b/app/src/main/res/layout/conversation_list_archived_empty_state.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/empty_state"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="32dp"
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
+
+    <TextView
+        style="@style/Signal.Text.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="20dp"
+        android:gravity="center"
+        android:text="@string/conversation_list_fragment__archived_chats_will_appear_here" />
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c263c4eaf3..b9117ebf14 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4366,6 +4366,8 @@
     <string name="conversation_list_fragment__fab_content_description">New chat</string>
     <string name="conversation_list_fragment__open_camera_description">Open Camera</string>
     <string name="conversation_list_fragment__no_chats_yet_get_started_by_messaging_a_friend">No chats yet.\nGet started by messaging a friend.</string>
+    <!-- Message shown when there are no archived chats to display -->
+    <string name="conversation_list_fragment__archived_chats_will_appear_here">Archived chats will appear here.</string>
     <!-- Message shown when there are no chats in the chat folder to display -->
     <string name="conversation_list_fragment__no_chats_to_display">No chats to display</string>
     <!-- Button text that will open up chat folder settings -->