Merge remote-tracking branch 'siacs/master' into development

1 files changed, 4 insertions, 5 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index c9cfb9b35..71df60ebf 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -314,12 +314,11 @@ public class Conversation extends AbstractEntity implements Blockable {
 	public List<Message> markRead() {
 		final List<Message> unread = new ArrayList<>();
 		synchronized (this.messages) {
-			for (int i = this.messages.size() - 1; i >= 0; --i) {
-				if (this.messages.get(i).isRead()) {
-					break;
+			for(Message message : this.messages) {
+				if (!message.isRead()) {
+					message.markRead();
+					unread.add(message);
 				}
-				this.messages.get(i).markRead();
-				unread.add(this.messages.get(i));
 			}
 		}
 		return unread;