diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
index e34360c7138..093a1babc12 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.vue
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -82,6 +82,11 @@
 
 			<ActionSeparator />
 
+			<ActionButton v-if="canLeaveConversation"
+				:icon="iconArchive"
+				@click.prevent.exact="toggleArchiveConversation">
+				{{ labelArchive }}
+			</ActionButton>
 			<ActionButton v-if="canLeaveConversation"
 				:icon="iconLeaveConversation"
 				@click.prevent.exact="leaveConversation">
@@ -137,6 +142,7 @@ export default {
 					type: 0,
 					displayName: '',
 					isFavorite: false,
+					isArchived: false,
 					notificationLevel: 0,
 					lastMessage: {},
 				}
@@ -164,6 +170,14 @@ export default {
 			return this.item.isFavorite ? t('spreed', 'Remove from favorites') : t('spreed', 'Add to favorites')
 		},
 
+		iconArchive() {
+			return this.item.isArchived ? 'icon-star-dark' : 'icon-starred'
+		},
+
+		labelArchive() {
+			return this.item.isArchived ? t('spreed', 'Remove from archive') : t('spreed', 'Archive conversation')
+		},
+
 		isNotifyAlways() {
 			return this.item.notificationLevel === PARTICIPANT.NOTIFY.ALWAYS
 		},
@@ -345,6 +359,9 @@ export default {
 				}
 			}
 		},
+		async toggleArchiveConversation() {
+			this.$store.dispatch('toggleArchive', this.item)
+		},
 		async toggleFavoriteConversation() {
 			this.$store.dispatch('toggleFavorite', this.item)
 		},
diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index eab11fc755e..3610e4de422 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -31,6 +31,10 @@
 				@abort-search="abortSearch" />
 			<NewGroupConversation
 				v-if="canStartConversations" />
+			<ActionButton
+				icon="icon-filter"
+				:close-after-click="true"
+				@click.stop="showArchived=!showArchived" />
 		</div>
 		<template #list class="left-sidebar__list">
 			<Caption v-if="isSearching"
@@ -119,6 +123,7 @@ import { CONVERSATION } from '../../constants'
 import { loadState } from '@nextcloud/initial-state'
 import NewGroupConversation from './NewGroupConversation/NewGroupConversation'
 import arrowNavigation from '../../mixins/arrowNavigation'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 
 export default {
 
@@ -132,6 +137,7 @@ export default {
 		Hint,
 		SearchBox,
 		NewGroupConversation,
+		ActionButton,
 	},
 
 	mixins: [
@@ -149,6 +155,7 @@ export default {
 			isCirclesEnabled: loadState('talk', 'circles_enabled'),
 			canStartConversations: loadState('talk', 'start_conversations'),
 			initialisedConversations: false,
+			showArchived: false,
 		}
 	},
 
@@ -161,6 +168,12 @@ export default {
 				conversations = conversations.filter(conversation => conversation.displayName.toLowerCase().indexOf(lowerSearchText) !== -1 || conversation.name.toLowerCase().indexOf(lowerSearchText) !== -1)
 			}
 
+			console.log(conversations)
+			conversations.forEach(conversation => console.log(conversation.isArchived))
+			if (this.showArchived === false) {
+				conversations = conversations.filter(conversation => conversation.isArchived == undefined || conversation.isArchived === false)
+			}
+
 			return conversations.sort(this.sortConversations)
 		},
 
diff --git a/src/store/conversationsStore.js b/src/store/conversationsStore.js
index 886d13bcf32..435a42647a6 100644
--- a/src/store/conversationsStore.js
+++ b/src/store/conversationsStore.js
@@ -178,6 +178,22 @@ const actions = {
 		commit('addConversation', conversation)
 	},
 
+	async toggleArchive({ commit, getters }, { token, isArchived }) {
+		const conversation = Object.assign({}, getters.conversations[token])
+		if (!conversation) {
+			return
+		}
+
+		// if (isArchived) {
+		// 	await DearchiveConversation(token)
+		// } else {
+		// 	await archiveConversation(token)
+		// }
+		conversation.isArchived = !isArchived
+
+		commit('addConversation', conversation)
+	},
+
 	async toggleLobby({ commit, getters }, { token, enableLobby }) {
 		const conversation = Object.assign({}, getters.conversations[token])
 		if (!conversation) {