diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index 11bb6005c..e65e9e2b1 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -139,7 +139,7 @@ $labels['resetsearch'] = 'Afinar la búsqueda';
 $labels['searchmod'] = 'Opciones de búsqueda';
 $labels['msgtext'] = 'Mensaje completo';
 $labels['openinextwin'] = 'Abrir en nueva ventana';
-$labels['emlsave'] = 'Guardar (.eml)';
+$labels['emlsave'] = 'Descargar (.eml)';
 $labels['compose'] = 'Escribir un mensaje';
 $labels['editasnew'] = 'Editar como nuevo';
 $labels['savemessage'] = 'Guardar como borrador';
@@ -259,6 +259,18 @@ $labels['section'] = 'Sección';
 $labels['maintenance'] = 'Mantenimiento';
 $labels['newmessage'] = 'Nuevo Mensaje';
 $labels['listoptions'] = 'Listar Opciones';
+$labels['signatureoptions'] = 'Opciones de Firma';
+$labels['whenreplying'] = 'Al responder';
+$labels['replytopposting'] = 'empezar un mensaje nuevo arriba del original';
+$labels['replybottomposting'] = 'empezar un mensaje nuevo abajo del original';
+$labels['replyremovesignature'] = 'Eliminar la firma original del mensaje al responder';
+$labels['autoaddsignature'] = 'Automáticamente agrgar firma';
+$labels['newmessageonly'] = 'solamente mensaje nuevo';
+$labels['replyandforwardonly'] = 'respuestas y reenvíos solamente';
+$labels['replysignaturepos'] = 'Colocar firma al responder o reenviar';
+$labels['belowquote'] = 'abajo del texto seleccionado';
+$labels['abovequote'] = 'arriba del texto seleccionado';
+$labels['insertsignature'] = 'Insertar firma';
 $labels['folder'] = 'Bandeja';
 $labels['folders'] = 'Bandejas';
 $labels['foldername'] = 'Nombre de bandeja';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 16c599d0c..25437da7f 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -259,6 +259,18 @@ $labels['section'] = 'Section';
 $labels['maintenance'] = 'Maintenance';
 $labels['newmessage'] = 'Nouveau Message';
 $labels['listoptions'] = 'Lister les options';
+$labels['signatureoptions'] = 'Options pour la signature';
+$labels['whenreplying'] = 'En répondant';
+$labels['replytopposting'] = 'commencer le nouveau message au-dessus de l\'original';
+$labels['replybottomposting'] = 'commencer le nouveau message en-dessous de l\'original';
+$labels['replyremovesignature'] = 'En répondant, supprimer la signature d\'origine du message';
+$labels['autoaddsignature'] = 'Ajouter la signature automatiquement';
+$labels['newmessageonly'] = 'nouveau message uniquement';
+$labels['replyandforwardonly'] = 'réponses et transferts uniquement';
+$labels['replysignaturepos'] = 'En répondant ou en transférant, placer la signature';
+$labels['belowquote'] = 'en-dessous de la citation';
+$labels['abovequote'] = 'au-dessus de la citation';
+$labels['insertsignature'] = 'Insérer la signature';
 $labels['folder'] = 'Dossier';
 $labels['folders'] = 'Dossiers';
 $labels['foldername'] = 'Nom du dossier';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 88365cafd..2c4c194ff 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -208,7 +208,7 @@ $labels['settingsfor'] = 'Instellingen voor';
 $labels['preferences'] = 'Instellingen';
 $labels['userpreferences'] = 'Gebruikersinstellingen';
 $labels['editpreferences'] = 'Wijzig gebruikersinstellingen';
-$labels['identities'] = 'Identititeiten';
+$labels['identities'] = 'Identiteiten';
 $labels['manageidentities'] = 'Beheer identiteiten voor dit account';
 $labels['newidentity'] = 'Identiteit toevoegen';
 $labels['newitem'] = 'Nieuw item';
@@ -254,11 +254,24 @@ $labels['advancedoptions'] = 'Geavanceerde opties';
 $labels['focusonnewmessage'] = 'Focus browserscherm bij nieuw bericht';
 $labels['checkallfolders'] = 'Controleer alle mappen op nieuwe berichten';
 $labels['displaynext'] = 'Na verplaatsen/verwijderen het volgende bericht tonen';
+$labels['indexsort'] = 'Gebruik berichtindex bij het sorteren op datum';
 $labels['mainoptions'] = 'Hoofdopties';
 $labels['section'] = 'Sectie';
 $labels['maintenance'] = 'Onderhoud';
 $labels['newmessage'] = 'Nieuw bericht';
 $labels['listoptions'] = 'Lijstopties';
