diff --git a/CHANGELOG b/CHANGELOG
index 2c5c9c76ccfac5892e7f18ef60d41e37d32fa6cf..be0c005fa061cd2cace7ff310477e77934bbd846 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 7.11.0 (unreleased)
+  - Make Reply-To config apply to change e-mail confirmation and other Devise notifications (Stan Hu)
   - Don't allow a merge request to be merged when its title starts with "WIP".
   - Add a page title to every page.
   - Get Gitorious importer to work again.
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5395fe16414f087f048cfa1d2c36dafa57e31f28
--- /dev/null
+++ b/app/mailers/devise_mailer.rb
@@ -0,0 +1,4 @@
+class DeviseMailer < Devise::Mailer
+  default from: "GitLab <#{Gitlab.config.gitlab.email_from}>"
+  default reply_to: Gitlab.config.gitlab.email_reply_to
+end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 9dce495106f50cd4167eb3c4e4aa941aad6f8f66..8f8c41697406fb8ea0a3071095efbc828b359b43 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -2,13 +2,8 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
   # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "GitLab <#{Gitlab.config.gitlab.email_from}>"
-
-
   # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
+  config.mailer = "DeviseMailer"
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index d28b4768545e2d5196a4f08dc475cdd03ce720a1..dbcf7286e45907e87f4e56353d96fbfcebbbbcf1 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -11,9 +11,8 @@ describe Notify do
   let(:recipient) { create(:user, email: 'recipient@example.com') }
   let(:project) { create(:project) }
 
-  around(:each) { ActionMailer::Base.deliveries.clear }
-
   before(:each) do
+    ActionMailer::Base.deliveries.clear
     email = recipient.emails.create(email: "notifications@example.com")
     recipient.update_attribute(:notification_email, email.email)
   end