diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 3b29aed7b..9cae92bed 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -70,7 +70,7 @@ class Mailer < ActionMailer::Base
   end
 
   # Builds a mail for notifying user about a new issue
-  def issue_add(user, issue)
+  def issue_add(user, issue, **options)
     redmine_headers 'Project' => issue.project.identifier,
                     'Issue-Tracker' => issue.tracker.name,
                     'Issue-Id' => issue.id,
@@ -82,7 +82,9 @@ class Mailer < ActionMailer::Base
     @issue = issue
     @user = user
     @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue)
-    subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]"
+    subject = +""
+    subject += "[#{l(:mail_subject_mention)}]" if options[:mention]
+    subject += "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]"
     subject += " (#{issue.status.name})" if Setting.show_status_changes_in_mail_subject?
     subject += " #{issue.subject}"
     mail :to => user,
@@ -96,12 +98,13 @@ class Mailer < ActionMailer::Base
   def self.deliver_issue_add(issue)
     users = issue.notified_users | issue.notified_watchers | issue.notified_mentions
     users.each do |user|
-      issue_add(user, issue).deliver_later
+      mention = issue.notified_mentions.include?(user)
+      issue_add(user, issue, mention: mention).deliver_later
     end
   end
 
   # Builds a mail for notifying user about an issue update
-  def issue_edit(user, journal)
+  def issue_edit(user, journal, **options)
     issue = journal.journalized
     redmine_headers 'Project' => issue.project.identifier,
                     'Issue-Tracker' => issue.tracker.name,
@@ -111,7 +114,9 @@ class Mailer < ActionMailer::Base
     message_id journal
     references issue
     @author = journal.user
-    s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] "
+    s = +""
+    s += "[#{l(:mail_subject_mention)}]" if options[:mention]
+    s += "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] "
     s += "(#{issue.status.name}) " if journal.new_value_for('status_id') && Setting.show_status_changes_in_mail_subject?
     s += issue.subject
     @issue = issue
@@ -134,7 +139,8 @@ class Mailer < ActionMailer::Base
       journal.notes? || journal.visible_details(user).any?
     end
     users.each do |user|
-      issue_edit(user, journal).deliver_later
+      mention = (journal.notified_mentions | journal.journalized.notified_mentions).include?(user)
+      issue_edit(user, journal, mention: mention).deliver_later
     end
   end
 
@@ -284,7 +290,7 @@ class Mailer < ActionMailer::Base
   end
 
   # Builds a mail to user about a new wiki content.
-  def wiki_content_added(user, wiki_content)
+  def wiki_content_added(user, wiki_content, **options)
     redmine_headers 'Project' => wiki_content.project.identifier,
                     'Wiki-Page-Id' => wiki_content.page.id
     @author = wiki_content.author
@@ -294,10 +300,12 @@ class Mailer < ActionMailer::Base
     @wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
                                       :project_id => wiki_content.project,
                                       :id => wiki_content.page.title)
+    subject = +""
+    subject << "[#{l(:mail_subject_mention)}]" if options[:mention]
+    subject << "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}"
     mail(
       :to => user,
-      :subject =>
-        "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :id => wiki_content.page.pretty_title)}"
+      :subject => subject
     )
   end
 
@@ -308,12 +316,13 @@ class Mailer < ActionMailer::Base
   def self.deliver_wiki_content_added(wiki_content)
     users = wiki_content.notified_users | wiki_content.page.wiki.notified_watchers | wiki_content.notified_mentions
     users.each do |user|
-      wiki_content_added(user, wiki_content).deliver_later
+      mention = wiki_content.notified_mentions.include?(user)
+      wiki_content_added(user, wiki_content, mention: mention).deliver_later
     end
   end
 
   # Builds a mail to user about an update of the specified wiki content.
-  def wiki_content_updated(user, wiki_content)
+  def wiki_content_updated(user, wiki_content, **options)
     redmine_headers 'Project' => wiki_content.project.identifier,
                     'Wiki-Page-Id' => wiki_content.page.id
     @author = wiki_content.author
