X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/7e267f1ebb17dd8e6b9ea007c2d65305fea0fb05..90b752b912db167ef9750843c1abf84188ef2438:/src/main/java/org/asamk/signal/JsonMessageEnvelope.java

diff --git a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
index e7003130..2e3018a3 100644
--- a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
@@ -20,6 +20,10 @@ class JsonMessageEnvelope {
         SignalServiceAddress source = envelope.getSourceAddress();
         this.source = source.getNumber();
         this.sourceDevice = envelope.getSourceDevice();
+        if (this.source.equals("")) {
+            this.source = content.getSender();
+            this.sourceDevice = content.getSenderDevice();
+        }
         this.relay = source.getRelay().isPresent() ? source.getRelay().get() : null;
         this.timestamp = envelope.getTimestamp();
         this.isReceipt = envelope.isReceipt();