+$labels['signatureoptions'] = 'Instellingen voor ondertekening';
+$labels['whenreplying'] = 'bij antwoorden';
+$labels['replytopposting'] = 'begin bericht boven het origineel';
+$labels['replybottomposting'] = 'begin bericht onder het origineel';
+$labels['replyremovesignature'] = 'Verwijder ondertekening uit het origneel bij het antwoorden';
+$labels['autoaddsignature'] = 'Ondertekening automatisch toevoegen';
+$labels['newmessageonly'] = 'alleen bij nieuwe berichten';
+$labels['replyandforwardonly'] = 'alleen bij antwoorden en doorsturen';
+$labels['replysignaturepos'] = 'Ondertekening plaatsen bij antwoorden of doorsturen';
+$labels['belowquote'] = 'onder het citaat';
+$labels['abovequote'] = 'boven het citaat';
+$labels['insertsignature'] = 'Ondertekening invoegen';
 $labels['folder'] = 'Map';
 $labels['folders'] = 'Mappen';
 $labels['foldername'] = 'Mapnaam';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 5ce45efe0..e354109a1 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -30,6 +30,7 @@ $messages['nomessagesfound'] = 'Geen berichten gevonden in deze mailbox';
 $messages['loggedout'] = 'Succesvol uitgelogd. Tot ziens!';
 $messages['mailboxempty'] = 'Mailbox is leeg';
 $messages['loading'] = 'Laden...';
+$messages['uploading'] = 'Bezig met uploaden...';
 $messages['loadingdata'] = 'Laden van data...';
 $messages['checkingmail'] = 'Controleren op nieuwe berichten...';
 $messages['sendingmessage'] = 'Bezig met bericht versturen...';
@@ -70,6 +71,7 @@ $messages['notsentwarning'] = 'Bericht is niet verstuurd. Weet u zeker dat u het
 $messages['noldapserver'] = 'Geef een LDAP adresboek server op om te doorzoeken';
 $messages['nocontactsreturned'] = 'Er zijn geen contactpersonen gevonden';
 $messages['nosearchname'] = 'Geef de naam of e-mail op van de contactpersoon';
+$messages['notuploadedwarning'] = 'Nog niet alle bijlagen zijn geüpload. Wacht even of annuleer de upload.';
 $messages['searchsuccessful'] = '$nr berichten gevonden';
 $messages['searchnomatch'] = 'Zoekopdracht heeft geen resultaten opgeleverd';
 $messages['searching'] = 'Zoeken...';
@@ -106,5 +108,6 @@ $messages['smtpfromerror'] = 'SMTP Fout ($code): Kon afzender "$from" niet inste
 $messages['smtptoerror'] = 'SMTP Fout ($code): Kon ontvanger "$to" niet toevoegen';
 $messages['smtprecipientserror'] = 'SMTP Fout: Kon lijst van ontvangers niet verwerken';
 $messages['smtperror'] = 'SMTP Fout: $msg';
+$messages['emailformaterror'] = 'Ongeldig e-mailadres: $email';
 
 ?>
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index 7195ddd8d..e39991d92 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -47,7 +47,7 @@ $labels['organization'] = 'Organizacija';
 $labels['reply-to'] = 'Odgovor na';
 $labels['mailboxlist'] = 'Mape';
 $labels['messagesfromto'] = 'Sporočila $from do $to od $count';
-$labels['messagenrof'] = 'Sporočilo $nr od $count';
+$labels['messagenrof'] = 'Sporočilo $n od $count';
 $labels['moveto'] = 'premakni v...';
 $labels['download'] = 'prenesi';
 $labels['filename'] = 'Ime datoteke';
@@ -143,7 +143,7 @@ $labels['emlsave'] = 'Prenos datoteke(.eml)';
 $labels['compose'] = 'Sestavi sporočilo';
 $labels['editasnew'] = 'Uredi kot novo';
 $labels['savemessage'] = 'Shrani kot osnutek';
-$labels['sendmessage'] = 'Pošlji sporočilo zdaj';
+$labels['sendmessage'] = 'Pošlji sporočilo';
 $labels['addattachment'] = 'Pripni datoteko';
 $labels['charset'] = 'Nabor znakov';
 $labels['editortype'] = 'Vrsta urejevalnika';
@@ -196,7 +196,7 @@ $labels['firstpage'] = 'Prva stran';
 $labels['nextpage'] = 'Naslednja stran';
 $labels['lastpage'] = 'Zadnja stran';
 $labels['groups'] = 'Skupine';
-$labels['personaladrbook'] = 'Osebni Stiki';
+$labels['personaladrbook'] = 'Stiki';
 $labels['import'] = 'Uvozi';
 $labels['importcontacts'] = 'Uvozi stike';
 $labels['importfromfile'] = 'Uvozi iz datoteke:';