@@ -328,10 +337,14 @@ class Mailer < ActionMailer::Base
       url_for(:controller => 'wiki', :action => 'diff',
               :project_id => wiki_content.project, :id => wiki_content.page.title,
               :version => wiki_content.version)
+
+    subject = +""
+    subject << "[#{l(:mail_subject_mention)}]" if options[:mention]
+    subject << "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
+
     mail(
       :to => user,
-      :subject =>
-        "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :id => wiki_content.page.pretty_title)}"
+      :subject => subject
     )
   end
 
@@ -346,7 +359,8 @@ class Mailer < ActionMailer::Base
     users |= wiki_content.notified_mentions
 
     users.each do |user|
-      wiki_content_updated(user, wiki_content).deliver_later
+      mention = wiki_content.notified_mentions.include?(user)
+      wiki_content_updated(user, wiki_content, mention: mention).deliver_later
     end
   end
 
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 3d9b1088d..d602a09c4 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -204,6 +204,7 @@ ar:
   warning_attachments_not_saved: "%{count}تعذر حفظ الملف"
 
   mail_subject_lost_password: " %{value}كلمة المرور الخاصة بك "
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'لتغير كلمة المرور، انقر على الروابط التالية:'
   mail_subject_register: " %{value}تفعيل حسابك "
   mail_body_register: 'لتفعيل حسابك، انقر على الروابط التالية:'
diff --git a/config/locales/az.yml b/config/locales/az.yml
index dac6b03b2..2c5ede08c 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -725,6 +725,7 @@ az:
   mail_body_reminder: "növbəti %{days} gün üçün Sizə təyin olunan %{count}:"
   mail_subject_account_activation_request: "Sistemdə istifadəçinin aktivləşdirilməsi üçün sorğu %{value}"
   mail_subject_lost_password: "Sizin %{value} parolunuz"
+  mail_subject_mention: "Mention"
   mail_subject_register: "Uçot qeydinin aktivləşdirilməsi %{value}"
   mail_subject_reminder: "yaxın %{days} gün üçün Sizə təyin olunan %{count}"
 
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 2401369ec..a4dd6dc51 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -251,6 +251,7 @@ bg:
   error_query_statement_invalid: Изпълнението на заявката завърши с грешка и тя беше записана. Моля докладвайте тази грешка на администратора на Redmine.
 
   mail_subject_lost_password: "Вашата парола (%{value})"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'За да смените паролата си, използвайте следния линк:'
   mail_body_lost_password_validity: Моля имайте предвид, че можете да използвате тази връзка само един път, за да промените паролата.
   mail_subject_register: "Активация на профил (%{value})"
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index b52730df4..b103b3b82 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -195,6 +195,7 @@ bs:
   warning_attachments_not_saved: "%{count} fajl(ovi) ne mogu biti snimljen(i)."
 
   mail_subject_lost_password: "Vaša %{value} lozinka"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Za promjenu lozinke, kliknite na sljedeći link:'
   mail_subject_register: "Aktivirajte %{value} vaš korisnički račun"
   mail_body_register: 'Za aktivaciju vašeg korisničkog računa, kliknite na sljedeći link:'
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 3dd5ec109..fde0806a3 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -204,6 +204,7 @@ ca:
   error_ldap_bind_credentials: "Compte/Contrasenya LDAP incorrecte"
 
   mail_subject_lost_password: "Contrasenya de %{value}"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: "Per a canviar la contrasenya, feu clic en l'enllaç següent:"
   mail_subject_register: "Activació del compte de %{value}"
   mail_body_register: "Per a activar el compte, feu clic en l'enllaç següent:"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index a7c8eff33..6370dc33a 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -205,6 +205,7 @@ cs:
   warning_attachments_not_saved: "%{count} soubor(ů) nebylo možné uložit."
 
   mail_subject_lost_password: "Vaše heslo (%{value})"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Pro změnu vašeho hesla klikněte na následující odkaz:'
   mail_subject_register: "Aktivace účtu (%{value})"
   mail_body_register: 'Pro aktivaci vašeho účtu klikněte na následující odkaz:'
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 5fbd88158..88a640454 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -196,6 +196,7 @@ da:
   error_scm_command_failed: "En fejl opstod under forbindelsen til det valgte repository: %{value}"
 
   mail_subject_lost_password: "Dit %{value} kodeord"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Klik på dette link for at ændre dit kodeord:'
   mail_subject_register: "%{value} kontoaktivering"
   mail_body_register: 'Klik på dette link for at aktivere din konto:'
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c07e4d17a..a9b40964f 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -854,6 +854,7 @@ de:
   mail_body_wiki_content_updated: "Die Wiki-Seite '%{id}' wurde von %{author} aktualisiert."
   mail_subject_account_activation_request: "Antrag auf %{value} Kontoaktivierung"
   mail_subject_lost_password: "Ihr %{value} Passwort"
