diff --git a/languages/bg.lang b/languages/bg.lang
index 3fe134ee..c266774d 100644
--- a/languages/bg.lang
+++ b/languages/bg.lang
@@ -198,7 +198,7 @@ $PALANG['pSendmail_welcome'] = 'Изпращане на е-мейл.';
 $PALANG['pSendmail_admin'] = 'От';
 $PALANG['pSendmail_to'] = 'До';
 $PALANG['pSendmail_to_text_error'] = 'Полето До е празен или невалиден е-мейл адрес!';
-$PALANG['pSendmail_subject'] = 'Заглавие';
+$PALANG['subject'] = 'Заглавие';
 $PALANG['pSendmail_subject_text'] = 'Добре дошли';
 $PALANG['pSendmail_body'] = 'Текст';
 $PALANG['pSendmail_button'] = 'Изпрати';
@@ -297,7 +297,6 @@ $PALANG['pUsersMain_password'] = 'Смяна на настоящата паро
 
 $PALANG['pUsersVacation_welcome'] = 'Автоматичен отговор.';
 $PALANG['pUsersVacation_welcome_text'] = 'Вие вече си имате конфигриран автоматичен отговор!';
-$PALANG['pUsersVacation_subject'] = 'Заглавие';
 $PALANG['pUsersVacation_subject_text'] = 'Out of Office'; # XXX
 $PALANG['pUsersVacation_body'] = 'Текст'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -322,7 +321,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Съобщение до всички';
 $PALANG['pBroadcast_from'] = 'От';
 $PALANG['pBroadcast_name'] = 'Име';
-$PALANG['pBroadcast_subject'] = 'Заглавие';
 $PALANG['pBroadcast_message'] = 'Съобщение';
 $PALANG['pBroadcast_send'] = 'Изпрати';
 $PALANG['pBroadcast_success'] = 'Вашето съобщение беше изпратено.';
diff --git a/languages/ca.lang b/languages/ca.lang
index 6cd6313d..e7e527d9 100644
--- a/languages/ca.lang
+++ b/languages/ca.lang
@@ -196,7 +196,7 @@ $PALANG['pSendmail_welcome'] = 'Enviar un e-mail.';
 $PALANG['pSendmail_admin'] = 'De';
 $PALANG['pSendmail_to'] = 'Destí';
 $PALANG['pSendmail_to_text_error'] = 'La direcció de destí està buida o és una direcció invàlida!';
-$PALANG['pSendmail_subject'] = 'Assumpte';
+$PALANG['subject'] = 'Assumpte';
 $PALANG['pSendmail_subject_text'] = 'Benvingut';
 $PALANG['pSendmail_body'] = 'Cos';
 $PALANG['pSendmail_button'] = 'Enviar missatge';
@@ -296,7 +296,6 @@ $PALANG['pUsersMain_password'] = 'Canvïi la seva contrasenya.';
 
 $PALANG['pUsersVacation_welcome'] = 'Resposta automàtica.';
 $PALANG['pUsersVacation_welcome_text'] = 'Ja disposa d\'una resposta automàtica configurada!';
-$PALANG['pUsersVacation_subject'] = 'Assumpte';
 $PALANG['pUsersVacation_subject_text'] = 'Fora de la feina';
 $PALANG['pUsersVacation_body'] = 'Cos'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -321,7 +320,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/cn.lang b/languages/cn.lang
index f27d4df4..230c6722 100644
--- a/languages/cn.lang
+++ b/languages/cn.lang
@@ -197,7 +197,7 @@ $PALANG['pSendmail_welcome'] = '发送邮件.';
 $PALANG['pSendmail_admin'] = '发件人';
 $PALANG['pSendmail_to'] = '收件人';
 $PALANG['pSendmail_to_text_error'] = '收件人为空或者收件人地址不正确!';
-$PALANG['pSendmail_subject'] = '主题';
+$PALANG['subject'] = '主题';
 $PALANG['pSendmail_subject_text'] = '欢迎';
 $PALANG['pSendmail_body'] = '内容';
 $PALANG['pSendmail_button'] = '发送';
@@ -296,7 +296,6 @@ $PALANG['pUsersMain_password'] = '修改当前密码.';
 
 $PALANG['pUsersVacation_welcome'] = '自动回复.';
 $PALANG['pUsersVacation_welcome_text'] = '你已经设置了自动回复!';
-$PALANG['pUsersVacation_subject'] = '主题';
 $PALANG['pUsersVacation_subject_text'] = '我现在无法回信';
 $PALANG['pUsersVacation_body'] = '内容'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -321,7 +320,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/cs.lang b/languages/cs.lang
index be3d97e2..d2bdaaec 100644
--- a/languages/cs.lang
+++ b/languages/cs.lang
@@ -205,7 +205,7 @@ $PALANG['pSendmail_welcome'] = 'Poslat email.';
 $PALANG['pSendmail_admin'] = 'Od';
 $PALANG['pSendmail_to'] = 'Komu';
 $PALANG['pSendmail_to_text_error'] = 'V poli "Komu" není zadaná platná emailová adresa!';
-$PALANG['pSendmail_subject'] = 'Předmět';
+$PALANG['subject'] = 'Předmět';
 $PALANG['pSendmail_subject_text'] = 'Vítejte';
 $PALANG['pSendmail_body'] = 'Obsah';
 $PALANG['pSendmail_button'] = 'Poslat email';
@@ -305,7 +305,6 @@ $PALANG['pUsersMain_password'] = 'Změnit heslo';
 
 $PALANG['pUsersVacation_welcome'] = 'Automatická odpověď';
 $PALANG['pUsersVacation_welcome_text'] = 'Již máte nastavenou automatickou odpověď!';
-$PALANG['pUsersVacation_subject'] = 'Předmět';
 $PALANG['pUsersVacation_subject_text'] = 'Dovolená';
 $PALANG['pUsersVacation_body'] = 'Obsah'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -332,7 +331,6 @@ $PALANG['pReturn_to'] = 'Odpovědět komu';
 $PALANG['pBroadcast_title'] = 'Odeslat zprávu do všech schránek';
 $PALANG['pBroadcast_from'] = 'Od';
 $PALANG['pBroadcast_name'] = 'Vaše jméno';
-$PALANG['pBroadcast_subject'] = 'Předmět';
 $PALANG['pBroadcast_message'] = 'Zpráva';
 $PALANG['pBroadcast_send'] = 'Odeslat zprávu';
 $PALANG['pBroadcast_success'] = 'Zpráva pro všechny schránky byla odeslána.';
diff --git a/languages/da.lang b/languages/da.lang
index 4efc505c..abb05af9 100644
--- a/languages/da.lang
+++ b/languages/da.lang
@@ -205,7 +205,7 @@ $PALANG['pSendmail_welcome'] = 'Send en email.';
 $PALANG['pSendmail_admin'] = 'Afsender';
 $PALANG['pSendmail_to'] = 'Modtager';
 $PALANG['pSendmail_to_text_error']  = 'Modtager er tom, eller har en ugyldig emailadresse.';
