diff --git a/src/app/components/message/Reply.tsx b/src/app/components/message/Reply.tsx
index e695bc77..a3b9c39d 100644
--- a/src/app/components/message/Reply.tsx
+++ b/src/app/components/message/Reply.tsx
@@ -194,6 +194,9 @@ export function Reply({
         time={
           replyEvent && (
             <Time
+              as="button"
+              className={HoverUnderline}
+              onClick={onClick ? () => onClick(eventId) : undefined}
               ts={replyEvent.origin_server_ts}
               dateFormatString={dateFormatString}
               hour24Clock={hour24Clock}
diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx
index eed7f37e..5817ba8c 100644
--- a/src/app/features/room/RoomTimeline.tsx
+++ b/src/app/features/room/RoomTimeline.tsx
@@ -63,7 +63,13 @@ import {
 import { RoomViewTyping } from './RoomViewTyping';
 import { rContent } from '../../../client/reader';
 import { ThreadSelector } from './message/thread-selector';
-import { TimelineFloat, JumpToLatestButton, ComboDivider, PlaceholderList } from './components';
+import {
+  TimelineFloat,
+  JumpToLatestButton,
+  ComboDivider,
+  PlaceholderList,
+  UnreadControls,
+} from './components';
 import { OutboxView } from './OutboxView';
 import { EncryptedMessageEvent } from '../../components/encrypted-event';
 import { useUserReadReceipt } from '../../hooks/useReadReceipt';
@@ -165,8 +171,6 @@ export function RoomTimeline({ eventId, roomInputRef, editor, timeline }: RoomTi
   const localEventSenders = useObservableValue(timeline.outbox.senders);
   const { events } = messageBatch.messages;
 
-  window.t = timeline;
-
   const range = useObservableValue(timeline.range.info);
   const rangeAtStart = range.start === 0;
   const rangeAtEnd = range.end === messageBatch.size;
@@ -255,20 +259,41 @@ export function RoomTimeline({ eventId, roomInputRef, editor, timeline }: RoomTi
   const stickToBottom = useCallback(() => {
     if (!atBottom) return;
 
-    setTimeout(() => {
-      const scrollEl = getScrollElement();
-      if (scrollEl) {
-        scrollToBottom(scrollEl, 'smooth');
-      }
-    }, 100);
+    // setTimeout(() => {
+    //   const scrollEl = getScrollElement();
+    //   if (scrollEl) {
+    //     scrollToBottom(scrollEl, 'smooth');
+    //   }
+    // }, 100);
   }, [getScrollElement, atBottom]);
 
   useObservableValueListener(timeline.outbox.senders, stickToBottom);
   useObservableValueListener(timeline.range.info, stickToBottom);
 
-  const handleOpenReply = useCallback((replyId: string) => {
-    console.log(replyId);
-  }, []);
+  const handleOpenReply = useCallback(
+    (replyId: string) => {
+      const replyIndex = timeline.batch.read.messages.events.findIndex(
+        (e) => e.event_id === replyId
+      );
+      console.log(replyIndex);
+      if (replyIndex > -1) {
+        scrollToItem(replyIndex, {
+          behavior: 'smooth',
+          align: 'center',
+          stopInView: true,
+        });
+        setFocusItem({
+          index: replyIndex,
+          scrollTo: false,
+          highlight: true,
+        });
+
+        return;
+      }
+      timeline.jumpToEvent(replyId);
+    },
+    [scrollToItem, timeline]
+  );
 
   const handleUserClick = useUserClickHandler();
   const handleUsernameClick = useUsernameClickHandler(editor);
@@ -277,6 +302,7 @@ export function RoomTimeline({ eventId, roomInputRef, editor, timeline }: RoomTi
   const handleReactionToggle = useCallback((targetEventId: string) => {
     console.log(targetEventId);
   }, []);
+
   const handleEdit = useCallback(
     (editEvtId?: string) => {
       if (editEvtId) {
@@ -304,9 +330,6 @@ export function RoomTimeline({ eventId, roomInputRef, editor, timeline }: RoomTi
     [timeline]
   );
 
-  console.log('========> RoomTimeline');
-  console.log(range, events.length);
-
   let threadSeries: MessageEventWithoutRoomId[] = [];
   const renderMatrixEvent = (event: MessageEventWithoutRoomId, item: number, collapse: boolean) => {
     const reactionEvents = reactions.get(event.event_id)?.filter((r) => !redacted.has(r.event_id));
@@ -524,29 +547,12 @@ export function RoomTimeline({ eventId, roomInputRef, editor, timeline }: RoomTi
 
   return (
     <Box grow="Yes" style={{ position: 'relative' }}>
-      {/* {unreadInfo?.readUptoEventId && !unreadInfo?.inLiveTimeline && (
-        <TimelineFloat position="Top">
-          <Chip
-            variant="Primary"
-            radii="Pill"
-            outlined
-            before={<Icon size="50" src={Icons.MessageUnread} />}
-            onClick={handleJumpToUnread}
-          >
-            <Text size="L400">Jump to Unread</Text>
-          </Chip>
-
-          <Chip
-            variant="SurfaceVariant"
-            radii="Pill"
-            outlined
-            before={<Icon size="50" src={Icons.CheckTwice} />}
-            onClick={handleMarkAsRead}
-          >
-            <Text size="L400">Mark as Read</Text>
-          </Chip>
-        </TimelineFloat>
-      )} */}
+      {readReceipt && (
+        <UnreadControls
+          onJumpToUnread={() => timeline.jumpToEvent(readReceipt.eventId)}
+          onMarkAsRead={() => undefined}
+        />
+      )}
       <Scroll ref={scrollRef} visibility="Hover">
         <Box
           direction="Column"
diff --git a/src/app/features/room/components/TimelineFloat.tsx b/src/app/features/room/components/TimelineFloat.tsx
index c39c1de6..bc9c4c58 100644
--- a/src/app/features/room/components/TimelineFloat.tsx
+++ b/src/app/features/room/components/TimelineFloat.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { as, Box } from 'folds';
+import { as, Box, Chip, Icon, Icons, Text } from 'folds';
 import classNames from 'classnames';
 import * as css from './styles.css';
 
@@ -15,3 +15,35 @@ export const TimelineFloat = as<'div', css.TimelineFloatVariants>(
     />
   )
 );
+
+type UnreadControlsProps = {
+  onJumpToUnread?: () => void;
+  onMarkAsRead: () => void;
+};
+export function UnreadControls({ onJumpToUnread, onMarkAsRead }: UnreadControlsProps) {
+  return (
+    <TimelineFloat position="Top">
+      {onJumpToUnread && (
+        <Chip
+          variant="Primary"
+          radii="Pill"
+          outlined
+          before={<Icon size="50" src={Icons.MessageUnread} />}
+          onClick={onJumpToUnread}
+        >
+          <Text size="L400">Jump to Unread</Text>
+        </Chip>
+      )}
+
+      <Chip
+        variant="SurfaceVariant"
+        radii="Pill"
+        outlined
+        before={<Icon size="50" src={Icons.CheckTwice} />}
+        onClick={onMarkAsRead}
+      >
+        <Text size="L400">Mark as Read</Text>
+      </Chip>
+    </TimelineFloat>
+  );
+}
diff --git a/src/app/features/room/thread-view/TimelineView.tsx b/src/app/features/room/thread-view/TimelineView.tsx
index 1bea1a8d..c485e28f 100644
--- a/src/app/features/room/thread-view/TimelineView.tsx
+++ b/src/app/features/room/thread-view/TimelineView.tsx
@@ -60,7 +60,13 @@ import {
 } from '../hooks/useTimeline';
 import { rContent } from '../../../../client/reader';
 import { useEditor } from '../../../components/editor';
-import { TimelineFloat, JumpToLatestButton, ComboDivider, PlaceholderList } from '../components';
+import {
+  TimelineFloat,
+  JumpToLatestButton,
+  ComboDivider,
+  PlaceholderList,
+  UnreadControls,
+} from '../components';
 import { OutboxView } from '../OutboxView';
 import { useUserReadReceipt } from '../../../hooks/useReadReceipt';
 import { useMessageParserOptions } from '../../../hooks/useMessageParserOptions';
@@ -420,6 +426,12 @@ export function TimelineView({ threadTimeline }: TimelineViewProps) {
 
   return (
     <Box grow="Yes" style={{ position: 'relative' }}>
+      {readReceipt && (
+        <UnreadControls
+          onJumpToUnread={() => threadTimeline.jumpToEvent(readReceipt.eventId)}
+          onMarkAsRead={() => undefined}
+        />
+      )}
       <Scroll ref={scrollRef} size="0" visibility="Hover" hideTrack>
         <Box direction="Column" style={{ minHeight: '100%' }}>
           <Box