+  mail_subject_mention: "Mention"
   mail_subject_register: "%{value} Kontoaktivierung"
   mail_subject_reminder: "%{count} Tickets müssen in den nächsten %{days} Tagen abgegeben werden"
   mail_subject_wiki_content_added: "Wiki-Seite '%{id}' hinzugefügt"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 59e404079..956564b7b 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -187,6 +187,7 @@ el:
   warning_attachments_not_saved: "%{count} αρχείο(α) δε μπορούν να αποθηκευτούν."
 
   mail_subject_lost_password: "Ο κωδικός σας %{value}"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Για να αλλάξετε τον κωδικό πρόσβασης, πατήστε τον ακόλουθο σύνδεσμο:'
   mail_subject_register: "Ενεργοποίηση του λογαριασμού χρήστη %{value} "
   mail_body_register: 'Για να ενεργοποιήσετε το λογαριασμό σας, επιλέξτε τον ακόλουθο σύνδεσμο:'
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 559037d2d..f7c905733 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -206,6 +206,7 @@ en-GB:
   warning_attachments_not_saved: "%{count} file(s) could not be saved."
 
   mail_subject_lost_password: "Your %{value} password"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'To change your password, click on the following link:'
   mail_subject_register: "Your %{value} account activation"
   mail_body_register: 'To activate your account, click on the following link:'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a6bf316d4..534e02fd6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -247,6 +247,7 @@ en:
   error_query_statement_invalid: "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
 
   mail_subject_lost_password: "Your %{value} password"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'To change your password, click on the following link:'
   mail_body_lost_password_validity: 'Please be aware that you may change the password only once using this link.'
   mail_subject_register: "Your %{value} account activation"
diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml
index cf3a6dfa7..f889094ba 100644
--- a/config/locales/es-PA.yml
+++ b/config/locales/es-PA.yml
@@ -656,6 +656,7 @@ es-PA:
   mail_body_reminder: "%{count} incidencia(s) asignadas a ti finalizan en los próximos %{days} días:"
   mail_subject_account_activation_request: "Incidencia de activación de cuenta %{value}"
   mail_subject_lost_password: "Tu contraseña del %{value}"
+  mail_subject_mention: "Mention"
   mail_subject_register: "Activación de la cuenta del %{value}"
   mail_subject_reminder: "%{count} incidencia(s) finalizan en los próximos %{days} días"
   notice_account_activated: Su cuenta ha sido activada. Ya puede conectarse.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f053f450b..e5e1d57a2 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -654,6 +654,7 @@ es:
   mail_body_reminder: "%{count} peticion(es) asignadas a ti finalizan en los próximos %{days} días:"
   mail_subject_account_activation_request: "Petición de activación de cuenta %{value}"
   mail_subject_lost_password: "Tu contraseña del %{value}"