-$PALANG['pSendmail_subject'] = 'Emne';
+$PALANG['subject'] = 'Emne';
 $PALANG['pSendmail_subject_text'] = 'Velkommen';
 $PALANG['pSendmail_body'] = 'Meddelelse';
 $PALANG['pSendmail_button'] = 'Send email';
@@ -305,7 +305,6 @@ $PALANG['pUsersMain_password']    = 'Ændr din nuværende adgangskode.';
 
 $PALANG['pUsersVacation_welcome'] = 'Autosvar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Du har allerede autosvar indstillet!';
-$PALANG['pUsersVacation_subject'] = 'Emne';
 $PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede';
 $PALANG['pUsersVacation_body'] = 'Meddelelse'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -332,7 +331,6 @@ $PALANG['pReturn_to'] = 'Tilbage til';
 $PALANG['pBroadcast_title'] = 'Rundsend meddelelse';
 $PALANG['pBroadcast_from'] = 'Afsender';
 $PALANG['pBroadcast_name'] = 'Dit navn';
-$PALANG['pBroadcast_subject'] = 'Emne';
 $PALANG['pBroadcast_message'] = 'Meddelelse';
 $PALANG['pBroadcast_send'] = 'Send meddelelse';
 $PALANG['pBroadcast_success'] = 'Din meddelelse er rundsendt.';
diff --git a/languages/de.lang b/languages/de.lang
index 8bb9211c..e754eb98 100644
--- a/languages/de.lang
+++ b/languages/de.lang
@@ -202,7 +202,7 @@ $PALANG['pSendmail_welcome'] = 'eMail versenden.';
 $PALANG['pSendmail_admin'] = 'Von';
 $PALANG['pSendmail_to'] = 'An';
 $PALANG['pSendmail_to_text_error'] = 'Das "An"-Feld ist leer bzw. ungültig!';
-$PALANG['pSendmail_subject'] = 'Betreff';
+$PALANG['subject'] = 'Betreff';
 $PALANG['pSendmail_subject_text'] = 'Willkommen';
 $PALANG['pSendmail_body'] = 'Text';
 $PALANG['pSendmail_button'] = 'Versende Nachricht';
@@ -302,7 +302,6 @@ $PALANG['pUsersMain_password'] = 'Ändern Sie Ihr Passwort.';
 
 $PALANG['pUsersVacation_welcome'] = 'Automatische Antwort.';
 $PALANG['pUsersVacation_welcome_text'] = 'Sie haben schon eine Automatische Antwort konfiguriert!';
-$PALANG['pUsersVacation_subject'] = 'Betreff';
 $PALANG['pUsersVacation_subject_text'] = 'Ich bin weg...';
 $PALANG['pUsersVacation_body'] = 'Nachricht';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -330,7 +329,6 @@ $PALANG['pReturn_to'] = 'Zurück zu';
 $PALANG['pBroadcast_title'] = 'Rundmail senden';
 $PALANG['pBroadcast_from'] = 'Von';
 $PALANG['pBroadcast_name'] = 'Ihr Name';
-$PALANG['pBroadcast_subject'] = 'Betreff';
 $PALANG['pBroadcast_message'] = 'Nachricht';
 $PALANG['pBroadcast_send'] = 'Nachricht senden';
 $PALANG['pBroadcast_success'] = 'Ihre Rundmail wurde gesendet.';
diff --git a/languages/en.lang b/languages/en.lang
index d01a22b8..0dc59778 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -203,7 +203,7 @@ $PALANG['pSendmail_welcome'] = 'Send an email.';
 $PALANG['pSendmail_admin'] = 'From';
 $PALANG['pSendmail_to'] = 'To';
 $PALANG['pSendmail_to_text_error'] = 'To is empty or is not a valid email address!';
-$PALANG['pSendmail_subject'] = 'Subject';
+$PALANG['subject'] = 'Subject';
 $PALANG['pSendmail_subject_text'] = 'Welcome';
 $PALANG['pSendmail_body'] = 'Body';
 $PALANG['pSendmail_button'] = 'Send Message';
@@ -306,7 +306,6 @@ $PALANG['pUsersMain_password'] = 'Change your current password.';
 
 $PALANG['pUsersVacation_welcome'] = 'Auto Response.';
 $PALANG['pUsersVacation_welcome_text'] = 'You already have an auto response configured!';
-$PALANG['pUsersVacation_subject'] = 'Subject';
 $PALANG['pUsersVacation_subject_text'] = 'Out of Office';
 $PALANG['pUsersVacation_body'] = 'Message';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -333,7 +332,6 @@ $PALANG['pReturn_to'] = 'Return to';
 $PALANG['pBroadcast_title'] = 'Send broadcast message';
 $PALANG['pBroadcast_from'] = 'From';
 $PALANG['pBroadcast_name'] = 'Your name';
-$PALANG['pBroadcast_subject'] = 'Subject';
 $PALANG['pBroadcast_message'] = 'Message';
 $PALANG['pBroadcast_send'] = 'Send message';
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.';
diff --git a/languages/es.lang b/languages/es.lang
index 505871c3..60ba4838 100644
--- a/languages/es.lang
+++ b/languages/es.lang
@@ -198,7 +198,7 @@ $PALANG['pSendmail_welcome'] = 'Enviar un e-mail.';
 $PALANG['pSendmail_admin'] = 'De';
 $PALANG['pSendmail_to'] = 'Destino';
 $PALANG['pSendmail_to_text_error'] = '¡La dirección destino está vacía o es una dirección inválida!';
-$PALANG['pSendmail_subject'] = 'Asunto';
+$PALANG['subject'] = 'Asunto';
 $PALANG['pSendmail_subject_text'] = 'Bienvenido';
 $PALANG['pSendmail_body'] = 'Cuerpo';
 $PALANG['pSendmail_button'] = 'Enviar mensaje';
@@ -298,7 +298,6 @@ $PALANG['pUsersMain_password'] = 'Cambie su contraseña.';
 
 $PALANG['pUsersVacation_welcome'] = 'Respuesta automática.';
 $PALANG['pUsersVacation_welcome_text'] = '¡Ya dispone de una respuesta automática configurada!';
-$PALANG['pUsersVacation_subject'] = 'Asunto';
 $PALANG['pUsersVacation_subject_text'] = 'Fuera del trabajo';
 $PALANG['pUsersVacation_body'] = 'Mensaje'; 
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -323,7 +322,6 @@ $PALANG['pReturn_to'] = 'Volver a';
 $PALANG['pBroadcast_title'] = 'Enviar mensaje a todos'; # XXX
 $PALANG['pBroadcast_from'] = 'De'; 
 $PALANG['pBroadcast_name'] = 'Tu nombre'; 
-$PALANG['pBroadcast_subject'] = 'Asunto'; 
 $PALANG['pBroadcast_message'] = 'Mensaje'; 
 $PALANG['pBroadcast_send'] = 'Enviar mensaje'; 
 $PALANG['pBroadcast_success'] = 'Se ha enviado el mensaje.'; 
