diff --git a/app/views/mailer/lost_password.rhtml b/app/views/mailer/lost_password.rhtml
index 430e14b..ea2e58a 100644
--- a/app/views/mailer/lost_password.rhtml
+++ b/app/views/mailer/lost_password.rhtml
@@ -1,3 +1,2 @@
-To change your password, use the following link:
-
+<%= l(:mail_body_lost_password) %>
 <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
diff --git a/app/views/mailer/lost_password_bg.rhtml b/app/views/mailer/lost_password_bg.rhtml
deleted file mode 100644
index b981f27..0000000
--- a/app/views/mailer/lost_password_bg.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-За да смените паролата си, използвайте следния линк:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
diff --git a/app/views/mailer/lost_password_de.rhtml b/app/views/mailer/lost_password_de.rhtml
deleted file mode 100644
index 1607e29..0000000
--- a/app/views/mailer/lost_password_de.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Benutzen Sie folgenden Link, um das Password zu ändern:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
diff --git a/app/views/mailer/lost_password_fr.rhtml b/app/views/mailer/lost_password_fr.rhtml
deleted file mode 100644
index 944852b..0000000
--- a/app/views/mailer/lost_password_fr.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Pour changer votre mot de passe, utilisez le lien suivant:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
diff --git a/app/views/mailer/lost_password_it.rhtml b/app/views/mailer/lost_password_it.rhtml
deleted file mode 100644
index 69814b0..0000000
--- a/app/views/mailer/lost_password_it.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Per cambiare la password, usate il seguente collegamento:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
diff --git a/app/views/mailer/lost_password_ja.rhtml b/app/views/mailer/lost_password_ja.rhtml
deleted file mode 100644
index 3c7ddd1..0000000
--- a/app/views/mailer/lost_password_ja.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-パスワードを変更するには、以下のリンクをたどってください:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
diff --git a/app/views/mailer/lost_password_nl.rhtml b/app/views/mailer/lost_password_nl.rhtml
deleted file mode 100644
index 22b067c..0000000
--- a/app/views/mailer/lost_password_nl.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Gebruik de volgende link om Uw wachtwoord te wijzigen:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
diff --git a/app/views/mailer/lost_password_pl.rhtml b/app/views/mailer/lost_password_pl.rhtml
deleted file mode 100644
index 6320f72..0000000
--- a/app/views/mailer/lost_password_pl.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-W celu zmiany swojego hasła użyj poniższego odnośnika:
-
-http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
\ No newline at end of file
diff --git a/app/views/mailer/lost_password_pt-br.rhtml b/app/views/mailer/lost_password_pt-br.rhtml
deleted file mode 100644
index 0cb1f7f..0000000
--- a/app/views/mailer/lost_password_pt-br.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Para mudar sua senha, clique no link abaixo:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
diff --git a/app/views/mailer/lost_password_pt.rhtml b/app/views/mailer/lost_password_pt.rhtml
deleted file mode 100644
index 0cb1f7f..0000000
--- a/app/views/mailer/lost_password_pt.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Para mudar sua senha, clique no link abaixo:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
diff --git a/app/views/mailer/lost_password_sv.rhtml b/app/views/mailer/lost_password_sv.rhtml
deleted file mode 100644
index 1394e73..0000000
--- a/app/views/mailer/lost_password_sv.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-För att ändra lösenord, följ denna länk:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
diff --git a/app/views/mailer/register.rhtml b/app/views/mailer/register.rhtml
index 1c93098..7e4f95f 100644
--- a/app/views/mailer/register.rhtml
+++ b/app/views/mailer/register.rhtml
@@ -1,3 +1,2 @@
-To activate your redMine account, use the following link:
-
+<%= l(:mail_body_register) %>
 <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
