diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt
index eac4941bf..4eae653ac 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt
@@ -255,7 +255,10 @@ private fun GenericCommentPostBody(
                         verticalAlignment = CenterVertically,
                         modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp),
                     ) {
-                        ContentSensitivityExplainer()
+                        ContentSensitivityExplainer(
+                            description = postViewModel.contentWarningDescription,
+                            onDescriptionChange = { postViewModel.contentWarningDescription = it },
+                        )
                     }
                 }
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/NewGroupDMScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/NewGroupDMScreen.kt
index 5fcf47ac8..c10ac9f86 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/NewGroupDMScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/NewGroupDMScreen.kt
@@ -238,7 +238,10 @@ fun GroupDMScreenContent(
                 DisplayPreviews(postViewModel, accountViewModel, nav)
 
                 if (postViewModel.wantsToMarkAsSensitive) {
-                    ContentSensitivityExplainer()
+                    ContentSensitivityExplainer(
+                        description = postViewModel.contentWarningDescription,
+                        onDescriptionChange = { postViewModel.contentWarningDescription = it },
+                    )
                 }
 
                 if (postViewModel.wantsToAddGeoHash) {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductScreen.kt
index 5f2435741..5f781ace3 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductScreen.kt
@@ -223,7 +223,10 @@ private fun NewProductBody(
                     verticalAlignment = CenterVertically,
                     modifier = Modifier.padding(vertical = Size5dp, horizontal = Size10dp),
                 ) {
-                    ContentSensitivityExplainer()
+                    ContentSensitivityExplainer(
+                        description = postViewModel.contentWarningDescription,
+                        onDescriptionChange = { postViewModel.contentWarningDescription = it },
+                    )
                 }
             }
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt
index dccdcf525..50988c065 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageScreen.kt
@@ -212,7 +212,10 @@ fun PublicMessageScreenContent(
                 DisplayPreviews(postViewModel.urlPreviews, accountViewModel, nav)
 
                 if (postViewModel.wantsToMarkAsSensitive) {
-                    ContentSensitivityExplainer()
+                    ContentSensitivityExplainer(
+                        description = postViewModel.contentWarningDescription,
+                        onDescriptionChange = { postViewModel.contentWarningDescription = it },
+                    )
                 }
 
                 if (postViewModel.wantsToAddGeoHash) {