diff --git a/src/app/components/RoomChat.svelte b/src/app/components/RoomChat.svelte
new file mode 100644
index 00000000..8fe4274c
--- /dev/null
+++ b/src/app/components/RoomChat.svelte
@@ -0,0 +1,636 @@
+<script lang="ts">
+  import {onDestroy, onMount} from "svelte"
+  import {readable} from "svelte/store"
+  import {page} from "$app/stores"
+  import {goto} from "$app/navigation"
+  import type {Readable} from "svelte/store"
+  import {debounce} from "throttle-debounce"
+  import {pubkey, publishThunk, waitForThunkError, joinRoom, leaveRoom} from "@welshman/app"
+  import {now, ifLet, int, formatTimestampAsDate, ago, MINUTE} from "@welshman/lib"
+  import type {TrustedEvent, EventContent} from "@welshman/util"
+  import {makeEvent, makeRoomMeta, MESSAGE, RELAY_ADD_MEMBER, ROOM_ADD_MEMBER} from "@welshman/util"
+  import AltArrowDown from "@assets/icons/alt-arrow-down.svg?dataurl"
+  import ClockCircle from "@assets/icons/clock-circle.svg?dataurl"
+  import Login2 from "@assets/icons/login-3.svg?dataurl"
+  import cx from "classnames"
+  import {fade, fly} from "@lib/transition"
+  import {popKey} from "@lib/implicit"
+  import Button from "@lib/components/Button.svelte"
+  import Divider from "@lib/components/Divider.svelte"
+  import Icon from "@lib/components/Icon.svelte"
+  import Spinner from "@lib/components/Spinner.svelte"
+  import RoomCompose from "@app/components/RoomCompose.svelte"
+  import RoomComposeEdit from "@app/components/RoomComposeEdit.svelte"
+  import RoomComposeParent from "@app/components/RoomComposeParent.svelte"
+  import RoomItem from "@app/components/RoomItem.svelte"
+  import RoomItemAddMember from "@app/components/RoomItemAddMember.svelte"
+  import RoomPinnedMessages from "@app/components/RoomPinnedMessages.svelte"
+  import ThunkToast from "@app/components/ThunkToast.svelte"
+  import VideoCallContent from "@app/components/VideoCallContent.svelte"
+  import VoiceWidget from "@app/components/VoiceWidget.svelte"
+  import {publishRoomJoinRequest} from "@app/access"
+  import {
+    CallState,
+    callTargetRoom,
+    callState,
+    VideoCallLayout,
+    videoCallLayout,
+    videoTileCount,
+  } from "@app/call"
+  import {publishDelete} from "@app/deletes"
+  import {prependParent, deriveRoom, getRoomType, PROTECTED, RoomType} from "@app/groups"
+  import {deriveUserRoomMembershipStatus, MembershipStatus} from "@app/members"
+  import {canEnforceNip70} from "@app/relays"
+  import {userSettingsValues} from "@app/settings"
+  import {makeFeed} from "@app/feeds"
+  import {checked, deferredRoomPath, setChecked} from "@app/notifications"
+  import {makeRoomPath} from "@app/routes"
+  import {pushToast} from "@app/toast"
+
+  type Props = {
+    url: string
+    h?: string
+  }
+
+  const {url, h}: Props = $props()
+
+  const room = h ? deriveRoom(url, h) : readable(undefined)
+  const addMemberKind = h ? ROOM_ADD_MEMBER : RELAY_ADD_MEMBER
+  const isVoiceRoom = $derived($room && getRoomType($room) === RoomType.Voice)
+
+  const voiceConnectedHere = $derived(
+    isVoiceRoom &&
+      $callState === CallState.Connected &&
+      $callTargetRoom?.url === url &&
+      $callTargetRoom?.h === h,
+  )
+
+  const showMobileVideoPanel = $derived(
+    isVoiceRoom && $callState === CallState.Connected && $videoCallLayout === VideoCallLayout.Video,
+  )
+
+  const roomPath = h ? makeRoomPath(url, h) : undefined
+
+  const videoCallChatHidden = $derived(
+    voiceConnectedHere && $videoCallLayout === VideoCallLayout.Video,
+  )
+
+  $effect(() => {
+    deferredRoomPath.set(videoCallChatHidden ? roomPath : undefined)
+    if (roomPath && voiceConnectedHere && !videoCallChatHidden) {
+      setChecked(roomPath)
+    }
+  })
+
+  onDestroy(() => deferredRoomPath.set(undefined))
+
+  let prevVideoTileCount = $state(0)
+
+  $effect(() => {
+    if ($callState !== CallState.Connected) {
+      videoCallLayout.set(VideoCallLayout.Chat)
+      prevVideoTileCount = 0
+      return
+    }
+
+    const here = isVoiceRoom && $callTargetRoom?.url === url && $callTargetRoom?.h === h
+    const n = $videoTileCount
+
+    if (!here) {
+      prevVideoTileCount = 0
+      return
+    }
+
+    if (prevVideoTileCount === 0 && n >= 1) {
+      videoCallLayout.set(VideoCallLayout.Video)
+    }
+    if (prevVideoTileCount >= 1 && n === 0 && $videoCallLayout === VideoCallLayout.Split) {
+      videoCallLayout.set(VideoCallLayout.Chat)
+    }
+    prevVideoTileCount = n
+  })
+
+  const shouldProtect = canEnforceNip70(url)
+  const membershipStatus = h
+    ? deriveUserRoomMembershipStatus(url, h)
+    : readable(MembershipStatus.Granted)
+  const at = $derived(parseInt($page.url.searchParams.get("at")!))
+  const inviteCode = $derived($page.url.searchParams.get("code") || "")
+
+  const join = async () => {
+    if (h) {
+      joining = true
+
+      try {
+        const message = await waitForThunkError(
+          inviteCode
+            ? publishRoomJoinRequest(url, h, inviteCode)
+            : joinRoom(url, makeRoomMeta({h})),
+        )
+
+        if (message && !message.startsWith("duplicate:")) {
+          return pushToast({theme: "error", message})
+        }
+
+        // Restart the feed now that we're a member
+        start()
+      } finally {
+        joining = false
+      }
+    }
+  }
+
+  const leave = async () => {
+    if (h) {
+      leaving = true
+      try {
+        const message = await waitForThunkError(leaveRoom(url, makeRoomMeta({h})))
+
+        if (message && !message.startsWith("duplicate:")) {
+          pushToast({theme: "error", message})
+        }
+      } finally {
+        leaving = false
+      }
+    }
+  }
+
+  const replyTo = (event: TrustedEvent) => {
+    parent = event
+    compose?.focus()
+  }
+
+  const clearParent = () => {
+    parent = undefined
+  }
+
+  const clearShare = () => {
+    share = undefined
+  }
+
+  const clearEventToEdit = () => {
+    eventToEdit = undefined
+  }
+
+  const onSubmit = async ({content, tags}: EventContent) => {
+    if (!content && !share) {
+      return
+    }
+
+    try {
+      if (h) {
+        tags.push(["h", h])
+      }
+
+      if (await shouldProtect) {
+        tags.push(PROTECTED)
+      }
+
+      let template: EventContent & {created_at?: number} = {content, tags}
+
+      if (eventToEdit) {
+        // Don't do anything if message hasn't changed
+        if (eventToEdit.content === content) {
+          return
+        }
+
+        // Delete previous message, to be republished with same timestamp
+        template.created_at = eventToEdit.created_at
+        publishDelete({
+          relays: [url],
+          event: $state.snapshot(eventToEdit),
+          protect: await shouldProtect,
+        })
+      }
+
+      if (share) {
+        template = prependParent(share, template, url)
+      }
+
+      if (parent) {
+        template = prependParent(parent, template, url)
+      }
+
+      const thunk = publishThunk({
+        relays: [url],
+        event: makeEvent(MESSAGE, template),
+        delay: $userSettingsValues.send_delay,
+      })
+
+      if ($userSettingsValues.send_delay) {
+        pushToast({
+          timeout: 30_000,
+          children: {
+            component: ThunkToast,
+            props: {thunk},
+          },
+        })
+      }
+    } finally {
+      clearParent()
+      clearShare()
+      clearEventToEdit()
+    }
+  }
+
+  const manageScrollPosition = () => {
+    // Only treat an `at` jump as "scrolled up" when it targets an event below the
+    // newest one; jumping to the most recent message already lands us at the bottom.
+    const newestEvent = $events[$events.length - 1]
+    const atIsBelowNewest = !isNaN(at) && newestEvent !== undefined && at < newestEvent.created_at
+
+    showScrollButton = atIsBelowNewest || Math.abs(element?.scrollTop || 0) > 1500
+
+    const newMessages = document.getElementById("new-messages")
+
+    if (newMessagesSeen) {
+      showFixedNewMessages = false
+    } else if (newMessages) {
+      const {y} = newMessages.getBoundingClientRect()
+
+      if (y > 0 && y < 300) {
+        newMessagesSeen = true
+        showFixedNewMessages = false
+      } else {
+        showFixedNewMessages = y < 0
+      }
+    }
+
+    if (!userHasScrolled && !isNaN(at)) {
+      const targetEvent = $events.find(event => event.created_at >= at)
+
+      if (targetEvent) {
+        const target = element?.querySelector(`[data-event="${targetEvent.id}"]`)
+
+        if (target instanceof HTMLElement) {
+          isProgrammaticScroll = true
+          target.scrollIntoView({block: "center"})
+        }
+      }
+    }
+  }
+
+  const onScroll = () => {
+    if (!isProgrammaticScroll) {
+      userHasScrolled = true
+      isUserScrolling = true
+      clearIsUserScrolling()
+      manageScrollPosition()
+    }
+
+    isProgrammaticScroll = false
+  }
+
+  const scrollToNewMessages = () =>
+    document.getElementById("new-messages")?.scrollIntoView({behavior: "smooth", block: "center"})
+
+  const scrollToBottom = () => {
+    if (!isNaN(at)) {
+      goto($page.url.pathname, {replaceState: true})
+    } else {
+      element?.scrollTo({top: 0, behavior: "smooth"})
+    }
+  }
+
+  const onVisibilityChange = () => {
+    if (document.hidden) {
+      lastVisibleAt = now()
+    } else if ($events.some(e => e.pubkey !== $pubkey && e.created_at > lastVisibleAt)) {
+      newMessagesAfter = lastVisibleAt
+      newMessagesBefore = now()
+      newMessagesSeen = false
+    }
+  }
+
+  let joining = $state(false)
+  let leaving = $state(false)
+  let userHasScrolled = $state(false)
+  let isProgrammaticScroll = $state(false)
+  let isUserScrolling = $state(false)
+  let loadingBackward = $state(true)
+  let loadingForward = $state(true)
+  let share = $state(popKey<TrustedEvent | undefined>("share"))
+  let parent: TrustedEvent | undefined = $state()
+  let element: HTMLElement | undefined = $state()
+  let lastVisibleAt = now()
+  let newMessagesAfter = $state($checked[$page.url.pathname])
+  let newMessagesBefore = $state(now())
+  let newMessagesSeen = false
+  let showFixedNewMessages = $state(false)
+  let showScrollButton = $state(false)
+  let cleanup: () => void
+  let events: Readable<TrustedEvent[]> = $state(readable([]))
+  let compose: RoomCompose | undefined = $state()
+  let eventToEdit: TrustedEvent | undefined = $state()
+
+  const clearIsUserScrolling = debounce(150, () => {
+    isUserScrolling = false
+  })
+
+  const elements = $derived.by(() => {
+    const elements = []
+    const seen = new Set()
+
+    let previousDate
+    let previousKind
+    let previousPubkey
+    let previousCreatedAt = 0
+    let newMessagesSeen = false
+
+    if (events) {
+      const lastUserEvent = $events.findLast(e => e.pubkey === $pubkey)
+
+      // Adjust the boundary to account for messages that came from a different device
+      const adjustedAfter =
+        newMessagesAfter && lastUserEvent
+          ? Math.max(lastUserEvent.created_at, newMessagesAfter)
+          : newMessagesAfter
+
+      for (const event of $events) {
+        if (seen.has(event.id)) {
+          continue
+        }
+
+        const date = formatTimestampAsDate(event.created_at)
+
+        if (
+          !newMessagesSeen &&
+          adjustedAfter &&
+          event.pubkey !== $pubkey &&
+          event.created_at > adjustedAfter &&
+          event.created_at < newMessagesBefore
+        ) {
+          elements.push({type: "new-messages", id: "new-messages"})
+          newMessagesSeen = true
+        }
+
+        if (date !== previousDate) {
+          elements.push({type: "date", value: date, id: date, showPubkey: false})
+        }
+
+        const showPubkey =
+          previousPubkey !== event.pubkey ||
+          event.created_at - previousCreatedAt > int(3, MINUTE) ||
+          previousKind === addMemberKind
+
+        elements.push({
+          id: event.id,
+          type: "note",
+          value: event,
+          showPubkey,
+        })
+
+        previousDate = date
+        previousKind = event.kind
+        previousPubkey = event.pubkey
+        previousCreatedAt = event.created_at
+        seen.add(event.id)
+      }
+    }
+
+    elements.reverse()
+
+    return elements
+  })
+
+  $effect(() => {
+    if (elements.length > 0 && !isUserScrolling) {
+      requestAnimationFrame(manageScrollPosition)
+    }
+  })
+
+  const start = () => {
+    cleanup?.()
+
+    const feed = makeFeed({
+      relays: [url],
+      at: at || now(),
+      element: element!,
+      filters: [
+        h ? {kinds: [MESSAGE, addMemberKind], "#h": [h]} : {kinds: [MESSAGE, addMemberKind]},
+      ],
+      onBackwardExhausted: () => {
+        loadingBackward = false
+      },
+      onForwardExhausted: () => {
+        loadingForward = false
+      },
+    })
+
+    events = feed.events
+    cleanup = feed.cleanup
+  }
+
+  const onEscape = () => {
+    clearParent()
+    clearShare()
+    eventToEdit = undefined
+  }
+
+  const canEditEvent = (event: TrustedEvent) =>
+    event.pubkey === $pubkey && event.created_at >= ago(5, MINUTE)
+
+  const onEditEvent = (event: TrustedEvent) => {
+    clearParent()
+    clearShare()
+    eventToEdit = event
+  }
+
+  const onEditPrevious = () => ifLet($events.toReversed().find(canEditEvent), onEditEvent)
+
+  onMount(() => {
+    start()
+
+    document.addEventListener("visibilitychange", onVisibilityChange)
+
+    return () => {
+      // Wrap in a closure to avoid calling a stale cleanup function
+      cleanup?.()
+      document.removeEventListener("visibilitychange", onVisibilityChange)
+    }
+  })
+</script>
+
+<div
+  class={cx(
+    "flex min-h-0 flex-1 flex-col",
+    voiceConnectedHere && $videoCallLayout === VideoCallLayout.Split && "md:flex-row",
+  )}>
+  {#if h && voiceConnectedHere}
+    <VideoCallContent
+      layout={$videoCallLayout}
+      {url}
+      {h}
+      class="hidden min-h-0 w-full min-w-0 flex-1 flex-col md:flex" />
+  {/if}
+
+  <div
+    class={cx(
+      "room flex min-h-0 min-w-0 flex-1 flex-col",
+      voiceConnectedHere && $videoCallLayout === VideoCallLayout.Video && "md:hidden",
+    )}>
+    {#if h}
+      <RoomPinnedMessages {url} {h} />
+    {/if}
+
+    {#if h && isVoiceRoom && $callState === CallState.Connected}
+      <VideoCallContent layout={$videoCallLayout} mobile {url} {h} class="md:hidden" />
+    {/if}
+
+    <div
+      bind:this={element}
+      onscroll={onScroll}
+      class={cx(
+        "room__content scroll-container",
+        showMobileVideoPanel ? "hidden md:flex md:flex-col-reverse" : "flex",
+      )}>
+      {#if $room?.isPrivate && $membershipStatus !== MembershipStatus.Granted}
+        <div class="py-20">
+          <div class="card flex flex-col gap-8 m-auto max-w-md items-center text-center">
+            <p class="opacity-75">You aren't currently a member of this room.</p>
+            {#if $membershipStatus === MembershipStatus.Pending}
+              <Button class="button button-neutral button-sm" disabled={leaving} onclick={leave}>
+                <Icon icon={ClockCircle} />
+                Access Pending
+              </Button>
+            {:else}
+              <Button class="button button-neutral button-sm" disabled={joining} onclick={join}>
+                {#if joining}
+                  <Spinner size="sm" />
+                {:else}
+                  <Icon icon={Login2} />
+                {/if}
+                Join Room
+              </Button>
+            {/if}
+          </div>
+        </div>
+      {:else}
+        {#if loadingForward && elements.length > 0}
+          <p class="py-20 flex justify-center">
+            <Spinner loading={loadingForward}>Looking for messages...</Spinner>
+          </p>
+        {/if}
+        {#each elements as { type, id, value, showPubkey } (id)}
+          {#if type === "new-messages"}
+            <div
+              {id}
+              class="flex items-center py-2 text-xs transition-colors"
+              class:opacity-0={showFixedNewMessages}>
+              <div class="h-px grow bg-primary text-primary-content"></div>
+              <p
+                class="rounded-full bg-primary text-primary-content px-2 py-1"
+                style="color: var(--primary-content)">
+                New Messages
+              </p>
+              <div class="h-px grow bg-primary text-primary-content"></div>
+            </div>
+          {:else if type === "date"}
+            <Divider>{value}</Divider>
+          {:else}
+            {@const event = value as TrustedEvent}
+            {#if event.kind === addMemberKind}
+              <RoomItemAddMember {url} {event} />
+            {:else}
+              <RoomItem
+                {url}
+                {event}
+                {replyTo}
+                {showPubkey}
+                canEdit={canEditEvent}
+                onEdit={onEditEvent} />
+            {/if}
+          {/if}
+        {/each}
+        <p class="flex h-10 items-center justify-center py-20">
+          {#if loadingBackward}
+            <Spinner loading={loadingBackward}>Looking for messages...</Spinner>
+          {:else}
+            <Spinner>End of message history</Spinner>
+          {/if}
+        </p>
+      {/if}
+      <div class="h-screen"></div>
+    </div>
+
+    <div
+      class={cx(
+        "room__compose flex flex-col gap-1 md:flex-row md:gap-0",
+        showMobileVideoPanel && "max-md:hidden",
+      )}>
+      <div class="room__compose-inner min-w-0 flex-1">
+        {#if $room?.isPrivate && $membershipStatus !== MembershipStatus.Granted}
+          <!-- pass -->
+        {:else if $room?.isRestricted && $membershipStatus !== MembershipStatus.Granted}
+          <div class="card m-4 flex flex-row items-center justify-between px-4 py-3">
+            <p class="opacity-75">Only members are allowed to post to this room.</p>
+            {#if $membershipStatus === MembershipStatus.Pending}
+              <Button class="button button-neutral button-sm" disabled={leaving} onclick={leave}>
+                <Icon icon={ClockCircle} />
+                Access Pending
+              </Button>
+            {:else}
+              <Button class="button button-neutral button-sm" disabled={joining} onclick={join}>
+                {#if joining}
+                  <Spinner size="sm" />
+                {:else}
+                  <Icon icon={Login2} />
+                {/if}
+                Ask to Join
+              </Button>
+            {/if}
+          </div>
+        {:else}
+          <div>
+            {#if parent}
+              <RoomComposeParent event={parent} clear={clearParent} verb="Replying to" />
+            {/if}
+            {#if share}
+              <RoomComposeParent event={share} clear={clearShare} verb="Sharing" />
+            {/if}
+            {#if eventToEdit}
+              <RoomComposeEdit clear={clearEventToEdit} />
+            {/if}
+          </div>
+          {#key eventToEdit}
+            <RoomCompose
+              {url}
+              {h}
+              {onSubmit}
+              {onEscape}
+              {onEditPrevious}
+              initialValues={eventToEdit}
+              bind:this={compose} />
+          {/key}
+        {/if}
+      </div>
+      {#if isVoiceRoom || $callState === CallState.Joining || $callState === CallState.Connected}
+        <div
+          class={cx(
+            "hide-on-keyboard flex-shrink-0 p-2 md:hidden",
+            showMobileVideoPanel && "hidden",
+          )}>
+          <VoiceWidget />
+        </div>
+      {/if}
+    </div>
+  </div>
+</div>
+
+{#if showScrollButton}
+  <div in:fade class="chat__scroll-down">
+    <Button class="button button-neutral button-circle" onclick={scrollToBottom}>
+      <Icon icon={AltArrowDown} />
+    </Button>
+  </div>
+{/if}
+
+{#if showFixedNewMessages}
+  <div class="relative z-popover flex justify-center">
+    <div transition:fly={{duration: 200}} class="fixed top-12 pt-sai">
+      <Button class="button button-primary button-xs button-pill" onclick={scrollToNewMessages}>
+        New Messages
+      </Button>
+    </div>
+  </div>
+{/if}
diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte
index 0f238231..c3fe1278 100644
--- a/src/routes/spaces/[relay]/[h]/+page.svelte
+++ b/src/routes/spaces/[relay]/[h]/+page.svelte
@@ -1,450 +1,25 @@
 <script lang="ts">
-  import {onDestroy, onMount} from "svelte"
-  import {readable} from "svelte/store"
   import {page} from "$app/stores"
-  import {goto} from "$app/navigation"
-  import type {Readable} from "svelte/store"
-  import {debounce} from "throttle-debounce"
-  import {pubkey, publishThunk, waitForThunkError, joinRoom, leaveRoom} from "@welshman/app"
-  import {now, ifLet, int, formatTimestampAsDate, ago, MINUTE} from "@welshman/lib"
   import type {MakeNonOptional} from "@welshman/lib"
-  import type {TrustedEvent, EventContent} from "@welshman/util"
-  import {makeEvent, makeRoomMeta, MESSAGE, ROOM_ADD_MEMBER} from "@welshman/util"
-  import AltArrowDown from "@assets/icons/alt-arrow-down.svg?dataurl"
-  import ClockCircle from "@assets/icons/clock-circle.svg?dataurl"
   import InfoCircle from "@assets/icons/info-circle.svg?dataurl"
-  import Login2 from "@assets/icons/login-3.svg?dataurl"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"
-  import cx from "classnames"
-  import {fade, fly} from "@lib/transition"
   import Button from "@lib/components/Button.svelte"
-  import Divider from "@lib/components/Divider.svelte"
   import Icon from "@lib/components/Icon.svelte"
-  import Spinner from "@lib/components/Spinner.svelte"
   import SpaceBar from "@app/components/SpaceBar.svelte"
-  import RoomCompose from "@app/components/RoomCompose.svelte"
-  import RoomComposeParent from "@app/components/RoomComposeParent.svelte"
-  import RoomImage from "@app/components/RoomImage.svelte"
+  import RoomChat from "@app/components/RoomChat.svelte"
   import RoomDetail from "@app/components/RoomDetail.svelte"
-  import RoomItem from "@app/components/RoomItem.svelte"
+  import RoomImage from "@app/components/RoomImage.svelte"
   import RoomName from "@app/components/RoomName.svelte"
   import RoomSearch from "@app/components/RoomSearch.svelte"
-  import RoomPinnedMessages from "@app/components/RoomPinnedMessages.svelte"
-  import ThunkToast from "@app/components/ThunkToast.svelte"
-  import RoomItemAddMember from "@src/app/components/RoomItemAddMember.svelte"
-  import RoomComposeEdit from "@src/app/components/RoomComposeEdit.svelte"
-  import {publishRoomJoinRequest} from "@app/access"
-  import {publishDelete} from "@app/deletes"
-  import {prependParent, deriveRoom, getRoomType, PROTECTED, RoomType} from "@app/groups"
-  import {deriveUserRoomMembershipStatus, MembershipStatus} from "@app/members"
-  import {canEnforceNip70, decodeRelay} from "@app/relays"
-  import {userSettingsValues} from "@app/settings"
-  import VoiceWidget from "@app/components/VoiceWidget.svelte"
-  import VideoCallContent from "@app/components/VideoCallContent.svelte"
-  import {
-    CallState,
-    callTargetRoom,
-    callState,
-    VideoCallLayout,
-    videoCallLayout,
-    videoTileCount,
-  } from "@app/call"
-  import {makeFeed} from "@app/feeds"
-  import {popKey} from "@lib/implicit"
-  import {checked, deferredRoomPath, setChecked} from "@app/notifications"
-  import {makeRoomPath} from "@app/routes"
+  import {decodeRelay} from "@app/relays"
   import {pushModal} from "@app/modal"
-  import {pushToast} from "@app/toast"
 
   const {h, relay} = $page.params as MakeNonOptional<typeof $page.params>
   const url = decodeRelay(relay)
-  const room = deriveRoom(url, h)
-  const isVoiceRoom = $derived(getRoomType($room) === RoomType.Voice)
 
-  const voiceConnectedHere = $derived(
-    isVoiceRoom &&
-      $callState === CallState.Connected &&
-      $callTargetRoom?.url === url &&
-      $callTargetRoom?.h === h,
-  )
-
-  const showMobileVideoPanel = $derived(
-    isVoiceRoom && $callState === CallState.Connected && $videoCallLayout === VideoCallLayout.Video,
-  )
-
-  const pageContentHiddenDesktopVideoOnly = $derived(
-    voiceConnectedHere && $videoCallLayout === VideoCallLayout.Video,
-  )
-
-  const roomPath = makeRoomPath(url, h)
-
-  const videoCallChatHidden = $derived(
-    voiceConnectedHere && $videoCallLayout === VideoCallLayout.Video,
-  )
-
-  $effect(() => {
-    deferredRoomPath.set(videoCallChatHidden ? roomPath : undefined)
-    if (voiceConnectedHere && !videoCallChatHidden) {
-      setChecked(roomPath)
-    }
-  })
-
-  onDestroy(() => deferredRoomPath.set(undefined))
-
-  let prevVideoTileCount = $state(0)
-
-  $effect(() => {
-    if ($callState !== CallState.Connected) {
-      videoCallLayout.set(VideoCallLayout.Chat)
-      prevVideoTileCount = 0
-      return
-    }
-
-    const here = isVoiceRoom && $callTargetRoom?.url === url && $callTargetRoom?.h === h
-    const n = $videoTileCount
-
-    if (!here) {
-      prevVideoTileCount = 0
-      return
-    }
-
-    if (prevVideoTileCount === 0 && n >= 1) {
-      videoCallLayout.set(VideoCallLayout.Video)
-    }
-    if (prevVideoTileCount >= 1 && n === 0 && $videoCallLayout === VideoCallLayout.Split) {
-      videoCallLayout.set(VideoCallLayout.Chat)
-    }
-    prevVideoTileCount = n
-  })
-  const shouldProtect = canEnforceNip70(url)
-  const membershipStatus = deriveUserRoomMembershipStatus(url, h)
-  const at = $derived(parseInt($page.url.searchParams.get("at")!))
-  const inviteCode = $derived($page.url.searchParams.get("code") || "")
+  const showRoomSearch = () => pushModal(RoomSearch, {url, h})
 
   const showRoomDetail = () => pushModal(RoomDetail, {url, h})
-
-  const join = async () => {
-    joining = true
-
-    try {
-      const message = await waitForThunkError(
-        inviteCode ? publishRoomJoinRequest(url, h, inviteCode) : joinRoom(url, makeRoomMeta({h})),
-      )
-
-      if (message && !message.startsWith("duplicate:")) {
-        return pushToast({theme: "error", message})
-      }
-
-      // Restart the feed now that we're a member
-      start()
-    } finally {
-      joining = false
-    }
-  }
-
-  const leave = async () => {
-    leaving = true
-    try {
-      const message = await waitForThunkError(leaveRoom(url, makeRoomMeta({h})))
-
-      if (message && !message.startsWith("duplicate:")) {
-        pushToast({theme: "error", message})
-      }
-    } finally {
-      leaving = false
-    }
-  }
-
-  const replyTo = (event: TrustedEvent) => {
-    parent = event
-    compose?.focus()
-  }
-
-  const clearParent = () => {
-    parent = undefined
-  }
-
-  const clearShare = () => {
-    share = undefined
-  }
-
-  const clearEventToEdit = () => {
-    eventToEdit = undefined
-  }
-
-  const onSubmit = async ({content, tags}: EventContent) => {
-    if (!content && !share) {
-      return
-    }
-
-    try {
-      tags.push(["h", h])
-
-      if (await shouldProtect) {
-        tags.push(PROTECTED)
-      }
-
-      let template: EventContent & {created_at?: number} = {content, tags}
-
-      if (eventToEdit) {
-        // Don't do anything if message hasn't changed
-        if (eventToEdit.content === content) {
-          return
-        }
-
-        // Delete previous message, to be republished with same timestamp
-        template.created_at = eventToEdit.created_at
-        publishDelete({
-          relays: [url],
-          event: $state.snapshot(eventToEdit),
-          protect: await shouldProtect,
-        })
-      }
-
-      if (share) {
-        template = prependParent(share, template, url)
-      }
-
-      if (parent) {
-        template = prependParent(parent, template, url)
-      }
-
-      const thunk = publishThunk({
-        relays: [url],
-        event: makeEvent(MESSAGE, template),
-        delay: $userSettingsValues.send_delay,
-      })
-
-      if ($userSettingsValues.send_delay) {
-        pushToast({
-          timeout: 30_000,
-          children: {
-            component: ThunkToast,
-            props: {thunk},
-          },
-        })
-      }
-    } finally {
-      clearParent()
-      clearShare()
-      clearEventToEdit()
-    }
-  }
-
-  const manageScrollPosition = () => {
-    // Only treat an `at` jump as "scrolled up" when it targets an event below the
-    // newest one; jumping to the most recent message already lands us at the bottom.
-    const newestEvent = $events[$events.length - 1]
-    const atIsBelowNewest = !isNaN(at) && newestEvent !== undefined && at < newestEvent.created_at
-
-    showScrollButton = atIsBelowNewest || Math.abs(element?.scrollTop || 0) > 1500
-
-    const newMessages = document.getElementById("new-messages")
-
-    if (newMessagesSeen) {
-      showFixedNewMessages = false
-    } else if (newMessages) {
-      const {y} = newMessages.getBoundingClientRect()
-
-      if (y > 0 && y < 300) {
-        newMessagesSeen = true
-        showFixedNewMessages = false
-      } else {
-        showFixedNewMessages = y < 0
-      }
-    }
-
-    if (!userHasScrolled && !isNaN(at)) {
-      const targetEvent = $events.find(event => event.created_at >= at)
-
-      if (targetEvent) {
-        const target = element?.querySelector(`[data-event="${targetEvent.id}"]`)
-
-        if (target instanceof HTMLElement) {
-          isProgrammaticScroll = true
-          target.scrollIntoView({block: "center"})
-        }
-      }
-    }
-  }
-
-  const onScroll = () => {
-    if (!isProgrammaticScroll) {
-      userHasScrolled = true
-      isUserScrolling = true
-      clearIsUserScrolling()
-      manageScrollPosition()
-    }
-
-    isProgrammaticScroll = false
-  }
-
-  const scrollToNewMessages = () =>
-    document.getElementById("new-messages")?.scrollIntoView({behavior: "smooth", block: "center"})
-
-  const scrollToBottom = () => {
-    if (!isNaN(at)) {
-      goto($page.url.pathname, {replaceState: true})
-    } else {
-      element?.scrollTo({top: 0, behavior: "smooth"})
-    }
-  }
-
-  const onVisibilityChange = () => {
-    if (document.hidden) {
-      lastVisibleAt = now()
-    } else if ($events.some(e => e.pubkey !== $pubkey && e.created_at > lastVisibleAt)) {
-      newMessagesAfter = lastVisibleAt
-      newMessagesBefore = now()
-      newMessagesSeen = false
-    }
-  }
-
-  let joining = $state(false)
-  let leaving = $state(false)
-  let userHasScrolled = $state(false)
-  let isProgrammaticScroll = $state(false)
-  let isUserScrolling = $state(false)
-  let loadingBackward = $state(true)
-  let loadingForward = $state(true)
-  let share = $state(popKey<TrustedEvent | undefined>("share"))
-  let parent: TrustedEvent | undefined = $state()
-  let element: HTMLElement | undefined = $state()
-  let lastVisibleAt = now()
-  let newMessagesAfter = $state($checked[$page.url.pathname])
-  let newMessagesBefore = $state(now())
-  let newMessagesSeen = false
-  let showFixedNewMessages = $state(false)
-  let showScrollButton = $state(false)
-  let cleanup: () => void
-  let events: Readable<TrustedEvent[]> = $state(readable([]))
-  let compose: RoomCompose | undefined = $state()
-  let eventToEdit: TrustedEvent | undefined = $state()
-
-  const clearIsUserScrolling = debounce(150, () => {
-    isUserScrolling = false
-  })
-
-  const elements = $derived.by(() => {
-    const elements = []
-    const seen = new Set()
-
-    let previousDate
-    let previousKind
-    let previousPubkey
-    let previousCreatedAt = 0
-    let newMessagesSeen = false
-
-    if (events) {
-      const lastUserEvent = $events.findLast(e => e.pubkey === $pubkey)
-
-      // Adjust the boundary to account for messages that came from a different device
-      const adjustedAfter =
-        newMessagesAfter && lastUserEvent
-          ? Math.max(lastUserEvent.created_at, newMessagesAfter)
-          : newMessagesAfter
-
-      for (const event of $events) {
-        if (seen.has(event.id)) {
-          continue
-        }
-
-        const date = formatTimestampAsDate(event.created_at)
-
-        if (
-          !newMessagesSeen &&
-          adjustedAfter &&
-          event.pubkey !== $pubkey &&
-          event.created_at > adjustedAfter &&
-          event.created_at < newMessagesBefore
-        ) {
-          elements.push({type: "new-messages", id: "new-messages"})
-          newMessagesSeen = true
-        }
-
-        if (date !== previousDate) {
-          elements.push({type: "date", value: date, id: date, showPubkey: false})
-        }
-
-        const showPubkey =
-          previousPubkey !== event.pubkey ||
-          event.created_at - previousCreatedAt > int(3, MINUTE) ||
-          previousKind === ROOM_ADD_MEMBER
-
-        elements.push({
-          id: event.id,
-          type: "note",
-          value: event,
-          showPubkey,
-        })
-
-        previousDate = date
-        previousKind = event.kind
-        previousPubkey = event.pubkey
-        previousCreatedAt = event.created_at
-        seen.add(event.id)
-      }
-    }
-
-    elements.reverse()
-
-    return elements
-  })
-
-  $effect(() => {
-    if (elements.length > 0 && !isUserScrolling) {
-      requestAnimationFrame(manageScrollPosition)
-    }
-  })
-
-  const start = () => {
-    cleanup?.()
-
-    const feed = makeFeed({
-      relays: [url],
-      at: at || now(),
-      element: element!,
-      filters: [{kinds: [MESSAGE, ROOM_ADD_MEMBER], "#h": [h]}],
-      onBackwardExhausted: () => {
-        loadingBackward = false
-      },
-      onForwardExhausted: () => {
-        loadingForward = false
-      },
-    })
-
-    events = feed.events
-    cleanup = feed.cleanup
-  }
-
-  const onEscape = () => {
-    clearParent()
-    clearShare()
-    eventToEdit = undefined
-  }
-
-  const canEditEvent = (event: TrustedEvent) =>
-    event.pubkey === $pubkey && event.created_at >= ago(5, MINUTE)
-
-  const onEditEvent = (event: TrustedEvent) => {
-    clearParent()
-    clearShare()
-    eventToEdit = event
-  }
-
-  const onEditPrevious = () => ifLet($events.toReversed().find(canEditEvent), onEditEvent)
-
-  onMount(() => {
-    start()
-
-    document.addEventListener("visibilitychange", onVisibilityChange)
-
-    return () => {
-      // Wrap in a closure to avoid calling a stale cleanup function
-      cleanup?.()
-      document.removeEventListener("visibilitychange", onVisibilityChange)
-    }
-  })
 </script>
 
 <SpaceBar>
@@ -458,7 +33,7 @@
     <Button
       class="button button-neutral button-sm button-square"
       aria-label="Search"
-      onclick={() => pushModal(RoomSearch, {url, h})}>
+      onclick={showRoomSearch}>
       <Icon size={4} icon={Magnifier} />
     </Button>
     <Button class="button button-neutral button-sm button-square" onclick={showRoomDetail}>
@@ -467,186 +42,4 @@
   {/snippet}
 </SpaceBar>
 
-<div
-  class={cx(
-    "flex min-h-0 flex-1 flex-col",
-    voiceConnectedHere && $videoCallLayout === VideoCallLayout.Split && "md:flex-row",
-  )}>
-  {#if voiceConnectedHere}
-    <VideoCallContent
-      layout={$videoCallLayout}
-      {url}
-      {h}
-      class="hidden min-h-0 w-full min-w-0 flex-1 flex-col md:flex" />
-  {/if}
-
-  <div
-    class={cx(
-      "room flex min-h-0 min-w-0 flex-1 flex-col",
-      voiceConnectedHere && $videoCallLayout === VideoCallLayout.Video && "md:hidden",
-    )}>
-    <RoomPinnedMessages {url} {h} />
-
-    {#if isVoiceRoom && $callState === CallState.Connected}
-      <VideoCallContent layout={$videoCallLayout} mobile {url} {h} class="md:hidden" />
-    {/if}
-
-    <div
-      bind:this={element}
-      onscroll={onScroll}
-      class={cx(
-        "room__content scroll-container",
-        showMobileVideoPanel ? "hidden md:flex md:flex-col-reverse" : "flex",
-        pageContentHiddenDesktopVideoOnly && "md:hidden",
-      )}>
-      {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
-        <div class="py-20">
-          <div class="card flex flex-col gap-8 m-auto max-w-md items-center text-center">
-            <p class="opacity-75">You aren't currently a member of this room.</p>
-            {#if $membershipStatus === MembershipStatus.Pending}
-              <Button class="button button-neutral button-sm" disabled={leaving} onclick={leave}>
-                <Icon icon={ClockCircle} />
-                Access Pending
-              </Button>
-            {:else}
-              <Button class="button button-neutral button-sm" disabled={joining} onclick={join}>
-                {#if joining}
-                  <Spinner size="sm" />
-                {:else}
-                  <Icon icon={Login2} />
-                {/if}
-                Join Room
-              </Button>
-            {/if}
-          </div>
-        </div>
-      {:else}
-        {#if loadingForward && elements.length > 0}
-          <p class="py-20 flex justify-center">
-            <Spinner loading={loadingForward}>Looking for messages...</Spinner>
-          </p>
-        {/if}
-        {#each elements as { type, id, value, showPubkey }, i (id)}
-          {#if type === "new-messages"}
-            <div
-              {id}
-              class="flex items-center py-2 text-xs transition-colors"
-              class:opacity-0={showFixedNewMessages}>
-              <div class="h-px flex-grow bg-primary text-primary-content"></div>
-              <p
-                class="rounded-full bg-primary text-primary-content px-2 py-1"
-                style="color: var(--primary-content)">
-                New Messages
-              </p>
-              <div class="h-px flex-grow bg-primary text-primary-content"></div>
-            </div>
-          {:else if type === "date"}
-            <Divider>{value}</Divider>
-          {:else}
-            {@const event = value as TrustedEvent}
-            {#if event.kind === ROOM_ADD_MEMBER}
-              <RoomItemAddMember {url} {event} />
-            {:else}
-              <RoomItem
-                {url}
-                {event}
-                {replyTo}
-                {showPubkey}
-                canEdit={canEditEvent}
-                onEdit={onEditEvent} />
-            {/if}
-          {/if}
-        {/each}
-        <p class="flex h-10 items-center justify-center py-20">
-          {#if loadingBackward}
-            <Spinner loading={loadingBackward}>Looking for messages...</Spinner>
-          {:else}
-            <Spinner>End of message history</Spinner>
-          {/if}
-        </p>
-      {/if}
-      <div class="h-screen"></div>
-    </div>
-
-    <div
-      class={cx(
-        "room__compose flex flex-col gap-1 md:flex-row md:gap-0",
-        pageContentHiddenDesktopVideoOnly && "md:hidden",
-        showMobileVideoPanel && "max-md:hidden",
-      )}>
-      <div class="room__compose-inner min-w-0 flex-1">
-        {#if $room.isPrivate && $membershipStatus !== MembershipStatus.Granted}
-          <!-- pass -->
-        {:else if $room.isRestricted && $membershipStatus !== MembershipStatus.Granted}
-          <div class="card m-4 flex flex-row items-center justify-between px-4 py-3">
-            <p class="opacity-75">Only members are allowed to post to this room.</p>
-            {#if $membershipStatus === MembershipStatus.Pending}
-              <Button class="button button-neutral button-sm" disabled={leaving} onclick={leave}>
-                <Icon icon={ClockCircle} />
-                Access Pending
-              </Button>
-            {:else}
-              <Button class="button button-neutral button-sm" disabled={joining} onclick={join}>
-                {#if joining}
-                  <Spinner size="sm" />
-                {:else}
-                  <Icon icon={Login2} />
-                {/if}
-                Ask to Join
-              </Button>
-            {/if}
-          </div>
-        {:else}
-          <div>
-            {#if parent}
-              <RoomComposeParent event={parent} clear={clearParent} verb="Replying to" />
-            {/if}
-            {#if share}
-              <RoomComposeParent event={share} clear={clearShare} verb="Sharing" />
-            {/if}
-            {#if eventToEdit}
-              <RoomComposeEdit clear={clearEventToEdit} />
-            {/if}
-          </div>
-          {#key eventToEdit}
-            <RoomCompose
-              {url}
-              {h}
-              {onSubmit}
-              {onEscape}
-              {onEditPrevious}
-              initialValues={eventToEdit}
-              bind:this={compose} />
-          {/key}
-        {/if}
-      </div>
-      {#if isVoiceRoom || $callState === CallState.Joining || $callState === CallState.Connected}
-        <div
-          class={cx(
-            "hide-on-keyboard flex-shrink-0 p-2 md:hidden",
-            showMobileVideoPanel && "hidden",
-          )}>
-          <VoiceWidget />
-        </div>
-      {/if}
-    </div>
-  </div>
-</div>
-
-{#if showScrollButton}
-  <div in:fade class="chat__scroll-down">
-    <Button class="button button-neutral button-circle" onclick={scrollToBottom}>
-      <Icon icon={AltArrowDown} />
-    </Button>
-  </div>
-{/if}
-
-{#if showFixedNewMessages}
-  <div class="relative z-popover flex justify-center">
-    <div transition:fly={{duration: 200}} class="fixed top-12 pt-sai">
-      <Button class="button button-primary button-xs button-pill" onclick={scrollToNewMessages}>
-        New Messages
-      </Button>
-    </div>
-  </div>
-{/if}
+<RoomChat {url} {h} />
diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte
index a17d4345..1e0f153d 100644
--- a/src/routes/spaces/[relay]/chat/+page.svelte
+++ b/src/routes/spaces/[relay]/chat/+page.svelte
@@ -1,327 +1,18 @@
 <script lang="ts">
-  import {onMount} from "svelte"
   import {page} from "$app/stores"
-  import {goto} from "$app/navigation"
-  import type {Readable} from "svelte/store"
-  import {readable} from "svelte/store"
-  import {debounce} from "throttle-debounce"
-  import {now, int, ifLet, formatTimestampAsDate, MINUTE, ago} from "@welshman/lib"
-  import type {TrustedEvent, EventContent} from "@welshman/util"
-  import {makeEvent, MESSAGE, RELAY_ADD_MEMBER} from "@welshman/util"
-  import {pubkey, publishThunk} from "@welshman/app"
-  import {fade, fly} from "@lib/transition"
   import ChatRound from "@assets/icons/chat-round.svg?dataurl"
-  import AltArrowDown from "@assets/icons/alt-arrow-down.svg?dataurl"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"
-  import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
-  import Spinner from "@lib/components/Spinner.svelte"
-  import Divider from "@lib/components/Divider.svelte"
-  import ThunkToast from "@app/components/ThunkToast.svelte"
+  import Icon from "@lib/components/Icon.svelte"
   import SpaceBar from "@app/components/SpaceBar.svelte"
   import SpaceSearch from "@app/components/SpaceSearch.svelte"
-  import RoomItem from "@app/components/RoomItem.svelte"
-  import RoomItemAddMember from "@src/app/components/RoomItemAddMember.svelte"
-
-  import RoomCompose from "@app/components/RoomCompose.svelte"
-  import RoomComposeEdit from "@src/app/components/RoomComposeEdit.svelte"
-  import RoomComposeParent from "@app/components/RoomComposeParent.svelte"
-  import {userSettingsValues} from "@app/settings"
-  import {decodeRelay, canEnforceNip70} from "@app/relays"
-  import {PROTECTED, prependParent} from "@app/groups"
-  import {publishDelete} from "@app/deletes"
-  import {checked} from "@app/notifications"
-  import {pushToast} from "@app/toast"
+  import RoomChat from "@app/components/RoomChat.svelte"
+  import {decodeRelay} from "@app/relays"
   import {pushModal} from "@app/modal"
-  import {makeFeed} from "@app/feeds"
-  import {popKey} from "@lib/implicit"
 
   const url = decodeRelay($page.params.relay!)
-  const shouldProtect = canEnforceNip70(url)
-  const at = $derived(parseInt($page.url.searchParams.get("at")!))
 
-  const replyTo = (event: TrustedEvent) => {
-    parent = event
-    compose?.focus()
-  }
-
-  const clearParent = () => {
-    parent = undefined
-  }
-
-  const clearEventToEdit = () => {
-    eventToEdit = undefined
-  }
-
-  const clearShare = () => {
-    share = undefined
-  }
-
-  const onSubmit = async ({content, tags}: EventContent) => {
-    if (!content && !share) {
-      return
-    }
-
-    try {
-      let template: EventContent & {created_at?: number} = {content, tags}
-
-      if (eventToEdit) {
-        // Don't do anything if message hasn't changed
-        if (eventToEdit.content === content) {
-          return
-        }
-
-        // Delete previous message, to be republished with same timestamp
-        template.created_at = eventToEdit.created_at
-        publishDelete({relays: [url], event: eventToEdit, protect: await shouldProtect})
-      }
-
-      if (await shouldProtect) {
-        tags.push(PROTECTED)
-      }
-
-      if (share) {
-        template = prependParent(share, template, url)
-      }
-
-      if (parent) {
-        template = prependParent(parent, template, url)
-      }
-
-      const thunk = publishThunk({
-        relays: [url],
-        event: makeEvent(MESSAGE, template),
-        delay: $userSettingsValues.send_delay,
-      })
-
-      if ($userSettingsValues.send_delay) {
-        pushToast({
-          timeout: 30_000,
-          children: {
-            component: ThunkToast,
-            props: {thunk},
-          },
-        })
-      }
-    } finally {
-      clearParent()
-      clearShare()
-      clearEventToEdit()
-    }
-  }
-
-  const manageScrollPosition = () => {
-    // Only treat an `at` jump as "scrolled up" when it targets an event below the
-    // newest one; jumping to the most recent message already lands us at the bottom.
-    const newestEvent = $events[$events.length - 1]
-    const atIsBelowNewest = !isNaN(at) && newestEvent !== undefined && at < newestEvent.created_at
-
-    showScrollButton = atIsBelowNewest || Math.abs(element?.scrollTop || 0) > 1500
-
-    const newMessages = document.getElementById("new-messages")
-
-    if (newMessagesSeen) {
-      showFixedNewMessages = false
-    } else if (newMessages) {
-      const {y} = newMessages.getBoundingClientRect()
-
-      if (y > 0 && y < 300) {
-        newMessagesSeen = true
-        showFixedNewMessages = false
-      } else {
-        showFixedNewMessages = y < 0
-      }
-    }
-
-    if (!userHasScrolled && !isNaN(at)) {
-      const targetEvent = $events.find(event => event.created_at >= at)
-
-      if (targetEvent) {
-        const target = element?.querySelector(`[data-event="${targetEvent.id}"]`)
-
-        if (target instanceof HTMLElement) {
-          isProgrammaticScroll = true
-          target.scrollIntoView({block: "center"})
-        }
-      }
-    }
-  }
-
-  const onScroll = () => {
-    if (!isProgrammaticScroll) {
-      userHasScrolled = true
-      isUserScrolling = true
-      clearIsUserScrolling()
-      manageScrollPosition()
-    }
-
-    isProgrammaticScroll = false
-  }
-
-  const scrollToNewMessages = () =>
-    document.getElementById("new-messages")?.scrollIntoView({behavior: "smooth", block: "center"})
-
-  const scrollToBottom = () => {
-    if (!isNaN(at)) {
-      goto($page.url.pathname, {replaceState: true})
-    } else {
-      element?.scrollTo({top: 0, behavior: "smooth"})
-    }
-  }
-
-  const onVisibilityChange = () => {
-    if (document.hidden) {
-      lastVisibleAt = now()
-    } else if ($events.some(e => e.pubkey !== $pubkey && e.created_at > lastVisibleAt)) {
-      newMessagesAfter = lastVisibleAt
-      newMessagesBefore = now()
-      newMessagesSeen = false
-    }
-  }
-
-  let loadingBackward = $state(true)
-  let loadingForward = $state(true)
-  let userHasScrolled = $state(false)
-  let isProgrammaticScroll = $state(false)
-  let isUserScrolling = $state(false)
-  let share = $state(popKey<TrustedEvent | undefined>("share"))
-  let parent: TrustedEvent | undefined = $state()
-  let element: HTMLElement | undefined = $state()
-  let lastVisibleAt = now()
-  let newMessagesAfter = $state($checked[$page.url.pathname])
-  let newMessagesBefore = $state(now())
-  let newMessagesSeen = false
-  let showFixedNewMessages = $state(false)
-  let showScrollButton = $state(false)
-  let cleanup: () => void
-  let events: Readable<TrustedEvent[]> = $state(readable([]))
-  let compose: RoomCompose | undefined = $state()
-  let eventToEdit: TrustedEvent | undefined = $state()
-
-  const clearIsUserScrolling = debounce(150, () => {
-    isUserScrolling = false
-  })
-
-  const elements = $derived.by(() => {
-    const elements = []
-    const seen = new Set()
-
-    let previousDate
-    let previousKind
-    let previousPubkey
-    let previousCreatedAt = 0
-    let newMessagesSeen = false
-
-    if (events) {
-      const lastUserEvent = $events.findLast(e => e.pubkey === $pubkey)
-
-      // Adjust the boundary to account for messages that came from a different device
-      const adjustedAfter =
-        newMessagesAfter && lastUserEvent
-          ? Math.max(lastUserEvent.created_at, newMessagesAfter)
-          : newMessagesAfter
-
-      for (const event of $events) {
-        if (seen.has(event.id)) {
-          continue
-        }
-
-        const date = formatTimestampAsDate(event.created_at)
-
-        if (
-          !newMessagesSeen &&
-          adjustedAfter &&
-          event.pubkey !== $pubkey &&
-          event.created_at > adjustedAfter &&
-          event.created_at < newMessagesBefore
-        ) {
-          elements.push({type: "new-messages", id: "new-messages"})
-          newMessagesSeen = true
-        }
-
-        if (date !== previousDate) {
-          elements.push({type: "date", value: date, id: date, showPubkey: false})
-        }
-
-        const showPubkey =
-          previousPubkey !== event.pubkey ||
-          event.created_at - previousCreatedAt > int(3, MINUTE) ||
-          previousKind === RELAY_ADD_MEMBER
-
-        elements.push({
-          id: event.id,
-          type: "note",
-          value: event,
-          showPubkey,
-        })
-
-        previousDate = date
-        previousKind = event.kind
-        previousPubkey = event.pubkey
-        previousCreatedAt = event.created_at
-        seen.add(event.id)
-      }
-    }
-
-    elements.reverse()
-
-    return elements
-  })
-
-  $effect(() => {
-    if (elements.length > 0 && !isUserScrolling) {
-      requestAnimationFrame(manageScrollPosition)
-    }
-  })
-
-  const start = () => {
-    cleanup?.()
-
-    const feed = makeFeed({
-      relays: [url],
-      at: at || now(),
-      element: element!,
-      filters: [{kinds: [MESSAGE, RELAY_ADD_MEMBER]}],
-      onBackwardExhausted: () => {
-        loadingBackward = false
-      },
-      onForwardExhausted: () => {
-        loadingForward = false
-      },
-    })
-
-    events = feed.events
-    cleanup = feed.cleanup
-  }
-
-  const onEscape = () => {
-    clearParent()
-    clearShare()
-    eventToEdit = undefined
-  }
-
-  const canEditEvent = (event: TrustedEvent) =>
-    event.pubkey === $pubkey && event.created_at >= ago(5, MINUTE)
-
-  const onEditEvent = (event: TrustedEvent) => {
-    clearParent()
-    clearShare()
-    eventToEdit = event
-  }
-
-  const onEditPrevious = () => ifLet($events.toReversed().find(canEditEvent), onEditEvent)
-
-  onMount(() => {
-    start()
-
-    document.addEventListener("visibilitychange", onVisibilityChange)
-
-    return () => {
-      // Wrap in a closure to avoid calling a stale cleanup function
-      cleanup?.()
-      document.removeEventListener("visibilitychange", onVisibilityChange)
-    }
-  })
+  const showSpaceSearch = () => pushModal(SpaceSearch, {url})
 </script>
 
 <SpaceBar>
@@ -335,98 +26,10 @@
     <Button
       class="button button-neutral button-sm button-square"
       aria-label="Search"
-      onclick={() => pushModal(SpaceSearch, {url})}>
+      onclick={showSpaceSearch}>
       <Icon size={4} icon={Magnifier} />
     </Button>
   {/snippet}
 </SpaceBar>
 
-<div class="room flex min-h-0 min-w-0 flex-1 flex-col">
-  <div bind:this={element} onscroll={onScroll} class="room__content scroll-container bg-surface">
-    {#if loadingForward && elements.length > 0}
-      <p class="py-20 flex justify-center">
-        <Spinner loading={loadingForward}>Looking for messages...</Spinner>
-      </p>
-    {/if}
-    {#each elements as { type, id, value, showPubkey }, i (id)}
-      {#if type === "new-messages"}
-        <div
-          {id}
-          class="flex items-center py-2 text-xs transition-colors"
-          class:opacity-0={showFixedNewMessages}>
-          <div class="h-px grow bg-primary text-primary-content"></div>
-          <p
-            class="rounded-full bg-primary text-primary-content px-2 py-1"
-            style="color: var(--primary-content)">
-            New Messages
-          </p>
-          <div class="h-px grow bg-primary text-primary-content"></div>
-        </div>
-      {:else if type === "date"}
-        <Divider>{value}</Divider>
-      {:else}
-        {@const event = value as TrustedEvent}
-        {#if event.kind === RELAY_ADD_MEMBER}
-          <RoomItemAddMember {url} {event} />
-        {:else}
-          <RoomItem
-            {url}
-            {event}
-            {replyTo}
-            {showPubkey}
-            canEdit={canEditEvent}
-            onEdit={onEditEvent} />
-        {/if}
-      {/if}
-    {/each}
-    <p class="flex h-10 items-center justify-center py-20">
-      {#if loadingBackward}
-        <Spinner loading={loadingBackward}>Looking for messages...</Spinner>
-      {:else}
-        <Spinner>End of message history</Spinner>
-      {/if}
-    </p>
-    <div class="h-screen"></div>
-  </div>
-
-  <div class="room__compose bg-surface">
-    <div>
-      {#if parent}
-        <RoomComposeParent event={parent} clear={clearParent} verb="Replying to" />
-      {/if}
-      {#if share}
-        <RoomComposeParent event={share} clear={clearShare} verb="Sharing" />
-      {/if}
-      {#if eventToEdit}
-        <RoomComposeEdit clear={clearEventToEdit} />
-      {/if}
-    </div>
-    {#key eventToEdit}
-      <RoomCompose
-        {url}
-        {onSubmit}
-        {onEscape}
-        {onEditPrevious}
-        initialValues={eventToEdit}
-        bind:this={compose} />
-    {/key}
-  </div>
-</div>
-
-{#if showScrollButton}
-  <div in:fade class="chat__scroll-down">
-    <Button class="button button-neutral button-circle" onclick={scrollToBottom}>
-      <Icon icon={AltArrowDown} />
-    </Button>
-  </div>
-{/if}
-
-{#if showFixedNewMessages}
-  <div class="relative z-popover flex justify-center">
-    <div transition:fly={{duration: 200}} class="fixed top-12 mt-sai">
-      <Button class="button button-primary button-xs button-pill" onclick={scrollToNewMessages}>
-        New Messages
-      </Button>
-    </div>
-  </div>
-{/if}
+<RoomChat {url} />