diff --git a/db/migrate/20170927000001_setting_send_no_auto_response_reg_exp.rb b/db/migrate/20170927000001_setting_send_no_auto_response_reg_exp.rb
new file mode 100644
index 000000000..781165172
--- /dev/null
+++ b/db/migrate/20170927000001_setting_send_no_auto_response_reg_exp.rb
@@ -0,0 +1,12 @@
+class SettingSendNoAutoResponseRegExp < ActiveRecord::Migration[5.0]
+  def up
+
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+
+    # improved domain name matching
+    return if !Setting.find_by(name: 'send_no_auto_response_reg_exp')
+    Setting.set('send_no_auto_response_reg_exp', '(mailer-daemon|postmaster|abuse|root|noreply|noreply.+?|no-reply|no-reply.+?)@.+?')
+  end
+
+end