diff --git a/languages/bg.lang b/languages/bg.lang
index 04a22055..b8aa08a0 100644
--- a/languages/bg.lang
+++ b/languages/bg.lang
@@ -366,7 +366,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/ca.lang b/languages/ca.lang
index 9d116788..9286c86a 100644
--- a/languages/ca.lang
+++ b/languages/ca.lang
@@ -365,7 +365,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/cn.lang b/languages/cn.lang
index af131447..48718137 100644
--- a/languages/cn.lang
+++ b/languages/cn.lang
@@ -365,7 +365,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/cs.lang b/languages/cs.lang
index a5a0f06f..da12eca5 100644
--- a/languages/cs.lang
+++ b/languages/cs.lang
@@ -377,7 +377,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Stahovat poštu pro:';
 $PALANG['pFetchmail_new_entry'] = 'Nová položka';
 $PALANG['pFetchmail_database_save_error'] = 'Tuto položku není možné uložit do databáze!';
diff --git a/languages/da.lang b/languages/da.lang
index 71030c16..475b77e2 100644
--- a/languages/da.lang
+++ b/languages/da.lang
@@ -378,7 +378,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Ugyldigt domæne-navn %s. Fejlede regulært udtryks-tjek";
 $PALANG['pInvalidDomainDNS']   = "Ugyldigt domæne %s, og/eller ikke fundet i DNS";
-$PALANG['pInvalidMailRegex']   = "Ugyldig emailadresse. Fejlede regulært udtryks-tjek";
+$PALANG['pInvalidMailRegex']   = "Ugyldig emailadresse %s. Fejlede regulært udtryks-tjek"; # XXX %s added, check if text is ok
 
 $PALANG['pFetchmail_welcome'] = 'Hent post for:';
 $PALANG['pFetchmail_new_entry'] = 'Ny regel';
diff --git a/languages/de.lang b/languages/de.lang
index 9025410d..5f828287 100644
--- a/languages/de.lang
+++ b/languages/de.lang
@@ -166,7 +166,7 @@ $PALANG['pPassword_admin'] = 'Login';
 $PALANG['pPassword_password_current'] = 'Jetziges Password';
 $PALANG['pPassword_password_current_text_error'] = 'Sie haben Ihr derzeitiges Passwort nicht angegeben!';
 $PALANG['pPassword_password'] = 'Neues Passwort';
-$PALANG['pPassword_password2'] = 'Neues Password (nochmal)';
+$PALANG['pPassword_password2'] = 'Neues Passwort (nochmal)';
 $PALANG['pPassword_password_text_error'] = 'Die beiden angegebenen Passwörter sind nicht identisch oder leer!';
 $PALANG['pPassword_button'] = 'Passwort ändern';
 $PALANG['pPassword_result_error'] = 'Unmöglich das Passwort zu ändern!';
@@ -376,7 +376,7 @@ $PALANG['password_no_characters'] = "Ihr Passwort muss mindestens %s Buchstaben
 $PALANG['password_no_digits'] = "Ihr Passwort muss mindestens %s Ziffer(n) enthalten.";
 $PALANG['pInvalidDomainRegex'] = "Ungültiger Domainname %s - Überprüfung per RegEx fehlgeschlagen";
 $PALANG['pInvalidDomainDNS'] = "Ungültige Domain %s - nicht per DNS auflösbar";
-$PALANG['pInvalidMailRegex'] = "Ungültige Mailadresse - Überprüfung per RegEx fehlgeschlagen";
+$PALANG['pInvalidMailRegex'] = "Ungültige Mailadresse %s - Überprüfung per RegEx fehlgeschlagen";
 
 $PALANG['pFetchmail_welcome'] = 'E-Mail Abruf für: ';
 $PALANG['pFetchmail_new_entry'] = 'Neuer Eintrag';
diff --git a/languages/en.lang b/languages/en.lang
index c1282205..8efd68d8 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -379,7 +379,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s).";
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check";
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS";
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check";
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check";
 
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:';
 $PALANG['pFetchmail_new_entry'] = 'New entry';
