diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 28fe5b3cf767964322bebc211be5dec912347806..ec803f5a8ee73d251f6427023152da72ece30c82 100755
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -31,23 +31,15 @@
   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 '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 'net/smtp'
 
 ActionMailer::Base.class_eval do
diff --git a/actionmailer/lib/action_mailer/vendor.rb b/actionmailer/lib/action_mailer/vendor.rb
new file mode 100644
index 0000000000000000000000000000000000000000..0ad7386fd8e1f0c1cc83592a839d4f0f1d9cc6df
--- /dev/null
+++ b/actionmailer/lib/action_mailer/vendor.rb
@@ -0,0 +1,14 @@
+# Prefer gems to the bundled libs.
+require 'rubygems'
+
+begin
+  gem 'tmail', '~> 1.1.0'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/tmail-1.1.0"
+end
+
+begin
+  gem 'text-format', '>= 0.6.3'
+rescue Gem::LoadError
+  $:.unshift "#{File.dirname(__FILE__)}/vendor/text-format-0.6.3"
+end
diff --git a/actionmailer/lib/action_mailer/vendor/text/format.rb b/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/text/format.rb
rename to actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/Makefile b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/Makefile
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/Makefile
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/Makefile
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/address.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/address.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/address.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/address.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/attachments.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/attachments.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/attachments.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/base64.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/base64.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/compat.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/compat.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/compat.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/compat.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/config.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/config.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/config.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/config.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/core_extensions.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/core_extensions.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/core_extensions.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/core_extensions.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/encode.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/encode.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/encode.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/encode.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/facade.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/facade.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/facade.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/facade.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/header.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/header.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/header.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/header.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/info.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/info.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/info.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/info.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/interface.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/interface.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/interface.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/interface.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/loader.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/loader.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/loader.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/loader.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/mail.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mail.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/mail.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mail.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/mailbox.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mailbox.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/mailbox.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mailbox.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/mbox.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mbox.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/mbox.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/mbox.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/net.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/net.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/net.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/net.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/obsolete.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/obsolete.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/obsolete.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/obsolete.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/parser.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/parser.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/parser.y b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.y
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/parser.y
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.y
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/port.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/port.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/port.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/port.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/quoting.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/quoting.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/quoting.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/scanner.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/scanner.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/scanner_r.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner_r.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/scanner_r.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner_r.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/stringio.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/stringio.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/stringio.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/stringio.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/tmail.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/tmail.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/tmail.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/tmail.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/utils.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/utils.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/utils.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/utils.rb
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/version.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb
similarity index 100%
rename from actionmailer/lib/action_mailer/vendor/tmail/version.rb
rename to actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb