diff --git a/ui/app/AppLayouts/Chat/stores/RootStore.qml b/ui/app/AppLayouts/Chat/stores/RootStore.qml
index 3ea34254c1..e3143ebc7e 100644
--- a/ui/app/AppLayouts/Chat/stores/RootStore.qml
+++ b/ui/app/AppLayouts/Chat/stores/RootStore.qml
@@ -381,7 +381,7 @@ QtObject {
             return obj
         }
         catch (e) {
-            console.debug("error parsing community by id: ", id, " error: ", e.message)
+            console.warn("error parsing community by id: ", id, " error: ", e.message)
             return {}
         }
     }
diff --git a/ui/app/mainui/activitycenter/controls/Badge.qml b/ui/app/mainui/activitycenter/controls/Badge.qml
index a09fd4a28e..5f4df776b3 100644
--- a/ui/app/mainui/activitycenter/controls/Badge.qml
+++ b/ui/app/mainui/activitycenter/controls/Badge.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.14
-import QtQuick.Layouts 1.14
 
 import utils 1.0
 
@@ -10,7 +9,7 @@ Rectangle {
     id: root
 
     height: visible ? 24 : 0
-    width: childrenRect.width + Style.current.smallPadding
+    width: childrenRect.width + Style.current.smallPadding * 2
     radius: height / 2
     border.width: 1
     border.color: Style.current.borderSecondary
diff --git a/ui/app/mainui/activitycenter/controls/CommunityBadge.qml b/ui/app/mainui/activitycenter/controls/CommunityBadge.qml
index aa3207d083..f064538105 100644
--- a/ui/app/mainui/activitycenter/controls/CommunityBadge.qml
+++ b/ui/app/mainui/activitycenter/controls/CommunityBadge.qml
@@ -21,9 +21,19 @@ Badge {
     signal communityNameClicked()
     signal channelNameClicked()
 
+    SVGImage {
+        id: communityIcon
+        anchors.left: parent.left
+        anchors.leftMargin: Style.current.smallPadding
+        anchors.verticalCenter:parent.verticalCenter
+        width: 16
+        height: 16
+        source: Style.svg("communities")
+    }
+
     StatusSmartIdenticon {
         id: identicon
-        anchors.left: parent.left
+        anchors.left: communityIcon.right
         anchors.leftMargin: Style.current.smallPadding
         anchors.verticalCenter: parent.verticalCenter
         name: root.communityName
diff --git a/ui/app/mainui/activitycenter/controls/ReplyComponent.qml b/ui/app/mainui/activitycenter/controls/ReplyBadge.qml
similarity index 63%
rename from ui/app/mainui/activitycenter/controls/ReplyComponent.qml
rename to ui/app/mainui/activitycenter/controls/ReplyBadge.qml
index 2933c6df82..2b9aa27390 100644
--- a/ui/app/mainui/activitycenter/controls/ReplyComponent.qml
+++ b/ui/app/mainui/activitycenter/controls/ReplyBadge.qml
@@ -9,33 +9,43 @@ import shared.panels 1.0
 
 import StatusQ.Core.Utils 0.1 as StatusQUtils
 
-Item {
-    id: replyComponent
+Badge {
+    id: root
 
     property string repliedMessageContent
 
+    signal replyClicked()
+
     SVGImage {
         id: replyIcon
-        width: 16
-        height: 16
-        source: Style.svg("reply-small-arrow")
         anchors.left: parent.left
+        anchors.leftMargin: Style.current.smallPadding
         anchors.verticalCenter:parent.verticalCenter
+        width: 16
+        height: width
+        source: Style.svg("reply-small-arrow")
+
+        MouseArea {
+            id: arrowArea
+            hoverEnabled: true
+            anchors.fill: parent
+            onClicked: root.replyClicked()
+        }
     }
 
     StyledTextEdit {
-        text: Utils.getReplyMessageStyle(StatusQUtils.Emoji.parse(StatusQUtils.Utils.linkifyAndXSS(repliedMessageContent), StatusQUtils.Emoji.size.small), false)
-        textFormat: Text.RichText
-        height: 18
+        id: communityNameText
         width: implicitWidth > 300 ? 300 : implicitWidth
-        clip: true
+        height: 18
         anchors.left: replyIcon.right
         anchors.leftMargin: 4
-        color: Style.current.secondaryText
-        font.weight: Font.Medium
-        font.pixelSize: 13
         anchors.verticalCenter: parent.verticalCenter
-        selectByMouse: true
+        text: Utils.getReplyMessageStyle(StatusQUtils.Emoji.parse(StatusQUtils.Utils.linkifyAndXSS(repliedMessageContent), 
+                                         StatusQUtils.Emoji.size.small), false)
         readOnly: true
+        textFormat: Text.RichText
+        clip: true
+        color: root.communityColor
+        font.pixelSize: 13
     }
-}
+}
\ No newline at end of file
diff --git a/ui/app/mainui/activitycenter/controls/qmldir b/ui/app/mainui/activitycenter/controls/qmldir
index f4f02c420b..cf845f5f5b 100644
--- a/ui/app/mainui/activitycenter/controls/qmldir
+++ b/ui/app/mainui/activitycenter/controls/qmldir
@@ -1,3 +1,3 @@
 ChannelBadge 1.0 ChannelBadge.qml
 CommunityBadge 1.0 CommunityBadge.qml
-ReplyComponent 1.0 ReplyComponent.qml
+ReplyBadge 1.0 ReplyBadge.qml
diff --git a/ui/app/mainui/activitycenter/views/ActivityNotificationMention.qml b/ui/app/mainui/activitycenter/views/ActivityNotificationMention.qml
index 9be3d1c2c5..da00c6ce60 100644
--- a/ui/app/mainui/activitycenter/views/ActivityNotificationMention.qml
+++ b/ui/app/mainui/activitycenter/views/ActivityNotificationMention.qml
@@ -7,7 +7,6 @@ import StatusQ.Components 0.1
 
 import shared 1.0
 import utils 1.0
-import shared.panels.chat 1.0
 
 import "../controls"
 
diff --git a/ui/app/mainui/activitycenter/views/ActivityNotificationMessage.qml b/ui/app/mainui/activitycenter/views/ActivityNotificationMessage.qml
index 28a646839e..f6872589b8 100644
--- a/ui/app/mainui/activitycenter/views/ActivityNotificationMessage.qml
+++ b/ui/app/mainui/activitycenter/views/ActivityNotificationMessage.qml
@@ -29,7 +29,6 @@ ActivityNotificationBase {
         messageId: notification.id
         senderDisplayName: notification.message.senderDisplayName
         messageText: notification.message.messageText
-        responseToMessageWithId: notification.message.responseToMessageWithId
         senderId: notification.message.senderId
         senderOptionalName: notification.message.senderOptionalName
         senderIcon: notification.message.senderIcon
diff --git a/ui/app/mainui/activitycenter/views/ActivityNotificationReply.qml b/ui/app/mainui/activitycenter/views/ActivityNotificationReply.qml
index 060162796c..6bdbb47d5c 100644
--- a/ui/app/mainui/activitycenter/views/ActivityNotificationReply.qml
+++ b/ui/app/mainui/activitycenter/views/ActivityNotificationReply.qml
@@ -7,11 +7,16 @@ import StatusQ.Components 0.1
 
 import shared 1.0
 import utils 1.0
-import shared.panels.chat 1.0
+
+import "../controls"
 
 ActivityNotificationMessage {
     id: root
 
+    badgeComponent: ReplyBadge {
+        repliedMessageContent: notification.repliedMessage.messageText
+        onReplyClicked: root.store.activityCenterModuleInst.switchTo(notification.sectionId, notification.chatId, notification.id)
+    }
 //        repliedMessageContent: notification.repliedMessage.messageText
 //        repliedMessageId: notification.message.responseToMessageWithId
 }
\ No newline at end of file