+  mail_subject_mention: "Mention"
   mail_subject_register: "Activación de la cuenta del %{value}"
   mail_subject_reminder: "%{count} peticion(es) finalizan en los próximos %{days} días"
   notice_account_activated: Su cuenta ha sido activada. Ya puede conectarse.
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 77c1dc5a9..93c5fb345 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -224,6 +224,7 @@ et:
   warning_attachments_not_saved: "%{count} faili salvestamine ei õnnestunud."
 
   mail_subject_lost_password: "Sinu %{value} parool"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: "Parooli vahetamiseks vajuta järgmisele lingile:"
   mail_subject_register: "Sinu %{value} konto aktiveerimine"
   mail_body_register: "Konto aktiveerimiseks vajuta järgmisele lingile:"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 8fba74007..47f4b465d 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -195,6 +195,7 @@ eu:
   warning_attachments_not_saved: "%{count} fitxategi ezin izan d(ir)a gorde."
 
   mail_subject_lost_password: "Zure %{value} pasahitza"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Zure pasahitza aldatzeko hurrengo estekan klikatu:'
   mail_subject_register: "Zure %{value} kontuaren gaitzea"
   mail_body_register: 'Zure kontua gaitzeko hurrengo estekan klikatu:'
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 70eb249e5..c25b3012b 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -250,6 +250,7 @@ fa:
   error_query_statement_invalid: هنگام اجرای جستار خطایی رخ داده و ثبت شده است. لطفاً این خطا را به راه‌بر پی‌گیر گزارش دهید.
 
   mail_subject_lost_password: "گذرواژه حساب %{value} شما"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'برای تغییر گذرواژه خود، بر روی پیوند زیر کلیک کنید:'
   mail_body_lost_password_validity: 'توجه داشته باشید که شما فقط یک‌بار بوسیله این پیوند می‌توانند گذرواژه خود را تغییر دهید.'
   mail_subject_register: "فعال‌سازی حساب %{value} شما"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 3820de268..96a24ca1f 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -204,6 +204,7 @@ fi:
   error_scm_command_failed: "Tietovarastoon pääsyssä tapahtui virhe: %{value}"
 
   mail_subject_lost_password: "Sinun %{value} salasanasi"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Vaihtaaksesi salasanasi, napsauta seuraavaa linkkiä:'
   mail_subject_register: "%{value} tilin aktivointi"
   mail_body_register: 'Aktivoidaksesi tilisi, napsauta seuraavaa linkkiä:'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2343f834d..81e854ebe 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -246,6 +246,7 @@ fr:
   error_exceeds_maximum_hours_per_day: "Impossible de saisir plus de %{max_hours} heures pour le même jour (%{logged_hours} heures ont déjà été saisies)"
 
   mail_subject_lost_password: "Votre mot de passe %{value}"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant :'
   mail_subject_register: "Activation de votre compte %{value}"
   mail_body_register: 'Pour activer votre compte, cliquez sur le lien suivant :'
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 91f3d24c2..84a5a8340 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -629,6 +629,7 @@ gl:
   mail_body_reminder: "%{count} petición(s) asignadas a ti rematan nos próximos %{days} días:"
   mail_subject_account_activation_request: "Petición de activación de conta %{value}"
   mail_subject_lost_password: "O teu contrasinal de %{value}"