diff --git a/languages/et.lang b/languages/et.lang
index 1949238c..a375907c 100644
--- a/languages/et.lang
+++ b/languages/et.lang
@@ -197,7 +197,7 @@ $PALANG['pSendmail_welcome'] = 'Saada kiri.';
 $PALANG['pSendmail_admin'] = 'Kellelt';
 $PALANG['pSendmail_to'] = 'Kellele';
 $PALANG['pSendmail_to_text_error'] = 'Kellele on tühi või ei sisalda kehtivat aadressi!';
-$PALANG['pSendmail_subject'] = 'Teema';
+$PALANG['subject'] = 'Teema';
 $PALANG['pSendmail_subject_text'] = 'Tere tulemast';
 $PALANG['pSendmail_body'] = 'Põhitekst';
 $PALANG['pSendmail_button'] = 'Saada teade';
@@ -296,7 +296,6 @@ $PALANG['pUsersMain_password'] = 'Muuda praegust parooli.';
 
 $PALANG['pUsersVacation_welcome'] = 'Automaatne vastus.';
 $PALANG['pUsersVacation_welcome_text'] = 'Automaatne vastus on juba seadistatud!';
-$PALANG['pUsersVacation_subject'] = 'Teema';
 $PALANG['pUsersVacation_subject_text'] = 'Kontorist väljas';
 $PALANG['pUsersVacation_body'] = 'Põhitekst'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -324,7 +323,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/eu.lang b/languages/eu.lang
index e74f3ff1..a43b2554 100644
--- a/languages/eu.lang
+++ b/languages/eu.lang
@@ -195,7 +195,7 @@ $PALANG['pSendmail_welcome'] = 'e-mail bat bidali.';
 $PALANG['pSendmail_admin'] = 'Igorlea';
 $PALANG['pSendmail_to'] = 'Norakoa';
 $PALANG['pSendmail_to_text_error'] = 'Norako helbidea hutsa dago edo okerra da!';
-$PALANG['pSendmail_subject'] = 'Gaia';
+$PALANG['subject'] = 'Gaia';
 $PALANG['pSendmail_subject_text'] = 'Ongi etorri';
 $PALANG['pSendmail_body'] = 'Gorputza';
 $PALANG['pSendmail_button'] = 'Mezua bidali';
@@ -295,7 +295,6 @@ $PALANG['pUsersMain_password'] = 'Alda ezazu pasahitza.';
 
 $PALANG['pUsersVacation_welcome'] = 'Erantzun automatikoa.';
 $PALANG['pUsersVacation_welcome_text'] = 'Erantzun automatiko bat konfiguratuta duzu!';
-$PALANG['pUsersVacation_subject'] = 'Gaia';
 $PALANG['pUsersVacation_subject_text'] = 'Lanetik kanpo';
 $PALANG['pUsersVacation_body'] = 'Gorputza'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -320,7 +319,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/fi.lang b/languages/fi.lang
index 18adb722..97fd3075 100644
--- a/languages/fi.lang
+++ b/languages/fi.lang
@@ -197,7 +197,7 @@ $PALANG['pSendmail_welcome'] = 'Lähetä sähköpostia.';
 $PALANG['pSendmail_admin'] = 'Keneltä';
 $PALANG['pSendmail_to'] = 'Kenelle';
 $PALANG['pSendmail_to_text_error'] = 'Kenelle on tyhjä tai osoite ei ole toimiva sähköpostiosoite!';
-$PALANG['pSendmail_subject'] = 'Otsikko';
+$PALANG['subject'] = 'Otsikko';
 $PALANG['pSendmail_subject_text'] = 'Tervetuloa';
 $PALANG['pSendmail_body'] = 'Viesti';
 $PALANG['pSendmail_button'] = 'Lähetä viesti';
@@ -296,7 +296,6 @@ $PALANG['pUsersMain_password'] = 'Vaihda nykyinen salasanasi.';
 
 $PALANG['pUsersVacation_welcome'] = 'Automaattivastaus.';
 $PALANG['pUsersVacation_welcome_text'] = 'Sinulla on jo automaattivastaus päällä!';
-$PALANG['pUsersVacation_subject'] = 'Otsikko';
 $PALANG['pUsersVacation_subject_text'] = 'Lomalla';
 $PALANG['pUsersVacation_body'] = 'Viesti'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -321,7 +320,6 @@ $PALANG['pReturn_to'] = 'Palaa osoitteeseen';
 $PALANG['pBroadcast_title'] = 'Lähetä tiedotusviesti';
 $PALANG['pBroadcast_from'] = 'Lähettäjä';
 $PALANG['pBroadcast_name'] = 'Nimesi';
-$PALANG['pBroadcast_subject'] = 'Aihe';
 $PALANG['pBroadcast_message'] = 'Viesti';
 $PALANG['pBroadcast_send'] = 'Lähetä viesti';
 $PALANG['pBroadcast_success'] = 'Tiedostusviestisi on lähetetty.';
diff --git a/languages/fo.lang b/languages/fo.lang
index 78ecdae1..0139d209 100644
--- a/languages/fo.lang
+++ b/languages/fo.lang
@@ -197,7 +197,7 @@ $PALANG['pSendmail_welcome'] = 'Send ein e-post.';
 $PALANG['pSendmail_admin'] = 'Frá';
 $PALANG['pSendmail_to'] = 'Til';
 $PALANG['pSendmail_to_text_error'] = 'Til er tómt ella ógyldug e-post adressa!';
-$PALANG['pSendmail_subject'] = 'Evni';
+$PALANG['subject'] = 'Evni';
 $PALANG['pSendmail_subject_text'] = 'Vælkomin';
 $PALANG['pSendmail_body'] = 'Boð';
 $PALANG['pSendmail_button'] = 'Send boð';
@@ -296,7 +296,6 @@ $PALANG['pUsersMain_password'] = 'Broyt títt núverandi loyniorð.';
 
 $PALANG['pUsersVacation_welcome'] = 'Sjálvvirkið svar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Tú hevur longu eini frítíðarboð uppsett!';
-$PALANG['pUsersVacation_subject'] = 'Evni';
 $PALANG['pUsersVacation_subject_text'] = 'Out of Office';
 $PALANG['pUsersVacation_body'] = 'Boð'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -326,7 +325,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/fr.lang b/languages/fr.lang
index e19d2170..f74f0aa1 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -198,7 +198,7 @@ $PALANG['pSendmail_welcome'] = 'Envoyer un courriel.';
 $PALANG['pSendmail_admin'] = 'De';
 $PALANG['pSendmail_to'] = 'À';
 $PALANG['pSendmail_to_text_error'] = 'À est vide ou ce n\'est pas une adresse courriel valide!';
