show displayed by contact on all devices

1 files changed, 4 insertions, 2 deletions

diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 0676c603..ffef19ed 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1545,7 +1545,9 @@ public class XmppConnectionService extends Service {
 	public boolean markMessage(Conversation conversation, String uuid,
 			int status) {
 		for (Message message : conversation.getMessages()) {
-			if (message.getUuid().equals(uuid)) {
+			if (message.getUuid().equals(uuid)
+					|| (message.getStatus() >= Message.STATUS_SEND && uuid
+							.equals(message.getRemoteMsgId()))) {
 				markMessage(message, status);
 				return true;
 			}
@@ -1758,7 +1760,7 @@ public class XmppConnectionService extends Service {
 		}
 		return contacts;
 	}
-	
+
 	public NotificationService getNotificationService() {
 		return this.mNotificationService;
 	}