diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
index ae5820e..b2d8142 100644
--- a/app/controllers/rooms_controller.rb
+++ b/app/controllers/rooms_controller.rb
@@ -32,7 +32,7 @@ class RoomsController < ApplicationController
     end
 
     def find_messages
-      messages = @room.messages.with_creator
+      messages = @room.messages.with_creator.with_attachment_details.with_boosts
 
       if show_first_message = messages.find_by(id: params[:message_id])
         @messages = messages.page_around(show_first_message)
diff --git a/app/models/message.rb b/app/models/message.rb
index aa5aa10..e607f6a 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -12,7 +12,13 @@ class Message < ApplicationRecord
   after_create_commit -> { room.receive(self) }
 
   scope :ordered, -> { order(:created_at) }
-  scope :with_creator, -> { includes(:creator) }
+  scope :with_creator, -> { preload(creator: :avatar_attachment) }
+  scope :with_attachment_details, -> {
+    with_rich_text_body_and_embeds
+    with_attached_attachment
+      .includes(attachment_blob: :variant_records)
+  }
+  scope :with_boosts, -> { includes(boosts: :booster) }
 
   def plain_text_body
     body.to_plain_text.presence || attachment&.filename&.to_s || ""