X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/03f733c4f4091dc53e391aa74a020681af98a4ff..02ad2f5a5192404185d00ec1b53ae2982760c0ea:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index df30d651b..de0ad21d6 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -48,7 +48,7 @@ class Notifier < ActionMailer::Base
   def message_notification(message)
     common_headers message.recipient
     from_header message.sender.display_name, "m", message.id, message.digest
-    subject I18n.t('notifier.message_notification.subject', :user => message.sender.display_name, :locale => locale)
+    subject message.title
     body :to_user => message.recipient.display_name,
          :from_user => message.sender.display_name,
          :body => message.body,
@@ -99,8 +99,8 @@ private
   def common_headers(recipient)
     recipients recipient.email
     locale recipient.preferred_language_from(I18n.available_locales)
-    from "OpenStreetMap <webmaster@openstreetmap.org>"
-    headers "return-path" => "bounces@openstreetmap.org",
+    from EMAIL_FROM
+    headers "return-path" => EMAIL_RETURN_PATH,
             "Auto-Submitted" => "auto-generated"
   end