diff --git a/config/locales/en.yml b/config/locales/en.yml
index 95a40fa0d..a50d1415c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -300,11 +300,6 @@ en:
     check: Select
     check_all: All
     check_none: None
-  mailer:
-    comment:
-      subject: Someone has commented on your debate
-    reply:
-      subject: Someone has replied to your comment
   unauthorized:
     default: "You are not authorized to access this page."
     manage:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index c196d080c..bf39516d3 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -300,11 +300,6 @@ es:
     check: Seleccionar
     check_all: Todos
     check_none: Ninguno
-  mailer:
-    comment:
-      subject: Alguien ha comentado en tu propuesta
-    reply:
-      subject: Alguien ha respondido a tu comentario
   unauthorized:
     default: "No tienes permiso para acceder a esta página."
     manage:
diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml
index c5aa00a97..030dc13de 100644
--- a/config/locales/mailers.en.yml
+++ b/config/locales/mailers.en.yml
@@ -1,14 +1,17 @@
 en:
   mailers:
     comment:
+      subject: "Someone has commented on your %{commentable}"
       hi: Hello
-      title: New comment on your debate
+      title: New comment
       new_comment_by_html: "There is a new comment by <b>%{commenter}</b> on"
     reply:
+      subject: Someone has replied to your comment
       hi: Hello
       title: New reply on your comment
       new_reply_by_html: "There'is a new reply by <b>%{commenter}</b> to your comment on"
     email_verification:
+      subject: Verify your email
       title: Please verify yourself
       instructions_html: "We need to verify you using this email, which we got from the Census. %{verification_link}"
       click_here_to_verify: "Please click here to verify yourself"
diff --git a/config/locales/mailers.es.yml b/config/locales/mailers.es.yml
index 9b37b2dd5..1ca753ab5 100644
--- a/config/locales/mailers.es.yml
+++ b/config/locales/mailers.es.yml
@@ -1,14 +1,17 @@
 es:
   mailers:
     comment:
+      subject: "Alguien ha comentado en tu %{commentable}"
       hi: Hola
-      title: Nuevo comentario en tu debate
+      title: Nuevo comentario
       new_comment_by_html: "Hay un nuevo comentario de <b>%{commenter}</b> en"
     reply:
+      subject: Alguien ha respondido a tu comentario
       hi: Hola
       title: Nueva respuesta a tu comentario
       new_reply_by_html: "Hay una nueva respuesta de <b>%{commenter}</b> a tu comentario en"
     email_verification:
+      subject: Verifica tu email
       title:  Verifica tu cuenta con el siguiente enlace
       instructions_html: "Para terminar de verificar tu cuenta de usuario en el Portal de Gobierno Abierto del Ayuntamiento de Madrid, necesitamos que pulses %{verification_link}."
       click_here_to_verify: "en este enlace"