1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 56ad55b8a..ad36be78a 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -501,8 +501,10 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
         if (conversation.getCorrectingMessage() == null) {
             message = new Message(conversation, body, conversation.getNextEncryption());
             if (conversation.getMode() == Conversation.MODE_MULTI) {
-                if (conversation.getNextCounterpart() != null) {
-                    message.setCounterpart(conversation.getNextCounterpart());
+                final Jid nextCounterpart = conversation.getNextCounterpart();
+                if (nextCounterpart != null) {
+                    message.setCounterpart(nextCounterpart);
+                    message.setTrueCounterpart(conversation.getMucOptions().getTrueCounterpart(nextCounterpart));
                     message.setType(Message.TYPE_PRIVATE);
                 }
             }