diff --git a/lib/mailtrap/mail.rb b/lib/mailtrap/mail.rb
index 20091ec..873c199 100644
--- a/lib/mailtrap/mail.rb
+++ b/lib/mailtrap/mail.rb
@@ -17,6 +17,7 @@ module Mail # rubocop:disable Metrics/ModuleLength
       category
       customvariables
       contenttype
+      replyto
     ].freeze
     private_constant :SPECIAL_HEADERS
 
@@ -189,12 +190,14 @@ def batch_base_from_content( # rubocop:disable Metrics/ParameterLists
       # Builds a mail object from Mail::Message
       # @param message [Mail::Message]
       # @return [Mailtrap::Mail::Base]
+      # rubocop:disable Metrics/AbcSize
       def from_message(message)
         Mailtrap::Mail::Base.new(
           from: prepare_addresses(message['from']).first,
           to: prepare_addresses(message['to']),
           cc: prepare_addresses(message['cc']),
           bcc: prepare_addresses(message['bcc']),
+          reply_to: prepare_addresses(message['reply-to']).first,
           subject: message.subject,
           text: prepare_text_part(message),
           html: prepare_html_part(message),
@@ -206,6 +209,7 @@ def from_message(message)
           template_variables: message['template_variables']&.unparsed_value
         )
       end
+      # rubocop:enable Metrics/AbcSize
 
       private
 
diff --git a/spec/fixtures/vcr_cassettes/Mailtrap_ActionMailer_DeliveryMethod/_deliver_/converts_the_message_and_sends_via_API.yml b/spec/fixtures/vcr_cassettes/Mailtrap_ActionMailer_DeliveryMethod/_deliver_/converts_the_message_and_sends_via_API.yml
index 002dcfe..e391e0c 100644
--- a/spec/fixtures/vcr_cassettes/Mailtrap_ActionMailer_DeliveryMethod/_deliver_/converts_the_message_and_sends_via_API.yml
+++ b/spec/fixtures/vcr_cassettes/Mailtrap_ActionMailer_DeliveryMethod/_deliver_/converts_the_message_and_sends_via_API.yml
@@ -5,7 +5,7 @@ http_interactions:
     uri: https://send.api.mailtrap.io/api/send
     body:
       encoding: UTF-8
-      string: '{"from":{"email":"mailtrap@mailtrap.io","name":"Mailtrap Test"},"to":[{"email":"to_1@railsware.com","name":"To 1"},{"email":"to_2@railsware.com"}],"cc":[{"email":"cc_1@railsware.com"},{"email":"cc_2@railsware.com","name":"Cc 2"}],"bcc":[{"email":"bcc_1@railsware.com"},{"email":"bcc_2@railsware.com"}],"subject":"You are awesome!","text":"Some text","html":"<div>HTML part</div>","attachments":[{"content":"VGhpcyBpcyBhIHRleHQgZmlsZQo=","type":"text/plain","filename":"file.txt","disposition":"attachment","content_id":"txt_content_id@test.mail"},{"content":"iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAABiElEQVRIid3VSW5UMRCA4U8d0gIx7AjhAghBTgFICAkxRFHukDDDIRiuwI7xPNAMISQRV4CABFmkWbie2nrt9muaFZTkxavhr7Jfucz/Ln2s4hU28B0/sBO6VczPCl/GNoYd6wsuZ3ELWKuBe3iSAQa4g7M4jEM4jRt4g5+4lMEHEbc+KUED/xVOvY5iThXgg/gek+UMfq4CbstU8L7RmU/c3qxwUkc0TnN/CT9Ycn4djrenhB/H24j5iMXQX8TTUsCncD6T6daUtzyp8hNSV30uJfgWAUfje70AqMFF7FC6kGOy20rQPoKTBd1ii3EsbF9LCUpH1K62q1uWwr5RSvAyjHdb+rzqSZU38iB8npWMTZu+M96mzU5qfT6H98FYKTn0sRUONwv2hQqcNK+G2FSZsNeNRsX5CqwtF7CHfVzpcn6cJbmlfqsPSJXvRczDaarpZUmaf3JP6pAjsZZw3+jM9/FIffKOyTXpRnY9OJu4+ifgXOaljnghtedurA94HraZn8x/Q34DYaON8Fk9Z1IAAAAASUVORK5CYII=","type":"image/png","filename":"file.png","disposition":"inline","content_id":"png_content_id@test.mail"}],"headers":{"Reply-To":"reply-to@railsware.com","X-Special-Domain-Specific-Header":"SecretValue","One-more-custom-header":"CustomValue"},"category":"Module Test"}'
+      string: '{"from":{"email":"mailtrap@mailtrap.io","name":"Mailtrap Test"},"to":[{"email":"to_1@railsware.com","name":"To 1"},{"email":"to_2@railsware.com"}],"reply_to":{"email":"reply-to@railsware.com"},"cc":[{"email":"cc_1@railsware.com"},{"email":"cc_2@railsware.com","name":"Cc 2"}],"bcc":[{"email":"bcc_1@railsware.com"},{"email":"bcc_2@railsware.com"}],"subject":"You are awesome!","text":"Some text","html":"<div>HTML part</div>","attachments":[{"content":"VGhpcyBpcyBhIHRleHQgZmlsZQo=","type":"text/plain","filename":"file.txt","disposition":"attachment","content_id":"txt_content_id@test.mail"},{"content":"iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAABiElEQVRIid3VSW5UMRCA4U8d0gIx7AjhAghBTgFICAkxRFHukDDDIRiuwI7xPNAMISQRV4CABFmkWbie2nrt9muaFZTkxavhr7Jfucz/Ln2s4hU28B0/sBO6VczPCl/GNoYd6wsuZ3ELWKuBe3iSAQa4g7M4jEM4jRt4g5+4lMEHEbc+KUED/xVOvY5iThXgg/gek+UMfq4CbstU8L7RmU/c3qxwUkc0TnN/CT9Ycn4djrenhB/H24j5iMXQX8TTUsCncD6T6daUtzyp8hNSV30uJfgWAUfje70AqMFF7FC6kGOy20rQPoKTBd1ii3EsbF9LCUpH1K62q1uWwr5RSvAyjHdb+rzqSZU38iB8npWMTZu+M96mzU5qfT6H98FYKTn0sRUONwv2hQqcNK+G2FSZsNeNRsX5CqwtF7CHfVzpcn6cJbmlfqsPSJXvRczDaarpZUmaf3JP6pAjsZZw3+jM9/FIffKOyTXpRnY9OJu4+ifgXOaljnghtedurA94HraZn8x/Q34DYaON8Fk9Z1IAAAAASUVORK5CYII=","type":"image/png","filename":"file.png","disposition":"inline","content_id":"png_content_id@test.mail"}],"headers":{"X-Special-Domain-Specific-Header":"SecretValue","One-more-custom-header":"CustomValue"},"category":"Module Test"}'
     headers:
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
diff --git a/spec/mailtrap/mail_spec.rb b/spec/mailtrap/mail_spec.rb
index 80c7e56..2ee0e09 100644
--- a/spec/mailtrap/mail_spec.rb
+++ b/spec/mailtrap/mail_spec.rb
@@ -40,7 +40,6 @@
         let(:expected_headers) do
           {
             'X-Special-Domain-Specific-Header' => 'SecretValue',
-            'Reply-To' => 'Reply To <reply-to@railsware.com>',
             'One-more-custom-header' => 'CustomValue'
           }
         end
@@ -53,6 +52,51 @@
 
         it { is_expected.to eq(expected_headers) }
       end
+
+      context 'when reply-to is added in varying formats' do
+        before do
+          message.reply_to = 'Reply To <reply-to@railsware.com>'
+        end
+
+        it 'excludes reply-to from custom headers' do
+          expect(headers).not_to have_key('Reply-To')
+        end
+      end
+
+      context 'when custom header and reply-to variants are present' do
+        before do
+          message.header['Reply-To'] = 'Reply To <reply-to@railsware.com>'
+          message.header['REPLY-TO'] = 'Upper Case <upper-reply-to@railsware.com>'
+          message.header['reply-to'] = 'Lower Case <lower-reply-to@railsware.com>'
+          message.header['X-Special-Domain-Specific-Header'] = 'SecretValue'
+        end
+
+        it 'keeps only custom headers and strips all reply-to header variants' do
+          expect(headers).to eq('X-Special-Domain-Specific-Header' => 'SecretValue')
+        end
+      end
+    end
+
+    describe '#reply_to' do
+      before do
+        message.reply_to = 'Reply To <reply-to@railsware.com>'
+      end
+
+      it 'maps reply-to to the structured field' do
+        expect(mail.reply_to).to eq(email: 'reply-to@railsware.com', name: 'Reply To')
+      end
+
+      context 'when reply-to header variants are present' do
+        before do
+          message.header['Reply-To'] = 'Reply To <reply-to@railsware.com>'
+          message.header['REPLY-TO'] = 'Upper Case <upper-reply-to@railsware.com>'
+          message.header['reply-to'] = 'Lower Case <lower-reply-to@railsware.com>'
+        end
+
+        it 'maps the reply-to value to the structured field' do
+          expect(mail.reply_to).to eq({ email: 'lower-reply-to@railsware.com', name: 'Lower Case' })
+        end
+      end
     end
 
     describe '#attachment' do
@@ -167,5 +211,20 @@
         end
       end
     end
+
+    context "when 'reply-to' is invalid" do
+      let(:invalid_reply_to) { 'invalid email@example.com' }
+
+      before do
+        message.header['Reply-To'] = invalid_reply_to
+      end
+
+      it 'raises an error' do
+        expect { mail }.to raise_error(
+          Mailtrap::Error,
+          "failed to parse 'Reply-To': 'invalid email@example.com'"
+        )
+      end
+    end
   end
 end