diff --git a/renderer/renderer.go b/renderer/renderer.go
index c9cae28..cabf92d 100644
--- a/renderer/renderer.go
+++ b/renderer/renderer.go
@@ -84,7 +84,10 @@ func EmojiFilter(content string, emojis []mastodon.Emoji) string {
 	return strings.NewReplacer(replacements...).Replace(content)
 }
 
-func StatusContentFilter(content string, emojis []mastodon.Emoji, mentions []mastodon.Mention) string {
+func StatusContentFilter(spoiler string, content string, emojis []mastodon.Emoji, mentions []mastodon.Mention) string {
+	if len(spoiler) > 0 {
+		content = spoiler + "<br />" + content
+	}
 	var replacements []string
 	for _, e := range emojis {
 		replacements = append(replacements, ":"+e.ShortCode+":", "<img class=\"status-emoji\" src=\""+e.URL+"\" alt=\""+e.ShortCode+"\" />")
diff --git a/templates/status.tmpl b/templates/status.tmpl
index b1babf6..0e6f0c0 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -41,7 +41,7 @@
 				{{end}}
 				{{end}}
 			</div>
-			<div class="status-content"> {{StatusContentFilter .Content .Emojis .Mentions}} </div>
+			<div class="status-content"> {{StatusContentFilter .SpoilerText .Content .Emojis .Mentions}} </div>
 			<div class="status-media-container">
 			{{range .MediaAttachments}}
 			{{if eq .Type "image"}}