diff --git a/app/models/fs/message.rb b/app/models/fs/message.rb
index c82181e0..905f86e4 100644
--- a/app/models/fs/message.rb
+++ b/app/models/fs/message.rb
@@ -18,6 +18,8 @@ def self.create_inbox_message_with_thread!(raw_message, box:)
       MessageObject.mark_message_objects_externally_signed(message.objects)
     end
 
+    associated_outbox_message.update(collapsed: true)
+
     EventBus.publish(:message_thread_created, message.thread) if message.thread.previously_new_record?
     EventBus.publish(:message_created, message)
   end