Merge branch 'master' of github.com:rails/rails

2 files changed, 7 insertions, 6 deletions

diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 70cc312634..6e2d288082 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -49,9 +49,3 @@ module ActionMailer
   autoload :TestCase
   autoload :TestHelper
 end
-
-module Text
-  extend ActiveSupport::Autoload
-
-  autoload :Format, 'text/format'
-end
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index ab5c3469b2..aab6e12387 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -3,6 +3,13 @@ module ActionMailer
     # Uses Text::Format to take the text and format it, indented two spaces for
     # each line, and wrapped at 72 columns.
     def block_format(text)
+      begin
+        require 'text/format'
+      rescue LoadError => e
+        $stderr.puts "You don't have text-format installed in your application. Please add it to your Gemfile and run bundle install"
+        raise e
+      end unless defined?(Text::Format)
+
       formatted = text.split(/\n\r\n/).collect { |paragraph|
         Text::Format.new(
           :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph