diff --git a/localization/de_DE.inc b/localization/de_DE.inc
index 6b6f18b..2ce1eee 100644
--- a/localization/de_DE.inc
+++ b/localization/de_DE.inc
@@ -35,6 +35,9 @@ $labels['form.imap.username'] = 'Benutzername';
 // Password
 $labels['form.imap.password'] = 'Passwort';
 
+// Folder hierarchy delimiter
+$labels['form.imap.delimiter'] = 'Ordnerhierarchie-Trennzeichen';
+
 // Value in \'Username\' field is too long (64 chars max).
 $labels['err.user.long'] = 'Der Wert in Feld \'Benutzername\' ist zu lang (max. 64 Zeichen).';
 
@@ -51,8 +54,14 @@ $labels['form.smtp.tls'] = 'Sichere Verbindung (TLS)';
 // Port
 $labels['form.smtp.port'] = 'Port';
 
-// Authorization required
-$labels['form.smtp.auth'] = 'Genehmigung benötigt';
+// Authorization
+$labels['form.smtp.auth'] = 'Autorisierung';
+
+// As IMAP
+$labels['form.smtp.auth.imap'] = 'Wie IMAP';
+
+// None
+$labels['form.smtp.auth.none'] = 'Keine';
 
 
 // Errors
diff --git a/localization/fr_FR.inc b/localization/fr_FR.inc
index 78e0d22..5ba46b4 100644
--- a/localization/fr_FR.inc
+++ b/localization/fr_FR.inc
@@ -35,6 +35,9 @@ $labels['form.imap.username'] = 'Nom d\'utilisateur';
 // Password
 $labels['form.imap.password'] = 'Mot de passe';
 
+// Folder hierarchy delimiter
+$labels['form.imap.delimiter'] = 'Délimiteur de hiérarchie des dossiers';
+
 // Value in \'Username\' field of IMAP section is too long (64 chars max).
 $labels['err.user.long'] = 'La valeur du champ \'Nom d\'utilisateur\' de la section IMAP est trop longue (64 caractères max).';
 
@@ -51,8 +54,14 @@ $labels['form.smtp.tls'] = 'Connexion sécurisée (TLS)';
 // Port
 $labels['form.smtp.port'] = 'Port';
 
-// Authorization required
-$labels['form.smtp.auth'] = 'Autorisation requise';
+// Authorization
+$labels['form.smtp.auth'] = 'Autorisation';
+
+// As IMAP
+$labels['form.smtp.auth.imap'] = 'Identique à IMAP';
+
+// None
+$labels['form.smtp.auth.none'] = 'Aucune';
 
 
 // Errors
diff --git a/localization/it_IT.inc b/localization/it_IT.inc
index 1c6b8f7..fdc1880 100644
--- a/localization/it_IT.inc
+++ b/localization/it_IT.inc
@@ -4,47 +4,73 @@
  */
 $labels = array();
 
-// IMAP
-$labels['form.caption'] = 'IMAP';
+// Plugin ident_switch
+$labels['form.common.caption'] = 'Plugin ident_switch';
 
 // Enabled
-$labels['form.enabled'] = 'Abilita';
+$labels['form.common.enabled'] = 'Abilita';
 
 // Label
-$labels['form.label'] = 'Nome visualizzato';
+$labels['form.common.label'] = 'Nome visualizzato';
+
+// Value in \'Label\' field is too long (32 chars max).
+$labels['err.label.long'] = 'Il valore del campo \'Nome Visualizzato\' è troppo lungo (massimo 32 caratteri).';
+
+
+// IMAP
+$labels['form.imap.caption'] = 'IMAP';
 
 // Server host name
-$labels['form.host']='Nome del server';
+$labels['form.imap.host'] = 'Nome del server';
 
-// Secure connection (SSL/TLS)
-$labels['form.secure']='Sicurezza della connessione';
+// Secure connection (TLS)
+$labels['form.imap.tls'] = 'Connessione sicura (TLS)';
 
 // Port
-$labels['form.port']='Porta';
-
-// Username
-$labels['form.username'] = 'Username';
-
-// Password
-$labels['form.password'] = 'Password';
+$labels['form.imap.port'] = 'Porta';
 
 // Folder hierarchy delimiter
-$labels['form.delimiter'] = 'Delimitatore gerarchico delle cartelle';
+$labels['form.imap.delimiter'] = 'Delimitatore gerarchico delle cartelle';
 
-// Value in \'Label\' field of IMAP section is too long (32 chars max).
-$labels['err.label.long'] = 'Il valore del campo \' Nome Visualizzato\' è troppo lungo. (massimo 32 caratteri).';
+// Username
+$labels['form.imap.username'] = 'Username';
 
-// Value in \'Server host name\' field of IMAP section is too long (64 chars max).
-$labels['err.host.long'] = 'Il valore del campo \'Nome del server\' della sezione IMAP è troppo lungo (massimo 64 caratteri).';
+// Password
+$labels['form.imap.password'] = 'Password';
 
-// Value in \'Username\' field of IMAP section is too long (64 chars max).
-$labels['err.user.long'] = 'Il valore del campo \'Username\' della sezione IMAP  è troppo lungo (massimo 64 caratteri).';
+// Value in \'Username\' field is too long (64 chars max).
+$labels['err.user.long'] = 'Il valore del campo \'Username\' è troppo lungo (massimo 64 caratteri).';
 
-// Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).
-$labels['err.delim.long'] = 'Il valore del campo \'Delimitatore gerarchico delle cartelle\'  è troppo lungo  (massimo 1 carattere).';
 
-// Value in \'Port\' field of IMAP section must be a number.
-$labels['err.port.num'] = 'Il valore del campo \'Porta\' nella sezione IMAP deve essere un numero.';
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
 
