diff --git a/lib/discordrb/data/message.rb b/lib/discordrb/data/message.rb
index 718a0a103..37d718402 100644
--- a/lib/discordrb/data/message.rb
+++ b/lib/discordrb/data/message.rb
@@ -70,12 +70,15 @@ class Message
     # @return [Integer, nil] the webhook ID that sent this message, or `nil` if it wasn't sent through a webhook.
     attr_reader :webhook_id
 
-    # @return [Array<Component>]
+    # @return [Array<Component>] Interaction components for this message.
     attr_reader :components
 
-    # @return [Integer] flags set on the message
+    # @return [Integer] flags set on the message.
     attr_reader :flags
 
+    # @return [Channel, nil] The thread that was started from this message, or nil.
+    attr_reader :thread
+
     # @!visibility private
     def initialize(data, bot)
       @bot = bot
@@ -160,7 +163,10 @@ def initialize(data, bot)
 
       @components = []
       @components = data['components'].map { |component_data| Components.from_data(component_data, @bot) } if data['components']
+
       @flags = data['flags'] || 0
+
+      @thread = data['thread'] ? @bot.ensure_channel(data['thread'], @server) : nil
     end
 
     # Replies to this message with the specified content.