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

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 75995edb9..55c2a6008 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -1398,9 +1398,14 @@ public class XmppConnectionService extends Service {
             }
         }
 
+        boolean mucMessage = conversation.getMode() == Conversation.MODE_MULTI && message.getType() != Message.TYPE_PRIVATE;
+        if (mucMessage) {
+            message.setCounterpart(conversation.getMucOptions().getSelf().getFullJid());
+        }
+
         if (resend) {
             if (packet != null && addToConversation) {
-                if (account.getXmppConnection().getFeatures().sm() || (conversation.getMode() == Conversation.MODE_MULTI && message.getCounterpart().isBareJid())) {
+                if (account.getXmppConnection().getFeatures().sm() || mucMessage) {
                     markMessage(message, Message.STATUS_UNSEND);
                 } else {
                     markMessage(message, Message.STATUS_SEND);
@@ -3596,7 +3601,7 @@ public class XmppConnectionService extends Service {
             Account account = conversation.getAccount();
             final Jid to = markable.getCounterpart();
             final boolean groupChat = conversation.getMode() == Conversation.MODE_MULTI;
-            MessagePacket packet = mMessageGenerator.confirm(account, to, markable.getRemoteMsgId(), groupChat);
+            MessagePacket packet = mMessageGenerator.confirm(account, to, markable.getRemoteMsgId(), markable.getCounterpart(), groupChat);
             this.sendMessagePacket(conversation.getAccount(), packet);
         }
     }