diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index 9a93593f45..0460865c7e 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -22,7 +22,7 @@ Spree.config do |config|
   # -- spree_paypal_express
   # Auto-capture payments. Without this option, payments must be manually captured in the paypal interface.
   config.auto_capture = true
-  config.override_actionmailer_config = false
+  #config.override_actionmailer_config = false
 end