-$PALANG['pSendmail_subject'] = 'Sujet';
+$PALANG['subject'] = 'Sujet';
 $PALANG['pSendmail_subject_text'] = 'Bienvenue';
 $PALANG['pSendmail_body'] = 'Message';
 $PALANG['pSendmail_button'] = 'Envoyer le message';
@@ -298,7 +298,6 @@ $PALANG['pUsersMain_password'] = 'Changer votre mot de passe.';
 
 $PALANG['pUsersVacation_welcome'] = 'Répondeur Automatique.';
 $PALANG['pUsersVacation_welcome_text'] = 'Votre repondeur automatique est déjà configuré!';
-$PALANG['pUsersVacation_subject'] = 'Sujet';
 $PALANG['pUsersVacation_subject_text'] = 'En dehors du bureau';
 $PALANG['pUsersVacation_body'] = 'Message';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -323,7 +322,6 @@ $PALANG['pReturn_to'] = 'Réponse à';
 $PALANG['pBroadcast_title'] = 'Envoyer un message général';
 $PALANG['pBroadcast_from'] = 'De';
 $PALANG['pBroadcast_name'] = 'Votre nom';
-$PALANG['pBroadcast_subject'] = 'Sujet';
 $PALANG['pBroadcast_message'] = 'Message';
 $PALANG['pBroadcast_send'] = 'Envoyer le message';
 $PALANG['pBroadcast_success'] = 'Votre message général a été envoyé.';
diff --git a/languages/hr.lang b/languages/hr.lang
index 4b1aab55..c63cb131 100644
--- a/languages/hr.lang
+++ b/languages/hr.lang
@@ -196,7 +196,7 @@ $PALANG['pSendmail_welcome'] = 'Pošlji e-poštu.';
 $PALANG['pSendmail_admin'] = 'Od';
 $PALANG['pSendmail_to'] = 'Za';
 $PALANG['pSendmail_to_text_error'] = 'Polje "Za" ne sadrži valjanu adresu e-pošte!';
-$PALANG['pSendmail_subject'] = 'Subjekt';
+$PALANG['subject'] = 'Subjekt';
 $PALANG['pSendmail_subject_text'] = 'Dobrodošli!';
 $PALANG['pSendmail_body'] = 'Tekst';
 $PALANG['pSendmail_button'] = 'Pošalji poruku';
@@ -295,7 +295,6 @@ $PALANG['pUsersMain_password'] = 'Promijenite lozinku.';
 
 $PALANG['pUsersVacation_welcome'] = 'Ovdje možete promijeniti obvijest o odsutnosti.';
 $PALANG['pUsersVacation_welcome_text'] = 'Obvijest o odsutnosti je već postavljena!';
-$PALANG['pUsersVacation_subject'] = 'Subjekt';
 $PALANG['pUsersVacation_subject_text'] = 'Odsutnost';
 $PALANG['pUsersVacation_body'] = 'Tekst'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -319,7 +318,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/hu.lang b/languages/hu.lang
index be2d9501..6795afd7 100644
--- a/languages/hu.lang
+++ b/languages/hu.lang
@@ -202,7 +202,7 @@ $PALANG['pSendmail_welcome'] = 'Email küldése.';
 $PALANG['pSendmail_admin'] = 'Feladó';
 $PALANG['pSendmail_to'] = 'Címzett';
 $PALANG['pSendmail_to_text_error'] = 'Ez egy üres, vagy nem megfelelõ email cím!';
-$PALANG['pSendmail_subject'] = 'Tárgy';
+$PALANG['subject'] = 'Tárgy';
 $PALANG['pSendmail_subject_text'] = 'Postafiókja sikeresen elkészült!';
 $PALANG['pSendmail_body'] = 'Üzenet';
 $PALANG['pSendmail_button'] = 'Üzenet küldése';
@@ -302,7 +302,6 @@ $PALANG['pUsersMain_password'] = 'Jelenlegi jelszó megváltoztatása.';
 
 $PALANG['pUsersVacation_welcome'] = 'Automatikus válasz.';
 $PALANG['pUsersVacation_welcome_text'] = 'Már van be állítva automatikus válasz !';
-$PALANG['pUsersVacation_subject'] = 'Tárgy';
 $PALANG['pUsersVacation_subject_text'] = 'Sajnálom, de jelenleg nem vagyok email közelben!';
 $PALANG['pUsersVacation_body'] = 'Üzenet'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -331,7 +330,6 @@ $PALANG['pReturn_to'] = 'Válasz ide';
 $PALANG['pBroadcast_title'] = 'Broadcast üzenet küldése';
 $PALANG['pBroadcast_from'] = 'Feladó';
 $PALANG['pBroadcast_name'] = 'Neved';
-$PALANG['pBroadcast_subject'] = 'Téma';
 $PALANG['pBroadcast_message'] = 'Üzenet';
 $PALANG['pBroadcast_send'] = 'Üzenet küldése';
 $PALANG['pBroadcast_success'] = 'Broadcast üzeneted elküldve.';
diff --git a/languages/is.lang b/languages/is.lang
index 14685a95..5cc39131 100644
--- a/languages/is.lang
+++ b/languages/is.lang
@@ -196,7 +196,7 @@ $PALANG['pSendmail_welcome'] = 'sendu tölvupóst.';
 $PALANG['pSendmail_admin'] = 'frá';
 $PALANG['pSendmail_to'] = 'til';
 $PALANG['pSendmail_to_text_error'] = 'til er tómt eða ekki uppgefið gilt netfang!';
-$PALANG['pSendmail_subject'] = 'Efni bréfs';
+$PALANG['subject'] = 'Efni bréfs'; # XXX check text - should be 'Subject'
 $PALANG['pSendmail_subject_text'] = 'Velkomin';
 $PALANG['pSendmail_body'] = 'Meginmál';
 $PALANG['pSendmail_button'] = 'Senda skilaboð';
@@ -295,7 +295,6 @@ $PALANG['pUsersMain_password'] = 'Breyta núverandi lykilorði.';
 
 $PALANG['pUsersVacation_welcome'] = 'sjálfvirk skilaboð.';
 $PALANG['pUsersVacation_welcome_text'] = 'Þú hefur nú þegar skilgreint sjálfvirk skilaboð!';
-$PALANG['pUsersVacation_subject'] = 'Meginmál - Subject';
 $PALANG['pUsersVacation_subject_text'] = 'Er ekki við - Out of Office';
 $PALANG['pUsersVacation_body'] = 'Meginmál'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -320,7 +319,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/it.lang b/languages/it.lang
index 530eeed9..b18ecd86 100644
--- a/languages/it.lang
+++ b/languages/it.lang
@@ -198,7 +198,7 @@ $PALANG['pSendmail_welcome'] = 'Spedisci una email.';
 $PALANG['pSendmail_admin'] = 'Da';
 $PALANG['pSendmail_to'] = 'A';
 $PALANG['pSendmail_to_text_error'] = 'Il campo "A" è vuoto o non è un indirizzo valido!';
