diff --git a/website/src/components/Tasks/LabelTask/LabelTask.tsx b/website/src/components/Tasks/LabelTask/LabelTask.tsx
index 2a066c87..97a38057 100644
--- a/website/src/components/Tasks/LabelTask/LabelTask.tsx
+++ b/website/src/components/Tasks/LabelTask/LabelTask.tsx
@@ -30,23 +30,6 @@ export const LabelTask = ({
   const cardColor = useColorModeValue("gray.50", "gray.800");
   const isSpamTask = task.mode === "simple" && task.valid_labels.length === 1 && task.valid_labels[0] === "spam";
 
-  // TODO: remove as soon as the backend delivers
-  // real information about the current message
-  const additionMessage: Message = useMemo(
-    () => ({
-      text: task.reply,
-      is_assistant: task.type === TaskType.label_assistant_reply,
-      message_id: task.message_id,
-      created_date: new Date().toISOString(),
-      emojis: {},
-      user_emojis: [],
-      id: "dummy",
-      lang: i18n.language,
-      parent_id: "dummy",
-    }),
-    [task.reply, task.type, task.message_id, i18n.language]
-  );
-
   return (
     <div data-cy="task" data-task-type={isSpamTask ? "spam-task" : "label-task"}>
       <TwoColumnsWithCards>
@@ -54,7 +37,10 @@ export const LabelTask = ({
           <TaskHeader taskType={taskType} />
           {task.conversation ? (
             <Box mt="4" p={[4, 6]} borderRadius="lg" bg={cardColor}>
-              <MessageTable messages={[...(task.conversation?.messages ?? []), additionMessage]} highlightLastMessage />
+              <MessageTable
+                messages={[...(task.conversation?.messages ?? []), task.reply_message]}
+                highlightLastMessage
+              />
             </Box>
           ) : (
             <Box mt="4">
diff --git a/website/src/types/Tasks.ts b/website/src/types/Tasks.ts
index a791916e..bbbe3a67 100644
--- a/website/src/types/Tasks.ts
+++ b/website/src/types/Tasks.ts
@@ -1,4 +1,4 @@
-import { Conversation } from "./Conversation";
+import { Conversation, Message } from "./Conversation";
 import { BaseTask, TaskType } from "./Task";
 
 export interface CreateInitialPromptTask extends BaseTask {
@@ -37,6 +37,7 @@ export interface LabelAssistantReplyTask extends BaseTask {
   type: TaskType.label_assistant_reply;
   message_id: string;
   conversation: Conversation;
+  reply_message: Message;
   reply: string;
   valid_labels: string[];
   mode: "simple" | "full";
@@ -47,6 +48,7 @@ export interface LabelPrompterReplyTask extends BaseTask {
   type: TaskType.label_prompter_reply;
   message_id: string;
   conversation: Conversation;
+  reply_message: Message;
   reply: string;
   valid_labels: string[];
   mode: "simple" | "full";