X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/50b6174dd68b51c659111f3712b77e3d3e8cf2e6..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 9484ce2e..2e3018a3 100644
--- a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
@@ -19,10 +19,11 @@ class JsonMessageEnvelope {
     public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content) {
         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.sourceDevice = envelope.getSourceDevice();
         this.relay = source.getRelay().isPresent() ? source.getRelay().get() : null;
         this.timestamp = envelope.getTimestamp();
         this.isReceipt = envelope.isReceipt();