-$PALANG['pSendmail_subject'] = 'Oggetto';
+$PALANG['subject'] = 'Oggetto'; # XXX check text - should be 'Subject'
 $PALANG['pSendmail_subject_text'] = 'Benvenuto';
 $PALANG['pSendmail_body'] = 'Corpo';
 $PALANG['pSendmail_button'] = 'Spedisci messaggio';
@@ -297,7 +297,6 @@ $PALANG['pUsersMain_password'] = 'Cambia la tua password corrente.';
 
 $PALANG['pUsersVacation_welcome'] = 'Autorisponditore.';
 $PALANG['pUsersVacation_welcome_text'] = 'Hai già un autorisponditore configurato';
-$PALANG['pUsersVacation_subject'] = 'Soggetto';
 $PALANG['pUsersVacation_subject_text'] = 'Assente dall\'ufficio';
 $PALANG['pUsersVacation_body'] = 'Corpo'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -322,7 +321,6 @@ $PALANG['pReturn_to'] = 'Ritorna a';
 $PALANG['pBroadcast_title'] = 'Invio di gruppo';
 $PALANG['pBroadcast_from'] = 'Da';
 $PALANG['pBroadcast_name'] = 'Il tuo nome';
-$PALANG['pBroadcast_subject'] = 'Oggetto';
 $PALANG['pBroadcast_message'] = 'Messaggio';
 $PALANG['pBroadcast_send'] = 'Invia';
 $PALANG['pBroadcast_success'] = 'Il tuo messaggio è stato inoltrato a tutto il gruppo.';
diff --git a/languages/ja.lang b/languages/ja.lang
index 2a5829de..ec6903dc 100644
--- a/languages/ja.lang
+++ b/languages/ja.lang
@@ -202,7 +202,7 @@ $PALANG['pSendmail_welcome'] = 'メール送信';
 $PALANG['pSendmail_admin'] = '差出人';
 $PALANG['pSendmail_to'] = '宛先';
 $PALANG['pSendmail_to_text_error'] = '宛先が空欄か無効です。';
-$PALANG['pSendmail_subject'] = '件名';
+$PALANG['subject'] = '件名';
 $PALANG['pSendmail_subject_text'] = 'ようこそ';
 $PALANG['pSendmail_body'] = '本文';
 $PALANG['pSendmail_button'] = 'メッセージ送信';
@@ -302,7 +302,6 @@ $PALANG['pUsersMain_password'] = 'パスワードを変更します。';
 
 $PALANG['pUsersVacation_welcome'] = '自動応答';
 $PALANG['pUsersVacation_welcome_text'] = '既に自動応答を構成してあります。';
-$PALANG['pUsersVacation_subject'] = '件名';
 $PALANG['pUsersVacation_subject_text'] = '不在';
 $PALANG['pUsersVacation_body'] = '本文'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -329,7 +328,6 @@ $PALANG['pReturn_to'] = '戻る: ';
 $PALANG['pBroadcast_title'] = 'ブロードキャストメッセージの送信';
 $PALANG['pBroadcast_from'] = '差出人';
 $PALANG['pBroadcast_name'] = '名前';
-$PALANG['pBroadcast_subject'] = '件名';
 $PALANG['pBroadcast_message'] = 'メッセージ';
 $PALANG['pBroadcast_send'] = 'メッセージ送信';
 $PALANG['pBroadcast_success'] = 'ブロードキャストメッセージは送信されました。';
diff --git a/languages/lt.lang b/languages/lt.lang
index 2d1ab0dd..71d43c86 100644
--- a/languages/lt.lang
+++ b/languages/lt.lang
@@ -198,7 +198,7 @@ $PALANG['pSendmail_welcome'] = 'Siųsti laišką';
 $PALANG['pSendmail_admin'] = 'Nuo';
 $PALANG['pSendmail_to'] = 'Kam';
 $PALANG['pSendmail_to_text_error'] = 'Adresatas neįvestas arba neteisingas pašto adresas!';
-$PALANG['pSendmail_subject'] = 'Tema';
+$PALANG['subject'] = 'Tema';
 $PALANG['pSendmail_subject_text'] = 'Sveiki';
 $PALANG['pSendmail_body'] = 'Žinutė';
 $PALANG['pSendmail_button'] = 'Siųsti';
@@ -297,7 +297,6 @@ $PALANG['pUsersMain_password'] = 'Pakeisti slaptažodį.';
 
 $PALANG['pUsersVacation_welcome'] = 'Automatinis (atostogų) atsakymas.';
 $PALANG['pUsersVacation_welcome_text'] = 'Auto atsakiklis jau nustatytas!';
-$PALANG['pUsersVacation_subject'] = 'Tema';
 $PALANG['pUsersVacation_subject_text'] = 'Esu išvykęs';
 $PALANG['pUsersVacation_body'] = 'Žinutė';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -327,7 +326,6 @@ $PALANG['pReturn_to'] = 'Grįžti į';
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/mk.lang b/languages/mk.lang
index 43524a6a..68b89719 100644
--- a/languages/mk.lang
+++ b/languages/mk.lang
@@ -197,7 +197,7 @@ $PALANG['pSendmail_welcome'] = 'Прати порака.';
 $PALANG['pSendmail_admin'] = 'Од';
 $PALANG['pSendmail_to'] = 'До';
 $PALANG['pSendmail_to_text_error'] = 'ДО полето е празно или адресата не е валидна!';
-$PALANG['pSendmail_subject'] = 'Тема';
+$PALANG['subject'] = 'Тема';
 $PALANG['pSendmail_subject_text'] = 'Добро дојдовте';
 $PALANG['pSendmail_body'] = 'Содржина';
 $PALANG['pSendmail_button'] = 'Прати порака';
@@ -297,7 +297,6 @@ $PALANG['pUsersMain_password'] = 'Промена на лозинка.';
 
 $PALANG['pUsersVacation_welcome'] = 'Автоматски одговор.';
 $PALANG['pUsersVacation_welcome_text'] = 'Веќе имате конфигуриран автоматски одговор!';
-$PALANG['pUsersVacation_subject'] = 'Тема';
 $PALANG['pUsersVacation_subject_text'] = 'Отсутен';
 $PALANG['pUsersVacation_body'] = 'Содржина'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -322,7 +321,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/nb.lang b/languages/nb.lang
index 6d0949bd..511d1d6b 100644
--- a/languages/nb.lang
+++ b/languages/nb.lang
@@ -198,7 +198,7 @@ $PALANG['pSendmail_welcome'] = 'Send en e-postmelding.';
 $PALANG['pSendmail_admin'] = 'Fra';
 $PALANG['pSendmail_to'] = 'Til';
 $PALANG['pSendmail_to_text_error'] = 'Til-feltet er ikke fylt ut eller inneholder en ugyldig e-postadresse!';
-$PALANG['pSendmail_subject'] = 'Emne';
+$PALANG['subject'] = 'Emne';
 $PALANG['pSendmail_subject_text'] = 'Velkommen';
 $PALANG['pSendmail_body'] = 'Meldingstekst';
 $PALANG['pSendmail_button'] = 'Send melding';