@@ -218,7 +218,7 @@ $labels['language'] = 'Jezik';
 $labels['timezone'] = 'Časovni pas';
 $labels['pagesize'] = 'Vrstic na stran';
 $labels['signature'] = 'Podpis';
-$labels['dstactive'] = 'Samodejna nastavitev sončne/legalne ure';
+$labels['dstactive'] = 'Samodejna nastavitev zimskega/letnega časa';
 $labels['htmleditor'] = 'Sestavi sporočila z obogatenim besedilom';
 $labels['htmlsignature'] = 'Podpis z obogatenim besedilom';
 $labels['previewpane'] = 'Prikaži predogled';
@@ -253,11 +253,24 @@ $labels['advancedoptions'] = 'Dodatne možnosti';
 $labels['focusonnewmessage'] = 'Usmeri okno brskalnika na novo sporočilo';
 $labels['checkallfolders'] = 'Preglej nova sporočila za vse mape';
 $labels['displaynext'] = 'Po izbrisu/premikanju sporočila prikaži naslednje sporočilo';
+$labels['indexsort'] = 'Uporabite seznam sporočil za razvrščanje po datumu';
 $labels['mainoptions'] = 'Osnovne nastavitve';
 $labels['section'] = 'Razdelek';
 $labels['maintenance'] = 'Vzdrževanje';
 $labels['newmessage'] = 'Novo sporočilo';
 $labels['listoptions'] = 'Prikaži seznam možnosti';
+$labels['signatureoptions'] = 'Nastavitve podpisa';
+$labels['whenreplying'] = 'Pri odgovoru';
+$labels['replytopposting'] = 'začni z novim sporočilom nad izvornim sporočilom';
+$labels['replybottomposting'] = 'začni z novim sporočilom pod izvornim sporočilom';
+$labels['replyremovesignature'] = 'Pri odgovoru na sporočilo odstrani izvorni podpis iz sporočila';
+$labels['autoaddsignature'] = 'Samodejno dodaj podpis';
+$labels['newmessageonly'] = 'samo novim sporočilom';
+$labels['replyandforwardonly'] = 'samo k odgovorom in posredovanim sporočilom';
+$labels['replysignaturepos'] = 'Pri odgovoru ali posredovanju sporočila vstavi podpis';
+$labels['belowquote'] = 'pod citiran tekst';
+$labels['abovequote'] = 'nad citiran tekst';
+$labels['insertsignature'] = 'Vstavi podpis';
 $labels['folder'] = 'Mapa';
 $labels['folders'] = 'Mape';
 $labels['foldername'] = 'Ime mape';
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index ff1991d95..4854d4bf2 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -25,6 +25,7 @@ $messages['nomessagesfound'] = 'V poštnem predalu ni sporočil.';
 $messages['loggedout'] = 'Odjava je bila uspešna.';
 $messages['mailboxempty'] = 'Poštni predal je prazen.';
 $messages['loading'] = 'Nalaganje...';
+$messages['uploading'] = 'Prenos dokumenta na strežnik...';
 $messages['loadingdata'] = 'Nalaganje podatkov...';
 $messages['checkingmail'] = 'Preverjanje novih sporočil...';
 $messages['sendingmessage'] = 'Pošiljanje sporočil...';
@@ -65,6 +66,7 @@ $messages['notsentwarning'] = 'Sporočilo ni bilo poslano. Želite zavreči to s
 $messages['noldapserver'] = 'Izberite LDAP strežnik, v katerem želite iskati?';
 $messages['nocontactsreturned'] = 'Nobenega stika ni bilo mogoče najti';
 $messages['nosearchname'] = 'Vnesite ime ali elektronski naslov stika';
+$messages['notuploadedwarning'] = 'Priponke se še nalagajo na strežnik. Počakajte ali prekinite prenos.';
 $messages['searchsuccessful'] = '$nr najdenih sporočil';
 $messages['searchnomatch'] = 'Ni zadetkov';
 $messages['searching'] = 'Iskanje...';
@@ -101,5 +103,6 @@ $messages['smtpfromerror'] = 'Napaka pri pošiljanju ($code): Neveljaven elektro
 $messages['smtptoerror'] = 'Napaka pri pošiljanju ($code): Neveljaven elektronski naslov prejemnika "$to"';
 $messages['smtprecipientserror'] = 'Napaka pri pošiljanju: Seznama prejemnikov ni bilo mogoče razčleniti';
 $messages['smtperror'] = 'Napaka pri pošiljanju:$msg';
+$messages['emailformaterror'] = 'Nepravilen elektronski naslov: $email';
 
 ?>