diff --git a/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte b/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte
index cd318f88cc..61fb32184f 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte
@@ -40,6 +40,7 @@
   export let withFlatActions: boolean = true
   export let excludedActions: string[] = []
   export let actions: Action[] = []
+  export let hoverable = true
   export let onClick: (() => void) | undefined = undefined
 
   $: personAccount = $personAccountByIdStore.get((value.createdBy ?? value.modifiedBy) as Ref<PersonAccount>)
@@ -72,6 +73,7 @@
   {actions}
   {excludedActions}
   {withFlatActions}
+  {hoverable}
   viewlet={undefined}
   {onClick}
 >
diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
index e0432cbac1..0b47be2517 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
@@ -32,6 +32,7 @@
   export let actions: Action[] = []
   export let excludedActions: string[] = []
   export let withFlatActions: boolean = true
+  export let hoverable = true
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -58,6 +59,7 @@
       actions,
       excludedActions,
       withFlatActions,
+      hoverable,
       onClick,
       onReply
     }}
diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
index 1a9b59c131..aef4ea5cbc 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
@@ -50,6 +50,7 @@
   export let showEmbedded = false
   export let hideReplies = false
   export let skipLabel = false
+  export let hoverable = true
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -123,6 +124,7 @@
       class:clickable={!!onClick}
       class:highlighted={isHighlighted}
       class:selected={isSelected}
+      class:hoverable
       class:embedded
       on:click={onClick}
     >
@@ -257,8 +259,10 @@
       visibility: visible;
     }
 
-    &:hover:not(.embedded) {
-      border: 1px solid var(--highlight-hover);
+    &.hoverable {
+      &:hover:not(.embedded) {
+        border: 1px solid var(--highlight-hover);
+      }
     }
   }
 
diff --git a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
index ffca62eb4c..916fd1adb2 100644
--- a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
@@ -49,6 +49,7 @@
   export let skipLabel = false
   export let withFlatActions: boolean = true
   export let excludedActions: string[] = []
+  export let hoverable = true
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -161,6 +162,7 @@
     {actions}
     {skipLabel}
     {withFlatActions}
+    {hoverable}
     {onClick}
     {onReply}
   >
diff --git a/plugins/activity-resources/src/components/reactions/ReactionNotificationPresenter.svelte b/plugins/activity-resources/src/components/reactions/ReactionNotificationPresenter.svelte
index 5a99f74722..37db630d7a 100644
--- a/plugins/activity-resources/src/components/reactions/ReactionNotificationPresenter.svelte
+++ b/plugins/activity-resources/src/components/reactions/ReactionNotificationPresenter.svelte
@@ -58,6 +58,7 @@
     {actions}
     {excludedActions}
     withFlatActions={false}
+    hoverable={false}
     onReply={handleReply}
     {onClick}
   />
@@ -70,6 +71,7 @@
     {withActions}
     {actions}
     {excludedActions}
+    hoverable={false}
     withFlatActions={false}
     onReply={handleReply}
     {onClick}
diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
index 1209ae7030..1c4c3d559f 100644
--- a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
+++ b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
@@ -42,6 +42,7 @@
   export let actions: Action[] = []
   export let excludedActions: string[] = []
   export let withFlatActions: boolean = true
+  export let hoverable = true
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -166,6 +167,7 @@
     {showEmbedded}
     {hideReplies}
     {withFlatActions}
+    {hoverable}
     {onClick}
     {onReply}
   >
diff --git a/plugins/chunter-resources/src/components/notification/ThreadNotificationPresenter.svelte b/plugins/chunter-resources/src/components/notification/ThreadNotificationPresenter.svelte
index 5a59258672..288dfc4d2c 100644
--- a/plugins/chunter-resources/src/components/notification/ThreadNotificationPresenter.svelte
+++ b/plugins/chunter-resources/src/components/notification/ThreadNotificationPresenter.svelte
@@ -43,6 +43,7 @@
   {actions}
   {excludedActions}
   withFlatActions={false}
+  hoverable={false}
   showNotify={showNotify && !notification.isViewed}
   onReply={handleReply}
   {onClick}
diff --git a/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte b/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
index e172b2bcf1..4bd32259da 100644
--- a/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
+++ b/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
@@ -29,6 +29,7 @@
   export let withFlatActions: boolean = true
   export let actions: Action[] = []
   export let excludedActions: string[] = []
+  export let hoverable = true
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 </script>
@@ -46,6 +47,7 @@
   {withFlatActions}
   {excludedActions}
   {actions}
+  {hoverable}
   {onClick}
   {onReply}
 />
diff --git a/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte b/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte
index e1e7e4c88d..f12ca65e8d 100644
--- a/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte
+++ b/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte
@@ -149,6 +149,7 @@
       {embedded}
       {skipLabel}
       {actions}
+      hoverable={false}
       withFlatActions={false}
       onReply={() => {
         handleReply(displayMessage)