+  mail_subject_mention: "Mention"
   mail_subject_register: "Activación da conta de %{value}"
   mail_subject_reminder: "%{count} petición(s) rematarán nos próximos %{days} días"
   notice_account_activated: A súa conta foi activada. Xa pode conectarse.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 705e38502..23f37d39f 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -205,6 +205,7 @@ he:
   warning_attachments_not_saved: "כשלון בשמירת %{count} קבצים."
 
   mail_subject_lost_password: "סיסמת ה־%{value} שלך"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'לשינו סיסמת ה־Redmine שלך, לחץ על הקישור הבא:'
   mail_subject_register: "הפעלת חשבון %{value}"
   mail_body_register: 'להפעלת חשבון ה־Redmine שלך, לחץ על הקישור הבא:'
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 3bb3f55f3..f5ba5c38d 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -188,6 +188,7 @@ hr:
   warning_attachments_not_saved: "%{count} Datoteka/e nije mogla biti spremljena."
 
   mail_subject_lost_password: "Vaša %{value} zaporka"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Kako biste promijenili Vašu zaporku slijedite poveznicu:'
   mail_subject_register: "Aktivacija korisničog računa %{value}"
   mail_body_register: 'Da biste aktivirali svoj račun, kliknite na sljedeci link:'
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index ee60626cb..57e60d99f 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -202,6 +202,7 @@
   error_issue_not_found_in_project: 'A feladat nem található, vagy nem ehhez a projekthez tartozik'
 
   mail_subject_lost_password: Az Ön Redmine jelszava
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'A Redmine jelszó megváltoztatásához, kattintson a következő linkre:'
   mail_subject_register: Redmine azonosító aktiválása
   mail_body_register: 'A Redmine azonosítója aktiválásához, kattintson a következő linkre:'
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 3f0351d54..b561ef8de 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -188,6 +188,7 @@ id:
   warning_attachments_not_saved: "%{count} berkas tidak bisa disimpan."
 
   mail_subject_lost_password: "Kata sandi %{value} anda"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Untuk mengubah kata sandi anda, klik tautan berikut::'
   mail_subject_register: "Aktivasi akun %{value} anda"
   mail_body_register: 'Untuk mengaktifkan akun anda, klik tautan berikut:'
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 7ff9fb678..fab1c1a17 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -179,6 +179,7 @@ it:
   error_scm_command_failed: "Si è verificato un errore durante l'accesso al repository: %{value}"
 
   mail_subject_lost_password: "Password %{value}"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Per cambiare la password, usa il seguente collegamento:'
   mail_subject_register: "Attivazione utente %{value}"
   mail_body_register: "Per attivare l'utente, usa il seguente collegamento:"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 13dbce328..8d74e14db 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -223,6 +223,7 @@ ja:
   warning_attachments_not_saved: "%{count}個の添付ファイルが保存できませんでした。"
 
   mail_subject_lost_password: "%{value} パスワード再設定"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'パスワードを変更するには、以下のリンクをクリックしてください:'
   mail_body_lost_password_validity: 'このリンクでパスワードを再設定できるのは1回だけです。ご注意ください。'
   mail_subject_register: "%{value} アカウント登録の確認"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 0007f1a16..fa5020e2d 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -231,6 +231,7 @@ ko:
   warning_attachments_not_saved: "%{count}개 파일을 저장할 수 없습니다."
 
   mail_subject_lost_password: "%{value} 비밀번호"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: '비밀번호를 변경하려면 다음 링크를 클릭하세요.'
   mail_subject_register: "%{value} 계정 활성화"
   mail_body_register: '계정을 활성화하려면 링크를 클릭하세요.:'
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index eebefc83b..c6a73efd2 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -224,6 +224,7 @@ lt:
   error_ldap_bind_credentials: "Netinkamas LDAP Vartotojo vardas/Slaptažodis"
 
   mail_subject_lost_password: "Jūsų %{value} slaptažodis"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Norėdami pakeisti slaptažodį, spauskite nuorodą:'
   mail_subject_register: "Jūsų %{value} paskyros aktyvavimas"
   mail_body_register: 'Norėdami aktyvuoti paskyrą, spauskite nuorodą:'
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index e7c5529c9..4dbf25be7 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -187,6 +187,7 @@ lv:
   warning_attachments_not_saved: "%{count} datnes netika saglabātas."
 
   mail_subject_lost_password: "Jūsu %{value} parole"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Lai mainītu paroli, spiediet uz šīs saites:'
   mail_subject_register: "Jūsu %{value} konta aktivizācija"
   mail_body_register: 'Lai izveidotu kontu, spiediet uz šīs saites:'
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 4c01fa5e6..5cc1f7ecf 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -200,6 +200,7 @@ mk:
   warning_attachments_not_saved: "%{count} file(s) could not be saved."
 
   mail_subject_lost_password: "Вашата %{value} лозинка"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'To change your password, click on the following link:'
   mail_subject_register: "Your %{value} account activation"
   mail_body_register: 'To activate your account, click on the following link:'
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index f63813992..85924185d 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -193,6 +193,7 @@ mn:
   warning_attachments_not_saved: "%{count} file(s) файлыг хадгалж чадсангүй."
 
   mail_subject_lost_password: "Таны %{value} нууц үг"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Нууц үгээ өөрчлөхийн тулд доорх холбоос дээр дарна уу:'
   mail_subject_register: "Таны %{value} дансыг идэвхжүүлэх"
   mail_body_register: 'Дансаа идэвхжүүлэхийн тулд доорх холбоос дээр дарна уу:'
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index a1ca2605b..20ae8f31f 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -598,6 +598,7 @@ nl:
   mail_body_reminder: "%{count} issue(s) die aan u toegewezen zijn en voldaan moeten zijn in de komende %{days} dagen:"
   mail_subject_account_activation_request: "%{value} account activeringsverzoek"
   mail_subject_lost_password: "uw %{value} wachtwoord"
