diff --git a/ViewModels/Sources/ViewModels/View Models/CompositionViewModel.swift b/ViewModels/Sources/ViewModels/View Models/CompositionViewModel.swift
index 634a664..b4dfcc8 100644
--- a/ViewModels/Sources/ViewModels/View Models/CompositionViewModel.swift	
+++ b/ViewModels/Sources/ViewModels/View Models/CompositionViewModel.swift	
@@ -106,7 +106,7 @@ public extension CompositionViewModel {
         }
 
         contentWarning = redraft.spoilerText
-        displayContentWarning = redraft.spoilerText.isEmpty
+        displayContentWarning = !redraft.spoilerText.isEmpty
         sensitive = redraft.sensitive
         displayPoll = redraft.poll != nil
         attachmentViewModels = redraft.mediaAttachments.map {
diff --git a/ViewModels/Sources/ViewModels/View Models/NewStatusViewModel.swift b/ViewModels/Sources/ViewModels/View Models/NewStatusViewModel.swift
index a2ce3da..536fbb5 100644
--- a/ViewModels/Sources/ViewModels/View Models/NewStatusViewModel.swift	
+++ b/ViewModels/Sources/ViewModels/View Models/NewStatusViewModel.swift	
@@ -64,7 +64,7 @@ public final class NewStatusViewModel: ObservableObject {
             compositionViewModel = CompositionViewModel(eventsSubject: compositionEventsSubject)
         }
 
-        if let inReplyTo = inReplyTo {
+        if let inReplyTo = inReplyTo, redraft == nil {
             compositionViewModel.text = inReplyTo.accountName.appending(" ")
         }