diff --git a/languages/es.lang b/languages/es.lang
index 3a54ac8d..d51bf0a8 100644
--- a/languages/es.lang
+++ b/languages/es.lang
@@ -367,7 +367,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "El nombre de dominio %s es inválido, no se ajusta a la expresión regular"; 
 $PALANG['pInvalidDomainDNS'] = "El dominio %s no es válido, y/o no tiene resolución DNS"; 
-$PALANG['pInvalidMailRegex'] = "La dirección de email no es válidas, no se ajusta a la expresión regular"; 
+$PALANG['pInvalidMailRegex'] = "La dirección de email no es válidas, no se ajusta a la expresión regular (%s)"; # XXX %s added - but it should be in the text, not at the end
 $PALANG['pFetchmail_welcome'] = 'Obtener mail para:';
 $PALANG['pFetchmail_new_entry'] = 'Nueva entrada'; 
 $PALANG['pFetchmail_database_save_error'] = '¡No se pudo salvar la entrada en la base de datos!'; 
diff --git a/languages/et.lang b/languages/et.lang
index 06c17805..ac5293cb 100644
--- a/languages/et.lang
+++ b/languages/et.lang
@@ -369,7 +369,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/eu.lang b/languages/eu.lang
index b8264ed5..952a4858 100644
--- a/languages/eu.lang
+++ b/languages/eu.lang
@@ -364,7 +364,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/fi.lang b/languages/fi.lang
index edcc54b7..20c57522 100644
--- a/languages/fi.lang
+++ b/languages/fi.lang
@@ -365,7 +365,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Virheellinen domain nimi %s, ei läpäise regexp testiä";
 $PALANG['pInvalidDomainDNS'] = "Virheellinen domain %s ja/tai ei löydy nimipalvelimista";
-$PALANG['pInvalidMailRegex'] = "Virheellinen sähköpostiosoite, ei läpäise regexp testiä";
+$PALANG['pInvalidMailRegex'] = "Virheellinen sähköpostiosoite, ei läpäise regexp testiä (%s)"; # XXX %s added - but it should be in the text, not at the end
 $PALANG['pFetchmail_welcome'] = 'Hae postit:';
 $PALANG['pFetchmail_new_entry'] = 'Uusi tietue';
 $PALANG['pFetchmail_database_save_error'] = 'Tätä tietuetta ei voitu tallentaa tietokantaan!';
diff --git a/languages/fo.lang b/languages/fo.lang
index b4553ba9..01784018 100644
--- a/languages/fo.lang
+++ b/languages/fo.lang
@@ -370,7 +370,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/fr.lang b/languages/fr.lang
index a35bef79..9fa704f0 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -367,7 +367,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Nom de Domaine Invalide %s, vérification regexp impossible";
 $PALANG['pInvalidDomainDNS'] = "Domaine Invalide %s, et/ou non resolvable via les DNS";
-$PALANG['pInvalidMailRegex'] = "Adresse email invalide, vérification regexp impossible";
+$PALANG['pInvalidMailRegex'] = "Adresse email invalide, vérification regexp impossible (%s)"; # XXX %s added - but it should be in the text, not at the end
 $PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :';
 $PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée';
 $PALANG['pFetchmail_database_save_error'] = 'Impossible d\'enregistrer cette entrée dans la base!';
diff --git a/languages/hr.lang b/languages/hr.lang
index fb2baa95..3a4f0606 100644
--- a/languages/hr.lang
+++ b/languages/hr.lang
@@ -363,7 +363,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/hu.lang b/languages/hu.lang
index 1c11f1f3..25f785bf 100644
--- a/languages/hu.lang
+++ b/languages/hu.lang
@@ -377,7 +377,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 
 $PALANG['pFetchmail_welcome'] = 'Mail lehozása:';
 $PALANG['pFetchmail_new_entry'] = 'Új bejegyzés';