-// Value in \'Port\' field of IMAP section must be between 1 and 65535.
-$labels['err.port.range'] = 'Il valore del campo \'Porta\' nella sezione IMAP deve essere compreso tra i valori 1 e 65535.';
+// Server host name
+$labels['form.smtp.host'] = 'Nome del server';
+
+// Secure connection (TLS)
+$labels['form.smtp.tls'] = 'Connessione sicura (TLS)';
+
+// Port
+$labels['form.smtp.port'] = 'Porta';
+
+// Authorization
+$labels['form.smtp.auth'] = 'Autorizzazione';
+
+// As IMAP
+$labels['form.smtp.auth.imap'] = 'Come IMAP';
+
+// None
+$labels['form.smtp.auth.none'] = 'Nessuna';
+
+
+// Errors
+
+// Value in \'Server host name\' field is too long (64 chars max).
+$labels['err.host.long'] = 'Il valore del campo \'Nome del server\' è troppo lungo (massimo 64 caratteri).';
+
+// Value in \'Port\' field must be a number.
+$labels['err.port.num'] = 'Il valore del campo \'Porta\' deve essere un numero.';
+
+// Value in \'Port\' field must be between 1 and 65535.
+$labels['err.port.range'] = 'Il valore del campo \'Porta\' deve essere compreso tra 1 e 65535.';
diff --git a/localization/nl_NL.inc b/localization/nl_NL.inc
index aa81c89..55c0992 100644
--- a/localization/nl_NL.inc
+++ b/localization/nl_NL.inc
@@ -4,47 +4,73 @@
  */
 $labels = array();
 
-// IMAP
-$labels['form.caption'] = 'IMAP';
+// Plugin ident_switch
+$labels['form.common.caption'] = 'Plugin ident_switch';
 
 // Enabled
-$labels['form.enabled'] = 'Inschakelen';
+$labels['form.common.enabled'] = 'Inschakelen';
 
 // Label
-$labels['form.label'] = 'Label';
+$labels['form.common.label'] = 'Label';
+
+// Value in \'Label\' field is too long (32 chars max).
+$labels['err.label.long'] = 'De waarde in het veld \'Label\' is te lang (maximaal 32 karakter is toegestaan).';
+
+
+// IMAP
+$labels['form.imap.caption'] = 'IMAP';
 
 // Server host name
-$labels['form.host']='Servernaam';
+$labels['form.imap.host'] = 'Servernaam';
 
-// Secure connection (SSL/TLS)
-$labels['form.secure']='Beveiligingstype';
+// Secure connection (TLS)
+$labels['form.imap.tls'] = 'Beveiligde verbinding (TLS)';
 
 // Port
-$labels['form.port']='Poortnummer';
-
-// Username
-$labels['form.username'] = 'Gebruikersnaam';
-
-// Password
-$labels['form.password'] = 'Wachtwoord';
+$labels['form.imap.port'] = 'Poortnummer';
 
 // Folder hierarchy delimiter
-$labels['form.delimiter'] = 'Map hiërarchie scheidingsteken';
+$labels['form.imap.delimiter'] = 'Map hiërarchie scheidingsteken';
 
-// Value in \'Label\' field of IMAP section is too long (32 chars max).
-$labels['err.label.long'] = 'De waarde in het veld \'Label\' is te lang! (maximaal 32 karakter is toegestaan).';
+// Username
+$labels['form.imap.username'] = 'Gebruikersnaam';
 
-// Value in \'Server host name\' field of IMAP section is too long (64 chars max).
+// Password
+$labels['form.imap.password'] = 'Wachtwoord';
+
+// Value in \'Username\' field is too long (64 chars max).
+$labels['err.user.long'] = 'De waarde in het veld \'Gebruikersnaam\' is te lang (maximaal 64 karakter is toegestaan).';
+
+
+// SMTP
+$labels['form.smtp.caption'] = 'SMTP';
+
+// Server host name
+$labels['form.smtp.host'] = 'Servernaam';
+
+// Secure connection (TLS)
+$labels['form.smtp.tls'] = 'Beveiligde verbinding (TLS)';
+
+// Port
+$labels['form.smtp.port'] = 'Poortnummer';
+
+// Authorization
+$labels['form.smtp.auth'] = 'Autorisatie';
+
+// As IMAP
+$labels['form.smtp.auth.imap'] = 'Zoals IMAP';
+
+// None
+$labels['form.smtp.auth.none'] = 'Geen';
+
+
+// Errors
+
+// Value in \'Server host name\' field is too long (64 chars max).
 $labels['err.host.long'] = 'De waarde in het veld \'Servernaam\' is te lang (maximaal 64 karakter is toegestaan).';
 
-// Value in \'Username\' field of IMAP section is too long (64 chars max).
-$labels['err.user.long'] = 'De waarde in het veld \'Gebruikersnaam\' is te lang! (maximaal 64 karakter is toegestaan).';
-
-// Value in \'Folder hierarchy delimiter\' field of IMAP section is too long (1 char max).
-$labels['err.delim.long'] = 'De waarde in het veld \'Map hiërarchie scheidingsteken\' is te lang! (maximaal 1 karakter is toegestaan).';
-
-// Value in \'Port\' field of IMAP section must be a number.
+// Value in \'Port\' field must be a number.
 $labels['err.port.num'] = 'De waarde in het veld \'Poortnummer\' moet een nummer zijn.';
 
-// Value in \'Port\' field of IMAP section must be between 1 and 65535.
+// Value in \'Port\' field must be between 1 and 65535.
 $labels['err.port.range'] = 'De waarde in het veld \'Poortnummer\' moet tussen de 1 en 65535 zijn.';