2 files changed, 40 insertions, 6 deletions

diff --git a/room.cpp b/room.cpp
index 5181fb2a..674f0343 100644
--- a/room.cpp
+++ b/room.cpp
@@ -169,11 +169,32 @@ void Room::setLastReadEvent(User* user, QString eventId)
     emit lastReadEventChanged(user);
 }
 
-void Room::markMessageAsRead(Event* event)
+void Room::markMessagesAsRead(Timeline::const_iterator end)
 {
-    setLastReadEvent(connection()->user(), event->id());
-    if (event->senderId() != connection()->userId())
-        d->connection->postReceipt(this, event);
+    if (messageEvents().empty())
+        return;
+
+    QString prevLastReadId = lastReadEvent(connection()->user());
+    setLastReadEvent(connection()->user(), (*--end)->id());
+
+    // We shouldn't send read receipts for messages from the local user - so
+    // shift back (if necessary) to the nearest message not from the local user
+    // or the so far last read message, whichever comes first.
+    for (; (*end)->id() != prevLastReadId; --end)
+    {
+        if ((*end)->senderId() != connection()->userId())
+        {
+            d->connection->postReceipt(this, (*end));
+            break;
+        }
+        if (end == messageEvents().begin())
+            break;
+    }
+}
+
+void Room::markMessagesAsRead()
+{
+    markMessagesAsRead(messageEvents().end());
 }
 
 QString Room::lastReadEvent(User* user)
diff --git a/room.h b/room.h
index 3727af0e..049efeb6 100644
--- a/room.h
+++ b/room.h
@@ -69,9 +69,22 @@ namespace QMatrixClient
             Q_INVOKABLE void updateData(SyncRoomData& data );
             Q_INVOKABLE void setJoinState( JoinState state );
 
-            Q_INVOKABLE void setLastReadEvent(User* user, QString eventId);
-            Q_INVOKABLE void markMessageAsRead( Event* event );
             Q_INVOKABLE QString lastReadEvent(User* user);
+            Q_INVOKABLE void setLastReadEvent(User* user, QString eventId);
+            /**
+             * @brief Mark the message at the iterator as read
+             *
+             * Marks the message at the iterator as read; also posts a read
+             * receipt to the server either for this message or, if it's from
+             * the local user, for the nearest non-local message before.
+             */
+            Q_INVOKABLE void markMessagesAsRead(Timeline::const_iterator iter);
+            /**
+             * @brief Mark the most recent message in the timeline as read
+             *
+             * This effectively marks everything in the room as read.
+             */
+            Q_INVOKABLE void markMessagesAsRead();
 
             Q_INVOKABLE int notificationCount() const;
             Q_INVOKABLE void resetNotificationCount();