diff --git a/app/views/mailer/register_bg.rhtml b/app/views/mailer/register_bg.rhtml
deleted file mode 100644
index adf4f5a..0000000
--- a/app/views/mailer/register_bg.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-За да активирате акаунта си използвайте следния линк:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
diff --git a/app/views/mailer/register_de.rhtml b/app/views/mailer/register_de.rhtml
deleted file mode 100644
index 1d0452b..0000000
--- a/app/views/mailer/register_de.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Um Ihren Account zu aktivieren, benutzen Sie folgenden Link:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
diff --git a/app/views/mailer/register_fr.rhtml b/app/views/mailer/register_fr.rhtml
deleted file mode 100644
index 054df5d..0000000
--- a/app/views/mailer/register_fr.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Pour activer votre compte sur redMine, utilisez le lien suivant:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
diff --git a/app/views/mailer/register_it.rhtml b/app/views/mailer/register_it.rhtml
deleted file mode 100644
index d117a96..0000000
--- a/app/views/mailer/register_it.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Per attivare la vostra utenza redMine, usate il seguente collegamento:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
diff --git a/app/views/mailer/register_ja.rhtml b/app/views/mailer/register_ja.rhtml
deleted file mode 100644
index 520d52f..0000000
--- a/app/views/mailer/register_ja.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-redMine アカウントをアクティブにするには、以下のリンクをたどってください:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
diff --git a/app/views/mailer/register_nl.rhtml b/app/views/mailer/register_nl.rhtml
deleted file mode 100644
index 966ef60..0000000
--- a/app/views/mailer/register_nl.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Gebruik de volgende link om Uw redMine account te activeren:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
diff --git a/app/views/mailer/register_pl.rhtml b/app/views/mailer/register_pl.rhtml
deleted file mode 100644
index ab20d4e..0000000
--- a/app/views/mailer/register_pl.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-W celu aktywacji Twojego konta w redMine, użyj poniższego odnośnika:
-
-http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
\ No newline at end of file
diff --git a/app/views/mailer/register_pt-br.rhtml b/app/views/mailer/register_pt-br.rhtml
deleted file mode 100644
index fcf3f02..0000000
--- a/app/views/mailer/register_pt-br.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Para ativar sua conta do redMine, clique no link abaixo:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
diff --git a/app/views/mailer/register_pt.rhtml b/app/views/mailer/register_pt.rhtml
deleted file mode 100644
index fcf3f02..0000000
--- a/app/views/mailer/register_pt.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-Para ativar sua conta do redMine, clique no link abaixo:
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
diff --git a/app/views/mailer/register_sv.rhtml b/app/views/mailer/register_sv.rhtml
deleted file mode 100644
index e7bdd22..0000000
--- a/app/views/mailer/register_sv.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-För att aktivera ditt redMine-konto, använd följande länk.
-
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 9f0c14a..f6492c1 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -75,7 +75,9 @@ notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
 mail_subject_lost_password: Вашата парола
+mail_body_lost_password: 'За да смените паролата си, използвайте следния линк:'
 mail_subject_register: Активация на акаунт
+mail_body_register: 'За да активирате акаунта си използвайте следния линк:'
 
 gui_validation_error: 1 грешка
 gui_validation_error_plural: %d грешки
diff --git a/lang/cs.yml b/lang/cs.yml
index 4392a0d..428fa31 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -75,7 +75,9 @@ notice_email_error: Při odesílání emailu nastala chyba (%s)
 notice_feeds_access_key_reseted: Váš klíč pro přístup k RSS byl resetován.
 
 mail_subject_lost_password: Vaše heslo
+mail_body_lost_password: 'To change your Redmine password, click on the following link:'
 mail_subject_register: aktivace účtu
+mail_body_register: 'To activate your Redmine account, click on the following link:'
 
 gui_validation_error: 1 chyba
 gui_validation_error_plural: %d chyb(y)
diff --git a/lang/de.yml b/lang/de.yml
index 9c44b92..ddb920f 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -75,7 +75,9 @@ notice_email_error: Beim Senden einer E-Mail ist ein Fehler aufgetreten (%s).
 notice_feeds_access_key_reseted: Ihr RSS-Zugriffsschlüssel wurde zurückgesetzt.
 
 mail_subject_lost_password: Ihr Redmine Kennwort
+mail_body_lost_password: 'Benutzen Sie folgenden Link, um das Password zu Ãndern:'
 mail_subject_register: Redmine Kontoaktivierung
+mail_body_register: 'Um Ihren Account zu aktivieren, benutzen Sie folgenden Link:'
 
 gui_validation_error: 1 Fehler
 gui_validation_error_plural: %d Fehler
diff --git a/lang/en.yml b/lang/en.yml
index d484561..bc6a51c 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -76,8 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
 notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
 
-mail_subject_lost_password: Your redMine password
-mail_subject_register: redMine account activation
+mail_subject_lost_password: Your Redmine password
+mail_body_lost_password: 'To change your Redmine password, click on the following link:'
+mail_subject_register: Redmine account activation
+mail_body_register: 'To activate your Redmine account, click on the following link:'
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errors
diff --git a/lang/es.yml b/lang/es.yml
index d90bb1d..bd0caad 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -72,7 +72,9 @@ notice_scm_error: La entrada y/o la revisión no existe en el depósito.
 notice_not_authorized: No tiene autorización para acceder a esta página.
 
 mail_subject_lost_password: Tu contraseña del CIYAT - Gestor de Solicitudes
+mail_body_lost_password: 'To change your Redmine password, click on the following link:'
 mail_subject_register: Activación de la cuenta del CIYAT - Gestor de Solicitudes
+mail_body_register: 'To activate your Redmine account, click on the following link:'
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errores
diff --git a/lang/fr.yml b/lang/fr.yml
index 03c77b6..7a8e483 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -77,7 +77,9 @@ notice_failed_to_save_issues: "%d demande(s) sur les %d sélectionnées n'ont pa
 notice_no_issue_selected: "Aucune demande sélectionnée ! Cochez les demandes que vous voulez mettre à jour."
 
 mail_subject_lost_password: Votre mot de passe redMine
+mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
 mail_subject_register: Activation de votre compte redMine
