diff --git a/src/app/commoncomponents/DataTransferMessageDelegate.qml b/src/app/commoncomponents/DataTransferMessageDelegate.qml
index d54f764f..12c8fe78 100644
--- a/src/app/commoncomponents/DataTransferMessageDelegate.qml
+++ b/src/app/commoncomponents/DataTransferMessageDelegate.qml
@@ -67,7 +67,7 @@ Loader {
                                        2 * hPadding - avatarBlockWidth
                                        - buttonsLoader.width - 24 - 6 - 24
 
-            isOutgoing: Author === ""
+            isOutgoing: Author === CurrentAccount.uri
             showTime: root.showTime
             seq: root.seq
             author: Author
diff --git a/src/app/commoncomponents/SBSMessageBase.qml b/src/app/commoncomponents/SBSMessageBase.qml
index 459988f4..113b53d9 100644
--- a/src/app/commoncomponents/SBSMessageBase.qml
+++ b/src/app/commoncomponents/SBSMessageBase.qml
@@ -231,6 +231,7 @@ Control {
                         } else {
                             y = 0
                         }
+
                         var distBorders = root.width - bubble.width - width
                         if (isOutgoing) {
                             if (distBorders > 0)
@@ -246,6 +247,7 @@ Control {
                     }
                 }
 
+
                 MessageBubble {
                     id: bubble
 
@@ -359,7 +361,7 @@ Control {
         EmojiReactions {
             id: emojiReaction
 
-            property bool isOutgoing: Author === ""
+            property bool isOutgoing: Author === CurrentAccount.uri
             Layout.alignment: isOutgoing ? Qt.AlignRight : Qt.AlignLeft
             Layout.rightMargin: isOutgoing ? status.width : undefined
             Layout.leftMargin: !isOutgoing ? avatarBlock.width : undefined
@@ -411,5 +413,6 @@ Control {
         id: reactionPopup
 
         emojiReaction: Reactions
+
     }
 }
diff --git a/src/app/commoncomponents/TextMessageDelegate.qml b/src/app/commoncomponents/TextMessageDelegate.qml
index 7016ccf9..03ea5354 100644
--- a/src/app/commoncomponents/TextMessageDelegate.qml
+++ b/src/app/commoncomponents/TextMessageDelegate.qml
@@ -37,7 +37,7 @@ SBSMessageBase {
                                   JamiTheme.chatviewLinkColorLight :
                                   JamiTheme.chatviewLinkColorDark
 
-    isOutgoing: Author === ""
+    isOutgoing: Author === CurrentAccount.uri
     author: Author
     readers: Readers
     timestamp: Timestamp
diff --git a/src/libclient/api/interaction.h b/src/libclient/api/interaction.h
index 84e58df5..23706046 100644
--- a/src/libclient/api/interaction.h
+++ b/src/libclient/api/interaction.h
@@ -325,14 +325,12 @@ struct Info
         if (message.contains("react-to") && type == Type::TEXT) {
             type = to_type("REACTION");
             react_to = message["react-to"];
-            authorUri = message["author"];
         }
+        authorUri = message["author"];
 
         if (type == Type::TEXT || type == Type::EDITED || type == Type::REACTION) {
             body = message["body"];
         }
-        if (type != Type::REACTION)
-            authorUri = accountURI == message["author"] ? "" : message["author"];
         timestamp = message["timestamp"].toInt();
         status = Status::SUCCESS;
         parentId = message["linearizedParent"];