3 files changed, 13 insertions, 11 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index a8233512ab..356861b591 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -524,14 +524,16 @@ module ActionMailer #:nodoc:
     def deliver!(mail = @mail)
       raise "no mail object available for delivery!" unless mail
 
-      begin
-        ActiveSupport::Notifications.instrument("action_mailer.deliver",
-          :template => template, :mailer => self.class.name) do |payload|
-          self.class.set_payload_for_mail(payload, mail)
+      ActiveSupport::Notifications.instrument("action_mailer.deliver",
+        :template => template, :mailer => self.class.name) do |payload|
+
+        self.class.set_payload_for_mail(payload, mail)
+
+        begin
           self.delivery_method.perform_delivery(mail) if perform_deliveries
+        rescue Exception => e # Net::SMTP errors or sendmail pipe errors
+          raise e if raise_delivery_errors
         end
-      rescue Exception => e # Net::SMTP errors or sendmail pipe errors
-        raise e if raise_delivery_errors
       end
 
       mail
diff --git a/actionmailer/lib/action_mailer/railties/subscriber.rb b/actionmailer/lib/action_mailer/railties/subscriber.rb
index af9c477237..cff852055c 100644
--- a/actionmailer/lib/action_mailer/railties/subscriber.rb
+++ b/actionmailer/lib/action_mailer/railties/subscriber.rb
@@ -3,13 +3,13 @@ module ActionMailer
     class Subscriber < Rails::Subscriber
       def deliver(event)
         recipients = Array(event.payload[:to]).join(', ')
-        info("Sent mail to #{recipients} (%1.fms)" % event.duration)
-        debug("\n#{event.payload[:mail]}")
+        info("\nSent mail to #{recipients} (%1.fms)" % event.duration)
+        debug(event.payload[:mail])
       end
 
       def receive(event)
-        info("Received mail (%.1fms)" % event.duration)
-        debug("\n#{event.payload[:mail]}")
+        info("\nReceived mail (%.1fms)" % event.duration)
+        debug(event.payload[:mail])
       end
 
       def logger
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index 318a1e46d1..0ca4f5494e 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -56,7 +56,7 @@ module ActionMailer
       end
 
       def read_fixture(action)
-        IO.readlines(File.join(RAILS_ROOT, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
+        IO.readlines(File.join(Rails.root, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
       end
   end
 end