diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
index 5f28240ac9..a046f51c47 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
@@ -282,7 +282,6 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    width: calc(100% - 3.5rem);
 
     span {
       margin-left: 0.25rem;
diff --git a/plugins/chunter-resources/src/utils.ts b/plugins/chunter-resources/src/utils.ts
index 65f63f9ceb..9a28577f40 100644
--- a/plugins/chunter-resources/src/utils.ts
+++ b/plugins/chunter-resources/src/utils.ts
@@ -382,10 +382,14 @@ export async function filterChatMessages (
 
 export function buildThreadLink (loc: Location, contextId: Ref<DocNotifyContext>, _id: Ref<ActivityMessage>): Location {
   const specials = chatSpecials.map(({ id }) => id)
+  const isSameContext = loc.path[3] === contextId
+
+  if (!isSameContext) {
+    loc.query = { message: _id }
+  }
 
   if (loc.path[2] === chunterId && specials.includes(loc.path[3])) {
     loc.path[4] = _id
-    loc.query = { message: _id }
     return loc
   }