Split out all the addresses from recipients

2 files changed, 26 insertions, 21 deletions

diff --git a/lib/action_mailbox/mail_ext/addresses.rb b/lib/action_mailbox/mail_ext/addresses.rb
new file mode 100644
index 0000000000..d7ace82bbf
--- /dev/null
+++ b/lib/action_mailbox/mail_ext/addresses.rb
@@ -0,0 +1,26 @@
+class Mail::Message
+  def from_address
+    Mail::Address.new from
+  end
+
+  def recipients_addresses
+    convert_to_addresses recipients
+  end
+
+  def to_addresses
+    convert_to_addresses to
+  end
+
+  def cc_addresses
+    convert_to_addresses cc
+  end
+
+  def bcc_addresses
+    convert_to_addresses bcc
+  end
+
+  private
+    def convert_to_addresses(recipients)
+      recipients.collect { |recipient| Mail::Address.new recipient }
+    end
+end
diff --git a/lib/action_mailbox/mail_ext/recipients.rb b/lib/action_mailbox/mail_ext/recipients.rb
index baf97472a6..58561c7f01 100644
--- a/lib/action_mailbox/mail_ext/recipients.rb
+++ b/lib/action_mailbox/mail_ext/recipients.rb
@@ -2,25 +2,4 @@ class Mail::Message
   def recipients
     Array(to) + Array(cc) + Array(bcc)
   end
-
-  def recipients_addresses
-    convert_to_addresses recipients
-  end
-
-  def to_addresses
-    convert_to_addresses to
-  end
-
-  def cc_addresses
-    convert_to_addresses cc
-  end
-
-  def bcc_addresses
-    convert_to_addresses bcc
-  end
-
-  private
-    def convert_to_addresses(recipients)
-      recipients.collect { |recipient| Mail::Address.new recipient }
-    end
 end