diff --git a/languages/is.lang b/languages/is.lang
index 66b5cc9f..70d1ead1 100644
--- a/languages/is.lang
+++ b/languages/is.lang
@@ -364,7 +364,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/it.lang b/languages/it.lang
index edbd79f9..f8148d1c 100644
--- a/languages/it.lang
+++ b/languages/it.lang
@@ -366,7 +366,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Ricevi posta per:';
 $PALANG['pFetchmail_new_entry'] = 'Nuova voce';
 $PALANG['pFetchmail_database_save_error'] = 'Impossibile registrare nel database!';
diff --git a/languages/ja.lang b/languages/ja.lang
index bf0de62a..071b48ec 100644
--- a/languages/ja.lang
+++ b/languages/ja.lang
@@ -375,7 +375,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 
 $PALANG['pFetchmail_welcome'] = 'メール取得:';
 $PALANG['pFetchmail_new_entry'] = '新しいエントリ';
diff --git a/languages/lt.lang b/languages/lt.lang
index e477343b..730e45a6 100644
--- a/languages/lt.lang
+++ b/languages/lt.lang
@@ -371,7 +371,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/mk.lang b/languages/mk.lang
index 6f362f5a..44a6a277 100644
--- a/languages/mk.lang
+++ b/languages/mk.lang
@@ -366,7 +366,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/nb.lang b/languages/nb.lang
index 16b7442c..24a93d04 100644
--- a/languages/nb.lang
+++ b/languages/nb.lang
@@ -365,7 +365,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Ugyldig domenenavn %s, regexp-validering feilet";
 $PALANG['pInvalidDomainDNS'] = "Ugyldig domene %s, og/eller finnes ikke i DNS";
-$PALANG['pInvalidMailRegex'] = "Ugyldig e-postadresse, regexp-validering feilet";
+$PALANG['pInvalidMailRegex'] = "Ugyldig e-postadresse, regexp-validering feilet (%s)"; # XXX %s added - but it should be in the text, not at the end
 $PALANG['pFetchmail_welcome'] = 'Hent e-post for:';
 $PALANG['pFetchmail_new_entry'] = 'Ny oppføring';
 $PALANG['pFetchmail_database_save_error'] = 'Kunne ikke lagre denne oppføringen i databasen!';
diff --git a/languages/nl.lang b/languages/nl.lang
index c0070646..30dc5f69 100644
--- a/languages/nl.lang
+++ b/languages/nl.lang
@@ -369,7 +369,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Ongeldig domein naam %s";
 $PALANG['pInvalidDomainDNS'] = "Ongeldig domein %s";
-$PALANG['pInvalidMailRegex'] = "Ongeldig email adres";
+$PALANG['pInvalidMailRegex'] = "Ongeldig email adres %s"; # XXX text change to: "Invalid email address %s, fails regexp check"
 $PALANG['pFetchmail_welcome'] = 'Haal mail op voor:';
 $PALANG['pFetchmail_new_entry'] = 'Nieuw item';
 $PALANG['pFetchmail_database_save_error'] = 'Niet in staat dit item toe te voegen aan database!';
diff --git a/languages/nn.lang b/languages/nn.lang
index a00203af..3a27e919 100644
--- a/languages/nn.lang
+++ b/languages/nn.lang
@@ -362,7 +362,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/pl.lang b/languages/pl.lang
index 7c1945e1..4102501e 100644
--- a/languages/pl.lang
+++ b/languages/pl.lang
@@ -371,7 +371,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = 'Nieprawidłowa nazwa domeny %s';
 $PALANG['pInvalidDomainDNS'] = 'Nieprawidłowa domena %s, nie wykrywana w DNS';
-$PALANG['pInvalidMailRegex'] = 'Nieprawidłowy adres email';
+$PALANG['pInvalidMailRegex'] = 'Nieprawidłowy adres email %s'; # XXX text changed to "Invalid email address %s, fails regexp check"
 $PALANG['pFetchmail_welcome'] = 'Pobierz pocztę dla:';
 $PALANG['pFetchmail_new_entry'] = 'Nowy wpis';
 $PALANG['pFetchmail_database_save_error'] = 'Wpis nie może być zapisany w bazie danych!';
