diff --git a/frontend/app/components/videos/ChatMessage.module.css b/frontend/app/components/videos/ChatMessage.module.css
index 0f8c785a..44aecaf3 100644
--- a/frontend/app/components/videos/ChatMessage.module.css
+++ b/frontend/app/components/videos/ChatMessage.module.css
@@ -8,6 +8,9 @@
   grid-template-columns: 52px minmax(0, 1fr);
   column-gap: 8px;
   align-items: baseline;
+  border-left: 2px solid transparent;
+  border-radius: 4px;
+  padding: 2px 4px 2px 2px;
 }
 .chatMessageNoTimestamp {
   display: block;
@@ -43,6 +46,90 @@
   line-height: 20px;
   font-size: 14px;
 }
+.eventMessage {
+  background: color-mix(in srgb, var(--mantine-color-violet-6) 12%, transparent);
+  border-left-color: var(--mantine-color-violet-5);
+}
+.highlightedMessage {
+  background: color-mix(in srgb, var(--mantine-color-yellow-6) 14%, transparent);
+  border-left-color: var(--mantine-color-yellow-5);
+}
+.actionMessage .message {
+  font-style: italic;
+}
+.replyPreview {
+  align-items: center;
+  color: var(--mantine-color-dimmed);
+  display: flex;
+  font-size: 12px;
+  gap: 4px;
+  line-height: 16px;
+  margin-bottom: 1px;
+  min-width: 0;
+}
+.replyAuthor {
+  color: var(--mantine-color-gray-5);
+  flex: 0 1 auto;
+  font-size: 12px;
+  font-weight: 700;
+  line-height: 16px;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.replyBody {
+  color: var(--mantine-color-dimmed);
+  flex: 1 1 auto;
+  font-size: 12px;
+  line-height: 16px;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.eventLabel,
+.bitsLabel {
+  align-items: center;
+  border-radius: 4px;
+  display: inline-flex;
+  font-size: 11px;
+  font-weight: 700;
+  gap: 2px;
+  line-height: 16px;
+  margin-right: 4px;
+  padding: 0 4px;
+  vertical-align: middle;
+}
+.eventLabel {
+  background: color-mix(in srgb, var(--mantine-color-violet-5) 20%, transparent);
+  color: var(--mantine-color-violet-2);
+}
+.bitsLabel {
+  background: color-mix(in srgb, var(--mantine-color-yellow-5) 22%, transparent);
+  color: var(--mantine-color-yellow-2);
+}
+.eventBody {
+  display: block;
+  margin-top: 2px;
+}
+.eventSystemMessage {
+  background: color-mix(in srgb, var(--mantine-color-violet-5) 14%, transparent);
+  border-radius: 4px;
+  color: var(--mantine-color-violet-1);
+  display: inline-block;
+  font-size: 13px;
+  font-weight: 700;
+  line-height: 18px;
+  margin-right: 4px;
+  padding: 1px 5px;
+}
+.eventUserMessage {
+  color: var(--mantine-color-text);
+  display: inline;
+  font-size: 14px;
+  line-height: 20px;
+}
 .emoteImage {
   padding-right: 2px;
   vertical-align: middle;
diff --git a/frontend/app/components/videos/ChatMessage.tsx b/frontend/app/components/videos/ChatMessage.tsx
index b5902105..b8f73925 100644
--- a/frontend/app/components/videos/ChatMessage.tsx
+++ b/frontend/app/components/videos/ChatMessage.tsx
@@ -1,9 +1,10 @@
 /* eslint-disable @next/next/no-img-element */
-import { Comment, GanymedeFormattedBadge, GanymedeFormattedMessageFragment, GanymedeFormattedMessageType } from "@/app/hooks/useChat";
+import { Comment, GanymedeChatMessageKind, GanymedeFormattedBadge, GanymedeFormattedMessageFragment, GanymedeFormattedMessageType } from "@/app/hooks/useChat";
 import { durationToTime } from "@/app/util/util";
 import classes from "./ChatMessage.module.css"
 import { Text, Tooltip } from "@mantine/core"
 import { useTranslations } from "next-intl";
+import { IconBolt, IconMessageCircle, IconStar } from "@tabler/icons-react";
 
 interface Params {
   comment: Comment;
@@ -19,9 +20,70 @@ const ChatMessage = ({ comment, showTimestamp, timestampSeconds, onTimestampClic
   const timestampActionLabel = hasTimestamp
     ? t("chatJumpToTimestamp", { timestamp: timestampLabel })
     : "";
+  const messageKind = comment.ganymede_chat_message_kind ?? GanymedeChatMessageKind.Normal;
+  const isEvent = messageKind === GanymedeChatMessageKind.UserNotice;
+  const isHighlighted = messageKind === GanymedeChatMessageKind.Highlighted;
+  const isAction = messageKind === GanymedeChatMessageKind.Action;
+  const bitsSpent = comment.message.bits_spent ?? 0;
+  const eventSystemMessage = isEvent ? comment.message.user_notice_params?.system_msg?.trim() : "";
+  const eventUserMessageFromParams = isEvent ? comment.message.user_notice_params?.params?.["user-message"]?.trim() : "";
+  const eventUserMessageFromBody = isEvent && eventSystemMessage && comment.message.body.startsWith(eventSystemMessage)
+    ? comment.message.body.slice(eventSystemMessage.length).trim()
+    : "";
+  const eventUserMessage = eventUserMessageFromParams || eventUserMessageFromBody;
+  const rowClassName = [
+    classes.chatMessage,
+    !showTimestamp ? classes.chatMessageNoTimestamp : "",
+    isEvent ? classes.eventMessage : "",
+    isHighlighted ? classes.highlightedMessage : "",
+    isAction ? classes.actionMessage : "",
+  ].filter(Boolean).join(" ");
+
+  const renderFormattedMessage = () => (
+    comment.ganymede_formatted_message && comment.ganymede_formatted_message.map(
+      (fragment: GanymedeFormattedMessageFragment, index: number) => {
+        switch (fragment.type) {
+          case GanymedeFormattedMessageType.Text:
+            return (
+              <Text key={`${comment._id}-text-${index}`} className={classes.message} span>
+                {fragment.text}
+              </Text>
+            )
+          case GanymedeFormattedMessageType.Emote: {
+            const emoteName = fragment.emote?.name || fragment.text;
+            // some emotes include a height, use the provided height or hardcode a standard height if not included
+            if ((fragment.emote?.height ?? 0) !== 0 && (fragment.emote?.width ?? 0) !== 0) {
+              return (
+                <Tooltip key={`${comment._id}-emote-${index}`} label={emoteName} position="top">
+                  <img
+                    src={fragment.url}
+                    className={classes.emoteImage}
+                    height={fragment.emote?.height}
+                    alt={emoteName}
+                  />
+                </Tooltip>
+              );
+            } else {
+              return (
+                <Tooltip key={`${comment._id}-emote-${index}`} label={emoteName} position="top">
+                  <img
+                    src={fragment.url}
+                    className={classes.emoteImage}
+                    alt={emoteName}
+                    height={28}
+                  />
+                </Tooltip>
+              );
+            }
+          }
+
+        }
+      }
+    )
+  );
 
   return (
-    <div key={comment._id} className={`${classes.chatMessage} ${!showTimestamp ? classes.chatMessageNoTimestamp : ""}`}>
+    <div key={comment._id} className={rowClassName}>
       {showTimestamp && (
         hasTimestamp ? (
           <button
@@ -38,6 +100,23 @@ const ChatMessage = ({ comment, showTimestamp, timestampSeconds, onTimestampClic
         )
       )}
       <span className={classes.content}>
+        {comment.message.reply && (
+          <span className={classes.replyPreview}>
+            <IconMessageCircle size={13} stroke={1.8} aria-hidden="true" />
+            <Text className={classes.replyAuthor} span>
+              {comment.message.reply.parent_display_name || comment.message.reply.parent_user_login}
+            </Text>
+            <Text className={classes.replyBody} span>
+              {comment.message.reply.parent_msg_body}
+            </Text>
+          </span>
+        )}
+        {isEvent && (
+          <span className={classes.eventLabel}>
+            <IconStar size={13} stroke={1.9} aria-hidden="true" />
+            {comment.ganymede_event_label || "Event"}
+          </span>
+        )}
         {/* badges */}
         <span>
           {comment.ganymede_formatted_badges &&
@@ -56,6 +135,12 @@ const ChatMessage = ({ comment, showTimestamp, timestampSeconds, onTimestampClic
               )
             )}
         </span>
+        {bitsSpent > 0 && (
+          <span className={classes.bitsLabel}>
+            <IconBolt size={12} stroke={2} aria-hidden="true" />
+            {bitsSpent.toLocaleString()} bits
+          </span>
+        )}
         {/* username */}
         <Text
           fw={700}
@@ -67,48 +152,22 @@ const ChatMessage = ({ comment, showTimestamp, timestampSeconds, onTimestampClic
           {comment.commenter.display_name}
         </Text>
         <Text className={classes.message} span>
-          :{" "}
+          {isAction ? " " : ": "}
         </Text>
         {/* message */}
-        {comment.ganymede_formatted_message && comment.ganymede_formatted_message.map(
-          (fragment: GanymedeFormattedMessageFragment, index: number) => {
-            switch (fragment.type) {
-              case GanymedeFormattedMessageType.Text:
-                return (
-                  <Text key={`${comment._id}-text-${index}`} className={classes.message} span>
-                    {fragment.text}
-                  </Text>
-                )
-              case GanymedeFormattedMessageType.Emote: {
-                const emoteName = fragment.emote?.name || fragment.text;
-                // some emotes include a height, use the provided height or hardcode a standard height if not included
-                if ((fragment.emote?.height ?? 0) !== 0 && (fragment.emote?.width ?? 0) !== 0) {
-                  return (
-                    <Tooltip key={`${comment._id}-emote-${index}`} label={emoteName} position="top">
-                      <img
-                        src={fragment.url}
-                        className={classes.emoteImage}
-                        height={fragment.emote?.height}
-                        alt={emoteName}
-                      />
-                    </Tooltip>
-                  );
-                } else {
-                  return (
-                    <Tooltip key={`${comment._id}-emote-${index}`} label={emoteName} position="top">
-                      <img
-                        src={fragment.url}
-                        className={classes.emoteImage}
-                        alt={emoteName}
-                        height={28}
-                      />
-                    </Tooltip>
-                  );
-                }
-              }
-
-            }
-          }
+        {isEvent && eventSystemMessage ? (
+          <span className={classes.eventBody}>
+            <Text className={classes.eventSystemMessage} span>
+              {eventSystemMessage}
+            </Text>
+            {eventUserMessage && (
+              <Text className={classes.eventUserMessage} span>
+                {eventUserMessage}
+              </Text>
+            )}
+          </span>
+        ) : (
+          renderFormattedMessage()
         )}
       </span>
 
diff --git a/frontend/app/components/videos/ChatPlayer.tsx b/frontend/app/components/videos/ChatPlayer.tsx
index 60550ce6..fc073238 100644
--- a/frontend/app/components/videos/ChatPlayer.tsx
+++ b/frontend/app/components/videos/ChatPlayer.tsx
@@ -6,6 +6,7 @@ import {
   useGetEmotesForVideo,
   useGetBadgesForVideo,
   Comment,
+  GanymedeChatMessageKind,
   GanymedeFormattedMessageFragment,
   GanymedeFormattedMessageType,
   getChatForVideo,
@@ -28,6 +29,17 @@ const TIME_SKIP_THRESHOLD = 2;
 const IGNORED_BADGES = new Set(['no_audio', 'no_video', 'predictions']);
 const SUBSCRIPTION_BADGES = new Set(['subscriber', 'sub-gifter', 'sub_gifter', 'bits']);
 const SCROLL_THRESHOLD = 100; // px from bottom to trigger auto-scroll
+const EVENT_LABELS: Record<string, string> = {
+  sub: "Sub",
+  resub: "Resub",
+  subgift: "Gift Sub",
+  anonsubgift: "Gift Sub",
+  submysterygift: "Gift Bomb",
+  raid: "Raid",
+  unraid: "Raid",
+  ritual: "Ritual",
+  announcement: "Announcement",
+};
 
 interface ChatMaps {
   emoteMap: Map<string, Emote>;
@@ -275,6 +287,35 @@ const ChatPlayer = ({ video, playerRef }: Params) => {
     }
   }, [handleError]);
 
+  const classifyComment = useCallback((comment: Comment) => {
+    const msgID = comment.message.user_notice_params?.msg_id;
+    const noticeID = typeof msgID === "string" ? msgID : "";
+
+    if (noticeID && noticeID !== "highlighted-message") {
+      comment.ganymede_chat_message_kind = GanymedeChatMessageKind.UserNotice;
+      comment.ganymede_event_label = EVENT_LABELS[noticeID] ?? "Event";
+      return comment;
+    }
+
+    if (noticeID === "highlighted-message") {
+      comment.ganymede_chat_message_kind = GanymedeChatMessageKind.Highlighted;
+      return comment;
+    }
+
+    if (comment.message.is_action) {
+      comment.ganymede_chat_message_kind = GanymedeChatMessageKind.Action;
+      return comment;
+    }
+
+    if ((comment.message.bits_spent ?? 0) > 0) {
+      comment.ganymede_chat_message_kind = GanymedeChatMessageKind.Bits;
+      return comment;
+    }
+
+    comment.ganymede_chat_message_kind = GanymedeChatMessageKind.Normal;
+    return comment;
+  }, []);
+
   const enqueueComments = useCallback((comments?: Comment[]) => {
     if (!comments?.length) return;
 
@@ -398,6 +439,7 @@ const ChatPlayer = ({ video, playerRef }: Params) => {
         // Process the message (e.g. add badges and emotes)
         const processedComment = addBadgesToFormattedComment(comment);
         processedComment.ganymede_formatted_message = addEmotesToFormattedComment(processedComment);
+        classifyComment(processedComment);
 
         // Add to batch and mark as processed
         newMessagesToAdd.push(processedComment);
@@ -415,7 +457,7 @@ const ChatPlayer = ({ video, playerRef }: Params) => {
     } catch (error) {
       handleError(error as Error, "Chat processing");
     }
-  }, [addBadgesToFormattedComment, addEmotesToFormattedComment, addProcessedId, handleError, setMessagesWithScroll]);
+  }, [addBadgesToFormattedComment, addEmotesToFormattedComment, addProcessedId, classifyComment, handleError, setMessagesWithScroll]);
 
   // Initialize chat data
   useEffect(() => {
diff --git a/frontend/app/hooks/useChat.ts b/frontend/app/hooks/useChat.ts
index 6384ac58..d79fcffb 100644
--- a/frontend/app/hooks/useChat.ts
+++ b/frontend/app/hooks/useChat.ts
@@ -40,6 +40,8 @@ export interface Comment {
   // format complex object into simpler ones for rendering
   ganymede_formatted_badges: GanymedeFormattedBadge[];
   ganymede_formatted_message: GanymedeFormattedMessageFragment[];
+  ganymede_chat_message_kind?: GanymedeChatMessageKind;
+  ganymede_event_label?: string;
 }
 
 export interface GanymedeFormattedBadge {
@@ -61,6 +63,14 @@ export enum GanymedeFormattedMessageType {
   Emote = "emote",
 }
 
+export enum GanymedeChatMessageKind {
+  Normal = "normal",
+  Action = "action",
+  Bits = "bits",
+  Highlighted = "highlighted",
+  UserNotice = "user_notice",
+}
+
 export interface GanymedeFormattedEmote {
   id: string;
   name: string;
@@ -83,18 +93,19 @@ export interface Commenter {
 
 export interface Message {
   body: string;
-  bits_spent: string;
+  bits_spent: number;
   fragments: Fragment[];
   is_action: boolean;
   user_badges: UserBadge[];
   user_color: string;
   user_notice_params: UserNoticeParams;
   Emoticons: EmoticonElement[];
+  reply?: Reply;
 }
 
 export interface Fragment {
   text: string;
-  emoticon: FragmentEmoticon;
+  emoticon: FragmentEmoticon | null;
 }
 
 export interface FragmentEmoticon {
@@ -108,7 +119,17 @@ export interface UserBadge {
 }
 
 export interface UserNoticeParams {
-  msg_id: string;
+  msg_id?: string | null;
+  system_msg?: string;
+  params?: Record<string, string>;
+}
+
+export interface Reply {
+  parent_msg_id: string;
+  parent_user_id: string;
+  parent_user_login: string;
+  parent_display_name: string;
+  parent_msg_body: string;
 }
 
 export interface EmoticonElement {
diff --git a/internal/chat/chat.go b/internal/chat/chat.go
index 9632618e..9acfc651 100644
--- a/internal/chat/chat.go
+++ b/internal/chat/chat.go
@@ -118,6 +118,15 @@ type Message struct {
 	UserColor        *string           `json:"user_color"`
 	UserNoticeParams UserNoticeParams  `json:"user_notice_params"`
 	Emoticons        []EmoticonElement `json:"emoticons"`
+	Reply            *Reply            `json:"reply,omitempty"`
+}
+
+type Reply struct {
+	ParentMsgID       string `json:"parent_msg_id"`
+	ParentUserID      string `json:"parent_user_id"`
+	ParentUserLogin   string `json:"parent_user_login"`
+	ParentDisplayName string `json:"parent_display_name"`
+	ParentMsgBody     string `json:"parent_msg_body"`
 }
 
 type EmoticonElement struct {
@@ -142,7 +151,9 @@ type UserBadge struct {
 }
 
 type UserNoticeParams struct {
-	MsgID interface{} `json:"msg_id"`
+	MsgID     interface{}       `json:"msg_id"`
+	SystemMsg string            `json:"system_msg,omitempty"`
+	Params    map[string]string `json:"params,omitempty"`
 }
 
 type Streamer struct {
diff --git a/internal/exec/twitch.go b/internal/exec/twitch.go
index af382637..04304b11 100644
--- a/internal/exec/twitch.go
+++ b/internal/exec/twitch.go
@@ -25,87 +25,119 @@ const (
 	liveChatMainFlushInterval = 5 * time.Second
 )
 
-// convertToLiveComment converts a Twitch IRC message to LiveComment format (old chat-downloader format)
+// convertToLiveComment converts a Twitch IRC message to LiveComment format (old chat-downloader format).
 func convertToLiveComment(msg twitchIRC.PrivateMessage) utils.LiveComment {
+	messageType := "text"
+	if msg.Tags["msg-id"] == "highlighted-message" {
+		messageType = "highlighted_message"
+	}
+
+	comment := newLiveComment(msg.User, msg.Tags, msg.RoomID, msg.ID, msg.Message, messageType, msg.Time)
+	comment.BitsSpent = msg.Bits
+	comment.IsAction = msg.Action
+	comment.IsFirstMessage = msg.FirstMessage
+	comment.CustomRewardID = msg.CustomRewardID
+	comment.Emotes = convertLiveCommentEmotes(msg.Emotes, 0)
+
+	if msg.Reply != nil {
+		comment.Reply = &utils.LiveCommentReply{
+			ParentMsgID:       msg.Reply.ParentMsgID,
+			ParentUserID:      msg.Reply.ParentUserID,
+			ParentUserLogin:   msg.Reply.ParentUserLogin,
+			ParentDisplayName: msg.Reply.ParentDisplayName,
+			ParentMsgBody:     msg.Reply.ParentMsgBody,
+		}
+	}
+
+	return comment
+}
+
+func convertUserNoticeToLiveComment(msg twitchIRC.UserNoticeMessage) utils.LiveComment {
+	message, emoteOffset := userNoticeDisplayMessage(msg.SystemMsg, msg.Message)
+	comment := newLiveComment(msg.User, msg.Tags, msg.RoomID, msg.ID, message, "user_notice", msg.Time)
+	comment.Emotes = convertLiveCommentEmotes(msg.Emotes, emoteOffset)
+	comment.UserNoticeParams = make(map[string]string, len(msg.MsgParams)+2)
+	comment.UserNoticeParams["msg-id"] = msg.MsgID
+	comment.UserNoticeParams["system-msg"] = msg.SystemMsg
+	if msg.Message != "" {
+		comment.UserNoticeParams["user-message"] = msg.Message
+	}
+
+	for key, value := range msg.MsgParams {
+		comment.UserNoticeParams[key] = value
+	}
+
+	return comment
+}
+
+func newLiveComment(user twitchIRC.User, tags map[string]string, roomID, id, message, messageType string, timestamp time.Time) utils.LiveComment {
 	comment := utils.LiveComment{
 		ActionType:       "add_chat_message",
-		ChannelID:        msg.RoomID,
-		ClientNonce:      msg.ID,
-		Colour:           msg.User.Color,
-		Flags:            msg.Tags["flags"],
-		Message:          msg.Message,
-		MessageID:        msg.ID,
-		MessageType:      "text",
-		ReturningChatter: msg.Tags["returning-chatter"],
-		Timestamp:        msg.Time.UnixMicro(),
-		UserType:         msg.Tags["user-type"],
-	}
-
-	// Parse first-msg tag
-	if firstMsg := msg.Tags["first-msg"]; firstMsg == "1" {
-		comment.IsFirstMessage = true
-	}
-
-	// Set author fields
-	comment.Author.DisplayName = msg.User.DisplayName
-	comment.Author.ID = msg.User.ID
-	comment.Author.Name = msg.User.Name
-	comment.Author.IsModerator = msg.User.Badges["moderator"] == 1 || msg.Tags["mod"] == "1"
-	comment.Author.IsSubscriber = msg.User.Badges["subscriber"] == 1
-	comment.Author.IsTurbo = msg.User.Badges["turbo"] == 1
-
-	// Convert badges
-	for badgeName, badgeVersion := range msg.User.Badges {
-		badge := struct {
-			ClickAction string `json:"click_action"`
-			ClickURL    string `json:"click_url"`
-			Description string `json:"description"`
-			Icons       []struct {
-				Height int    `json:"height"`
-				ID     string `json:"id"`
-				URL    string `json:"url"`
-				Width  int    `json:"width"`
-			} `json:"icons"`
-			ID      string      `json:"id"`
-			Name    string      `json:"name"`
-			Title   string      `json:"title"`
-			Version interface{} `json:"version"`
-		}{
+		ChannelID:        roomID,
+		ClientNonce:      id,
+		Colour:           user.Color,
+		Flags:            tags["flags"],
+		Message:          message,
+		MessageID:        id,
+		MessageType:      messageType,
+		ReturningChatter: tags["returning-chatter"],
+		Timestamp:        timestamp.UnixMicro(),
+		UserType:         tags["user-type"],
+	}
+
+	comment.Author.DisplayName = user.DisplayName
+	comment.Author.ID = user.ID
+	comment.Author.Name = user.Name
+	comment.Author.IsModerator = user.Badges["moderator"] == 1 || tags["mod"] == "1"
+	comment.Author.IsSubscriber = user.Badges["subscriber"] == 1 || tags["subscriber"] == "1"
+	comment.Author.IsTurbo = user.Badges["turbo"] == 1 || tags["turbo"] == "1"
+	comment.Author.Badges = convertLiveCommentBadges(user.Badges)
+
+	return comment
+}
+
+func convertLiveCommentBadges(badges map[string]int) []utils.LiveCommentBadge {
+	liveBadges := make([]utils.LiveCommentBadge, 0, len(badges))
+	for badgeName, badgeVersion := range badges {
+		liveBadges = append(liveBadges, utils.LiveCommentBadge{
 			ID:      badgeName,
 			Name:    badgeName,
 			Title:   badgeName,
 			Version: badgeVersion,
-		}
-		comment.Author.Badges = append(comment.Author.Badges, badge)
-	}
-
-	// Convert emotes
-	for _, emote := range msg.Emotes {
-		commentEmote := struct {
-			ID     string `json:"id"`
-			Images []struct {
-				Height int    `json:"height"`
-				ID     string `json:"id"`
-				URL    string `json:"url"`
-				Width  int    `json:"width"`
-			} `json:"images"`
-			Locations []string `json:"locations"`
-			Name      string   `json:"name"`
-		}{
+		})
+	}
+
+	return liveBadges
+}
+
+func convertLiveCommentEmotes(emotes []*twitchIRC.Emote, offset int) []utils.LiveCommentEmote {
+	liveEmotes := make([]utils.LiveCommentEmote, 0, len(emotes))
+	for _, emote := range emotes {
+		commentEmote := utils.LiveCommentEmote{
 			ID:   emote.ID,
 			Name: emote.Name,
 		}
 
-		// Convert emote positions to location strings
 		for _, position := range emote.Positions {
-			location := fmt.Sprintf("%d-%d", position.Start, position.End)
+			location := fmt.Sprintf("%d-%d", position.Start+offset, position.End+offset)
 			commentEmote.Locations = append(commentEmote.Locations, location)
 		}
 
-		comment.Emotes = append(comment.Emotes, commentEmote)
+		liveEmotes = append(liveEmotes, commentEmote)
 	}
 
-	return comment
+	return liveEmotes
+}
+
+func userNoticeDisplayMessage(systemMessage, userMessage string) (string, int) {
+	switch {
+	case systemMessage == "":
+		return userMessage, 0
+	case userMessage == "":
+		return systemMessage, 0
+	default:
+		return systemMessage + " " + userMessage, len(systemMessage) + 1
+	}
 }
 
 type liveChatJSONArrayWriter struct {
@@ -717,19 +749,15 @@ func SaveTwitchLiveChatToFile(ctx context.Context, channel, filename string) err
 		var lastMessageReceivedUnixNano atomic.Int64
 		lastMessageReceivedUnixNano.Store(time.Now().UnixNano())
 
-		// Handle messages
-		client.OnPrivateMessage(func(message twitchIRC.PrivateMessage) {
-			receivedAt := time.Now()
-			lastMessageReceivedUnixNano.Store(receivedAt.UnixNano())
-
-			comment := convertToLiveComment(message)
+		saveLiveComment := func(comment utils.LiveComment, receivedAt time.Time, twitchMessageTime time.Time) {
 			writeStarted := time.Now()
 			if err := chatWriter.Append(comment); err != nil {
 				errors := writeErrors.Add(1)
 				logger.Error().Err(err).
 					Int64("message_write_errors", errors).
-					Str("message_id", message.ID).
-					Msg("error saving chat message")
+					Str("message_id", comment.MessageID).
+					Str("message_type", comment.MessageType).
+					Msg("error saving live chat item")
 				return
 			}
 
@@ -746,10 +774,26 @@ func SaveTwitchLiveChatToFile(ctx context.Context, channel, filename string) err
 			if count == 1 || count%500 == 0 {
 				logger.Debug().
 					Int64("messages_saved", count).
-					Dur("message_age", receivedAt.Sub(message.Time)).
-					Time("twitch_message_time", message.Time).
-					Msg("live chat message saved")
+					Dur("message_age", receivedAt.Sub(twitchMessageTime)).
+					Time("twitch_message_time", twitchMessageTime).
+					Str("message_type", comment.MessageType).
+					Msg("live chat item saved")
 			}
+		}
+
+		// Handle messages
+		client.OnPrivateMessage(func(message twitchIRC.PrivateMessage) {
+			receivedAt := time.Now()
+			lastMessageReceivedUnixNano.Store(receivedAt.UnixNano())
+
+			saveLiveComment(convertToLiveComment(message), receivedAt, message.Time)
+		})
+
+		client.OnUserNoticeMessage(func(message twitchIRC.UserNoticeMessage) {
+			receivedAt := time.Now()
+			lastMessageReceivedUnixNano.Store(receivedAt.UnixNano())
+
+			saveLiveComment(convertUserNoticeToLiveComment(message), receivedAt, message.Time)
 		})
 
 		// Handle connection
diff --git a/internal/exec/twitch_live_chat_test.go b/internal/exec/twitch_live_chat_test.go
new file mode 100644
index 00000000..e402b954
--- /dev/null
+++ b/internal/exec/twitch_live_chat_test.go
@@ -0,0 +1,133 @@
+package exec
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	twitchIRC "github.com/gempir/go-twitch-irc/v4"
+)
+
+func TestConvertToLiveCommentIncludesReply(t *testing.T) {
+	message := twitchIRC.PrivateMessage{
+		User: twitchIRC.User{
+			ID:          "269899575",
+			Name:        "fletchercodes",
+			DisplayName: "FletcherCodes",
+			Color:       "#DAA520",
+			Badges:      map[string]int{"subscriber": 12},
+		},
+		Tags: map[string]string{
+			"flags":             "",
+			"returning-chatter": "0",
+			"user-type":         "",
+			"subscriber":        "1",
+		},
+		RoomID:         "408892348",
+		ID:             "6efffc70-27a1-4637-9111-44e5104bb7da",
+		Time:           time.Unix(1_551_473_087, 761_000_000),
+		Message:        "Chew your food slower... it's healthier",
+		Bits:           100,
+		Action:         true,
+		FirstMessage:   true,
+		CustomRewardID: "reward-id",
+		Reply: &twitchIRC.Reply{
+			ParentMsgID:       "b34ccfc7-4977-403a-8a94-33c6bac34fb8",
+			ParentUserID:      "71601484",
+			ParentUserLogin:   "yannismate",
+			ParentDisplayName: "Yannismate",
+			ParentMsgBody:     "This message contains special chars !:",
+		},
+	}
+
+	comment := convertToLiveComment(message)
+
+	if comment.Reply == nil {
+		t.Fatal("expected reply metadata")
+	}
+	if comment.Reply.ParentMsgID != message.Reply.ParentMsgID {
+		t.Fatalf("expected parent message ID %q, got %q", message.Reply.ParentMsgID, comment.Reply.ParentMsgID)
+	}
+	if comment.Reply.ParentMsgBody != message.Reply.ParentMsgBody {
+		t.Fatalf("expected parent body %q, got %q", message.Reply.ParentMsgBody, comment.Reply.ParentMsgBody)
+	}
+	if comment.BitsSpent != 100 {
+		t.Fatalf("expected bits spent to be copied, got %d", comment.BitsSpent)
+	}
+	if !comment.IsAction {
+		t.Fatal("expected action flag to be copied")
+	}
+	if !comment.IsFirstMessage {
+		t.Fatal("expected first message flag to be copied")
+	}
+	if comment.CustomRewardID != "reward-id" {
+		t.Fatalf("expected custom reward ID, got %q", comment.CustomRewardID)
+	}
+}
+
+func TestConvertUserNoticeToLiveCommentResubWithUserMessage(t *testing.T) {
+	raw := `@badges=moderator/1,subscriber/24;color=#1FD2FF;display-name=Karl_Kons;emotes=28087:0-6;flags=;id=7c95beea-a7ac-4c10-9e0a-d7dbf163c038;login=karl_kons;mod=1;msg-id=resub;msg-param-months=34;msg-param-sub-plan-name=look\sat\sthose\sshitty\semotes,\srip\s$5\sLUL;msg-param-sub-plan=1000;room-id=11148817;subscriber=1;system-msg=Karl_Kons\sjust\ssubscribed\swith\sa\sTier\s1\ssub.\sKarl_Kons\ssubscribed\sfor\s34\smonths\sin\sa\srow!;tmi-sent-ts=1540140252828;turbo=0;user-id=68706331;user-type=mod :tmi.twitch.tv USERNOTICE #pajlada :WutFace`
+	message, ok := twitchIRC.ParseMessage(raw).(*twitchIRC.UserNoticeMessage)
+	if !ok {
+		t.Fatal("expected user notice message")
+	}
+
+	comment := convertUserNoticeToLiveComment(*message)
+
+	expectedBody := "Karl_Kons just subscribed with a Tier 1 sub. Karl_Kons subscribed for 34 months in a row! WutFace"
+	if comment.Message != expectedBody {
+		t.Fatalf("expected body %q, got %q", expectedBody, comment.Message)
+	}
+	if comment.MessageType != "user_notice" {
+		t.Fatalf("expected user_notice message type, got %q", comment.MessageType)
+	}
+	if comment.UserNoticeParams["msg-id"] != "resub" {
+		t.Fatalf("expected msg-id resub, got %q", comment.UserNoticeParams["msg-id"])
+	}
+	if comment.UserNoticeParams["msg-param-months"] != "34" {
+		t.Fatalf("expected msg-param-months 34, got %q", comment.UserNoticeParams["msg-param-months"])
+	}
+	if comment.UserNoticeParams["user-message"] != "WutFace" {
+		t.Fatalf("expected user-message WutFace, got %q", comment.UserNoticeParams["user-message"])
+	}
+}
+
+func TestConvertUserNoticeToLiveCommentRaidWithoutUserMessage(t *testing.T) {
+	raw := `@badges=partner/1;color=#00FF7F;display-name=FletcherCodes;emotes=;flags=;id=7a61cd41-f049-466b-9654-43e5bfc554aa;login=fletchercodes;mod=0;msg-id=raid;msg-param-displayName=FletcherCodes;msg-param-login=fletchercodes;msg-param-profileImageURL=https://static-cdn.jtvnw.net/jtv_user_pictures/herr_currywurst-profile_image-e6c037c9d321b955-70x70.jpeg;msg-param-viewerCount=538;room-id=269899575;subscriber=0;system-msg=538\sraiders\sfrom\sFletcherCodes\shave\sjoined\n!;tmi-sent-ts=1551490358542;turbo=0;user-id=269899575;user-type= :tmi.twitch.tv USERNOTICE #clippyassistant`
+	message, ok := twitchIRC.ParseMessage(raw).(*twitchIRC.UserNoticeMessage)
+	if !ok {
+		t.Fatal("expected user notice message")
+	}
+
+	comment := convertUserNoticeToLiveComment(*message)
+
+	if comment.Message != "538 raiders from FletcherCodes have joined!" {
+		t.Fatalf("unexpected raid message body: %q", comment.Message)
+	}
+	if comment.UserNoticeParams["msg-id"] != "raid" {
+		t.Fatalf("expected msg-id raid, got %q", comment.UserNoticeParams["msg-id"])
+	}
+	if comment.UserNoticeParams["msg-param-viewerCount"] != "538" {
+		t.Fatalf("expected viewer count 538, got %q", comment.UserNoticeParams["msg-param-viewerCount"])
+	}
+}
+
+func TestConvertUserNoticeToLiveCommentShiftsUserMessageEmotes(t *testing.T) {
+	raw := `@badges=;color=;display-name=FletcherCodes;emotes=64138:0-8;flags=;id=e4090aa9-8079-41ff-904d-64c7a2193ee0;login=fletchercodes;mod=0;msg-id=ritual;msg-param-ritual-name=new_chatter;room-id=408892348;subscriber=0;system-msg=@FletcherCodes\sis\snew\shere.\sSay\shello!;tmi-sent-ts=1551487438943;turbo=0;user-id=412636239;user-type= :tmi.twitch.tv USERNOTICE #clippyassistant :SeemsGood`
+	message, ok := twitchIRC.ParseMessage(raw).(*twitchIRC.UserNoticeMessage)
+	if !ok {
+		t.Fatal("expected user notice message")
+	}
+
+	comment := convertUserNoticeToLiveComment(*message)
+
+	if len(comment.Emotes) != 1 || len(comment.Emotes[0].Locations) != 1 {
+		t.Fatalf("expected one emote location, got %#v", comment.Emotes)
+	}
+
+	offset := len(message.SystemMsg) + 1
+	expectedLocation := fmt.Sprintf("%d-%d", offset, offset+len(message.Message)-1)
+	if comment.Emotes[0].Locations[0] != expectedLocation {
+		t.Fatalf("expected shifted emote location %q, got %q", expectedLocation, comment.Emotes[0].Locations[0])
+	}
+}
diff --git a/internal/tasks/live_chat.go b/internal/tasks/live_chat.go
index 268b9d87..6bae5420 100644
--- a/internal/tasks/live_chat.go
+++ b/internal/tasks/live_chat.go
@@ -252,6 +252,9 @@ func (w ConvertLiveChatWorker) Work(ctx context.Context, job *river.Job[ConvertL
 	if err != nil {
 		return err
 	}
+	if err := utils.EnrichTwitchChatMetadataFromLiveChat(dbItems.Video.TmpLiveChatDownloadPath, dbItems.Video.TmpChatDownloadPath); err != nil {
+		return err
+	}
 
 	// set queue status to completed
 	err = setQueueStatus(ctx, store.Client, QueueStatusInput{
diff --git a/internal/utils/live_chat.go b/internal/utils/live_chat.go
index 8a6e4af8..fca75944 100644
--- a/internal/utils/live_chat.go
+++ b/internal/utils/live_chat.go
@@ -9,53 +9,74 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
+type LiveCommentBadgeIcon struct {
+	Height int    `json:"height"`
+	ID     string `json:"id"`
+	URL    string `json:"url"`
+	Width  int    `json:"width"`
+}
+
+type LiveCommentBadge struct {
+	ClickAction string                 `json:"click_action"`
+	ClickURL    string                 `json:"click_url"`
+	Description string                 `json:"description"`
+	Icons       []LiveCommentBadgeIcon `json:"icons"`
+	ID          string                 `json:"id"`
+	Name        string                 `json:"name"`
+	Title       string                 `json:"title"`
+	Version     interface{}            `json:"version"`
+}
+
+type LiveCommentEmoteImage struct {
+	Height int    `json:"height"`
+	ID     string `json:"id"`
+	URL    string `json:"url"`
+	Width  int    `json:"width"`
+}
+
+type LiveCommentEmote struct {
+	ID        string                  `json:"id"`
+	Images    []LiveCommentEmoteImage `json:"images"`
+	Locations []string                `json:"locations"`
+	Name      string                  `json:"name"`
+}
+
+type LiveCommentReply struct {
+	ParentMsgID       string `json:"parent_msg_id"`
+	ParentUserID      string `json:"parent_user_id"`
+	ParentUserLogin   string `json:"parent_user_login"`
+	ParentDisplayName string `json:"parent_display_name"`
+	ParentMsgBody     string `json:"parent_msg_body"`
+}
+
 type LiveComment struct {
 	ActionType string `json:"action_type"`
 	Author     struct {
-		Badges []struct {
-			ClickAction string `json:"click_action"`
-			ClickURL    string `json:"click_url"`
-			Description string `json:"description"`
-			Icons       []struct {
-				Height int    `json:"height"`
-				ID     string `json:"id"`
-				URL    string `json:"url"`
-				Width  int    `json:"width"`
-			} `json:"icons"`
-			ID      string      `json:"id"`
-			Name    string      `json:"name"`
-			Title   string      `json:"title"`
-			Version interface{} `json:"version"`
-		} `json:"badges"`
-		DisplayName  string `json:"display_name"`
-		ID           string `json:"id"`
-		IsModerator  bool   `json:"is_moderator"`
-		IsSubscriber bool   `json:"is_subscriber"`
-		IsTurbo      bool   `json:"is_turbo"`
-		Name         string `json:"name"`
+		Badges       []LiveCommentBadge `json:"badges"`
+		DisplayName  string             `json:"display_name"`
+		ID           string             `json:"id"`
+		IsModerator  bool               `json:"is_moderator"`
+		IsSubscriber bool               `json:"is_subscriber"`
+		IsTurbo      bool               `json:"is_turbo"`
+		Name         string             `json:"name"`
 	} `json:"author"`
-	ChannelID   string `json:"channel_id"`
-	ClientNonce string `json:"client_nonce"`
-	Colour      string `json:"colour"`
-	Emotes      []struct {
-		ID     string `json:"id"`
-		Images []struct {
-			Height int    `json:"height"`
-			ID     string `json:"id"`
-			URL    string `json:"url"`
-			Width  int    `json:"width"`
-		} `json:"images"`
-		Locations []string `json:"locations"`
-		Name      string   `json:"name"`
-	} `json:"emotes"`
-	Flags            string `json:"flags"`
-	IsFirstMessage   bool   `json:"is_first_message"`
-	Message          string `json:"message"`
-	MessageID        string `json:"message_id"`
-	MessageType      string `json:"message_type"`
-	ReturningChatter string `json:"returning_chatter"`
-	Timestamp        int64  `json:"timestamp"`
-	UserType         string `json:"user_type"`
+	ChannelID        string             `json:"channel_id"`
+	ClientNonce      string             `json:"client_nonce"`
+	Colour           string             `json:"colour"`
+	Emotes           []LiveCommentEmote `json:"emotes"`
+	Flags            string             `json:"flags"`
+	IsFirstMessage   bool               `json:"is_first_message"`
+	Message          string             `json:"message"`
+	MessageID        string             `json:"message_id"`
+	MessageType      string             `json:"message_type"`
+	ReturningChatter string             `json:"returning_chatter"`
+	Timestamp        int64              `json:"timestamp"`
+	UserType         string             `json:"user_type"`
+	BitsSpent        int                `json:"bits_spent,omitempty"`
+	IsAction         bool               `json:"is_action,omitempty"`
+	CustomRewardID   string             `json:"custom_reward_id,omitempty"`
+	Reply            *LiveCommentReply  `json:"reply,omitempty"`
+	UserNoticeParams map[string]string  `json:"user_notice_params,omitempty"`
 }
 
 func OpenLiveChatFile(path string) ([]LiveComment, error) {
diff --git a/internal/utils/tdl.go b/internal/utils/tdl.go
index b557c469..1620dc85 100644
--- a/internal/utils/tdl.go
+++ b/internal/utils/tdl.go
@@ -50,9 +50,19 @@ type Message struct {
 	Body             string          `json:"body"`
 	BitsSpent        int             `json:"bits_spent"`
 	Fragments        []Fragment      `json:"fragments"`
+	IsAction         bool            `json:"is_action"`
 	UserBadges       []UserBadge     `json:"user_badges"`
 	UserColor        string          `json:"user_color"`
 	UserNoticeParams UserNoticParams `json:"user_notice_params"`
+	Reply            *ChatReply      `json:"reply,omitempty"`
+}
+
+type ChatReply struct {
+	ParentMsgID       string `json:"parent_msg_id"`
+	ParentUserID      string `json:"parent_user_id"`
+	ParentUserLogin   string `json:"parent_user_login"`
+	ParentDisplayName string `json:"parent_display_name"`
+	ParentMsgBody     string `json:"parent_msg_body"`
 }
 
 type Fragment struct {
@@ -68,7 +78,9 @@ type UserBadge struct {
 }
 
 type UserNoticParams struct {
-	MsgID *string `json:"msg-id"`
+	MsgID     *string           `json:"msg-id,omitempty"`
+	SystemMsg string            `json:"system-msg,omitempty"`
+	Params    map[string]string `json:"params,omitempty"`
 }
 
 type Emoticon struct {
@@ -159,7 +171,8 @@ func ConvertTwitchLiveChatToTDLChat(path string, outPath string, channelName str
 			},
 			Message: Message{
 				Body:       liveComment.Message,
-				BitsSpent:  0,
+				BitsSpent:  liveComment.BitsSpent,
+				IsAction:   liveComment.IsAction,
 				UserBadges: []UserBadge{},
 				UserColor:  liveComment.Colour,
 				UserNoticeParams: UserNoticParams{
@@ -168,10 +181,23 @@ func ConvertTwitchLiveChatToTDLChat(path string, outPath string, channelName str
 			},
 		}
 
+		if liveComment.Reply != nil {
+			tdlComment.Message.Reply = liveCommentReplyToChatReply(liveComment.Reply)
+		}
+
 		if liveComment.MessageType == "highlighted_message" {
 			var highlightString = "highlighted-message"
 			tdlComment.Message.UserNoticeParams.MsgID = &highlightString
 		}
+		if msgID, ok := liveComment.UserNoticeParams["msg-id"]; ok && msgID != "" {
+			tdlComment.Message.UserNoticeParams.MsgID = &msgID
+		}
+		if systemMsg, ok := liveComment.UserNoticeParams["system-msg"]; ok {
+			tdlComment.Message.UserNoticeParams.SystemMsg = systemMsg
+		}
+		if len(liveComment.UserNoticeParams) > 0 {
+			tdlComment.Message.UserNoticeParams.Params = liveUserNoticeParams(liveComment.UserNoticeParams)
+		}
 
 		// create the first message fragment
 		tdlComment.Message.Fragments = append(tdlComment.Message.Fragments, Fragment{
@@ -353,6 +379,170 @@ func writeTDLChat(parsedChat TDLChat, outPath string) error {
 	return nil
 }
 
+type liveChatMetadata struct {
+	BitsSpent        int
+	IsAction         bool
+	Reply            *LiveCommentReply
+	UserNoticeParams map[string]string
+}
+
+type finalChatReply struct {
+	ParentMsgID       string `json:"parent_msg_id"`
+	ParentUserID      string `json:"parent_user_id"`
+	ParentUserLogin   string `json:"parent_user_login"`
+	ParentDisplayName string `json:"parent_display_name"`
+	ParentMsgBody     string `json:"parent_msg_body"`
+}
+
+type finalChatUserNoticeParams struct {
+	MsgID     string            `json:"msg_id,omitempty"`
+	SystemMsg string            `json:"system_msg,omitempty"`
+	Params    map[string]string `json:"params,omitempty"`
+}
+
+func EnrichTwitchChatMetadataFromLiveChat(liveChatPath string, chatPath string) error {
+	liveComments, err := OpenLiveChatFile(liveChatPath)
+	if err != nil {
+		return err
+	}
+
+	metadataByID := make(map[string]liveChatMetadata)
+	for _, liveComment := range liveComments {
+		if liveComment.MessageID == "" {
+			continue
+		}
+
+		userNoticeParams := liveComment.UserNoticeParams
+		if liveComment.MessageType == "highlighted_message" && len(userNoticeParams) == 0 {
+			userNoticeParams = map[string]string{"msg-id": "highlighted-message"}
+		}
+
+		metadata := liveChatMetadata{
+			BitsSpent:        liveComment.BitsSpent,
+			IsAction:         liveComment.IsAction,
+			Reply:            liveComment.Reply,
+			UserNoticeParams: userNoticeParams,
+		}
+
+		if metadata.BitsSpent == 0 && !metadata.IsAction && metadata.Reply == nil && len(metadata.UserNoticeParams) == 0 {
+			continue
+		}
+
+		metadataByID[liveComment.MessageID] = metadata
+	}
+
+	if len(metadataByID) == 0 {
+		return nil
+	}
+
+	data, err := os.ReadFile(chatPath)
+	if err != nil {
+		return fmt.Errorf("failed to read chat file for metadata enrichment: %w", err)
+	}
+
+	var chatData map[string]interface{}
+	if err := json.Unmarshal(data, &chatData); err != nil {
+		return fmt.Errorf("failed to unmarshal chat file for metadata enrichment: %w", err)
+	}
+
+	rawComments, ok := chatData["comments"].([]interface{})
+	if !ok {
+		return fmt.Errorf("failed to enrich chat metadata: comments field missing or invalid")
+	}
+
+	enrichedCount := 0
+	for _, rawComment := range rawComments {
+		comment, ok := rawComment.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		id, ok := comment["_id"].(string)
+		if !ok || id == "" {
+			continue
+		}
+
+		metadata, ok := metadataByID[id]
+		if !ok {
+			continue
+		}
+
+		message, ok := comment["message"].(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		if metadata.BitsSpent > 0 {
+			message["bits_spent"] = metadata.BitsSpent
+		}
+		if metadata.IsAction {
+			message["is_action"] = true
+		}
+		if metadata.Reply != nil {
+			message["reply"] = finalChatReply{
+				ParentMsgID:       metadata.Reply.ParentMsgID,
+				ParentUserID:      metadata.Reply.ParentUserID,
+				ParentUserLogin:   metadata.Reply.ParentUserLogin,
+				ParentDisplayName: metadata.Reply.ParentDisplayName,
+				ParentMsgBody:     metadata.Reply.ParentMsgBody,
+			}
+		}
+		if len(metadata.UserNoticeParams) > 0 {
+			message["user_notice_params"] = finalUserNoticeParams(metadata.UserNoticeParams)
+		}
+
+		enrichedCount++
+	}
+
+	output, err := json.Marshal(chatData)
+	if err != nil {
+		return fmt.Errorf("failed to marshal enriched chat metadata: %w", err)
+	}
+	if err := os.WriteFile(chatPath, output, 0o644); err != nil {
+		return fmt.Errorf("failed to write enriched chat metadata: %w", err)
+	}
+
+	log.Debug().
+		Str("live_chat_file", liveChatPath).
+		Str("chat_file", chatPath).
+		Int("enriched_comments", enrichedCount).
+		Msg("enriched Twitch chat metadata")
+
+	return nil
+}
+
+func liveCommentReplyToChatReply(reply *LiveCommentReply) *ChatReply {
+	return &ChatReply{
+		ParentMsgID:       reply.ParentMsgID,
+		ParentUserID:      reply.ParentUserID,
+		ParentUserLogin:   reply.ParentUserLogin,
+		ParentDisplayName: reply.ParentDisplayName,
+		ParentMsgBody:     reply.ParentMsgBody,
+	}
+}
+
+func liveUserNoticeParams(params map[string]string) map[string]string {
+	noticeParams := make(map[string]string, len(params))
+	for key, value := range params {
+		if key == "msg-id" || key == "system-msg" {
+			continue
+		}
+		noticeParams[key] = value
+	}
+	if len(noticeParams) == 0 {
+		return nil
+	}
+	return noticeParams
+}
+
+func finalUserNoticeParams(params map[string]string) finalChatUserNoticeParams {
+	return finalChatUserNoticeParams{
+		MsgID:     params["msg-id"],
+		SystemMsg: params["system-msg"],
+		Params:    liveUserNoticeParams(params),
+	}
+}
+
 func microSecondToMillisecondUnix(t int64) (time.Time, error) {
 	sT := strconv.FormatInt(t, 10)
 	fST := sT[:len(sT)-3]
diff --git a/internal/utils/tdl_test.go b/internal/utils/tdl_test.go
new file mode 100644
index 00000000..48725d76
--- /dev/null
+++ b/internal/utils/tdl_test.go
@@ -0,0 +1,236 @@
+package utils
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+)
+
+func TestConvertTwitchLiveChatToTDLChatKeepsMessagesAndUserNotices(t *testing.T) {
+	tmpDir := t.TempDir()
+	inputPath := filepath.Join(tmpDir, "live-chat.json")
+	outputPath := filepath.Join(tmpDir, "tdl-chat.json")
+	chatStart := time.Unix(1_700_000_000, 0)
+
+	normalComment := LiveComment{
+		ActionType:  "add_chat_message",
+		ChannelID:   "408892348",
+		Colour:      "#1FD2FF",
+		Message:     "hello chat",
+		MessageID:   "normal-message-id",
+		MessageType: "text",
+		Timestamp:   chatStart.Add(2 * time.Second).UnixMicro(),
+		BitsSpent:   50,
+		IsAction:    true,
+		Reply: &LiveCommentReply{
+			ParentMsgID:       "parent-message-id",
+			ParentUserID:      "222",
+			ParentUserLogin:   "parentuser",
+			ParentDisplayName: "ParentUser",
+			ParentMsgBody:     "original message",
+		},
+	}
+	normalComment.Author.DisplayName = "NormalUser"
+	normalComment.Author.ID = "111"
+	normalComment.Author.Name = "normaluser"
+	normalComment.Author.IsSubscriber = true
+	normalComment.Author.Badges = []LiveCommentBadge{
+		{Name: "subscriber", Version: 12},
+	}
+
+	userNoticeComment := LiveComment{
+		ActionType:  "add_chat_message",
+		ChannelID:   "408892348",
+		Colour:      "#00FF7F",
+		Message:     "NormalUser just subscribed with a Tier 1 sub. Great stream!",
+		MessageID:   "notice-message-id",
+		MessageType: "user_notice",
+		Timestamp:   chatStart.Add(5 * time.Second).UnixMicro(),
+		UserNoticeParams: map[string]string{
+			"msg-id":                  "resub",
+			"system-msg":              "NormalUser just subscribed with a Tier 1 sub.",
+			"msg-param-months":        "12",
+			"msg-param-sub-plan":      "1000",
+			"msg-param-sub-plan-name": "Channel Subscription",
+		},
+	}
+	userNoticeComment.Author.DisplayName = "NormalUser"
+	userNoticeComment.Author.ID = "111"
+	userNoticeComment.Author.Name = "normaluser"
+
+	input, err := json.Marshal([]LiveComment{normalComment, userNoticeComment})
+	if err != nil {
+		t.Fatalf("failed to marshal live comments: %v", err)
+	}
+	if err := os.WriteFile(inputPath, input, 0o644); err != nil {
+		t.Fatalf("failed to write live comments: %v", err)
+	}
+
+	err = ConvertTwitchLiveChatToTDLChat(inputPath, outputPath, "clippyassistant", "video-id", "external-id", 408892348, chatStart, "previous-video-id")
+	if err != nil {
+		t.Fatalf("ConvertTwitchLiveChatToTDLChat returned error: %v", err)
+	}
+
+	output, err := os.ReadFile(outputPath)
+	if err != nil {
+		t.Fatalf("failed to read output chat: %v", err)
+	}
+
+	var chat TDLChat
+	if err := json.Unmarshal(output, &chat); err != nil {
+		t.Fatalf("failed to unmarshal output chat: %v", err)
+	}
+
+	if len(chat.Comments) != 3 {
+		t.Fatalf("expected initial comment plus two live comments, got %d", len(chat.Comments))
+	}
+
+	convertedNormal := chat.Comments[1]
+	if convertedNormal.ID != normalComment.MessageID {
+		t.Fatalf("expected normal comment ID %q, got %q", normalComment.MessageID, convertedNormal.ID)
+	}
+	if convertedNormal.Message.Body != normalComment.Message {
+		t.Fatalf("expected normal body %q, got %q", normalComment.Message, convertedNormal.Message.Body)
+	}
+	if convertedNormal.Message.BitsSpent != normalComment.BitsSpent {
+		t.Fatalf("expected bits spent %d, got %d", normalComment.BitsSpent, convertedNormal.Message.BitsSpent)
+	}
+	if !convertedNormal.Message.IsAction {
+		t.Fatal("expected action flag")
+	}
+	if convertedNormal.Message.Reply == nil {
+		t.Fatal("expected reply metadata")
+	}
+	if convertedNormal.Message.Reply.ParentMsgID != "parent-message-id" {
+		t.Fatalf("expected reply parent message ID, got %q", convertedNormal.Message.Reply.ParentMsgID)
+	}
+	if len(convertedNormal.Message.UserBadges) != 1 || convertedNormal.Message.UserBadges[0].ID != "subscriber" {
+		t.Fatalf("expected subscriber badge, got %#v", convertedNormal.Message.UserBadges)
+	}
+
+	convertedNotice := chat.Comments[2]
+	if convertedNotice.ID != userNoticeComment.MessageID {
+		t.Fatalf("expected notice comment ID %q, got %q", userNoticeComment.MessageID, convertedNotice.ID)
+	}
+	if convertedNotice.Message.Body != userNoticeComment.Message {
+		t.Fatalf("expected notice body %q, got %q", userNoticeComment.Message, convertedNotice.Message.Body)
+	}
+	if convertedNotice.Message.UserNoticeParams.MsgID == nil {
+		t.Fatal("expected notice msg-id")
+	}
+	if *convertedNotice.Message.UserNoticeParams.MsgID != "resub" {
+		t.Fatalf("expected notice msg-id resub, got %q", *convertedNotice.Message.UserNoticeParams.MsgID)
+	}
+	if convertedNotice.Message.UserNoticeParams.SystemMsg != userNoticeComment.UserNoticeParams["system-msg"] {
+		t.Fatalf("expected notice system message, got %q", convertedNotice.Message.UserNoticeParams.SystemMsg)
+	}
+	if convertedNotice.Message.UserNoticeParams.Params["msg-param-months"] != "12" {
+		t.Fatalf("expected notice params, got %#v", convertedNotice.Message.UserNoticeParams.Params)
+	}
+}
+
+func TestEnrichTwitchChatMetadataFromLiveChat(t *testing.T) {
+	tmpDir := t.TempDir()
+	liveChatPath := filepath.Join(tmpDir, "live-chat.json")
+	chatPath := filepath.Join(tmpDir, "chat.json")
+	chatStart := time.Unix(1_700_000_000, 0)
+
+	liveComments := []LiveComment{
+		{
+			Message:   "hello chat",
+			MessageID: "normal-message-id",
+			Timestamp: chatStart.UnixMicro(),
+		},
+		{
+			Message:   "reply body",
+			MessageID: "reply-message-id",
+			Timestamp: chatStart.Add(time.Second).UnixMicro(),
+			BitsSpent: 25,
+			IsAction:  true,
+			Reply: &LiveCommentReply{
+				ParentMsgID:       "parent-id",
+				ParentUserID:      "222",
+				ParentUserLogin:   "parentuser",
+				ParentDisplayName: "ParentUser",
+				ParentMsgBody:     "parent body",
+			},
+		},
+		{
+			Message:   "Somebody subscribed!",
+			MessageID: "notice-message-id",
+			Timestamp: chatStart.Add(2 * time.Second).UnixMicro(),
+			UserNoticeParams: map[string]string{
+				"msg-id":           "sub",
+				"system-msg":       "Somebody subscribed!",
+				"msg-param-months": "1",
+			},
+		},
+	}
+
+	liveInput, err := json.Marshal(liveComments)
+	if err != nil {
+		t.Fatalf("failed to marshal live comments: %v", err)
+	}
+	if err := os.WriteFile(liveChatPath, liveInput, 0o644); err != nil {
+		t.Fatalf("failed to write live chat: %v", err)
+	}
+
+	chatInput := []byte(`{
+		"streamer":{"name":"channel","id":123},
+		"comments":[
+			{"_id":"normal-message-id","message":{"body":"hello chat","bits_spent":0,"is_action":false}},
+			{"_id":"reply-message-id","message":{"body":"reply body","bits_spent":0,"is_action":false}},
+			{"_id":"notice-message-id","message":{"body":"Somebody subscribed!","bits_spent":0,"is_action":false}}
+		],
+		"embeddedData":{"kept":true}
+	}`)
+	if err := os.WriteFile(chatPath, chatInput, 0o644); err != nil {
+		t.Fatalf("failed to write chat: %v", err)
+	}
+
+	if err := EnrichTwitchChatMetadataFromLiveChat(liveChatPath, chatPath); err != nil {
+		t.Fatalf("EnrichTwitchChatMetadataFromLiveChat returned error: %v", err)
+	}
+
+	output, err := os.ReadFile(chatPath)
+	if err != nil {
+		t.Fatalf("failed to read enriched chat: %v", err)
+	}
+
+	var enriched struct {
+		Comments []struct {
+			ID      string `json:"_id"`
+			Message struct {
+				BitsSpent        int                       `json:"bits_spent"`
+				IsAction         bool                      `json:"is_action"`
+				Reply            *finalChatReply           `json:"reply"`
+				UserNoticeParams finalChatUserNoticeParams `json:"user_notice_params"`
+			} `json:"message"`
+		} `json:"comments"`
+		EmbeddedData map[string]bool `json:"embeddedData"`
+	}
+	if err := json.Unmarshal(output, &enriched); err != nil {
+		t.Fatalf("failed to unmarshal enriched chat: %v", err)
+	}
+
+	if !enriched.EmbeddedData["kept"] {
+		t.Fatal("expected unrelated top-level fields to be preserved")
+	}
+	if enriched.Comments[0].Message.Reply != nil || enriched.Comments[0].Message.UserNoticeParams.MsgID != "" {
+		t.Fatalf("expected untouched normal comment, got %#v", enriched.Comments[0].Message)
+	}
+	if enriched.Comments[1].Message.BitsSpent != 25 || !enriched.Comments[1].Message.IsAction {
+		t.Fatalf("expected bits/action metadata, got %#v", enriched.Comments[1].Message)
+	}
+	if enriched.Comments[1].Message.Reply == nil || enriched.Comments[1].Message.Reply.ParentMsgID != "parent-id" {
+		t.Fatalf("expected reply metadata, got %#v", enriched.Comments[1].Message.Reply)
+	}
+	if enriched.Comments[2].Message.UserNoticeParams.MsgID != "sub" {
+		t.Fatalf("expected user notice msg ID, got %#v", enriched.Comments[2].Message.UserNoticeParams)
+	}
+	if enriched.Comments[2].Message.UserNoticeParams.Params["msg-param-months"] != "1" {
+		t.Fatalf("expected user notice params, got %#v", enriched.Comments[2].Message.UserNoticeParams.Params)
+	}
+}