diff --git a/internal/webserver/tpl/tweet_page_includes/text_with_entities.tpl b/internal/webserver/tpl/tweet_page_includes/text_with_entities.tpl
new file mode 100644
index 0000000..ea2d59f
--- /dev/null
+++ b/internal/webserver/tpl/tweet_page_includes/text_with_entities.tpl
@@ -0,0 +1,18 @@
+{{define "text-with-entities"}}
+  {{range (splitList "\n" .)}}
+    <p class="text" hx-trigger="click consume">
+      {{range (get_entities .)}}
+        {{if (eq .EntityType 1)}}
+          <!-- Mention -->
+          <a class="entity" href="/{{.Contents}}">@{{.Contents}}</a>
+        {{else if (eq .EntityType 2)}}
+          <!-- Hashtag -->
+          <a class="entity" href="/search/%23{{.Contents}}">#{{.Contents}}</a>
+        {{else}}
+          <!-- Just text -->
+          {{.Contents}}
+        {{end}}
+      {{end}}
+    </p>
+  {{end}}
+{{end}}