this.timestamp = envelope.getTimestamp();
this.isReceipt = envelope.isReceipt();
if (content != null) {
+ if (envelope.isUnidentifiedSender()) {
+ this.source = content.getSender();
+ this.sourceDevice = content.getSenderDevice();
+ }
if (content.getDataMessage().isPresent()) {
this.dataMessage = new JsonDataMessage(content.getDataMessage().get());
}