diff --git a/website/src/components/ContextMessages.tsx b/website/src/components/ContextMessages.tsx
deleted file mode 100644
index 8217f8b7..00000000
--- a/website/src/components/ContextMessages.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Box } from "@chakra-ui/react";
-import { Message } from "src/components/Messages";
-
-export const ContextMessages = ({ messages }: { messages: Message[] }) => {
-  return (
-    <Box className="flex flex-col gap-1">
-      {messages.map((message, i) => {
-        return (
-          <Box key={i}>
-            <span>{message.is_assistant ? "Assistant: " : "User: "}</span>
-            <span>{message.text}</span>
-          </Box>
-        );
-      })}
-    </Box>
-  );
-};
diff --git a/website/src/components/Tasks/EvaluateTask.tsx b/website/src/components/Tasks/EvaluateTask.tsx
index 94b47fbb..c45d3dbe 100644
--- a/website/src/components/Tasks/EvaluateTask.tsx
+++ b/website/src/components/Tasks/EvaluateTask.tsx
@@ -1,9 +1,10 @@
 import { useState } from "react";
-import { ContextMessages } from "src/components/ContextMessages";
 import { Sortable } from "src/components/Sortable/Sortable";
 import { SurveyCard } from "src/components/Survey/SurveyCard";
 import { TaskControlsOverridable } from "src/components/Survey/TaskControlsOverridable";
 
+import { MessageTable } from "../Messages/MessageTable";
+
 export const EvaluateTask = ({ tasks, trigger, mutate, mainBgClasses }) => {
   const [ranking, setRanking] = useState<number[]>([]);
   const submitResponse = (task) => {
@@ -20,6 +21,11 @@ export const EvaluateTask = ({ tasks, trigger, mutate, mainBgClasses }) => {
     setRanking([]);
     mutate();
   };
+  let messages = null;
+  if (tasks[0].task.conversation) {
+    messages = tasks[0].task.conversation.messages;
+    messages = messages.map((message, index) => ({ ...message, id: index }));
+  }
 
   const sortables = tasks[0].task.replies ? "replies" : "prompts";
 
@@ -30,7 +36,7 @@ export const EvaluateTask = ({ tasks, trigger, mutate, mainBgClasses }) => {
         <p className="text-lg py-1">
           Given the following {sortables}, sort them from best to worst, best being first, worst being last.
         </p>
-        {tasks[0].task.conversation ? <ContextMessages messages={tasks[0].task.conversation.messages} /> : null}
+        {messages ? <MessageTable messages={messages} /> : null}
         <Sortable items={tasks[0].task[sortables]} onChange={setRanking} className="my-8" />
       </SurveyCard>