save full jid when sending in muc. check chat markers against 'sender'

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index e5a2ec171..4a9a77a19 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -303,10 +303,11 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         return null;
     }
 
-    public Message findMessageWithRemoteId(String id) {
+    public Message findMessageWithRemoteId(String id, Jid counterpart) {
         synchronized (this.messages) {
             for (Message message : this.messages) {
-                if (id.equals(message.getRemoteMsgId()) || id.equals(message.getUuid())) {
+                if (counterpart.equals(message.getCounterpart())
+                        && (id.equals(message.getRemoteMsgId()) || id.equals(message.getUuid()))) {
                     return message;
                 }
             }