diff --git a/config/environments/production.rb b/config/environments/production.rb
index a6ae03b..0e549a0 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -85,7 +85,7 @@ Rails.application.configure do
     host: ENV['CANONICAL_HOST'],
     protocol: ENV['CANONICAL_HOST_PROTOCOL'] || 'https'
   }
-
+  config.action_mailer.asset_host = ENV['CANONICAL_HOST']
 
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {
@@ -96,8 +96,6 @@ Rails.application.configure do
     password: ENV['SMTP_PASSWORD'],
     authentication: ENV['SMTP_AUTHENTICATION'] || 'plain',
     enable_starttls_auto: ENV['SMTP_ENABLE_STARTTLS_AUTO'] || 'true'
-    open_timeout: 5,
-    read_timeout: 5
   }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to