From dfab38b941658614e5a898b24427fd8d992cc37d Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 12 Jun 2017 14:44:33 -0400
Subject: [PATCH] Rework how messages are marked read.

// FREEBIE
---
 src/Devices/OWSReadReceiptsProcessor.m | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Devices/OWSReadReceiptsProcessor.m b/src/Devices/OWSReadReceiptsProcessor.m
index fa753a086..60f16a24b 100644
--- a/src/Devices/OWSReadReceiptsProcessor.m
+++ b/src/Devices/OWSReadReceiptsProcessor.m
@@ -90,6 +90,10 @@ NSString *const OWSReadReceiptsProcessorMarkedMessageAsReadNotification =
             // Mark all unread messages in this thread that are older than message specified in the read
             // receipt.
             NSMutableArray<id<OWSReadTracking>> *interactionsToMarkAsRead = [NSMutableArray new];
+
+            // Always mark the message specified by the read receipt as read.
+            [interactionsToMarkAsRead addObject:message];
+
             [self.storageManager.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
                 [[transaction ext:TSUnseenDatabaseViewExtensionName]
                     enumerateRowsInGroup:message.uniqueThreadId