diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index 6dbfca996..7f00539ab 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -748,8 +748,12 @@ class ConversationInfoActivity :
         binding.archiveConversationBtn.setOnClickListener {
             if (conversation!!.hasArchived) {
                 viewModel.unarchiveConversation(conversationUser, conversationToken)
+                binding.archiveConversationIcon.setImageDrawable(resources.getDrawable(R.drawable.outline_archive_24))
+                binding.archiveConversationText.text = resources.getString(R.string.archive_conversation)
             } else {
                 viewModel.archiveConversation(conversationUser, conversationToken)
+                binding.archiveConversationIcon.setImageDrawable(resources.getDrawable(R.drawable.ic_eye))
+                binding.archiveConversationText.text = resources.getString(R.string.unarchive_conversation)
             }
         }
 
diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
index 73a6fc939..fcb8ad497 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -211,7 +211,8 @@ class ConversationsListActivity :
         mutableMapOf(
             FilterConversationFragment.MENTION to false,
             FilterConversationFragment.UNREAD to false,
-            FilterConversationFragment.ARCHIVE to false
+            FilterConversationFragment.ARCHIVE to false,
+            FilterConversationFragment.DEFAULT to true
         )
     val searchBehaviorSubject = BehaviorSubject.createDefault(false)
     private lateinit var accountIconBadge: BadgeDrawable
@@ -381,7 +382,7 @@ class ConversationsListActivity :
                     sortConversations(conversationItemsWithHeader)
 
                     // Filter Conversations
-                    if (!filterState.containsValue(true)) filterableConversationItems = conversationItems
+                    if (!containsTrue()) filterableConversationItems = conversationItems
                     filterConversation()
                     adapter!!.updateDataSet(filterableConversationItems, false)
                     Handler().postDelayed({ checkToShowUnreadBubble() }, UNREAD_BUBBLE_DELAY.toLong())
@@ -396,6 +397,14 @@ class ConversationsListActivity :
         }
     }
 
+    private fun containsTrue(): Boolean {
+        for ((k, v) in filterState) {
+            if (k != FilterConversationFragment.DEFAULT && v) return true
+        }
+
+        return false
+    }
+
     fun filterConversation() {
         val accountId = UserIdUtils.getIdForUser(userManager.currentUser.blockingGet())
         filterState[FilterConversationFragment.UNREAD] = (
@@ -423,22 +432,15 @@ class ConversationsListActivity :
             ) == "true"
 
         val newItems: MutableList<AbstractFlexibleItem<*>> = ArrayList()
-        if (filterState[FilterConversationFragment.UNREAD] == false &&
-            filterState[FilterConversationFragment.MENTION] == false &&
-            filterState[FilterConversationFragment.ARCHIVE] == false
-        ) {
-            adapter!!.updateDataSet(conversationItems, true)
-        } else {
-            val items = conversationItems
-            for (i in items) {
-                val conversation = (i as ConversationItem).model
-                if (filter(conversation)) {
-                    newItems.add(i)
-                }
+        val items = conversationItems
+        for (i in items) {
+            val conversation = (i as ConversationItem).model
+            if (filter(conversation)) {
+                newItems.add(i)
             }
-            adapter!!.updateDataSet(newItems, true)
-            setFilterableItems(newItems)
         }
+        adapter!!.updateDataSet(newItems, true)
+        setFilterableItems(newItems)
 
         updateFilterConversationButtonColor()
     }
@@ -460,11 +462,18 @@ class ConversationsListActivity :
 
                     FilterConversationFragment.UNREAD -> result = result && (conversation.unreadMessages > 0)
 
-                    FilterConversationFragment.ARCHIVE -> result = result && conversation.hasArchived
+                    FilterConversationFragment.DEFAULT -> {
+                        result = if (filterState[FilterConversationFragment.ARCHIVE] == true) {
+                            result && conversation.hasArchived
+                        } else {
+                            result && !conversation.hasArchived
+                        }
+                    }
                 }
             }
         }
 
+        Log.d("Julius", "Conversation: ${conversation.name} Result: $result")
         return result
     }
 
@@ -661,7 +670,7 @@ class ConversationsListActivity :
                 override fun onMenuItemActionExpand(item: MenuItem): Boolean {
                     initSearchDisposable()
                     adapter!!.setHeadersShown(true)
-                    if (!filterState.containsValue(true)) filterableConversationItems = searchableConversationItems
+                    if (!containsTrue()) filterableConversationItems = searchableConversationItems
                     adapter!!.updateDataSet(filterableConversationItems, false)
                     adapter!!.showAllHeaders()
                     binding.swipeRefreshLayoutView?.isEnabled = false
@@ -671,7 +680,7 @@ class ConversationsListActivity :
 
                 override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
                     adapter!!.setHeadersShown(false)
-                    if (!filterState.containsValue(true)) filterableConversationItems = conversationItemsWithHeader
+                    if (!containsTrue()) filterableConversationItems = conversationItemsWithHeader
                     adapter!!.updateDataSet(filterableConversationItems, false)
                     adapter!!.hideAllHeaders()
                     if (searchHelper != null) {
@@ -1838,7 +1847,7 @@ class ConversationsListActivity :
     }
 
     fun updateFilterConversationButtonColor() {
-        if (filterState.containsValue(true)) {
+        if (containsTrue()) {
             binding.filterConversationsButton.let { viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY) }
         } else {
             binding.filterConversationsButton.let {
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
index d077b92a2..6eb3c1719 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
@@ -104,6 +104,7 @@ class FilterConversationFragment : DialogFragment() {
     private fun setUpChips() {
         binding.unreadFilterChip.isChecked = filterState[UNREAD]!!
         binding.mentionedFilterChip.isChecked = filterState[MENTION]!!
+        binding.archivedFilterChip.isChecked = filterState[ARCHIVE]!!
     }
 
     private fun processSubmit() {
@@ -136,5 +137,6 @@ class FilterConversationFragment : DialogFragment() {
         const val MENTION: String = "mention"
         const val UNREAD: String = "unread"
         const val ARCHIVE: String = "archive"
+        const val DEFAULT: String = "default"
     }
 }
diff --git a/app/src/main/res/layout/dialog_filter_conversation.xml b/app/src/main/res/layout/dialog_filter_conversation.xml
index 75c1d79d0..c2e9a029a 100644
--- a/app/src/main/res/layout/dialog_filter_conversation.xml
+++ b/app/src/main/res/layout/dialog_filter_conversation.xml
@@ -32,7 +32,7 @@
         android:layout_marginTop="@dimen/standard_half_margin"
         android:layout_marginEnd="@dimen/standard_margin"
         android:layout_marginBottom="@dimen/standard_half_margin"
-        app:chipSpacingHorizontal="@dimen/standard_margin">
+        app:chipSpacingHorizontal="@dimen/standard_half_margin">
 
         <com.google.android.material.chip.Chip
             android:id="@+id/unread_filter_chip"