From d0a828985a7da7881ad4e7dc2940f6bc38c19b50 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Mon, 18 Nov 2019 10:03:59 +1100
Subject: [PATCH] Fix placeholder messages showing in the wrong conversation.

---
 src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
index 0c2afbff5e..25b59eb42e 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
@@ -1580,8 +1580,9 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
   }
 
   private Optional<InsertResult> insertPlaceholder(@NonNull String sender, int senderDevice, long timestamp) {
+    Recipient primaryDevice = getPrimaryDeviceRecipient(sender);
     SmsDatabase         database    = DatabaseFactory.getSmsDatabase(context);
-    IncomingTextMessage textMessage = new IncomingTextMessage(Address.fromSerialized(sender),
+    IncomingTextMessage textMessage = new IncomingTextMessage(primaryDevice.getAddress(),
                                                               senderDevice, timestamp, "",
                                                               Optional.absent(), 0, false);