diff --git a/README b/README
index 1c54778..48e244a 100644
--- a/README
+++ b/README
@@ -12,6 +12,7 @@ Changes (localhost_custom fork):
 - visible edited post time
 - visible quoted post (status in status)
 - hide boosts in spoiler
+- hide NSFW content and attachments in spoiler
 - some micro visual changes
 - some others changes no matter
 
diff --git a/templates/status.tmpl b/templates/status.tmpl
index c5a8f21..e6d3495 100644
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -105,6 +105,7 @@
 			<div class="status-content">
 				{{if .Sensitive}}[NSFW]<br/>{{end}}
 				{{- if .SpoilerText}}{{EmojiFilter (HTML .SpoilerText) .Emojis | Raw}}<br/>{{end -}}
+				{{if .Sensitive}}<details>{{end}}
 				{{- StatusContentFilter .Content .Emojis .Mentions | Raw -}}
 				{{if .Pleroma.Quote}}
 				<details>
@@ -112,6 +113,7 @@
 				{{template "status" (WithContext .Pleroma.Quote $.Ctx)}}
 				</details>
 				{{end}}
+				{{if .Sensitive}}</details>{{end}}
 			</div>
 			{{end}}
 			{{$st_id := .ID}}
@@ -132,6 +134,7 @@
 			</div>
 			{{end}}
 			{{if .MediaAttachments}}
+			{{if .Sensitive}}<details><summary>NSFW attachments</summary>{{end}}
 			<div class="status-media-container">
 				{{range .MediaAttachments}}
 
@@ -185,6 +188,7 @@
 				{{end}}
 				{{end}}
 			</div>
+			{{if .Sensitive}}</details>{{end}}
 			{{end}}
 			{{if .Poll}}
 			<form class="poll-form" action="/vote/{{.Poll.ID}}" method="POST" target="_self">