diff --git a/src/app_service/service/chat/service.nim b/src/app_service/service/chat/service.nim
index 3899eb9c9e..4eca16c031 100644
--- a/src/app_service/service/chat/service.nim
+++ b/src/app_service/service/chat/service.nim
@@ -489,7 +489,7 @@ QtObject:
         let leaveGroupResponse = status_chat.leaveGroupChat(chatId)
         self.emitUpdate(leaveGroupResponse)
 
-      discard status_chat.deactivateChat(chatId)
+      discard status_chat.deactivateChat(chatId, preserveHistory = chat.chatType == chat_dto.ChatType.OneToOne)
 
       var channelGroupId = chat.communityId
       if (channelGroupId == ""):
@@ -497,7 +497,6 @@ QtObject:
 
       self.channelGroups[channelGroupId].chats.delete(self.getChatIndex(channelGroupId, chatId))
       self.chats.del(chatId)
-      discard status_chat.deleteMessagesByChatId(chatId)
       self.events.emit(SIGNAL_CHAT_LEFT, ChatArgs(chatId: chatId))
     except Exception as e:
       error "Error deleting channel", chatId, msg = e.msg
diff --git a/src/app_service/service/message/service.nim b/src/app_service/service/message/service.nim
index 0069ed24f7..70cfe284a7 100644
--- a/src/app_service/service/message/service.nim
+++ b/src/app_service/service/message/service.nim
@@ -190,12 +190,6 @@ QtObject:
     result.msgCursor = initTable[string, MessageCursor]()
     result.pinnedMsgCursor = initTable[string, MessageCursor]()
 
-  proc removeMessageWithId(messages: var seq[MessageDto], msgId: string) =
-    for i in 0..<messages.len:
-      if (messages[i].id == msgId):
-        messages.delete(i)
-        return
-
   proc isChatCursorInitialized(self: Service, chatId: string): bool =
     return self.msgCursor.hasKey(chatId)
 
@@ -441,6 +435,10 @@ QtObject:
       var receivedData = DiscordChannelImportFinishedSignal(e)
       self.resetMessageCursor(receivedData.channelId)
       self.asyncLoadMoreMessagesForChat(receivedData.channelId)
+    
+    self.events.on(SIGNAL_CHAT_LEFT) do(e: Args):
+      var chatArg = ChatArgs(e)
+      self.resetMessageCursor(chatArg.chatId)
 
   proc getTransactionDetails*(self: Service, message: MessageDto): (string, string) =
     let networksDto = self.networkService.getNetworks()
diff --git a/src/backend/chat.nim b/src/backend/chat.nim
index 48812f88da..1d6ed423eb 100644
--- a/src/backend/chat.nim
+++ b/src/backend/chat.nim
@@ -51,8 +51,8 @@ proc createOneToOneChat*(chatId: string, ensName: string = ""): RpcResponse[Json
 proc leaveGroupChat*(chatId: string): RpcResponse[JsonNode] {.raises: [Exception].} =
   result = callPrivateRPC("leaveGroupChat".prefix, %* [nil, chatId, true])
 
-proc deactivateChat*(chatId: string): RpcResponse[JsonNode] {.raises: [Exception].} =
-  callPrivateRPC("deactivateChat".prefix, %* [{ "ID": chatId }])
+proc deactivateChat*(chatId: string, preserveHistory: bool = false): RpcResponse[JsonNode] {.raises: [Exception].} =
+  callPrivateRPC("deactivateChat".prefix, %* [{ "ID": chatId, "preserveHistory": preserveHistory }])
 
 proc clearChatHistory*(chatId: string): RpcResponse[JsonNode] {.raises: [Exception].} =
   callPrivateRPC("clearHistory".prefix, %* [{ "id": chatId }])
diff --git a/ui/imports/shared/views/chat/ChatContextMenuView.qml b/ui/imports/shared/views/chat/ChatContextMenuView.qml
index 44f5ae9bd8..6e8ba3a522 100644
--- a/ui/imports/shared/views/chat/ChatContextMenuView.qml
+++ b/ui/imports/shared/views/chat/ChatContextMenuView.qml
@@ -207,7 +207,7 @@ StatusMenu {
                 return qsTr("Leave group")
             }
             return root.chatType === Constants.chatType.oneToOne ?
-                        qsTr("Delete Chat") :
+                        qsTr("Close Chat") :
                         qsTr("Leave Chat")
         }
         icon.name: root.chatType === Constants.chatType.oneToOne || root.isCommunityChat ? "delete" : "arrow-left"
@@ -290,12 +290,12 @@ StatusMenu {
             confirmButtonObjectName: "deleteChatConfirmationDialogDeleteButton"
             headerSettings.title: root.isCommunityChat ? qsTr("Delete #%1").arg(root.chatName) :
                                             root.chatType === Constants.chatType.oneToOne ?
-                                            qsTr("Delete chat") :
+                                            qsTr("Close chat") :
                                             qsTr("Leave chat")
             confirmButtonLabel: root.isCommunityChat ? qsTr("Delete") : headerSettings.title
             confirmationText: root.isCommunityChat ? qsTr("Are you sure you want to delete #%1 channel?").arg(root.chatName) :
                                                 root.chatType === Constants.chatType.oneToOne ?
-                                                qsTr("Are you sure you want to delete this chat?"):
+                                                qsTr("Are you sure you want to close this chat?"):
                                                 qsTr("Are you sure you want to leave this chat?")
             showCancelButton: true
             cancelBtnType: "normal"