1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index e4920f0c86..bf60e2f3d5 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -426,7 +426,7 @@ module ActionMailer #:nodoc:
       end
 
       def template_root=(root)
-        write_inheritable_attribute(:template_root, ActionView::PathSet.new(Array(root)))
+        write_inheritable_attribute(:template_root, ActionView::PathSet::Path.new(root))
       end
     end
 
@@ -541,7 +541,7 @@ module ActionMailer #:nodoc:
       end
 
       def template_path
-        "#{template_root.join}/#{mailer_name}"
+        "#{template_root}/#{mailer_name}"
       end
 
       def initialize_template_class(assigns)