diff --git a/app/mailers/enterprise_mailer.rb b/app/mailers/enterprise_mailer.rb
index dc7b9d8695..8ef7e74044 100644
--- a/app/mailers/enterprise_mailer.rb
+++ b/app/mailers/enterprise_mailer.rb
@@ -2,9 +2,6 @@ require 'devise/mailers/helpers'
 class EnterpriseMailer < Spree::BaseMailer
   include Devise::Mailers::Helpers
 
-  layout 'mailer'
-  helper Spree::MailerHelper
-
   def welcome(enterprise)
     @enterprise = enterprise
     mail(:to => enterprise.email, :from => from_address,
diff --git a/app/mailers/spree/base_mailer_decorator.rb b/app/mailers/spree/base_mailer_decorator.rb
new file mode 100644
index 0000000000..a776eb8946
--- /dev/null
+++ b/app/mailers/spree/base_mailer_decorator.rb
@@ -0,0 +1,8 @@
+Spree::BaseMailer.class_eval do
+  # Inline stylesheets
+  include Roadie::Rails::Automatic
+
+  # Define layout
+  layout 'mailer'
+  helper Spree::MailerHelper
+end
\ No newline at end of file
diff --git a/app/mailers/spree/order_mailer_decorator.rb b/app/mailers/spree/order_mailer_decorator.rb
index e2c63257ae..c6eeb31df8 100644
--- a/app/mailers/spree/order_mailer_decorator.rb
+++ b/app/mailers/spree/order_mailer_decorator.rb
@@ -1,6 +1,4 @@
 Spree::OrderMailer.class_eval do
-  layout 'mailer'
-  helper Spree::MailerHelper
   helper HtmlHelper
   helper CheckoutHelper
   helper SpreeCurrencyHelper
diff --git a/app/mailers/spree/user_mailer_decorator.rb b/app/mailers/spree/user_mailer_decorator.rb
index 3663212299..40313d1b66 100644
--- a/app/mailers/spree/user_mailer_decorator.rb
+++ b/app/mailers/spree/user_mailer_decorator.rb
@@ -1,7 +1,4 @@
 Spree::UserMailer.class_eval do
-  layout 'mailer'
-  helper Spree::MailerHelper
-
   def signup_confirmation(user)
     @user = user
     mail(:to => user.email, :from => from_address,