diff --git a/e2e/USER_STORIES.md b/e2e/USER_STORIES.md
index cdc72c97..be03cfb7 100644
--- a/e2e/USER_STORIES.md
+++ b/e2e/USER_STORIES.md
@@ -709,6 +709,7 @@ Acceptance:
 - "Create a Thread" from a room message's menu opens the thread composer
   pre-filled with a quote of that message.
 - Publishing files the thread under that room's board.
+- The message it was created from carries a link to the thread, which opens it.
 - Opening the thread shows the quoted original message as part of the opening
   post.
 
diff --git a/e2e/specs/articles-threads.spec.ts b/e2e/specs/articles-threads.spec.ts
index e57e3f93..9174bcbf 100644
--- a/e2e/specs/articles-threads.spec.ts
+++ b/e2e/specs/articles-threads.spec.ts
@@ -948,6 +948,7 @@ test("US-045 turn a chat message into a thread", async ({seed, as}) => {
   await composer.getByRole("button", {name: "Create Thread"}).click()
 
   await expect(page.getByRole("heading", {name: "Create a Thread"})).toHaveCount(0)
+  await expect(message.getByRole("link", {name: "Deploy failures"})).toBeVisible()
 
   await page.goto(`${spacePath(url)}/threads`)
 
diff --git a/src/app/components/RoomItem.svelte b/src/app/components/RoomItem.svelte
index dcddb134..88793298 100644
--- a/src/app/components/RoomItem.svelte
+++ b/src/app/components/RoomItem.svelte
@@ -12,6 +12,7 @@
   import type {TrustedEvent, EventContent} from "@welshman/util"
   import {
     MESSAGE,
+    THREAD,
     getCommentFiltersForParent,
     getIdOrAddress,
     matchTag,
@@ -19,6 +20,7 @@
     tagValue,
   } from "@welshman/util"
   import {isMobile} from "@lib/html"
+  import NotesMinimalistic from "@assets/icons/notes-minimalistic.svg?dataurl"
   import Pen from "@assets/icons/pen.svg?dataurl"
   import Reply from "@assets/icons/reply-2.svg?dataurl"
   import ReplyAlt from "@assets/icons/reply.svg?dataurl"
@@ -43,7 +45,7 @@
   import {ENABLE_ZAPS} from "@app/env"
   import type {FeedContext} from "@app/feeds"
   import {deriveEvent, deriveEventsForUrl} from "@app/repository"
-  import {makeContentPath} from "@app/routes"
+  import {makeContentPath, makeThreadPath} from "@app/routes"
   import {pushModal} from "@app/modal"
 
   type Props = {
@@ -85,6 +87,8 @@
     $innerEvent && makeContentPath(url, $innerEvent.kind, getIdOrAddress($innerEvent)),
   )
 
+  const threads = deriveEventsForUrl(url, [{kinds: [THREAD], "#q": [event.id]}])
+
   const commenterDisplays = $derived(
     deriveDisplaysByPubkey(uniq($innerComments.map(e => e.pubkey)), url),
   )
@@ -154,6 +158,16 @@
       {createReaction}
       reactionClass="tip-right"
       innerEvent={$innerEvent} />
+    {#each $threads as thread (thread.id)}
+      <Link
+        href={makeThreadPath(url, thread.id)}
+        class="button button-xs button-neutral gap-1 rounded-full">
+        <Icon icon={NotesMinimalistic} />
+        <span class="max-w-48 truncate">
+          {tagValue(tagSpec("title"), thread.tags) || "Thread"}
+        </span>
+      </Link>
+    {/each}
     {#if path && $innerComments.length > 0}
       {@const pubkeys = $innerComments.map(e => e.pubkey)}
       {@const isOwn = pubkeys.includes($user.pubkey)}
diff --git a/src/app/components/RoomItemMenu.svelte b/src/app/components/RoomItemMenu.svelte
index e1c378bc..413d3893 100644
--- a/src/app/components/RoomItemMenu.svelte
+++ b/src/app/components/RoomItemMenu.svelte
@@ -53,6 +53,7 @@
     pushModal(ThreadCreate, {
       url,
       h,
+      quote: event,
       initialValues: {content: toNostrURI(nip19.neventEncode({...event, relays: [url]}))},
     })
   }
diff --git a/src/app/components/RoomItemMenuMobile.svelte b/src/app/components/RoomItemMenuMobile.svelte
index 0437d0c5..d4a2a0c3 100644
--- a/src/app/components/RoomItemMenuMobile.svelte
+++ b/src/app/components/RoomItemMenuMobile.svelte
@@ -64,7 +64,12 @@
   const createThread = () =>
     pushModal(
       ThreadCreate,
-      {url, h, initialValues: {content: toNostrURI(nip19.neventEncode({...event, relays: [url]}))}},
+      {
+        url,
+        h,
+        quote: event,
+        initialValues: {content: toNostrURI(nip19.neventEncode({...event, relays: [url]}))},
+      },
       {replaceState: true},
     )
 
diff --git a/src/app/components/ThreadCreate.svelte b/src/app/components/ThreadCreate.svelte
index 0fa55391..044d26f1 100644
--- a/src/app/components/ThreadCreate.svelte
+++ b/src/app/components/ThreadCreate.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import {writable} from "svelte/store"
+  import type {TrustedEvent} from "@welshman/util"
   import {relay} from "@welshman/util"
   import {Thread} from "@welshman/domain"
   import {publish} from "@welshman/app"
@@ -32,10 +33,11 @@
     url: string
     h?: string
     shareToChat?: boolean
+    quote?: TrustedEvent
     initialValues?: Values
   }
 
-  const {url, h, shareToChat = false, initialValues}: Props = $props()
+  const {url, h, shareToChat = false, quote, initialValues}: Props = $props()
   const draftKey = new DraftKey<Values>(`thread:${url}:${h ?? ""}`)
   const draft = draftKey.get()
   const shouldProtect = $relays.hasNip(url, 70)
@@ -81,6 +83,10 @@
         eventWriter.setRoom(url, h)
       }
 
+      if (quote) {
+        eventWriter.addQuote(quote)
+      }
+
       const thunk = await command(eventWriter).then(publish)
       const error = await thunk.waitForError()