1 files changed, 7 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index bc0a7a6ec4..9b9b514dad 100755
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -35,13 +35,18 @@ end
 $:.unshift(File.dirname(__FILE__) + "/action_mailer/vendor/")
 
 require 'action_mailer/base'
+require 'action_mailer/helpers'
 require 'action_mailer/mail_helper'
 require 'action_mailer/quoting'
 require 'action_mailer/vendor/tmail'
 require 'net/smtp'
 
-ActionView::Base.class_eval { include MailHelper }
-ActionMailer::Base.class_eval { include ActionMailer::Quoting }
+ActionMailer::Base.class_eval do
+  include ActionMailer::Quoting
+  include ActionMailer::Helpers
+
+  helper MailHelper
+end
 
 old_verbose, $VERBOSE = $VERBOSE, nil
 TMail::Encoder.const_set("MAX_LINE_LEN", 200)