diff --git a/protocol/messenger_handler.go b/protocol/messenger_handler.go
index ebff22b5c..953b2715a 100644
--- a/protocol/messenger_handler.go
+++ b/protocol/messenger_handler.go
@@ -39,13 +39,6 @@ const (
 	requestAddressForTransactionDeclinedMessage = "Request address for transaction declined"
 )
 
-const (
-	// IncreaseUnviewedMessagesCountTimeout
-	// this timeout indicates how long the time between received messages should be
-	// for a new message to increase the unviewed messages counter
-	IncreaseUnviewedMessagesCountTimeout = 1000 * 60 * 2
-)
-
 var (
 	ErrMessageNotAllowed                     = errors.New("message from a non-contact")
 	ErrMessageForWrongChatType               = errors.New("message for the wrong chat type")
@@ -403,7 +396,7 @@ func (m *Messenger) handleCommandMessage(state *ReceivedMessageState, message *c
 
 	// Increase unviewed count
 	if !common.IsPubKeyEqual(message.SigPubKey, &m.identity.PublicKey) {
-		m.updateUnviewedCounts(chat, message)
+		m.updateUnviewedCounts(chat, message.Mentioned || message.Replied)
 		message.OutgoingStatus = ""
 	} else {
 		// Our own message, mark as sent
@@ -2052,7 +2045,7 @@ func (m *Messenger) handleChatMessage(state *ReceivedMessageState, forceSeen boo
 			}
 		}
 		if !skipUpdateUnviewedCountForAlbums {
-			m.updateUnviewedCounts(chat, receivedMessage)
+			m.updateUnviewedCounts(chat, receivedMessage.Mentioned || receivedMessage.Replied)
 		}
 	}
 
@@ -3003,14 +2996,9 @@ func (m *Messenger) isMessageAllowedFrom(publicKey string, chat *Chat) (bool, er
 	return contact.added(), nil
 }
 
-func (m *Messenger) updateUnviewedCounts(chat *Chat, message *common.Message) {
-	if chat == nil {
-		return
-	}
-	if chat.LastMessage == nil || message.Timestamp > chat.LastMessage.Timestamp+IncreaseUnviewedMessagesCountTimeout {
-		chat.UnviewedMessagesCount++
-	}
-	if message.Mentioned || message.Replied {
+func (m *Messenger) updateUnviewedCounts(chat *Chat, mentionedOrReplied bool) {
+	chat.UnviewedMessagesCount++
+	if mentionedOrReplied {
 		chat.UnviewedMentionsCount++
 	}
 }