1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java b/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java
index 92ccf86e1..54d6fcb1a 100644
--- a/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java
+++ b/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java
@@ -216,7 +216,9 @@ public class HttpUploadConnection implements Transferable {
                 mXmppConnectionService.getFileBackend().updateFileParams(message, get);
                 mXmppConnectionService.getFileBackend().updateMediaScanner(file);
                 finish();
-                message.setCounterpart(message.getConversation().getJid().asBareJid());
+                if (!message.isPrivateMessage()) {
+                    message.setCounterpart(message.getConversation().getJid().asBareJid());
+                }
                 mXmppConnectionService.resendMessage(message, delayed);
             } else {
                 Log.d(Config.LOGTAG, "http upload failed because response code was " + code);