8 files changed, 33 insertions, 1 deletions
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 2f7dd6ee5..0d9f10a08 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class ApplicationMailer < ActionMailer::Base
-  default from: (ENV['SMTP_FROM_ADDRESS'] || 'notifications@localhost')
+  default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
   layout 'mailer'
 end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
new file mode 100644
index 000000000..5c086768d
--- /dev/null
+++ b/app/mailers/user_mailer.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class UserMailer < Devise::Mailer
+  default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
+  layout 'mailer'
+
+  def confirmation_instructions(user, token)
+    @resource = user
+    @token    = token
+
+    I18n.with_locale(@resource.locale || I18n.default_locale) do
+      mail to: @resource.email
+    end
+  end
+
+  def reset_password_instructions(user, token)
+    @resource = user
+    @token    = token
+
+    I18n.with_locale(@resource.locale || I18n.default_locale) do
+      mail to: @resource.email
+    end
+  end
+
+  def password_change(user)
+    @resource = user
+
+    I18n.with_locale(@resource.locale || I18n.default_locale) do
+      mail to: @resource.email
+    end
+  end
+end
diff --git a/app/views/auth/mailer/confirmation_instructions.en.html.erb b/app/views/user_mailer/confirmation_instructions.en.html.erb
index 69e9ff80f..69e9ff80f 100644
--- a/app/views/auth/mailer/confirmation_instructions.en.html.erb
+++ b/app/views/user_mailer/confirmation_instructions.en.html.erb
diff --git a/app/views/auth/mailer/confirmation_instructions.en.text.erb b/app/views/user_mailer/confirmation_instructions.en.text.erb
index bb21cf8e2..bb21cf8e2 100644
--- a/app/views/auth/mailer/confirmation_instructions.en.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.en.text.erb
diff --git a/app/views/auth/mailer/password_change.en.html.erb b/app/views/user_mailer/password_change.en.html.erb
index a1bc77463..a1bc77463 100644
--- a/app/views/auth/mailer/password_change.en.html.erb
+++ b/app/views/user_mailer/password_change.en.html.erb
diff --git a/app/views/auth/mailer/password_change.en.text.erb b/app/views/user_mailer/password_change.en.text.erb
index 27581e604..27581e604 100644
--- a/app/views/auth/mailer/password_change.en.text.erb
+++ b/app/views/user_mailer/password_change.en.text.erb
diff --git a/app/views/auth/mailer/reset_password_instructions.en.html.erb b/app/views/user_mailer/reset_password_instructions.en.html.erb
index 643b43319..643b43319 100644
--- a/app/views/auth/mailer/reset_password_instructions.en.html.erb
+++ b/app/views/user_mailer/reset_password_instructions.en.html.erb
diff --git a/app/views/auth/mailer/reset_password_instructions.en.text.erb b/app/views/user_mailer/reset_password_instructions.en.text.erb
index fe73b0165..fe73b0165 100644
--- a/app/views/auth/mailer/reset_password_instructions.en.text.erb
+++ b/app/views/user_mailer/reset_password_instructions.en.text.erb