+  mail_subject_mention: "Mention"
   mail_subject_register: "uw %{value} accountactivering"
   mail_subject_reminder: "%{count} issue(s) die voldaan moeten zijn in de komende %{days} dagen."
   notice_account_activated: Uw account is geactiveerd. U kunt nu inloggen.
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 1514c93df..e3548405c 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -171,6 +171,7 @@
   error_issue_not_found_in_project: 'Saken eksisterer ikke, eller hører ikke til dette prosjektet'
 
   mail_subject_lost_password: "Ditt %{value} passord"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Klikk følgende lenke for å endre ditt passord:'
   mail_subject_register: "%{value} kontoaktivering"
   mail_body_register: 'Klikk følgende lenke for å aktivere din konto:'
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index b78a7216c..6aef9c5cb 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -259,6 +259,7 @@ pl:
   error_query_statement_invalid: "Wystąpił błąd podczas wykonywania tej kwerendy i został on zapisany w dzienniku. Poinformuj o tym błędzie administratora Redmine."
 
   mail_subject_lost_password: "Twoje hasło do %{value}"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: "W celu zmiany swojego hasła użyj poniższego odnośnika:"
   mail_body_lost_password_validity: Pamiętaj o tym, że korzystając z tego linku możesz zmienić hasło tylko raz.
   mail_subject_register: "Aktywacja konta w %{value}"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 3344a5d17..b60001457 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -204,6 +204,7 @@ pt-BR:
   error_ldap_bind_credentials: "Conta/Palavra-chave do LDAP não é válida"
 
   mail_subject_lost_password: "Sua senha do %{value}."
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
   mail_subject_register: "Ativação de conta do %{value}."
   mail_body_register: 'Para ativar sua conta, clique no link abaixo:'
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 0c4cf22da..19884c93e 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -191,6 +191,7 @@ pt:
   error_ldap_bind_credentials: "Conta/Palavra-chave do LDAP não é válida"
 
   mail_subject_lost_password: "Palavra-chave de %{value}"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Para mudar a sua palavra-chave, clique na ligação abaixo:'
   mail_subject_register: "Ativação de conta de %{value}"
   mail_body_register: 'Para ativar a sua conta, clique na ligação abaixo:'
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 672291284..2d30566dd 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -179,6 +179,7 @@ ro:
   warning_attachments_not_saved: "Nu s-au putut salva %{count} fișiere."
 
   mail_subject_lost_password: "Parola dumneavoastră: %{value}"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Pentru a schimba parola, accesați:'
   mail_subject_register: "Activarea contului %{value}"
   mail_body_register: 'Pentru activarea contului, accesați:'
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2d0be5c6b..014b6cf9c 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -735,6 +735,7 @@ ru:
   mail_body_reminder: "%{count} назначенных на Вас задач на следующие %{days} дней:"
   mail_subject_account_activation_request: "Запрос на активацию пользователя в системе %{value}"
   mail_subject_lost_password: "Ваш %{value} пароль"