diff --git a/languages/pt-br.lang b/languages/pt-br.lang
index 6c296665..8aa55cdc 100644
--- a/languages/pt-br.lang
+++ b/languages/pt-br.lang
@@ -377,7 +377,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Nome de domínio inválido %s, falhou checagem por expressão regular";
 $PALANG['pInvalidDomainDNS'] = "Domínio inválido %s, e/ou não pôde ser resolvido por DNS";
-$PALANG['pInvalidMailRegex'] = "Endereço de email inválido, falhou checagem por expressão regular";
+$PALANG['pInvalidMailRegex'] = "Endereço de email inválido, falhou checagem por expressão regular (%s)"; # XXX %s added - but it should be in the text, not at the end
 
 $PALANG['pFetchmail_welcome'] = 'Configuração de recuperação de mensagens para: ';
 $PALANG['pFetchmail_new_entry'] = 'Criar Novo Registro';
diff --git a/languages/ru.lang b/languages/ru.lang
index d8b426a9..9ac20b93 100644
--- a/languages/ru.lang
+++ b/languages/ru.lang
@@ -377,7 +377,7 @@ $PALANG['password_no_characters'] = "Ваш пароль должен содер
 $PALANG['password_no_digits'] = "Ваш пароль должен содержать не менее %s цифр(ы).";
 $PALANG['pInvalidDomainRegex'] = "Некорректное имя домена %s, не соответствует регулярному выражению";
 $PALANG['pInvalidDomainDNS'] = "Некорректный домен %s, и/или не обнаруживается в DNS";
-$PALANG['pInvalidMailRegex'] = "Некорректный адрес e-mail, не соответствует регулярному выражению";
+$PALANG['pInvalidMailRegex'] = "Некорректный адрес e-mail, не соответствует регулярному выражению (%s)"; # XXX %s added - but it should be in the text, not at the end
 
 $PALANG['pFetchmail_welcome'] = 'Собирать почту для:';
 $PALANG['pFetchmail_new_entry'] = 'Новая запись';
diff --git a/languages/sk.lang b/languages/sk.lang
index 25987381..07fb6864 100644
--- a/languages/sk.lang
+++ b/languages/sk.lang
@@ -366,7 +366,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Neplatný názov domény %s";
 $PALANG['pInvalidDomainDNS'] = "Neplatná doména %s alebo neexistuje jej DNS záznam";
-$PALANG['pInvalidMailRegex'] = "Neplatná emailová adresa";
+$PALANG['pInvalidMailRegex'] = "Neplatná emailová adresa %s"; # text change to "Invalid email address %s, fails regexp check"
 $PALANG['pFetchmail_welcome'] = 'Sťahovanie emailu pre:';
 $PALANG['pFetchmail_new_entry'] = 'Nová položka';
 $PALANG['pFetchmail_database_save_error'] = 'Nepodarilo sa uložiť položku do databázy!';
diff --git a/languages/sl.lang b/languages/sl.lang
index 7df3ac39..b0f1afa0 100644
--- a/languages/sl.lang
+++ b/languages/sl.lang
@@ -365,7 +365,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/sv.lang b/languages/sv.lang
index 9ac1aa9d..508040fe 100644
--- a/languages/sv.lang
+++ b/languages/sv.lang
@@ -367,7 +367,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Hämta mail för:';
 $PALANG['pFetchmail_new_entry'] = 'Ny anteckning';
 $PALANG['pFetchmail_database_save_error'] = 'Misslyckades med att spara anteckningen i databasen!';
diff --git a/languages/tr.lang b/languages/tr.lang
index b3ed8d78..25085461 100644
--- a/languages/tr.lang
+++ b/languages/tr.lang
@@ -365,7 +365,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
diff --git a/languages/tw.lang b/languages/tw.lang
index 80476c7e..e5df290a 100644
--- a/languages/tw.lang
+++ b/languages/tw.lang
@@ -365,7 +365,7 @@ $PALANG['password_no_characters'] = "Your password must contain at least %s char
 $PALANG['password_no_digits'] = "Your password must contain at least %s digit(s)."; # XXX
 $PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
 $PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
+$PALANG['pInvalidMailRegex'] = "Invalid email address %s, fails regexp check"; # XXX
 $PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
 $PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
 $PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX