diff --git a/src/core/mentions/processUserContentMentions.ts b/src/core/mentions/processUserContentMentions.ts
index 245a25b3793..b903e743961 100644
--- a/src/core/mentions/processUserContentMentions.ts
+++ b/src/core/mentions/processUserContentMentions.ts
@@ -39,7 +39,11 @@ export async function processUserContentMentions({
 	// should parse mentions).
 	return Promise.all(
 		userContent.map(async (block) => {
-			const shouldProcessMentions = (text: string) => text.includes("<task>") || text.includes("<feedback>")
+			const shouldProcessMentions = (text: string) =>
+				text.includes("<task>") ||
+				text.includes("<feedback>") ||
+				text.includes("<answer>") ||
+				text.includes("<user_message>")
 
 			if (block.type === "text") {
 				if (shouldProcessMentions(block.text)) {