+  mail_subject_mention: "Упоминание"
   mail_subject_register: "Активация учётной записи %{value}"
   mail_subject_reminder: "%{count} назначенных на Вас задач в ближайшие %{days} дней"
 
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 86b8817da..8b2bb969d 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -179,6 +179,7 @@ sk:
   error_issue_not_found_in_project: 'Úloha nebola nájdená, alebo nepatrí k tomuto projektu'
 
   mail_subject_lost_password: "Vaše heslo %{value}"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Na zmenu hesla kliknite na nasledujúci odkaz:'
   mail_subject_register: "Aktivácia vášho účtu %{value}"
   mail_body_register: 'Ak si želáte aktivovať váš účet, kliknite na nasledujúci odkaz:'
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 0f3629bb1..ec1c70d8c 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -181,6 +181,7 @@ sl:
   error_issue_not_found_in_project: 'Zahtevek ni bil najden ali pa ne pripada temu projektu'
 
   mail_subject_lost_password: "Vaše %{value} geslo"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Za spremembo glesla kliknite na naslednjo povezavo:'
   mail_subject_register: "Aktivacija %{value} vašega računa"
   mail_body_register: 'Za aktivacijo vašega računa kliknite na naslednjo povezavo:'
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index f51212330..f47d83c32 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -243,6 +243,7 @@ sq:
   error_attachment_not_found: "S’u gjet bashkëngjitja %{name}"
 
   mail_subject_lost_password: "Fjalëkalimi juaj %{value}"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Që të ndryshoni fjalëkalimin, klikoni mbi lidhjen vijuese:'
   mail_body_lost_password_validity: 'Ju lutemi, mbani parasysh se fjalëkalimin mundeni ta ndryshoni vetëm një herë duke përdorur këtë lidhje.'
   mail_subject_register: "Aktivizim i llogarisë tuaj %{value}"
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 4a1fa7ffe..9e9ffe88c 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -202,6 +202,7 @@ sr-YU:
   warning_attachments_not_saved: "%{count} datoteka ne može biti snimljena."
 
   mail_subject_lost_password: "Vaša %{value} lozinka"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Za promenu vaše lozinke, kliknite na sledeći link:'
   mail_subject_register: "Aktivacija vašeg %{value} naloga"
   mail_body_register: 'Za aktivaciju vašeg naloga, kliknite na sledeći link:'
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 64f9cd761..6b7a23d89 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -200,6 +200,7 @@ sr:
   warning_attachments_not_saved: "%{count} датотека не може бити снимљена."
 
   mail_subject_lost_password: "Ваша %{value} лозинка"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'За промену ваше лозинке, кликните на следећи линк:'
   mail_subject_register: "Активација вашег %{value} налога"
   mail_body_register: 'За активацију вашег налога, кликните на следећи линк:'
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 971211d10..1ce82faff 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -251,6 +251,7 @@ sv:
   warning_attachments_not_saved: "%{count} fil(er) kunde inte sparas."
 
   mail_subject_lost_password: "Ditt %{value} lösenord"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'För att ändra ditt lösenord, klicka på följande länk:'
   mail_subject_register: "Din %{value} kontoaktivering"
   mail_body_register: 'För att aktivera ditt konto, klicka på följande länk:'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 637035501..1c4e7fe61 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -179,6 +179,7 @@ th:
   error_issue_not_found_in_project: 'ไม่พบปัญหานี้ หรือปัญหาไม่ได้อยู่ในโครงการนี้'
 
   mail_subject_lost_password: "รหัสผ่าน %{value} ของคุณ"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'คลิ๊กที่ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่าน:'
   mail_subject_register: "เปิดบัญชี %{value} ของคุณ"
   mail_body_register: 'คลิ๊กที่ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่าน:'
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 558460e95..f566c148a 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -195,6 +195,7 @@ tr:
   error_issue_not_found_in_project: 'İş bilgisi bulunamadı veya bu projeye ait değil'
 
   mail_subject_lost_password: "Parolanız %{value}"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Parolanızı değiştirmek için, aşağıdaki bağlantıya tıklayın:'
   mail_subject_register: "%{value} hesap aktivasyonu"
   mail_body_register: 'Hesabınızı etkinleştirmek için, aşağıdaki bağlantıya tıklayın:'
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 348cad046..f12e126f8 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -188,6 +188,7 @@ uk:
   notice_account_pending: "Ваш обліковий запис створено і він чекає на підтвердження адміністратором."
 
   mail_subject_lost_password: "Ваш %{value} пароль"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: 'Для зміни пароля, зайдіть за наступним посиланням:'
   mail_subject_register: "Активація облікового запису %{value}"
   mail_body_register: 'Для активації облікового запису, зайдіть за наступним посиланням:'
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 4369fbb79..4e0bc76e6 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -235,6 +235,7 @@ vi:
   error_issue_not_found_in_project: 'Vấn đề không tồn tại hoặc không thuộc dự án'
 
   mail_subject_lost_password: "%{value}: mật mã của bạn"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: "Để đổi mật mã, hãy click chuột vào liên kết sau:"
   mail_subject_register: "%{value}: kích hoạt tài khoản"
   mail_body_register: "Để kích hoạt tài khoản, hãy click chuột vào liên kết sau:"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 601708f2c..df1ab4abf 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -310,6 +310,7 @@
   error_exceeds_maximum_hours_per_day: "工時記錄單日不能超過 %{max_hours} 小時 (目前已登錄 %{logged_hours} 小時)"
 
   mail_subject_lost_password: 您的 Redmine 網站密碼
