diff --git a/src/StatusQ/Components/StatusMessage.qml b/src/StatusQ/Components/StatusMessage.qml
index 2f780f6e..0ad91935 100644
--- a/src/StatusQ/Components/StatusMessage.qml
+++ b/src/StatusQ/Components/StatusMessage.qml
@@ -267,6 +267,7 @@ Rectangle {
                     Layout.fillWidth: true
                     sender: root.messageDetails.sender
                     amISender: root.messageDetails.amISender
+                    messageOriginInfo: root.messageDetails.messageOriginInfo
                     resendText: root.resendText
                     showResendButton: root.hasExpired && root.messageDetails.amISender
                     onClicked: root.senderNameClicked(sender, mouse)
diff --git a/src/StatusQ/Components/StatusMessageDetails.qml b/src/StatusQ/Components/StatusMessageDetails.qml
index df1cf5e5..246308e9 100644
--- a/src/StatusQ/Components/StatusMessageDetails.qml
+++ b/src/StatusQ/Components/StatusMessageDetails.qml
@@ -13,6 +13,7 @@ QtObject {
     property int contentType: 0
     property string messageText: ""
     property string messageContent: ""
+    property string messageOriginInfo: ""
 }
 
 
diff --git a/src/StatusQ/Components/private/statusMessage/StatusMessageHeader.qml b/src/StatusQ/Components/private/statusMessage/StatusMessageHeader.qml
index bede3c8b..2af8e27a 100644
--- a/src/StatusQ/Components/private/statusMessage/StatusMessageHeader.qml
+++ b/src/StatusQ/Components/private/statusMessage/StatusMessageHeader.qml
@@ -23,6 +23,7 @@ Item {
     property bool isContact: sender.isContact
     property int trustIndicator: sender.trustIndicator
     property bool amISender: false
+    property string messageOriginInfo: ""
 
     signal clicked(var sender, var mouse)
     signal resendClicked()
@@ -56,6 +57,14 @@ Item {
                 }
             }
         }       
+        StatusBaseText {
+            id: messageOriginInfo
+            Layout.alignment: Qt.AlignVCenter
+            visible: root.messageOriginInfo !== ""
+            color: Theme.palette.baseColor1
+            font.pixelSize: 10
+            text: root.messageOriginInfo
+        }
         StatusContactVerificationIcons {
             visible: !root.amISender
             isContact: root.isContact
@@ -78,7 +87,7 @@ Item {
         }
         StatusBaseText {
             id: tertiaryDetailText
-            visible: !root.amISender
+            visible: !root.amISender && messageOriginInfo == ""
             Layout.alignment: Qt.AlignVCenter
             font.pixelSize: 10
             elide: Text.ElideMiddle