diff --git a/fun.go b/fun.go
index 0626412..cf3b726 100644
--- a/fun.go
+++ b/fun.go
@@ -185,8 +185,9 @@ func obfusbreak(s string) string {
 		if where == "" {
 			return m
 		}
-		return fmt.Sprintf(`<a class="mention" href="%s">%s</a>`, html.EscapeString(where),
-			html.EscapeString(m))
+		who := m[0:1 + strings.IndexByte(m[1:], '@')]
+		return fmt.Sprintf(`<span class="h-card"><a class="u-url mention" href="%s">%s</a></span>`,
+			html.EscapeString(where), html.EscapeString(who))
 	})
 	return s
 }