+  mail_subject_mention: "Mention"
   mail_body_lost_password: '欲變更您的 Redmine 網站密碼, 請點選以下鏈結:'
   mail_subject_register: 啟用您的 Redmine 帳號
   mail_body_register: '欲啟用您的 Redmine 帳號, 請點選以下鏈結:'
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a272a704b..896fca8fa 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -205,6 +205,7 @@ zh:
   warning_attachments_not_saved: "%{count} 个文件保存失败"
 
   mail_subject_lost_password: "您的 %{value} 密码"
+  mail_subject_mention: "Mention"
   mail_body_lost_password: '请点击以下链接来修改您的密码：'
   mail_subject_register: "%{value}帐号激活"
   mail_body_register: '请点击以下链接来激活您的帐号：'
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 07b7d27ae..31a6ee50f 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -475,6 +475,10 @@ class MailerTest < ActiveSupport::TestCase
     # @dlopper won't receive duplicated notifications
     assert_equal 3, ActionMailer::Base.deliveries.size
     assert_include User.find(1).mail, recipients
+    # Emails that were sent to the mentioned users should have a [Mention] label
+    emails_by_recipients("dlopper@somenet.foo", "admin@somenet.foo").each do |m|
+      assert_match "[#{l(:mail_subject_mention)}]", m.subject
+    end
   end
 
   def test_issue_add_should_include_enabled_fields
@@ -637,6 +641,9 @@ class MailerTest < ActiveSupport::TestCase
     # @dlopper won't receive duplicated notifications
     assert_equal 3, ActionMailer::Base.deliveries.size
     assert_include User.find(1).mail, recipients
+
+    # Emails that were sent to the mentioned users should have a [Mention] label
+    assert_match "[#{l(:mail_subject_mention)}]", emails_by_recipients("admin@somenet.foo").first.subject
   end
 
   def test_issue_edit_should_notify_mentioned_users_in_notes
@@ -652,6 +659,9 @@ class MailerTest < ActiveSupport::TestCase
     # @dlopper won't receive duplicated notifications
     assert_equal 3, ActionMailer::Base.deliveries.size
     assert_include User.find(1).mail, recipients
+
+    # Emails that were sent to the mentioned users should have a [Mention] label
+    assert_match "[#{l(:mail_subject_mention)}]", emails_by_recipients("admin@somenet.foo").first.subject
   end
 
   def test_issue_should_send_email_notification_with_suppress_empty_fields
@@ -762,6 +772,8 @@ class MailerTest < ActiveSupport::TestCase
     # @dlopper won't receive duplicated notifications
     assert_equal 3, ActionMailer::Base.deliveries.size
     assert_include User.find(1).mail, recipients
+    # Emails that were sent to the mentioned users should have a [Mention] label
+    assert_match "[#{l(:mail_subject_mention)}]", emails_by_recipients("admin@somenet.foo").first.subject
   end
 
   def test_wiki_content_updated
@@ -787,6 +799,8 @@ class MailerTest < ActiveSupport::TestCase
     # @dlopper won't receive duplicated notifications
     assert_equal 3, ActionMailer::Base.deliveries.size
     assert_include User.find(1).mail, recipients
+    # Emails that were sent to the mentioned users should have a [Mention] label
+    assert_match "[#{l(:mail_subject_mention)}]", emails_by_recipients("admin@somenet.foo").first.subject
   end
 
   def test_register
@@ -1221,4 +1235,8 @@ class MailerTest < ActiveSupport::TestCase
   def destination_user(mail)
     EmailAddress.where(:address => [mail.to, mail.cc].flatten).map(&:user).first
   end
+
+  def emails_by_recipients(*recipients)
+    ActionMailer::Base.deliveries.select{ |m| (recipients & m.to).present? }
+  end
 end
