1 files changed, 10 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 4b3d5f35c1..28fe5b3cf7 100755
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -31,14 +31,23 @@ unless defined?(ActionController)
   end
 end
 
+# attempt to load the TMail gem
+begin
+  require 'rubygems'
+  gem 'TMail', '> 1.1.0'
+  require 'tmail'
+rescue Gem::LoadError
+  # no gem, fall back to vendor copy
+end
+
 $:.unshift(File.dirname(__FILE__) + "/action_mailer/vendor/")
 
+require 'tmail'
 require 'action_mailer/base'
 require 'action_mailer/helpers'
 require 'action_mailer/mail_helper'
 require 'action_mailer/quoting'
 require 'action_mailer/test_helper'
-require 'tmail'
 require 'net/smtp'
 
 ActionMailer::Base.class_eval do