@@ -297,7 +297,6 @@ $PALANG['pUsersMain_password'] = 'Endre passordet ditt.';
 
 $PALANG['pUsersVacation_welcome'] = 'Automatisk svar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar aktivert!';
-$PALANG['pUsersVacation_subject'] = 'Emne';
 $PALANG['pUsersVacation_subject_text'] = 'Fraværsmelding';
 $PALANG['pUsersVacation_body'] = 'Meldingstekst';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -321,7 +320,6 @@ $PALANG['pReturn_to'] = 'Returner til';
 $PALANG['pBroadcast_title'] = 'Send masseutsendelse';
 $PALANG['pBroadcast_from'] = 'Fra';
 $PALANG['pBroadcast_name'] = 'Ditt navn';
-$PALANG['pBroadcast_subject'] = 'Emne';
 $PALANG['pBroadcast_message'] = 'Melding';
 $PALANG['pBroadcast_send'] = 'Send melding';
 $PALANG['pBroadcast_success'] = 'Masseutsendelsesmeldingen ble sendt.';
diff --git a/languages/nl.lang b/languages/nl.lang
index faec65c3..485d86f1 100644
--- a/languages/nl.lang
+++ b/languages/nl.lang
@@ -199,7 +199,7 @@ $PALANG['pSendmail_welcome'] = 'Verstuur een e-mail.';
 $PALANG['pSendmail_admin'] = 'Van';
 $PALANG['pSendmail_to'] = 'Naar';
 $PALANG['pSendmail_to_text_error'] = 'Naar is leeg of een ongeldig adres.';
-$PALANG['pSendmail_subject'] = 'Onderwerp';
+$PALANG['subject'] = 'Onderwerp';
 $PALANG['pSendmail_subject_text'] = 'Welkom';
 $PALANG['pSendmail_body'] = 'Inhoud';
 $PALANG['pSendmail_button'] = 'Verstuur bericht';
@@ -300,7 +300,6 @@ $PALANG['pUsersMain_password'] = 'Wijzig uw huidige wachtwoord.';
 
 $PALANG['pUsersVacation_welcome'] = 'Automatisch beantwoorden.';
 $PALANG['pUsersVacation_welcome_text'] = 'U heeft uw automatisch beantwoorden ingesteld.';
-$PALANG['pUsersVacation_subject'] = 'Onderwerp';
 $PALANG['pUsersVacation_subject_text'] = 'Out of Office';
 $PALANG['pUsersVacation_body'] = 'Bericht';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -325,7 +324,6 @@ $PALANG['pReturn_to'] = 'Ga terug naar';
 $PALANG['pBroadcast_title'] = 'Verzend broadcast bericht';
 $PALANG['pBroadcast_from'] = 'Van';
 $PALANG['pBroadcast_name'] = 'Uw naam';
-$PALANG['pBroadcast_subject'] = 'Onderwerp';
 $PALANG['pBroadcast_message'] = 'Bericht';
 $PALANG['pBroadcast_send'] = 'Verzend bericht';
 $PALANG['pBroadcast_success'] = 'Uw algemene bericht is verzonden.';
diff --git a/languages/nn.lang b/languages/nn.lang
index 4a166d4e..e8638c57 100644
--- a/languages/nn.lang
+++ b/languages/nn.lang
@@ -196,7 +196,7 @@ $PALANG['pSendmail_welcome'] = 'Send E-post.';
 $PALANG['pSendmail_admin'] = 'Fra';
 $PALANG['pSendmail_to'] = 'Mottaker';
 $PALANG['pSendmail_to_text_error'] = '"Mottaker"-feltet er tomt eller er ugyldig!';
-$PALANG['pSendmail_subject'] = 'Emne';
+$PALANG['subject'] = 'Emne';
 $PALANG['pSendmail_subject_text'] = 'Velkommen';
 $PALANG['pSendmail_body'] = 'Melding';
 $PALANG['pSendmail_button'] = 'Send beskjed';
@@ -295,7 +295,6 @@ $PALANG['pUsersMain_password'] = 'Endre passord.';
 
 $PALANG['pUsersVacation_welcome'] = 'Automatisk Svar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Du har allerede autosvar!';
-$PALANG['pUsersVacation_subject'] = 'Emne';
 $PALANG['pUsersVacation_subject_text'] = 'Ikke tilstede';
 $PALANG['pUsersVacation_body'] = 'Melding'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -319,7 +318,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/pl.lang b/languages/pl.lang
index fb7b71e6..3467d091 100644
--- a/languages/pl.lang
+++ b/languages/pl.lang
@@ -200,7 +200,7 @@ $PALANG['pSendmail_welcome'] = 'Wyślij wiadomość.';
 $PALANG['pSendmail_admin'] = 'Od';
 $PALANG['pSendmail_to'] = 'Do';
 $PALANG['pSendmail_to_text_error'] = 'Podany adres jest niepoprawny, bądź pole "Do" jest puste!';
-$PALANG['pSendmail_subject'] = 'Temat';
+$PALANG['subject'] = 'Temat';
 $PALANG['pSendmail_subject_text'] = 'Witamy';
 $PALANG['pSendmail_body'] = 'Tekst';
 $PALANG['pSendmail_button'] = 'Wyślij wiadomość';
@@ -301,7 +301,6 @@ $PALANG['pUsersMain_password'] = 'Zmień aktualne hasło.';
 
 $PALANG['pUsersVacation_welcome'] = 'Automatyczną odpowiedź.';
 $PALANG['pUsersVacation_welcome_text'] = 'Masz już skonfigurowaną automatyczną odpowiedź!';
-$PALANG['pUsersVacation_subject'] = 'Temat';
 $PALANG['pUsersVacation_subject_text'] = 'Poza biurem';
 $PALANG['pUsersVacation_body'] = 'Wiadomość';
 
@@ -327,7 +326,6 @@ $PALANG['pReturn_to'] = 'Powrót do';
 $PALANG['pBroadcast_title'] = 'Wyślij wiadomość do wszystkich';
 $PALANG['pBroadcast_from'] = 'Od';
 $PALANG['pBroadcast_name'] = 'Nazwa';
-$PALANG['pBroadcast_subject'] = 'Temat';
 $PALANG['pBroadcast_message'] = 'Wiadomość';
 $PALANG['pBroadcast_send'] = 'Wyślij wiadomość';
 $PALANG['pBroadcast_success'] = 'Wiadomość do wszystkich została wysłana.';
diff --git a/languages/pt-br.lang b/languages/pt-br.lang
index 4e1b9cb0..9697120a 100644
--- a/languages/pt-br.lang
+++ b/languages/pt-br.lang
@@ -204,7 +204,7 @@ $PALANG['pSendmail_welcome'] = 'Envio de mensagem.';
 $PALANG['pSendmail_admin'] = 'De';
 $PALANG['pSendmail_to'] = 'Para';
 $PALANG['pSendmail_to_text_error'] = 'Campo Para está vazio ou não é um endereço de email válido!';
