diff --git a/actionmailbox/test/unit/mail_ext/recipients_test.rb b/actionmailbox/test/unit/mail_ext/addresses_test.rb
similarity index 74%
rename from actionmailbox/test/unit/mail_ext/recipients_test.rb
rename to actionmailbox/test/unit/mail_ext/addresses_test.rb
index fdcad440e2..0758921d26 100644
--- a/actionmailbox/test/unit/mail_ext/recipients_test.rb
+++ b/actionmailbox/test/unit/mail_ext/addresses_test.rb
@@ -3,15 +3,20 @@
 require_relative "../../test_helper"
 
 module MailExt
-  class RecipientsTest < ActiveSupport::TestCase
+  class AddressesTest < ActiveSupport::TestCase
     setup do
       @mail = Mail.new \
+        from: "sally@example.com",
         to: "david@basecamp.com",
         cc: "jason@basecamp.com",
         bcc: "andrea@basecamp.com",
         x_original_to: "ryan@basecamp.com"
     end
 
+    test "from address uses address object" do
+      assert_equal "example.com", @mail.from_address.domain
+    end
+
     test "recipients include everyone from to, cc, bcc, and x-original-to" do
       assert_equal %w[ david@basecamp.com jason@basecamp.com andrea@basecamp.com ryan@basecamp.com ], @mail.recipients
     end
@@ -31,5 +36,9 @@ module MailExt
     test "bcc addresses use address objects" do
       assert_equal "basecamp.com", @mail.bcc_addresses.first.domain
     end
+
+    test "x_original_to addresses use address objects" do
+      assert_equal "basecamp.com", @mail.x_original_to_addresses.first.domain
+    end
   end
 end