diff --git a/modules/m_user.cc b/modules/m_user.cc
index 91eaceedc..e7f5b273c 100644
--- a/modules/m_user.cc
+++ b/modules/m_user.cc
@@ -29,6 +29,14 @@ highlighted_event(const event &event,
 		json::get<"content"_>(event)
 	};
 
+	const string_view &formatted_body
+	{
+		content.get("formatted_body")
+	};
+
+	if(has(formatted_body, user.user_id))
+		return true;
+
 	const string_view &body
 	{
 		content.get("body")