From ee3c78d2a8110731d948acda10c30d8537dc9698 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 17 Oct 2018 17:01:22 -0300
Subject: [PATCH] [FIX] Last message not updating after message delete if show
 deleted status is on (#12350)

---
 packages/rocketchat-lib/server/functions/deleteMessage.js | 2 +-
 packages/rocketchat-lib/server/models/Rooms.js            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-lib/server/functions/deleteMessage.js b/packages/rocketchat-lib/server/functions/deleteMessage.js
index f8ddf3887498..eb0d6956a499 100644
--- a/packages/rocketchat-lib/server/functions/deleteMessage.js
+++ b/packages/rocketchat-lib/server/functions/deleteMessage.js
@@ -39,7 +39,7 @@ RocketChat.deleteMessage = function(message, user) {
 	if (RocketChat.settings.get('Store_Last_Message')) {
 		const room = RocketChat.models.Rooms.findOneById(message.rid, { fields: { lastMessage: 1 } });
 		if (!room.lastMessage || room.lastMessage._id === message._id) {
-			RocketChat.models.Rooms.resetLastMessageById(message.rid);
+			RocketChat.models.Rooms.resetLastMessageById(message.rid, message._id);
 		}
 	}
 
diff --git a/packages/rocketchat-lib/server/models/Rooms.js b/packages/rocketchat-lib/server/models/Rooms.js
index 4b8755b874ef..64f0185fa408 100644
--- a/packages/rocketchat-lib/server/models/Rooms.js
+++ b/packages/rocketchat-lib/server/models/Rooms.js
@@ -435,9 +435,9 @@ class ModelRooms extends RocketChat.models._Base {
 		return this.update(query, update);
 	}
 
-	resetLastMessageById(_id) {
+	resetLastMessageById(_id, messageId) {
 		const query = { _id };
-		const lastMessage = RocketChat.models.Messages.getLastVisibleMessageSentWithNoTypeByRoomId(_id);
+		const lastMessage = RocketChat.models.Messages.getLastVisibleMessageSentWithNoTypeByRoomId(_id, messageId);
 
 		const update = lastMessage ? {
 			$set: {