diff --git a/templates/postcontent.tmpl b/templates/postcontent.tmpl
new file mode 100644
index 0000000..63c7b85
--- /dev/null
+++ b/templates/postcontent.tmpl
@@ -0,0 +1,102 @@
+{{ with $s := .Data }}
+
+ {{StatusContentFilter .Content .Emojis .Mentions}}
+
+ {{if .MediaAttachments}}
+
+ {{end}}
+
+ {{if .Poll}}
+
+
+ {{end}}
+
+{{ end }}
\ No newline at end of file
diff --git a/templates/status.tmpl b/templates/status.tmpl
index 1ba1dda..966309e 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -91,103 +91,12 @@
{{if .SpoilerText}}
{{.SpoilerText}}
- {{StatusContentFilter .Content .Emojis .Mentions}}
+ {{template "postcontent.tmpl" (WithContext $s $.Ctx)}}
{{else}}
- {{StatusContentFilter .Content .Emojis .Mentions}}
+ {{template "postcontent.tmpl" (WithContext $s $.Ctx)}}
{{end}}
{{end}}
- {{if .MediaAttachments}}
-
- {{end}}
- {{if .Poll}}
-
- {{end}}