+mail_body_register: 'Pour activer votre compte Redmine, cliquez sur le lien suivant:'
 
 gui_validation_error: 1 erreur
 gui_validation_error_plural: %d erreurs
diff --git a/lang/it.yml b/lang/it.yml
index 17b75d9..1a41a8d 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -75,7 +75,9 @@ notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
 mail_subject_lost_password: Password redMine
+mail_body_lost_password: 'Per cambiare la password, usate il seguente collegamento:'
 mail_subject_register: Attivazione utenza redMine
+mail_body_register: 'Per attivare la vostra utenza Redmine, usate il seguente collegamento:'
 
 gui_validation_error: 1 errore
 gui_validation_error_plural: %d errori
diff --git a/lang/ja.yml b/lang/ja.yml
index 6450d0b..c5795f2 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -76,7 +76,9 @@ notice_email_error: メール送信中にエラーが発生しました (%s)
 notice_feeds_access_key_reseted: RSSアクセスキーを初期化しました。
 
 mail_subject_lost_password: redMineパスワード
+mail_body_lost_password: 'パスワードを変更するには、以下のリンクをたどってください:'
 mail_subject_register: redMineアカウントが有効になりました
+mail_body_register: 'Redmine アカウントをアクティブにするには、以下のリンクをたどってください:'
 
 gui_validation_error: 1件のエラー
 gui_validation_error_plural: %d件のエラー
diff --git a/lang/nl.yml b/lang/nl.yml
index 5d9efed..f86dee6 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -75,7 +75,9 @@ notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
 mail_subject_lost_password: Uw redMine wachtwoord
+mail_body_lost_password: 'Gebruik de volgende link om Uw wachtwoord te wijzigen:'
 mail_subject_register: redMine account activatie
+mail_body_register: 'Gebruik de volgende link om Uw Redmine account te activeren:'
 
 gui_validation_error: 1 fout
 gui_validation_error_plural: %d fouten
diff --git a/lang/pl.yml b/lang/pl.yml
index e74d4f3..58a77cd 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -72,7 +72,9 @@ notice_scm_error: Wejście i/lub zmiana nie istnieje w repozytorium.
 notice_not_authorized: Nie jesteś autoryzowany by zobaczyć stronę.
 
 mail_subject_lost_password: Twoje hasło do redMine
+mail_body_lost_password: 'W celu zmiany swojego hasła użyj poniższego odnośnika:'
 mail_subject_register: Aktywacja konta w redMine
+mail_body_register: 'W celu aktywacji Twojego konta w Redmine, użyj poniższego odnośnika:'
 
 gui_validation_error: 1 błąd
 gui_validation_error_plural: %d błędów
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index b988ac5..e2031f3 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -75,7 +75,9 @@ notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
 mail_subject_lost_password: Sua senha do redMine.
+mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
 mail_subject_register: Ativacao de conta do redMine.
+mail_body_register: 'Para ativar sua conta do Redmine, clique no link abaixo:'
 
 gui_validation_error: 1 erro
 gui_validation_error_plural: %d erros
diff --git a/lang/pt.yml b/lang/pt.yml
index f624e38..e6ae7fb 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -75,7 +75,9 @@ notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
 mail_subject_lost_password: Sua senha do redMine.
+mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
 mail_subject_register: Ativação de conta do redMine.
+mail_body_register: 'Para ativar sua conta do Redmine, clique no link abaixo:'
 
 gui_validation_error: 1 erro
 gui_validation_error_plural: %d erros
diff --git a/lang/ro.yml b/lang/ro.yml
index d02b0be..81d850e 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -75,7 +75,9 @@ notice_email_error: Eroare in trimiterea e-mailului (%s)
 notice_feeds_access_key_reseted: Parola de acces RSS a fost resetat.
 
 mail_subject_lost_password: Parola clair.ro|PM
+mail_body_lost_password: 'To change your Redmine password, click on the following link:'
 mail_subject_register: Activare cont clair.ro|PM
+mail_body_register: 'To activate your Redmine account, click on the following link:'
 
 gui_validation_error: 1 eroare
 gui_validation_error_plural: %d erori
diff --git a/lang/sv.yml b/lang/sv.yml
index 1a494ea..7912925 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -75,7 +75,9 @@ notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
 mail_subject_lost_password: Ditt redMine lösenord
+mail_body_lost_password: 'För att ändra lösenord, följ denna länk:'
 mail_subject_register: redMine kontoaktivering
+mail_body_register: 'För att aktivera ditt Redmine-konto, använd följande länk.'
 
 gui_validation_error: 1 fel
 gui_validation_error_plural: %d fel
diff --git a/lang/zh.yml b/lang/zh.yml
index d6c20b5..d0d8490 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -78,7 +78,9 @@ notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
 mail_subject_lost_password: 您的redMine口令
+mail_body_lost_password: 'To change your Redmine password, click on the following link:'
 mail_subject_register: redMine帐户激活
+mail_body_register: 'To activate your Redmine account, click on the following link:'
 
 gui_validation_error: 1 个错误
 gui_validation_error_plural: %d 个错误