-$PALANG['pSendmail_subject'] = 'Assunto';
+$PALANG['subject'] = 'Assunto';
 $PALANG['pSendmail_subject_text'] = 'Bem-vindo(a)';
 $PALANG['pSendmail_body'] = 'Corpo da Mensagem';
 $PALANG['pSendmail_button'] = 'Enviar Mensagem';
@@ -304,7 +304,6 @@ $PALANG['pUsersMain_password'] = 'Altere a senha de sua conta.';
 
 $PALANG['pUsersVacation_welcome'] = 'Configuração de resposta automática.';
 $PALANG['pUsersVacation_welcome_text'] = 'Você já possui uma resposta automática configurada!';
-$PALANG['pUsersVacation_subject'] = 'Assunto';
 $PALANG['pUsersVacation_subject_text'] = 'Ausente';
 $PALANG['pUsersVacation_body'] = 'Corpo da Mensagem';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -331,7 +330,6 @@ $PALANG['pReturn_to'] = 'Retornar para';
 $PALANG['pBroadcast_title'] = 'Envio de mensagem em massa.';
 $PALANG['pBroadcast_from'] = 'De';
 $PALANG['pBroadcast_name'] = 'Seu nome';
-$PALANG['pBroadcast_subject'] = 'Assunto';
 $PALANG['pBroadcast_message'] = 'Mensagem';
 $PALANG['pBroadcast_send'] = 'Enviar Mensagem';
 $PALANG['pBroadcast_success'] = 'Mensagem em massa enviada.';
diff --git a/languages/ru.lang b/languages/ru.lang
index e8891301..ae09cb62 100644
--- a/languages/ru.lang
+++ b/languages/ru.lang
@@ -204,7 +204,7 @@ $PALANG['pSendmail_welcome'] = 'Послать письмо.';
 $PALANG['pSendmail_admin'] = 'От';
 $PALANG['pSendmail_to'] = 'Кому';
 $PALANG['pSendmail_to_text_error'] = 'Поле Кому пустое либо содержит некорректный адрес!';
-$PALANG['pSendmail_subject'] = 'Тема';
+$PALANG['subject'] = 'Тема';
 $PALANG['pSendmail_subject_text'] = 'Добро пожаловать!';
 $PALANG['pSendmail_body'] = 'Текст';
 $PALANG['pSendmail_button'] = 'Послать сообщение';
@@ -304,7 +304,6 @@ $PALANG['pUsersMain_password'] = 'Изменить текущий пароль.'
 
 $PALANG['pUsersVacation_welcome'] = 'Автоответчик.';
 $PALANG['pUsersVacation_welcome_text'] = 'У вас уже есть настроенный автоответчик!';
-$PALANG['pUsersVacation_subject'] = 'Тема';
 $PALANG['pUsersVacation_subject_text'] = 'Вне офиса';
 $PALANG['pUsersVacation_body'] = 'Сообщение';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -331,7 +330,6 @@ $PALANG['pReturn_to'] = 'Вернуться к';
 $PALANG['pBroadcast_title'] = 'Отправка широковещательного сообщения';
 $PALANG['pBroadcast_from'] = 'От';
 $PALANG['pBroadcast_name'] = 'Ваше имя';
-$PALANG['pBroadcast_subject'] = 'Тема';
 $PALANG['pBroadcast_message'] = 'Сообщение';
 $PALANG['pBroadcast_send'] = 'Отправить сообщение';
 $PALANG['pBroadcast_success'] = 'Ваше широковещательное сообщение было отправлено.';
diff --git a/languages/sk.lang b/languages/sk.lang
index 790cf892..d1d3556f 100644
--- a/languages/sk.lang
+++ b/languages/sk.lang
@@ -198,7 +198,7 @@ $PALANG['pSendmail_welcome'] = 'Poslať email';
 $PALANG['pSendmail_admin'] = 'Od';
 $PALANG['pSendmail_to'] = 'Komu';
 $PALANG['pSendmail_to_text_error'] = 'Cieľ nie je platná emailová adresa!';
-$PALANG['pSendmail_subject'] = 'Predmet';
+$PALANG['subject'] = 'Predmet';
 $PALANG['pSendmail_subject_text'] = 'Vitajte';
 $PALANG['pSendmail_body'] = 'Obsah';
 $PALANG['pSendmail_button'] = 'Poslať email';
@@ -297,7 +297,6 @@ $PALANG['pUsersMain_password'] = 'Zmeniť heslo';
 
 $PALANG['pUsersVacation_welcome'] = 'Automatická odpoveď';
 $PALANG['pUsersVacation_welcome_text'] = 'Automatická odpoveď je zapnutá!';
-$PALANG['pUsersVacation_subject'] = 'Predmet';
 $PALANG['pUsersVacation_subject_text'] = 'Dovolenka';
 $PALANG['pUsersVacation_body'] = 'Správa';
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -322,7 +321,6 @@ $PALANG['pReturn_to'] = 'Návrat na';
 $PALANG['pBroadcast_title'] = 'Poslať hromadnú správu všetkým používateľom';
 $PALANG['pBroadcast_from'] = 'Od';
 $PALANG['pBroadcast_name'] = 'Vaše meno';
-$PALANG['pBroadcast_subject'] = 'Predmet';
 $PALANG['pBroadcast_message'] = 'Obsah';
 $PALANG['pBroadcast_send'] = 'Poslať správu';
 $PALANG['pBroadcast_success'] = 'Hromadná správa bola odoslaná.';
diff --git a/languages/sl.lang b/languages/sl.lang
index f392cdc6..68ec9be1 100644
--- a/languages/sl.lang
+++ b/languages/sl.lang
@@ -197,7 +197,7 @@ $PALANG['pSendmail_welcome'] = 'Pošlji e-pošto.';
 $PALANG['pSendmail_admin'] = 'Od';
 $PALANG['pSendmail_to'] = 'Za';
 $PALANG['pSendmail_to_text_error'] = 'Polje "Za" ne vsebuje veljavnega e-poštnega naslova!';
-$PALANG['pSendmail_subject'] = 'Zadeva';
+$PALANG['subject'] = 'Zadeva';
 $PALANG['pSendmail_subject_text'] = 'Pozdravljeni!';
 $PALANG['pSendmail_body'] = 'Besedilo';
 $PALANG['pSendmail_button'] = 'Pošlji sporočilo';
@@ -296,7 +296,6 @@ $PALANG['pUsersMain_password'] = 'Spremenite geslo.';
 
 $PALANG['pUsersVacation_welcome'] = 'Tukaj lahko nastavite obvestilo o odsotnosti.';
 $PALANG['pUsersVacation_welcome_text'] = 'Obvestilo o odsotnosti imate že nastavljeno!';
-$PALANG['pUsersVacation_subject'] = 'Zadeva';
 $PALANG['pUsersVacation_subject_text'] = 'Odsotnost';
 $PALANG['pUsersVacation_body'] = 'Besedilo'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -321,7 +320,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/sv.lang b/languages/sv.lang
