diff --git a/src-tauri/src/commands/chat.rs b/src-tauri/src/commands/chat.rs
index b98d204..be76b0a 100644
--- a/src-tauri/src/commands/chat.rs
+++ b/src-tauri/src/commands/chat.rs
@@ -8,7 +8,10 @@ use tauri::{AppHandle, Emitter, State};
 use uuid::Uuid;
 
 use crate::error::{into_err, AppError};
-use crate::models::{Message, MessageReaction, MessageReactionSummary, Room, User};
+use surrealdb::engine::remote::ws::Client;
+use surrealdb::Surreal;
+
+use crate::models::{Message, MessageReaction, MessageReactionSummary, MessageSnippet, Room, User};
 use crate::AppState;
 
 const DEFAULT_PAGE_SIZE: i64 = 50;
@@ -163,6 +166,22 @@ async fn hydrate_reactions(
     Ok(())
 }
 
+async fn hydrate_replies(db: &Surreal<Client>, messages: &mut [Message]) -> Result<(), String> {
+    for message in messages.iter_mut() {
+        if let Some(reply_to_id) = &message.reply_to {
+            let mut result: Vec<MessageSnippet> = db
+                .query("SELECT id, author_username, body FROM message WHERE id = $id")
+                .bind(("id", reply_to_id.clone()))
+                .await
+                .map_err(into_err)?
+                .take(0)
+                .map_err(into_err)?;
+            message.replied_to_message = result.pop();
+        }
+    }
+    Ok(())
+}
+
 async fn hydrate_direct_rooms(
     state: &State<'_, AppState>,
     rooms: &mut [Room],
@@ -442,9 +461,12 @@ pub async fn send_message(
         .take(0)
         .map_err(into_err)?;
 
-    result
+    let mut msg = result
         .pop()
-        .ok_or_else(|| into_err(AppError::NotFound("message after create".into())))
+        .ok_or_else(|| into_err(AppError::NotFound("message after create".into())))?;
+
+    hydrate_replies(&state.db, std::slice::from_mut(&mut msg)).await?;
+    Ok(msg)
 }
 
 /// Return cached messages for a room without hitting the remote DB.
@@ -504,9 +526,15 @@ pub async fn get_messages(
     result.reverse();
     let user = current_user(&state).await?;
     hydrate_reactions(&state, &user, &mut result).await?;
+    hydrate_replies(&state.db, &mut result).await?;
 
     if before.is_none() {
-        cache_put(&state.msg_cache, &state.cache_order, &room_id, result.clone());
+        cache_put(
+            &state.msg_cache,
+            &state.cache_order,
+            &room_id,
+            result.clone(),
+        );
     } else {
         let mut c = state.msg_cache.lock().unwrap();
         if let Some(existing) = c.get_mut(&room_id) {
@@ -641,7 +669,11 @@ pub async fn subscribe_room(
     let handle = tokio::spawn(async move {
         while let Some(Ok(notification)) = stream.next().await {
             let action = format!("{:?}", notification.action);
-            let data = notification.data.clone();
+            let mut data = notification.data.clone();
+
+            if data.reply_to.is_some() {
+                let _ = hydrate_replies(&db, std::slice::from_mut(&mut data)).await;
+            }
 
             {
                 let mut c = msg_cache.lock().unwrap();
@@ -673,7 +705,7 @@ pub async fn subscribe_room(
                 "chat:message",
                 &LiveMessageEvent {
                     action,
-                    data: &notification.data,
+                    data: &data,
                 },
             );
         }
diff --git a/src-tauri/src/models.rs b/src-tauri/src/models.rs
index b2fb98b..0074474 100644
--- a/src-tauri/src/models.rs
+++ b/src-tauri/src/models.rs
@@ -37,6 +37,13 @@ pub struct RoomMember {
     pub muted: Option<bool>,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize, SurrealValue)]
+pub struct MessageSnippet {
+    pub id: RecordId,
+    pub author_username: Option<String>,
+    pub body: String,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, SurrealValue)]
 pub struct Message {
     pub id: RecordId,
@@ -48,6 +55,7 @@ pub struct Message {
     pub updated: Option<Datetime>,
     pub deleted: Option<bool>,
     pub reply_to: Option<RecordId>,
+    pub replied_to_message: Option<MessageSnippet>,
     pub reactions: Option<Vec<MessageReactionSummary>>,
 }
 
diff --git a/src/lib/components/ChatMain.svelte b/src/lib/components/ChatMain.svelte
index eb8ecae..f3f3977 100644
--- a/src/lib/components/ChatMain.svelte
+++ b/src/lib/components/ChatMain.svelte
@@ -203,7 +203,11 @@
                     {/if}
                     {#if msg.reply_to}
                         <div class="reply-chip">
-                            replying to {sid(msg.reply_to)}
+                            {#if msg.replied_to_message}
+                                replying to {msg.replied_to_message.author_username ?? 'unknown'}: {msg.replied_to_message.body.length > 80 ? msg.replied_to_message.body.slice(0, 80) + '…' : msg.replied_to_message.body}
+                            {:else}
+                                replying to message
+                            {/if}
                         </div>
                     {/if}
                     {#if !msg.deleted}