1 files changed, 11 insertions, 4 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index c72ac09e..a179d96b 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -227,11 +227,18 @@ public class Conversation extends AbstractEntity implements Blockable {
 		return null;
 	}
 
-	public Message findMessageWithRemoteIdAndCounterpart(String id, Jid counterpart) {
+	public Message findMessageWithRemoteIdAndCounterpart(String id, Jid counterpart, boolean received, boolean carbon) {
 		synchronized (this.messages) {
-			for(Message message : this.messages) {
-				if(id.equals(message.getRemoteMsgId()) && counterpart.equals(message.getCounterpart())) {
-					return message;
+			for(int i = this.messages.size() - 1; i >= 0; --i) {
+				Message message = messages.get(i);
+				if (counterpart.equals(message.getCounterpart())
+						&& ((message.getStatus() == Message.STATUS_RECEIVED) == received)
+						&& (carbon == message.isCarbon() || received) ) {
+					if (id.equals(message.getRemoteMsgId())) {
+						return message;
+					} else {
+						return null;
+					}
 				}
 			}
 		}