diff --git a/orchestrator/src/client/components/ghostwriter/MessageList.tsx b/orchestrator/src/client/components/ghostwriter/MessageList.tsx
index f62f637..297d4de 100644
--- a/orchestrator/src/client/components/ghostwriter/MessageList.tsx
+++ b/orchestrator/src/client/components/ghostwriter/MessageList.tsx
@@ -1,5 +1,7 @@
 import type { JobChatMessage } from "@shared/types";
 import type React from "react";
+import ReactMarkdown from "react-markdown";
+import remarkGfm from "remark-gfm";
 import { StreamingMessage } from "./StreamingMessage";
 
 type MessageListProps = {
@@ -39,10 +41,15 @@ export const MessageList: React.FC<MessageListProps> = ({
               </div>
               {isActiveStreaming ? (
                 <StreamingMessage content={message.content} />
+              ) : message.role === "assistant" ? (
+                <div className="text-sm leading-relaxed text-foreground [&_a]:text-primary [&_a]:underline [&_blockquote]:border-l [&_blockquote]:border-border [&_blockquote]:pl-3 [&_code]:rounded [&_code]:bg-muted/40 [&_code]:px-1 [&_h1]:mt-4 [&_h1]:text-base [&_h1]:font-semibold [&_h2]:mt-4 [&_h2]:text-sm [&_h2]:font-semibold [&_h3]:mt-3 [&_h3]:text-sm [&_h3]:font-semibold [&_li]:my-1 [&_ol]:my-2 [&_ol]:list-decimal [&_ol]:pl-5 [&_p]:my-2 [&_pre]:my-3 [&_pre]:overflow-x-auto [&_pre]:rounded [&_pre]:bg-muted/40 [&_pre]:p-3 [&_ul]:my-2 [&_ul]:list-disc [&_ul]:pl-5">
+                  <ReactMarkdown remarkPlugins={[remarkGfm]}>
+                    {message.content || "..."}
+                  </ReactMarkdown>
+                </div>
               ) : (
                 <div className="whitespace-pre-wrap text-sm leading-relaxed text-foreground">
-                  {message.content ||
-                    (message.role === "assistant" ? "..." : "")}
+                  {message.content}
                 </div>
               )}
             </div>