1 files changed, 7 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index 701dc34431..ab5c3469b2 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -17,8 +17,13 @@ module ActionMailer
     end
 
     # Access the mailer instance.
-    def mailer #:nodoc:
-      @controller
+    def mailer
+      @_controller
+    end
+
+    # Access the message instance.
+    def message
+      @_message
     end
   end
 end