index e884eaf2..136c062b 100644
--- a/languages/sv.lang
+++ b/languages/sv.lang
@@ -199,7 +199,7 @@ $PALANG['pSendmail_welcome'] = 'Skicka ett mail.';
 $PALANG['pSendmail_admin'] = 'Från';
 $PALANG['pSendmail_to'] = 'Till';
 $PALANG['pSendmail_to_text_error'] = 'Till är en ogiltig mailadress eller tomt.!';
-$PALANG['pSendmail_subject'] = 'Ämne';
+$PALANG['subject'] = 'Ämne'; # XXX check text - should be 'Subject'
 $PALANG['pSendmail_subject_text'] = 'Välkommen';
 $PALANG['pSendmail_body'] = 'Meddelande';
 $PALANG['pSendmail_button'] = 'Skicka';
@@ -298,7 +298,6 @@ $PALANG['pUsersMain_password'] = 'Ändra ditt nuvarande lösenord.';
 
 $PALANG['pUsersVacation_welcome'] = 'Autosvar.';
 $PALANG['pUsersVacation_welcome_text'] = 'Du har redan ett autosvar meddelande definierat!';
-$PALANG['pUsersVacation_subject'] = 'Ärende';
 $PALANG['pUsersVacation_subject_text'] = 'Out of Office';
 $PALANG['pUsersVacation_body'] = 'Text'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -323,7 +322,6 @@ $PALANG['pReturn_to'] = 'Återvänd till';
 $PALANG['pBroadcast_title'] = 'Grupputskick till alla';
 $PALANG['pBroadcast_from'] = 'Från';
 $PALANG['pBroadcast_name'] = 'Ditt namn';
-$PALANG['pBroadcast_subject'] = 'Ämne';
 $PALANG['pBroadcast_message'] = 'Meddelande';
 $PALANG['pBroadcast_send'] = 'Skicka';
 $PALANG['pBroadcast_success'] = 'Ditt grupputskick har sänts.';
diff --git a/languages/tr.lang b/languages/tr.lang
index 83f0ad15..c5785470 100644
--- a/languages/tr.lang
+++ b/languages/tr.lang
@@ -197,7 +197,7 @@ $PALANG['pSendmail_welcome'] = 'Eposta gönder.';
 $PALANG['pSendmail_admin'] = 'kimden';
 $PALANG['pSendmail_to'] = 'Kime';
 $PALANG['pSendmail_to_text_error'] = 'Kime doðru bir e-posta deðil!';
-$PALANG['pSendmail_subject'] = 'konu';
+$PALANG['subject'] = 'konu';
 $PALANG['pSendmail_subject_text'] = 'Hoþ geldiniz';
 $PALANG['pSendmail_body'] = 'Metin';
 $PALANG['pSendmail_button'] = 'Mesaj Gönder';
@@ -296,7 +296,6 @@ $PALANG['pUsersMain_password'] = 'þifrenizi deðiþtirin.';
 
 $PALANG['pUsersVacation_welcome'] = 'Otomatik Cevaplama.';
 $PALANG['pUsersVacation_welcome_text'] = 'Zaten bir otomatik cevaplamanýz bulunmakta!';
-$PALANG['pUsersVacation_subject'] = 'konu';
 $PALANG['pUsersVacation_subject_text'] = 'Ofis dýþýnda';
 $PALANG['pUsersVacation_body'] = 'Metin'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -321,7 +320,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/languages/tw.lang b/languages/tw.lang
index 7d9f019d..3cb13fdf 100644
--- a/languages/tw.lang
+++ b/languages/tw.lang
@@ -197,7 +197,7 @@ $PALANG['pSendmail_welcome'] = '發送郵件.';
 $PALANG['pSendmail_admin'] = '發件人';
 $PALANG['pSendmail_to'] = '收件人';
 $PALANG['pSendmail_to_text_error'] = '收件人為空或者收件人地址不正確!';
-$PALANG['pSendmail_subject'] = '主題';
+$PALANG['subject'] = '主題';
 $PALANG['pSendmail_subject_text'] = '歡迎';
 $PALANG['pSendmail_body'] = '內容';
 $PALANG['pSendmail_button'] = '發送';
@@ -296,7 +296,6 @@ $PALANG['pUsersMain_password'] = '修改當前密碼.';
 
 $PALANG['pUsersVacation_welcome'] = '自動回復.';
 $PALANG['pUsersVacation_welcome_text'] = '你已經設置了自動回復!';
-$PALANG['pUsersVacation_subject'] = '主題';
 $PALANG['pUsersVacation_subject_text'] = '我現在無法回信';
 $PALANG['pUsersVacation_body'] = '內容'; # XXX text changed to 'Message'
 $PALANG['pUsersVacation_body_text'] = <<<EOM
@@ -321,7 +320,6 @@ $PALANG['pReturn_to'] = 'Return to'; # XXX
 $PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
 $PALANG['pBroadcast_from'] = 'From'; # XXX
 $PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
 $PALANG['pBroadcast_message'] = 'Message'; # XXX
 $PALANG['pBroadcast_send'] = 'Send message'; # XXX
 $PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
diff --git a/templates/broadcast-message.tpl b/templates/broadcast-message.tpl
index d8c8ce2f..a0091048 100644
--- a/templates/broadcast-message.tpl
+++ b/templates/broadcast-message.tpl
@@ -13,7 +13,7 @@
 		<td><input class="flat" size="43" type="text" name="name"/></td>
 	</tr>
 	<tr>
-		<td class="label"><label>{$PALANG.pBroadcast_subject}:</label></td>
+		<td class="label"><label>{$PALANG.subject}:</label></td>
 		<td><input class="flat" size="43" type="text" name="subject"/></td>
 	</tr>
 	<tr>
diff --git a/templates/sendmail.tpl b/templates/sendmail.tpl
index ee2b5155..3a764301 100644
--- a/templates/sendmail.tpl
+++ b/templates/sendmail.tpl
@@ -15,7 +15,7 @@
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td class="label"><label>{$PALANG.pSendmail_subject}:</label></td>
+		<td class="label"><label>{$PALANG.subject}:</label></td>
 		<td><input class="flat" type="text" name="fSubject" value="{$PALANG.pSendmail_subject_text}" /></td>
 		<td>&nbsp;</td>
 	</tr>
diff --git a/templates/vacation.tpl b/templates/vacation.tpl
index 495e5dc8..72892204 100644
--- a/templates/vacation.tpl
+++ b/templates/vacation.tpl
@@ -56,7 +56,7 @@
     </tr>
 
 	<tr>
-		<td class="label"><label>{$PALANG.pUsersVacation_subject}:</label></td>
+		<td class="label"><label>{$PALANG.subject}:</label></td>
 		<td><textarea class="flat" rows="3" cols="60" name="fSubject" >{$tSubject}</textarea></td>
 		<td>&nbsp;</td>
 	</tr>