diff --git a/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte b/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte
index 61fb32184f..46f747c814 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte
@@ -41,6 +41,7 @@
   export let excludedActions: string[] = []
   export let actions: Action[] = []
   export let hoverable = true
+  export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
   export let onClick: (() => void) | undefined = undefined
 
   $: personAccount = $personAccountByIdStore.get((value.createdBy ?? value.modifiedBy) as Ref<PersonAccount>)
@@ -74,6 +75,7 @@
   {excludedActions}
   {withFlatActions}
   {hoverable}
+  {hoverStyles}
   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 f41d514423..dd2514fac8 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
@@ -33,6 +33,7 @@
   export let excludedActions: string[] = []
   export let withFlatActions: boolean = true
   export let hoverable = true
+  export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -60,6 +61,7 @@
       excludedActions,
       withFlatActions,
       hoverable,
+      hoverStyles,
       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 7fbe0f63d4..6ec3e3e427 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
@@ -49,7 +49,7 @@
   export let hideFooter = false
   export let skipLabel = false
   export let hoverable = true
-  export let hoverStyles: 'borderedHover' | 'filledHover' = 'filledHover'
+  export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
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 98377461cb..cb50393a97 100644
--- a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
@@ -50,6 +50,7 @@
   export let withFlatActions: boolean = true
   export let excludedActions: string[] = []
   export let hoverable = true
+  export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -159,6 +160,7 @@
   {skipLabel}
   {withFlatActions}
   {hoverable}
+  {hoverStyles}
   {onClick}
   {onReply}
 >
diff --git a/plugins/chunter-resources/src/components/ChannelScrollView.svelte b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
index 08cb81368c..e4fbe1e643 100644
--- a/plugins/chunter-resources/src/components/ChannelScrollView.svelte
+++ b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
@@ -384,6 +384,7 @@
           value={message}
           skipLabel={skipLabels}
           {showEmbedded}
+          hoverStyles="filledHover"
           isHighlighted={isSelected}
           shouldScroll={isSelected}
         />
diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
index faaf72f0bc..b4b3bb67ae 100644
--- a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
+++ b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
@@ -44,13 +44,13 @@
   export let withFlatActions: boolean = true
   export let hoverable = true
   export let inline = false
+  export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
 
-  const viewletQuery = createQuery()
   const userQuery = createQuery()
 
   const currentAccount = getCurrentAccount()
@@ -175,6 +175,7 @@
     {hideFooter}
     {withFlatActions}
     {hoverable}
+    {hoverStyles}
     {onClick}
     {onReply}
   >
diff --git a/plugins/chunter-resources/src/components/chat/navigator/ChatNavGroup.svelte b/plugins/chunter-resources/src/components/chat/navigator/ChatNavGroup.svelte
index 57a2d2268b..20974fb4d3 100644
--- a/plugins/chunter-resources/src/components/chat/navigator/ChatNavGroup.svelte
+++ b/plugins/chunter-resources/src/components/chat/navigator/ChatNavGroup.svelte
@@ -147,14 +147,12 @@
     <div class="separator" />
   {/if}
 
-  {#if contexts.length}
-    <div class="block">
-      <ChatGroupHeader header={model.label} actions={getGroupActions()} />
-      {#each contexts as context (context._id)}
-        <ChatNavItem {context} isSelected={selectedContextId === context._id} on:select />
-      {/each}
-    </div>
-  {/if}
+  <div class="block">
+    <ChatGroupHeader header={model.label} actions={getGroupActions()} />
+    {#each contexts as context (context._id)}
+      <ChatNavItem {context} isSelected={selectedContextId === context._id} on:select />
+    {/each}
+  </div>
 </Scroller>
 
 <style lang="scss">
diff --git a/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte b/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
index 4bd32259da..ae33098169 100644
--- a/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
+++ b/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
@@ -30,6 +30,7 @@
   export let actions: Action[] = []
   export let excludedActions: string[] = []
   export let hoverable = true
+  export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 </script>
@@ -48,6 +49,7 @@
   {excludedActions}
   {actions}
   {hoverable}
+  {hoverStyles}
   {onClick}
   {onReply}
 />
diff --git a/plugins/chunter-resources/src/components/threads/ThreadParentPresenter.svelte b/plugins/chunter-resources/src/components/threads/ThreadParentPresenter.svelte
index 5336455636..a355a1bc09 100644
--- a/plugins/chunter-resources/src/components/threads/ThreadParentPresenter.svelte
+++ b/plugins/chunter-resources/src/components/threads/ThreadParentPresenter.svelte
@@ -19,4 +19,4 @@
   export let message: ActivityMessage
 </script>
 
-<ActivityMessagePresenter value={message} hideFooter />
+<ActivityMessagePresenter value={message} hideFooter hoverStyles="filledHover" />