Bring back the title for the column with subscription checkboxes; complete german translations

72 files changed, 146 insertions, 96 deletions

diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index cf85bf9be..c2534f1c5 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -38,8 +38,7 @@ $labels['to'] = 'المستقبل';
 $labels['cc'] = 'نسخة';
 $labels['bcc'] = 'نسخة مخفية';
 $labels['replyto'] = 'الرد إلى';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Mail-Followup-To';
 $labels['date'] = 'التاريخ';
 $labels['size'] = 'الحجم';
 $labels['priority'] = 'الأولوية';
@@ -201,8 +200,7 @@ $labels['maxuploadsize'] = 'أقصى حجم للملف هو $size';
 $labels['addcc'] = 'أضف CC';
 $labels['addbcc'] = 'أضف BCC';
 $labels['addreplyto'] = 'أضيف Reply-To';
-$labels['addmailreplyto'] = 'إضافة Mail-Reply-To';
-$labels['addmailfollowupto'] = 'إضافة Mail-Followup-To';
+$labels['addfollowupto'] = 'إضافة Mail-Followup-To';
 $labels['mdnrequest'] = 'طلب المرسل إعلامه عند قراءتك لرسالته. هل تود إعلام المرسل؟';
 $labels['receiptread'] = 'إيصال الاستلام )بالقراءة)';
 $labels['yourmessage'] = 'هذا إيصال بقراءة رسالتك';
@@ -326,6 +324,7 @@ $labels['replysamefolder'] = 'وضع الردود في المجلد الذي ي�
 $labels['folder'] = 'مجلد';
 $labels['folders'] = 'مجلدات';
 $labels['foldername'] = 'اسم المجلد';
+$labels['subscribed'] = 'مشترك';
 $labels['messagecount'] = 'الرسائل';
 $labels['create'] = 'أنشئ';
 $labels['createfolder'] = 'أنشئ مجلد جديد';
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index d136603a9..427c7a810 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -261,6 +261,7 @@ $labels['listoptions'] = 'Allistar opciones';
 $labels['folder'] = 'Bandexa';
 $labels['folders'] = 'Bandexes';
 $labels['foldername'] = 'Nome de bandexa';
+$labels['subscribed'] = 'Soscrita';
 $labels['messagecount'] = 'Mensaxes';
 $labels['create'] = 'Facer';
 $labels['createfolder'] = 'Facer una bandexa nueva';
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 7128a02e5..ce515e2d4 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -306,6 +306,7 @@ $labels['afternseconds'] = '$n saniyədən sonra';
 $labels['folder'] = 'Qovluq';
 $labels['folders'] = 'Qovluqlar';
 $labels['foldername'] = 'Qovluq adı';
+$labels['subscribed'] = 'İmzalanıb';
 $labels['messagecount'] = 'Məktublar';
 $labels['create'] = 'Yarad';
 $labels['createfolder'] = 'Yeni qovluq yarad';
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 81c106e67..14ad45aab 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -39,8 +39,7 @@ $labels['to'] = 'Получател';
 $labels['cc'] = 'Копие до';
 $labels['bcc'] = 'Скрито копие до';
 $labels['replyto'] = 'Отговор до';
-$labels['mailreplyto'] = 'Отговор към';
-$labels['mailfollowupto'] = 'Препращане към';
+$labels['followupto'] = 'Препращане към';
 $labels['date'] = 'Дата';
 $labels['size'] = 'Размер';
 $labels['priority'] = 'Приоритет';
@@ -202,8 +201,7 @@ $labels['maxuploadsize'] = 'Максимално позволен размер $
 $labels['addcc'] = 'Копие до';
 $labels['addbcc'] = 'Скрито копие до';
 $labels['addreplyto'] = 'Отговор на';
-$labels['addmailreplyto'] = 'Добавяне на отговор към';
-$labels['addmailfollowupto'] = 'Добавяне на препращане към';
+$labels['addfollowupto'] = 'Добавяне на препращане към';
 $labels['mdnrequest'] = 'Подателят на писмото е пожелал да бъде уведомен, че сте го прочели. Желаете ли да изпратите обратна разписка?';
 $labels['receiptread'] = 'Обратна разписка (прочетено)';
 $labels['yourmessage'] = 'Това е обратна разписка за писмото Ви';
@@ -326,6 +324,7 @@ $labels['reqdsn'] = 'Винаги изисквай отговор при дос�
 $labels['folder'] = 'Папка';
 $labels['folders'] = 'Папки';
 $labels['foldername'] = 'Име на папката';
+$labels['subscribed'] = 'Използвай';
 $labels['messagecount'] = 'Писма';
 $labels['create'] = 'Създай';
 $labels['createfolder'] = 'Направи нова папка';
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index f783d8017..37fcc867b 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -243,6 +243,7 @@ $labels['checkallfolders'] = 'সবগুলো মেইলবক্সে ন
 $labels['folder'] = 'ফোল্ডার/মেইলবক্স';
 $labels['folders'] = 'ফোল্ডার/মেইলবক্স';
 $labels['foldername'] = 'ফোল্ডার/মেইলবক্স এর নাম';
+$labels['subscribed'] = 'গ্রহনকারি';
 $labels['messagecount'] = 'মেইল/চিঠি';
 $labels['create'] = 'প্রস্তুত করুন';
 $labels['createfolder'] = 'নতুন ফোল্ডার / মেইলবক্স প্রস্তুত করুন';
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index bd95df56c..c8812d5c4 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -168,6 +168,7 @@ $labels['never'] = 'ebet';
 $labels['folder'] = 'Renkell';
 $labels['folders'] = 'Renkelloù';
 $labels['foldername'] = 'Anv ar renkell';
+$labels['subscribed'] = 'Koumananer';
 $labels['create'] = 'Krouiñ';
 $labels['createfolder'] = 'Krouiñ ur renkell nevez';
 $labels['managefolders'] = 'Aozañ ar renkelloù';
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index a0e5d7272..ab65eb72a 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -218,6 +218,7 @@ $labels['never'] ='nikada';
 $labels['folder']  = 'Fascikla';
 $labels['folders']  = 'Fascikle';
 $labels['foldername']  = 'Ime fascikle';
+$labels['subscribed']  = 'Pretplaćen';
 $labels['create']  = 'Napravi';
 $labels['createfolder']  = 'Napravi novu fasciklu';
 $labels['managefolders']  = 'Podesi fasciklu';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index cda48e79d..d75a2f8e5 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -313,6 +313,7 @@ $labels['reqmdn'] = 'Demana sempre la confirmació de recepció';
 $labels['folder'] = 'Carpeta';
 $labels['folders'] = 'Carpetes';
 $labels['foldername'] = 'Nom de carpeta';
+$labels['subscribed'] = 'Subscriure\'s';
 $labels['messagecount'] = 'Missatges';
 $labels['create'] = 'Crea';
 $labels['createfolder'] = 'Crea nova carpeta';
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index 943460928..67c571cd0 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -315,6 +315,7 @@ $labels['reqmdn'] = 'Vždy požadovat doručenku';
 $labels['folder'] = 'Složka';
 $labels['folders'] = 'Složky';
 $labels['foldername'] = 'Jméno složky';
+$labels['subscribed'] = 'Vybráno';
 $labels['messagecount'] = 'Počet zpráv';
 $labels['create'] = 'Vytvořit';
 $labels['createfolder'] = 'Vytvořit novou složku';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index 67e0e12bc..3e22ee4d4 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -318,6 +318,7 @@ $labels['replysamefolder'] = 'Rhoi atebion yn yr un ffolder i\'r neges sy\'n cae
 $labels['folder'] = 'Ffolder';
 $labels['folders'] = 'Ffolderi';
 $labels['foldername'] = 'Enw ffolder';
+$labels['subscribed'] = 'Tanysgrifwyd';
 $labels['messagecount'] = 'Negeseuon';
 $labels['create'] = 'Creu';
 $labels['createfolder'] = 'Creu ffolder newydd';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 69790e232..3aa1ae44d 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -305,6 +305,7 @@ $labels['afternseconds'] = 'efter $n sekunder';
 $labels['folder'] = 'Mappe';
 $labels['folders'] = 'Mapper';
 $labels['foldername'] = 'Mappenavn';
+$labels['subscribed'] = 'Abonneret';
 $labels['messagecount'] = 'Beskeder';
 $labels['create'] = 'Opret';
 $labels['createfolder'] = 'Opret ny mappe';
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 12b17c37f..f1308c026 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -38,8 +38,7 @@ $labels['to'] = 'Empfänger';
 $labels['cc'] = 'Kopie (CC)';
 $labels['bcc'] = 'Blind-Kopie';
 $labels['replyto'] = 'Antwort an';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Followup-To';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Grösse';
 $labels['priority'] = 'Priorität';
@@ -201,8 +200,7 @@ $labels['maxuploadsize'] = 'Maximal erlaubte Dateigrösse ist $size';
 $labels['addcc'] = 'Cc hinzufügen';
 $labels['addbcc'] = 'Bcc hinzufügen';
 $labels['addreplyto'] = 'Antwortadresse hinzufügen';
-$labels['addmailreplyto'] = 'Mail-Reply-To hinzufügen';
-$labels['addmailfollowupto'] = 'Mail-Followup-To hinzufügen';
+$labels['addfollowupto'] = 'Followup-To hinzufügen';
 $labels['mdnrequest'] = 'Der Sender dieser Nachricht hat eine Empfangsbestätigung angefordert. Möchten Sie diese jetzt senden?';
 $labels['receiptread'] = 'Empfangsbestätigung (gelesen)';
 $labels['yourmessage'] = 'Dieses ist eine Empfangsbestätigung für Ihre Nachricht';
@@ -326,11 +324,19 @@ $labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern'
 $labels['folder'] = 'Ordner';
 $labels['folders'] = 'Ordner';
 $labels['foldername'] = 'Ordnername';
+$labels['subscribed'] = 'Abonniert';
 $labels['messagecount'] = 'Nachrichten';
 $labels['create'] = 'Erstellen';
 $labels['createfolder'] = 'Neuen Ordner erstellen';
 $labels['managefolders'] = 'Ordner verwalten';
 $labels['specialfolders'] = 'Spezialordner';
+$labels['properties'] = 'Eigenschaften';
+$labels['folderproperties'] = 'Ordnereigenschaften';
+$labels['parentfolder'] = 'Übergeordneter Ordner';
+$labels['location'] = 'Standort';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Ordnergrösse anzeigen';
+$labels['changesubscription'] = 'Abonnieren';
 $labels['sortby'] = 'Sortieren nach';
 $labels['sortasc'] = 'aufsteigend sortieren';
 $labels['sortdesc'] = 'absteigend sortieren';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index c1adbd300..b753418e0 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -57,6 +57,8 @@ $messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?'
 $messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
 $messages['folderdeleting'] = 'Lösche Ordner...';
 $messages['foldermoving'] = 'Verschiebe Ordner...';
+$messages['foldersubscribing'] = 'Abonniere Ordner...';
+$messages['folderunsubscribing'] = 'Ordner abbstellen...';
 $messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt';
 $messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein';
 $messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein';
@@ -76,6 +78,10 @@ $messages['searching'] = 'Suche...';
 $messages['checking'] = 'Prüfe...';
 $messages['nospellerrors'] = 'Keine Rechtschreibfehler gefunden';
 $messages['folderdeleted'] = 'Ordner erfolgreich gelöscht';
+$messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert';
+$messages['folderunsubscribed'] = 'Der Ordner wurde erfolgreich abbestellt';
+$messages['folderpurged'] = 'Der Ordner wurde erfolgreich gelöscht';
+$messages['folderexpunged'] = 'Der Ordner wurde erfolgreich gepackt';
 $messages['deletedsuccessfully'] = 'Erfolgreich gelöscht';
 $messages['converting'] = 'Entferne Formatierungen...';
 $messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden';
@@ -125,5 +131,11 @@ $messages['messagemoved'] = 'Nachricht(en) erfolgreich verschoben';
 $messages['messagecopied'] = 'Nachricht(en) erfolgreich kopiert';
 $messages['messagemarked'] = 'Nachricht(en) erfolgreich markiert';
 $messages['autocompletechars'] = 'Geben Sie mind. $min Zeichen für die Auto-Vervollständigung ein';
+$messages['namecannotbeempty'] = 'Der Name darf nicht leer sein';
+$messages['nametoolong'] = 'Der Name ist zu lang';
+$messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert';
+$messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt';
+$messages['errorreadonly'] = 'Die Aktion nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
+$messages['errornoperm'] = 'Die Aktion nicht ausgeführt werden. Zugriff verweigert.';
 
 ?>
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index df48af770..581fdcdb4 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -38,8 +38,7 @@ $labels['to'] = 'Empfänger';
 $labels['cc'] = 'Kopie';
 $labels['bcc'] = 'Blindkopie';
 $labels['replyto'] = 'Antwort an';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Followup-To';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Größe';
 $labels['priority'] = 'Priorität';
@@ -201,8 +200,7 @@ $labels['maxuploadsize'] = 'Maximal erlaubte Dateigröße ist $size';
 $labels['addcc'] = 'Cc hinzufügen';
 $labels['addbcc'] = 'Bcc hinzufügen';
 $labels['addreplyto'] = 'Antwortadresse hinzufügen';
-$labels['addmailreplyto'] = 'Mail-Reply-To hinzufügen';
-$labels['addmailfollowupto'] = 'Mail-Followup-To hinzufügen';
+$labels['addfollowupto'] = 'Followup-To hinzufügen';
 $labels['mdnrequest'] = 'Der Sender dieser Nachricht möchte gerne eine Lesebestätigung. Wollen Sie dieses bestätigen?';
 $labels['receiptread'] = 'Empfangsbestätigung (gelesen)';
 $labels['yourmessage'] = 'Dies ist eine Empfangsbestätigung für Ihre Nachricht';
@@ -326,6 +324,7 @@ $labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern'
 $labels['folder'] = 'Ordner';
 $labels['folders'] = 'Ordner';
 $labels['foldername'] = 'Ordnername';
+$labels['subscribed'] = 'Abonniert';
 $labels['messagecount'] = 'Nachrichten';
 $labels['create'] = 'Erstellen';
 $labels['createfolder'] = 'Neuen Ordner erstellen';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 8ec449155..47e4e017d 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -81,6 +81,7 @@ $messages['folderdeleted'] = 'Ordner erfolgreich gelöscht';
 $messages['foldersubscribed'] = 'Der Ordner wurde erfolgreich abonniert';
 $messages['folderunsubscribed'] = 'Der Ordner wurde erfolgreich abbestellt';
 $messages['folderpurged'] = 'Der Ordner wurde erfolgreich gelöscht';
+$messages['folderexpunged'] = 'Der Ordner wurde erfolgreich gepackt';
 $messages['deletedsuccessfully'] = 'Erfolgreich gelöscht';
 $messages['converting'] = 'Entferne Formatierungen der Nachricht...';
 $messages['messageopenerror'] = 'Die Nachricht konnte nicht vom Server geladen werden';
@@ -134,5 +135,7 @@ $messages['namecannotbeempty'] = 'Der Name darf nicht leer sein';
 $messages['nametoolong'] = 'Der Name ist zu lang';
 $messages['folderupdated'] = 'Der Ordner wurde erfolgreich aktualisiert';
 $messages['foldercreated'] = 'Der Ordner wurde erfolgreich erstellt';
+$messages['errorreadonly'] = 'Die Aktion nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
+$messages['errornoperm'] = 'Die Aktion nicht ausgeführt werden. Zugriff verweigert.';
 
 ?>
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index f013d48c7..188477099 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -234,6 +234,7 @@ $labels['newmessage'] = 'Νέο Μήνυμα';
 $labels['folder'] = 'Φάκελος';
 $labels['folders'] = 'Φάκελοι';
 $labels['foldername'] = 'Όνομα φακέλου';
+$labels['subscribed'] = 'Εγγραφή';
 $labels['messagecount'] = 'Μηνύματα';
 $labels['create'] = 'Δημιουργία';
 $labels['createfolder'] = 'Δημιουργία νέου φακέλου';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 22be28ec8..dfeb1c2d4 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -376,6 +376,7 @@ $labels['replysamefolder'] = 'Place replies in the folder of the message being r
 $labels['folder']  = 'Folder';
 $labels['folders']  = 'Folders';
 $labels['foldername']  = 'Folder name';
+$labels['subscribed']  = 'Subscribed';
 $labels['messagecount'] = 'Messages';
 $labels['create']  = 'Create';
 $labels['createfolder']  = 'Create new folder';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index ee3041a65..06fafd584 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -216,6 +216,7 @@ $labels['messagescomposition'] = 'Mesaĝo-verkado';
 $labels['folder'] = 'Dosierujo';
 $labels['folders'] = 'Dosierujoj';
 $labels['foldername'] = 'Dosierujo-nomo';
+$labels['subscribed'] = 'Abonata';
 $labels['messagecount'] = 'Mesaĝoj';
 $labels['create'] = 'Kreu';
 $labels['createfolder'] = 'Kreu novan dosierujon';
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index 88272767b..25f0cf928 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -297,6 +297,7 @@ $labels['afternseconds'] = 'despues de $n segundos';
 $labels['folder'] = 'Carpeta';
 $labels['folders'] = 'Carpetas';
 $labels['foldername'] = 'Nombre de carpeta';
+$labels['subscribed'] = 'Suscripta';
 $labels['messagecount'] = 'Mensajes';
 $labels['create'] = 'Crear';
 $labels['createfolder'] = 'Crear nueva carpeta';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index da69bebc0..8365693d6 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -40,8 +40,7 @@ $labels['to'] = 'Destinatario';
 $labels['cc'] = 'Copia';
 $labels['bcc'] = 'Cco';
 $labels['replyto'] = 'Respuesta a';
-$labels['mailreplyto'] = 'Responder a';
-$labels['mailfollowupto'] = 'Seguir a';
+$labels['followupto'] = 'Seguir a';
 $labels['date'] = 'Fecha';
 $labels['size'] = 'Tamaño';
 $labels['priority'] = 'Prioridad';
@@ -203,8 +202,7 @@ $labels['maxuploadsize'] = 'Tamaño máximo permitido: $size';
 $labels['addcc'] = 'Añadir Cc';
 $labels['addbcc'] = 'Añadir Cco';
 $labels['addreplyto'] = 'Añadir Respuesta a';
-$labels['addmailreplyto'] = 'Añadir Responder a';
-$labels['addmailfollowupto'] = 'Añadir Seguir a';
+$labels['addfollowupto'] = 'Añadir Seguir a';
 $labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando usted lo lea. ¿Quiere enviar esta notificación?';
 $labels['receiptread'] = 'Notificación de lectura';
 $labels['yourmessage'] = 'Esta es una notificación de lectura de su mensaje';
@@ -328,6 +326,7 @@ $labels['replysamefolder'] = 'Coloque las respuestas en la carpeta del mensaje q
 $labels['folder'] = 'Bandeja';
 $labels['folders'] = 'Bandejas';
 $labels['foldername'] = 'Nombre de bandeja';
+$labels['subscribed'] = 'Suscrita';
 $labels['messagecount'] = 'Mensajes';
 $labels['create'] = 'Crear';
 $labels['createfolder'] = 'Crear nueva bandeja';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index d244231d9..a80155d70 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -40,8 +40,7 @@ $labels['to'] = 'Saaja';
 $labels['cc'] = 'Koopia';
 $labels['bcc'] = 'Pimekoopia';
 $labels['replyto'] = 'Vastus aadressile';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Followup-To';
 $labels['date'] = 'Kuupäev';
 $labels['size'] = 'Suurus';
 $labels['priority'] = 'Tähtsus';
@@ -203,8 +202,7 @@ $labels['maxuploadsize'] = 'Faili maksimaalne lubatud suurus on $size';
 $labels['addcc'] = 'Lisa koopia';
 $labels['addbcc'] = 'Lisa pimekoopia';
 $labels['addreplyto'] = 'Lisa vastus aadressile';
-$labels['addmailreplyto'] = 'Lisa Mail-Reply-To';
-$labels['addmailfollowupto'] = 'Lisa Mail-Followup-To';
+$labels['addfollowupto'] = 'Lisa Followup-To';
 $labels['mdnrequest'] = 'Selle kirja saatja soovib saada kinnitust kirja lugemise kohta. Kas soovid kinnituse saata?';
 $labels['receiptread'] = 'Kättesaamiskinnitus (leotud)';
 $labels['yourmessage'] = 'See on sinu saadetud kirja kättesaamiskinnitus';
@@ -328,6 +326,7 @@ $labels['replysamefolder'] = 'Paiguta vastused samasse kausta, millele vastataks
 $labels['folder'] = 'Kaust';
 $labels['folders'] = 'Kaustad';
 $labels['foldername'] = 'Kausta nimi';
+$labels['subscribed'] = 'Näitan';
 $labels['messagecount'] = 'Kirju';
 $labels['create'] = 'Loo';
 $labels['createfolder'] = 'Uue kausta loomine';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 2dcb15fab..9080f8a6d 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -220,6 +220,7 @@ $labels['messagescomposition'] = 'Mezuak sortu';
 $labels['folder'] = 'Karpeta';
 $labels['folders'] = 'Karpetak';
 $labels['foldername'] = 'Karpeta izena';
+$labels['subscribed'] = 'Harpideturik';
 $labels['messagecount'] = 'Mezuak';
 $labels['create'] = 'Sortu';
 $labels['createfolder'] = 'Karpeta berria sortu';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 2f88d28e8..19700a5da 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -283,6 +283,7 @@ $labels['checkallfolders'] = 'تمام پوشه ها را بخاطر پیام ه
 $labels['folder']  = 'پوشه ';
 $labels['folders']  = 'پوشه ها';
 $labels['foldername']  = 'نام پوشه ';
+$labels['subscribed']  = 'مشترک ';
 $labels['messagecount'] = 'پيغام ها ';
 $labels['create']  = 'ایجاد کردن';
 $labels['createfolder']  = 'ایجاد پوشه جدید';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index e291e3ab3..45a80327e 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -304,6 +304,7 @@ $labels['afternseconds'] = '$n sekunnin jälkeen';
 $labels['folder'] = 'Kansio';
 $labels['folders'] = 'Kansiot';
 $labels['foldername'] = 'Kansion nimi';
+$labels['subscribed'] = 'Näytetään';
 $labels['messagecount'] = 'Viestejä';
 $labels['create'] = 'Luo uusi';
 $labels['createfolder'] = 'Luo uusi kansio';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 127224b08..a3e4bc01d 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -322,6 +322,7 @@ $labels['replysamefolder'] = 'Placer les réponses dans le dossier du message é
 $labels['folder'] = 'Dossier';
 $labels['folders'] = 'Dossiers';
 $labels['foldername'] = 'Nom du dossier';
+$labels['subscribed'] = 'Abonné';
 $labels['messagecount'] = 'Messages';
 $labels['create'] = 'Créer';
 $labels['createfolder'] = 'Créer un nouveau dossier';
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 7691bb43d..40b99a232 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -164,6 +164,7 @@ $labels['never'] = 'riamh';
 $labels['folder'] = 'Fillteán';
 $labels['folders'] = 'Fillteán';
 $labels['foldername'] = 'Ainm fillteán';
+$labels['subscribed'] = 'Síntiú';
 $labels['create'] = 'Cruthaigh';
 $labels['createfolder'] = 'Cruthaigh fillteán nua';
 $labels['managefolders'] = 'Stiúir na fillteán';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index adf53c686..1ba8edbd9 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -35,8 +35,7 @@ $labels['to'] = 'Destinatario';
 $labels['cc'] = 'Copia (CC)';
 $labels['bcc'] = 'Copia Oculta (BCC)';
 $labels['replyto'] = 'Respostar a (Reply-To)';
-$labels['mailreplyto'] = 'Respostar ao autor (Mail-Reply-To)';
-$labels['mailfollowupto'] = 'Respostar a todos (Mail-Followup-To)';
+$labels['followupto'] = 'Respostar a todos (Followup-To)';
 $labels['date'] = 'Data';
 $labels['size'] = 'Tamaño';
 $labels['priority'] = 'Prioridade';
@@ -198,8 +197,7 @@ $labels['maxuploadsize'] = 'O tamaño máximo permitido de ficheiro é de $size'
 $labels['addcc'] = 'Engadir Copia (CC)';
 $labels['addbcc'] = 'Engadir Copia Oculta (BCC)';
 $labels['addreplyto'] = 'Engadir Respostar a (Reply-To)';
-$labels['addmailreplyto'] = 'Engadir Respostar ao autor (Mail-Reply-To)';
-$labels['addmailfollowupto'] = 'Engadir Respostar a todos (Mail-Followup-To)';
+$labels['addfollowupto'] = 'Engadir Respostar a todos (Followup-To)';
 $labels['mdnrequest'] = 'O remitente desta mensaxe pediu ser notificado cando vostede a lea. Quere notificar ao remitente?';
 $labels['receiptread'] = 'Notificación da entrega da mensaxe (lectura)';
 $labels['yourmessage'] = 'Esta é unha notificación da entrega da súa mensaxe';
@@ -323,6 +321,7 @@ $labels['replysamefolder'] = 'Deixar as respostas no cartafol onde está a mensa
 $labels['folder'] = 'Cartafol';
 $labels['folders'] = 'Cartafoles';
 $labels['foldername'] = 'Nome do cartafol';
+$labels['subscribed'] = 'Subscrito';
 $labels['messagecount'] = 'Mensaxes';
 $labels['create'] = 'Crear';
 $labels['createfolder'] = 'Crear novo cartafol';
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index ccc468e67..61f27f769 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -36,16 +36,12 @@ $labels['to'] = 'הנמען';
 $labels['cc'] = 'לידיעה';
 $labels['bcc'] = 'מכותב מוסתר';
 $labels['replyto'] = 'כתובת למענה';
-$labels['mailreplyto'] = 'כתובת למענה';
-$labels['mailfollowupto'] = 'כתובת להעברת הודעה';
+$labels['followupto'] = 'כתובת להעברת הודעה';
 $labels['date'] = 'תאריך';
 $labels['size'] = 'גודל';
 $labels['priority'] = 'עדיפות';
 $labels['organization'] = 'ארגון';
 $labels['readstatus'] = 'נקרא';
-$labels['reply-to'] = 'כתובת למענה';
-$labels['mail-reply-to'] = 'כתובת למענה';
-$labels['mail-followup-to'] = 'כתובת להעברת הודעה';
 $labels['mailboxlist'] = 'תיקים';
 $labels['messagesfromto'] = 'הודעות $from עד $to מתוך $count';
 $labels['threadsfromto'] = 'שרשור $from עד $to מתוך $count';
@@ -199,8 +195,7 @@ $labels['maxuploadsize'] = 'גודל מקסימלי לקובץ הוא  $size';
 $labels['addcc'] = 'הוספת מכותב לידיעה';
 $labels['addbcc'] = 'הוספת מכותב נסתר';
 $labels['addreplyto'] = 'הוספת כתובת למענה';
-$labels['addmailreplyto'] = 'הוספת כתובת למענה';
-$labels['addmailfollowupto'] = 'הוספת כתובת להעברת הודעה';
+$labels['addfollowupto'] = 'הוספת כתובת להעברת הודעה';
 $labels['mdnrequest'] = 'השולח ביקש לדעת אם ההודעה נקראה. האם להודיע לשולח?';
 $labels['receiptread'] = 'אישור קבלה (נקרא)';
 $labels['yourmessage'] = 'אישור קבלה להודעתך';
@@ -324,6 +319,7 @@ $labels['replysamefolder'] = 'המענה ישמר בתיקיה של ההודעה
 $labels['folder'] = 'תיק';
 $labels['folders'] = 'תיקים';
 $labels['foldername'] = 'שם תיק';
+$labels['subscribed'] = 'מנוי';
 $labels['messagecount'] = 'הודעות';
 $labels['create'] = 'יצירה';
 $labels['createfolder'] = 'יצירת תיק חדש';
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 38e3bdfea..36d91fe57 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -223,6 +223,7 @@ $labels['never']		= 'कभी नहाीं';
 $labels['folder']		= 'फ़ोल्डर';
 $labels['folders']		= 'फ़ोल्डर';
 $labels['foldername']		= 'फ़ोल्डर नाम';
+$labels['subscribed']		= 'सबस्क्राईब किया गया';
 $labels['create']		= 'बनाऐं';
 $labels['createfolder']		= 'फ़ोलडर बनाऐं';
 $labels['managefolders']	= 'फ़ोलडर को व्यवस्थित करें';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index 4c3e51be8..2043f7c01 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -38,8 +38,7 @@ $labels['to'] = 'Za';
 $labels['cc'] = 'Cc';
 $labels['bcc'] = 'Bcc';
 $labels['replyto'] = 'Odgovor-na';
-$labels['mailreplyto'] = 'Mail-Odogovori-na';
-$labels['mailfollowupto'] = 'Mail-Nastavi-na';
+$labels['followupto'] = 'Nastavi-na';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Veličina';
 $labels['priority'] = 'Prioritet';
@@ -201,8 +200,7 @@ $labels['maxuploadsize'] = 'Maksimalna dozvoljena velicina datoteke je $size';
 $labels['addcc'] = 'Dodaj Cc';
 $labels['addbcc'] = 'Dodaj Bcc';
 $labels['addreplyto'] = 'Dodaj Odgovori-na';
-$labels['addmailreplyto'] = 'Dodaj Mail-Odgovori-na';
-$labels['addmailfollowupto'] = 'Dodaj Mail-Nastavak-na';
+$labels['addfollowupto'] = 'Dodaj Nastavak-na';
 $labels['mdnrequest'] = 'Pošiljaoc ove poruke je tražio da bude obaviješten o njenom primitku. Želite li obavijestiti pošiljaoca?';
 $labels['receiptread'] = 'Vrati potvrdu (pročitano)';
 $labels['yourmessage'] = 'Ovo je vraćena potvrda vaše poruke';
@@ -326,6 +324,7 @@ $labels['replysamefolder'] = 'Spremi odgovore u mapu gdje se nalazi poruka';
 $labels['folder'] = 'Mapa';
 $labels['folders'] = 'Mape';
 $labels['foldername'] = 'Ime mape';
+$labels['subscribed'] = 'Pretplata';
 $labels['messagecount'] = 'Poruke';
 $labels['create'] = 'Napravi';
 $labels['createfolder'] = 'Napravi novu mapu';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index f7a00e6a8..f8f2b6fce 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -40,16 +40,15 @@ $labels['to'] = 'Címzett';
 $labels['cc'] = 'Másolat';
 $labels['bcc'] = 'Titkos másolat';
 $labels['replyto'] = 'Válaszcím';
-$labels['mailreplyto'] = 'Hírcsoport';
-$labels['mailfollowupto'] = 'Hírcsoport válasz';
+$labels['followupto'] = 'Hírcsoport válasz';
 $labels['date'] = 'Dátum';
 $labels['size'] = 'Méret';
 $labels['priority'] = 'Sürgősség';
 $labels['organization'] = 'Szervezet';
 $labels['readstatus'] = 'Olvasott';
 $labels['reply-to'] = 'Válaszcím';
-$labels['mailreply-to'] = 'Hírcsoport';
-$labels['mailfollowup-to'] = 'Hírcsoport válasz';
+$labels['mail-reply-to'] = 'Hírcsoport';
+$labels['mail-followup-to'] = 'Hírcsoport válasz';
 $labels['mailboxlist'] = 'Mappák';
 $labels['messagesfromto'] = 'Üzenetek: $from - $to / $count';
 $labels['threadsfromto'] = 'Témák ($from - $to, összesen $count)';
@@ -203,8 +202,7 @@ $labels['maxuploadsize'] = 'A maximális feltölthető fájl mérete $size';
 $labels['addcc'] = 'Cc (Másolati cím) hozzáadása';
 $labels['addbcc'] = 'Bcc (titkos másolati cím) hozzáadása';
 $labels['addreplyto'] = 'Válaszcím hozzáadása';
-$labels['addmailreplyto'] = 'Hírcsoport hozzáadása';
-$labels['addmailfollowupto'] = 'Hírcsoport válasz hozzáadása';
+$labels['addfollowupto'] = 'Hírcsoport válasz hozzáadása';
 $labels['mdnrequest'] = 'Az üzenet küldője értesítést kér arról, hogy elolvasta a levelet. El legyen küldve az olvasási visszaigazolás?';
 $labels['receiptread'] = 'Olvasási visszaigazolás (olvasott)';
 $labels['yourmessage'] = 'Ez az üzenete olvasási visszaigazolása';
@@ -327,6 +325,7 @@ $labels['reqdsn'] = 'Kézbesítési visszaigazolás megkövetelése';
 $labels['folder'] = 'Mappa';
 $labels['folders'] = 'Mappák';
 $labels['foldername'] = 'Mappa neve';
+$labels['subscribed'] = 'Feliratkozás';
 $labels['messagecount'] = 'Üzenet';
 $labels['create'] = 'Létrehozás';
 $labels['createfolder'] = 'Új mappa létrehozása';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 17ab1b7f4..5809c13f2 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -245,6 +245,7 @@ $labels['checkallfolders'] = 'Ստուգել բոլոր դարակները նո�
 $labels['folder'] = 'Դարակ';
 $labels['folders'] = 'Դարակներ';
 $labels['foldername'] = 'Դարակի անուն';
+$labels['subscribed'] = 'Բաժանորդագրված';
 $labels['messagecount'] = 'Նամակներ';
 $labels['create'] = 'Ստեղծել';
 $labels['createfolder'] = 'Բացել նոր դարակ';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 3d0bc3996..80a351adf 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -38,8 +38,7 @@ $labels['to'] = 'Penerima';
 $labels['cc'] = 'Lampiran';
 $labels['bcc'] = 'Lampiran tersembunyi';
 $labels['replyto'] = 'Balas kepada';
-$labels['mailreplyto'] = 'Surat Balasan Untuk';
-$labels['mailfollowupto'] = 'Surat Tindak Lanjut Untuk';
+$labels['followupto'] = 'Surat Tindak Lanjut Untuk';
 $labels['date'] = 'Tanggal';
 $labels['size'] = 'Ukuran';
 $labels['priority'] = 'Prioritas';
@@ -201,8 +200,7 @@ $labels['maxuploadsize'] = 'Ukuran file maksimal adalah $size';
 $labels['addcc'] = 'Tambah Cc';
 $labels['addbcc'] = 'Tambah Bcc';
 $labels['addreplyto'] = 'Tambah Balas Ke';
-$labels['addmailreplyto'] = 'Tambahkan Balas-Ke';
-$labels['addmailfollowupto'] = 'Tambahkan Tindak-Lanjut-Ke';
+$labels['addfollowupto'] = 'Tambahkan Tindak-Lanjut-Ke';
 $labels['mdnrequest'] = 'Pengirim pesan ini telah meminta untuk diberitahu ketika Anda membaca pesan ini. Apakah anda ingin memberitahu pengirim?';
 $labels['receiptread'] = 'Tanda Terima (baca)';
 $labels['yourmessage'] = 'Ini adalah Tanda Terima untuk pesan Anda';
@@ -326,6 +324,7 @@ $labels['replysamefolder'] = 'Taruh balasan di folder yang sama dengan pesan yan
 $labels['folder'] = 'Map';
 $labels['folders'] = 'Map-map';
 $labels['foldername'] = 'Nama map';
+$labels['subscribed'] = 'Subscribed';
 $labels['messagecount'] = 'Pesan-pesan';
 $labels['create'] = 'Buat';
 $labels['createfolder'] = 'Buat map baru';
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index 2e2db1feb..edb0ce348 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -246,6 +246,7 @@ $labels['checkallfolders'] = 'Athuga ný skeyti í öllum möppum';
 $labels['folder'] = 'Mappa';
 $labels['folders'] = 'Möppur';
 $labels['foldername'] = 'Nafn möppu';
+$labels['subscribed'] = 'Valin';
 $labels['messagecount'] = 'Skeyti';
 $labels['create'] = 'Búa til';
 $labels['createfolder'] = 'Búa til nýja möppu';
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 4e4395eff..327791c82 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -39,15 +39,14 @@ $labels['to'] = 'Destinatario';
 $labels['cc'] = 'Cc';
 $labels['bcc'] = 'Bcn';
 $labels['replyto'] = 'Rispondi a';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Followup-To';
 $labels['date'] = 'Data';
 $labels['size'] = 'Dimensione';
 $labels['priority'] = 'Priorità';
 $labels['organization'] = 'Società';
 $labels['reply-to'] = 'Rispondi a';
-$labels['mailreply-to'] = 'Mail-Reply-To';
-$labels['mailfollowup-to'] = 'Mail-Followup-To';
+$labels['mail-reply-to'] = 'Mail-Reply-To';
+$labels['mail-followup-to'] = 'Mail-Followup-To';
 $labels['mailboxlist'] = 'Cartelle';
 $labels['messagesfromto'] = 'Messaggi da $from a $to di $count';
 $labels['threadsfromto'] = 'Thread da $from a $to di $count';
@@ -201,8 +200,7 @@ $labels['maxuploadsize'] = 'La dimensione massima consentita è $size';
 $labels['addcc'] = 'Aggiungi Cc';
 $labels['addbcc'] = 'Aggiungi Bcc';
 $labels['addreplyto'] = 'Aggiungi Rispondi a';
-$labels['addmailreplyto'] = 'Aggiungi Mail-Reply-To';
-$labels['addmailfollowupto'] = 'Aggiungi Mail-Followup-To';
+$labels['addfollowupto'] = 'Aggiungi Followup-To';
 $labels['mdnrequest'] = 'Il mittente ha richiesto di ricevere una notifica dell\'avvenuta lettura del messaggio. Si desidera inviare tale notifica?';
 $labels['receiptread'] = 'Ricevuta di ritorno (letto)';
 $labels['yourmessage'] = 'Questa è la ricevuta di ritorno del messaggio inviato';
@@ -324,6 +322,7 @@ $labels['reqdsn'] = 'Richiedi sempre la ricevuta di consegna';
 $labels['folder'] = 'Cartella';
 $labels['folders'] = 'Cartelle';
 $labels['foldername'] = 'Nome cartella';
+$labels['subscribed'] = 'Sottoscritta';
 $labels['messagecount'] = 'Messaggi';
 $labels['create'] = 'Crea';
 $labels['createfolder'] = 'Crea nuova cartella';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 699ecec36..317ba6ea2 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -41,8 +41,7 @@ $labels['to'] = '宛先';
 $labels['cc'] = 'コピー';
 $labels['bcc'] = 'Bcc';
 $labels['replyto'] = 'Reply-To (返信先)';
-$labels['mailreplyto'] = 'Mail-Reply-To (ML 投稿者)';
-$labels['mailfollowupto'] = 'Mail-Followup-To (ML の宛先)';
+$labels['followupto'] = 'Followup-To ( の宛先)';
 $labels['date'] = '日付';
 $labels['size'] = 'サイズ';
 $labels['priority'] = '優先度';
@@ -204,8 +203,7 @@ $labels['maxuploadsize'] = '添付可能なファイルのサイズは最大 $si
 $labels['addcc'] = 'Cc 追加';
 $labels['addbcc'] = 'Bcc 追加';
 $labels['addreplyto'] = 'Reply-To 追加';
-$labels['addmailreplyto'] = 'Mail-Reply-To 追加';
-$labels['addmailfollowupto'] = 'Mail-Followup-To 追加';
+$labels['addfollowupto'] = 'Followup-To 追加';
 $labels['mdnrequest'] = 'メールの差出人は開封確認の送付を求めています。開封確認のメールを送付しますか?';
 $labels['receiptread'] = '開封確認 (表示済み)';
 $labels['yourmessage'] = 'これはあなたが送信したメールに対する開封確認です。';
@@ -329,6 +327,7 @@ $labels['replysamefolder'] = '返信されてきたメールを返信元メー�
 $labels['folder'] = 'フォルダ';
 $labels['folders'] = 'フォルダ一覧';
 $labels['foldername'] = 'フォルダ名';
+$labels['subscribed']  = '購読済';
 $labels['messagecount'] = 'メール';
 $labels['create'] = '作成';
 $labels['createfolder'] = 'フォルダの新規作成';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 081fc98e1..7a56fc41b 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -270,6 +270,7 @@ $labels['insertsignature'] = 'ხელმოცერის ჩასმა';
 $labels['folder'] = 'საქაღალდე';
 $labels['folders'] = 'საქაღალდეები';
 $labels['foldername'] = 'საქაღალდის დასახელება';
+$labels['subscribed'] = 'გამოწერილია';
 $labels['messagecount'] = 'შეტყობინებები';
 $labels['create'] = 'შექმნა';
 $labels['createfolder'] = 'საქაღალდის შექმნა';
diff --git a/program/localization/kh_KH/labels.inc b/program/localization/kh_KH/labels.inc
index 0f9efb46b..75799a292 100644
--- a/program/localization/kh_KH/labels.inc
+++ b/program/localization/kh_KH/labels.inc
@@ -308,6 +308,7 @@ $labels['afternseconds'] = 'ក្រោយពី $n វិនាទី';
 $labels['folder'] = 'ថត';
 $labels['folders'] = 'ថតទាំងអស់';
 $labels['foldername'] = 'ឈ្មោះ Folder';
+$labels['subscribed'] = 'ភ្ជាប់ជាប្រចាំ';
 $labels['messagecount'] = 'សារ';
 $labels['create'] = 'បង្កើត';
 $labels['createfolder'] = 'បង្កើត Folder ថ្មី';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 546c45310..15bb8e7a3 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -246,6 +246,7 @@ $labels['checkallfolders'] = '새 메시지를 위해 모든 폴더 체크';
 $labels['folder'] = '폴더';
 $labels['folders'] = '폴더';
 $labels['foldername'] = '폴더 이름';
+$labels['subscribed'] = '가입됨';
 $labels['messagecount'] = '메시지';
 $labels['create'] = '만들기';
 $labels['createfolder'] = '새 폴더 만들기';
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index d1fdc944d..699e37419 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -173,6 +173,7 @@ $labels['never'] = 'qet';
 $labels['folder'] = 'Peldank';
 $labels['folders'] = 'Peldank';
 $labels['foldername'] = 'Navê peldankê';
+$labels['subscribed'] = 'Ni şanenav';
 $labels['messagecount'] = 'Peyam';
 $labels['create'] = 'Biafirîne';
 $labels['createfolder'] = 'Peldankeke nû biafirîne';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 4c8feffb0..392d7b208 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -39,8 +39,7 @@ $labels['to'] = 'Gavėjas';
 $labels['cc'] = 'Kopija';
 $labels['bcc'] = 'Slaptoji kopija';
 $labels['replyto'] = 'Atsakymą gaus';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Followup-To';
 $labels['date'] = 'Data';
 $labels['size'] = 'Dydis';
 $labels['priority'] = 'Prioritetas';
@@ -202,8 +201,7 @@ $labels['maxuploadsize'] = 'Maksimalus leistinas failo dydis yra $size';
 $labels['addcc'] = 'Pridėti Cc';
 $labels['addbcc'] = 'Pridėti Bcc';
 $labels['addreplyto'] = 'Pridėti Reply-To';
-$labels['addmailreplyto'] = 'Pridėti Mail-Reply-To';
-$labels['addmailfollowupto'] = 'Pridėti Mail-Followup-To';
+$labels['addfollowupto'] = 'Pridėti Followup-To';
 $labels['mdnrequest'] = 'Šio laiško siuntėjas paprašė patvirtinti, kad jūs jį perskaitėte. Ar išsiųsti tai patvirtinančią pažymą?';
 $labels['receiptread'] = 'Patvirtinimas (laiškas perskaitytas)';
 $labels['yourmessage'] = 'Tai – pažyma, patvirtinanti, jog buvo perskaitytas Jūsų laiškas';
@@ -327,6 +325,7 @@ $labels['replysamefolder'] = 'Atsakymus talpinti į tą patį aplanką, kuriame
 $labels['folder'] = 'Aplankas';
 $labels['folders'] = 'Aplankai';
 $labels['foldername'] = 'Aplanko vardas';
+$labels['subscribed'] = 'Užsakytas';
 $labels['messagecount'] = 'Laiškai';
 $labels['create'] = 'Sukurti';
 $labels['createfolder'] = 'Sukurti naują aplanką';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index 907206f4e..797b455f8 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -273,6 +273,7 @@ $labels['insertsignature'] = 'Ievietot parakstu';
 $labels['folder'] = 'Mapi';
 $labels['folders'] = 'Mapes';
 $labels['foldername'] = 'Mapes nosaukums';
+$labels['subscribed'] = 'Abonēta';
 $labels['messagecount'] = 'Vēstules';
 $labels['create'] = 'Izveidot';
 $labels['createfolder'] = 'Izveidot jaunu mapi';
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 0e23079a5..462fdce4b 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -270,6 +270,7 @@ $labels['insertsignature'] = 'Вметни потпис';
 $labels['folder'] = 'Папка';
 $labels['folders'] = 'Папки';
 $labels['foldername'] = 'Име на папката';
+$labels['subscribed'] = 'Претплатен';
 $labels['messagecount'] = 'Пораки';
 $labels['create'] = 'Создај';
 $labels['createfolder'] = 'Создај нова папка';
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index 213c2bf47..218781381 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -374,6 +374,7 @@ $labels['afternseconds'] = '$n क्षणानंतर';
 $labels['folder'] = 'फोल्डर';
 $labels['folders'] = 'फोल्डर्स';
 $labels['foldername'] = 'फोल्डरचे नाव';
+$labels['subscribed'] = 'वर्गणिदार होणे';
 $labels['messagecount'] = 'संदेश';
 $labels['create'] = 'तयार करा';
 $labels['createfolder'] = 'नवीन फोल्डर तयार करा';
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index 19c4d1a2a..bf395daa1 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -211,6 +211,7 @@ $labels['never'] = 'tidak pernah';
 $labels['folder'] = 'Kabinet Fail';
 $labels['folders'] = 'Kabinet Fail';
 $labels['foldername'] = 'Nama Kabinet Fail';
+$labels['subscribed'] = 'Dilanggan';
 $labels['messagecount'] = 'Mesej-mesej';
 $labels['create'] = 'Cipta';
 $labels['createfolder'] = 'Cipta kabinet fail baru';
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index a57ca51b5..c9f3b0ff1 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -308,6 +308,7 @@ $labels['afternseconds'] = 'etter $n sekunder';
 $labels['folder'] = 'Mappe';
 $labels['folders'] = 'Mapper';
 $labels['foldername'] = 'Mappenavn';
+$labels['subscribed'] = 'Abonnere';
 $labels['messagecount'] = 'Meldinger';
 $labels['create'] = 'Opprett';
 $labels['createfolder'] = 'Lag ny mappe';
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index 826a0e4b6..ec4ed1aca 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -163,6 +163,7 @@ $labels['never'] = 'काहिलै नहुने';
 $labels['folder'] = 'फोल्डर';
 $labels['folders'] = 'फोल्डरहरु';
 $labels['foldername'] = 'फोल्डरको नाम';
+$labels['subscribed'] = 'सबस्क्राईब गरियो';
 $labels['create'] = 'बनाउनुहोस';
 $labels['createfolder'] = 'नया फोलडर बनाउनुहोस';
 $labels['managefolders'] = 'फोलडर व्यवस्थित गर्नुहोस';
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index c60a3c290..86b6c4b94 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -317,6 +317,7 @@ $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
 $labels['folder'] = 'Map';
 $labels['folders'] = 'Mappen';
 $labels['foldername'] = 'Naam';
+$labels['subscribed'] = 'Gebruiken';
 $labels['messagecount'] = 'Berichten';
 $labels['create'] = 'Aanmaken';
 $labels['createfolder'] = 'Nieuwe map aanmaken';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 2485f0a00..5097ec7a4 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -42,8 +42,7 @@ $labels['to'] = 'Ontvanger';
 $labels['cc'] = 'Kopie';
 $labels['bcc'] = 'Bcc';
 $labels['replyto'] = 'Antwoord-aan';
-$labels['mailreplyto'] = 'Mail-Antwoord-Aan';
-$labels['mailfollowupto'] = 'Mail-Followup-Aan';
+$labels['followupto'] = 'Followup-Aan';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Grootte';
 $labels['priority'] = 'Prioriteit';
@@ -205,8 +204,7 @@ $labels['maxuploadsize'] = 'Maximum toegestane bestandsgrootte is $size';
 $labels['addcc'] = 'Cc toevoegen';
 $labels['addbcc'] = 'Bcc toevoegen';
 $labels['addreplyto'] = 'Antwoord-aan toevoegen';
-$labels['addmailreplyto'] = 'Mail-Antwoord-Aan toevoegen';
-$labels['addmailfollowupto'] = 'Mail-Followup-Aan toevoegen';
+$labels['addfollowupto'] = 'Mail-Followup-Aan toevoegen';
 $labels['mdnrequest'] = 'De afzender van dit bericht heeft gevraagd een melding te ontvangen wanneer u dit bericht heeft gelezen. Wilt u deze melding verzenden?';
 $labels['receiptread'] = 'Ontvangstbevestiging (gelezen)';
 $labels['yourmessage'] = 'Dit is een ontvangstbevestiging voor uw bericht';
@@ -330,6 +328,7 @@ $labels['replysamefolder'] = 'Plaats antwoorden in de folder van het beantwoorde
 $labels['folder'] = 'Map';
 $labels['folders'] = 'Mappen';
 $labels['foldername'] = 'Mapnaam';
+$labels['subscribed'] = 'Geabonneerd';
 $labels['messagecount'] = 'Berichten';
 $labels['create'] = 'Nieuw';
 $labels['createfolder'] = 'Maak nieuwe map';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index a26f15798..d79c67c20 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -306,6 +306,7 @@ $labels['afternseconds'] = 'etter $n sekund';
 $labels['folder'] = 'Mappe';
 $labels['folders'] = 'Mapper';
 $labels['foldername'] = 'Mappenamn';
+$labels['subscribed'] = 'Abonnert';
 $labels['messagecount'] = 'Meldingar';
 $labels['create'] = 'Opprette';
 $labels['createfolder'] = 'Opprett ny mappe';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 6cde0469d..519eb34ef 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -314,6 +314,7 @@ $labels['afternseconds'] = 'po $n sekundach';
 $labels['folder'] = 'Folder';
 $labels['folders'] = 'Foldery';
 $labels['foldername'] = 'Nazwa folderu';
+$labels['subscribed'] = 'Zasubskrybowany';
 $labels['messagecount'] = 'Wiadomości';
 $labels['create'] = 'Utwórz';
 $labels['createfolder'] = 'Utwórz nowy folder';
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index 9f61159a0..e7692e7bc 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -283,6 +283,7 @@ $labels['checkallfolders'] = 'په ټولو پوښيو کې نوي استوزي
 $labels['folder']  = 'پوښۍ ';
 $labels['folders']  = 'پوښۍ';
 $labels['foldername']  = 'پوښۍ نوم ';
+$labels['subscribed']  = 'ګډ شو ';
 $labels['messagecount'] = 'استوزي ';
 $labels['create']  = 'جوړول، رامنځ ته کول ';
 $labels['createfolder']  = 'نوې پوښۍ جوړ کړه ';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index bd001d7f5..ee236d7da 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -312,6 +312,7 @@ $labels['afternseconds'] = 'depois de $n segundos';
 $labels['folder'] = 'Pasta';
 $labels['folders'] = 'Pastas';
 $labels['foldername'] = 'Nome da pasta';
+$labels['subscribed'] = 'Ativo';
 $labels['messagecount'] = 'Mensagens';
 $labels['create'] = 'Criar';
 $labels['createfolder'] = 'Criar nova pasta';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 5f43b7f63..8897c5138 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -42,8 +42,7 @@ $labels['to'] = 'Para';
 $labels['cc'] = 'Cc';
 $labels['bcc'] = 'Bcc';
 $labels['replyto'] = 'Responder para';
-$labels['mailreplyto'] = 'Mensagem-Responder-Para';
-$labels['mailfollowupto'] = 'Mensagem-Reencaminhar-Para';
+$labels['followupto'] = 'Reencaminhar-Para';
 $labels['date'] = 'Data';
 $labels['size'] = 'Tamanho';
 $labels['priority'] = 'Prioridade';
@@ -205,8 +204,7 @@ $labels['maxuploadsize'] = 'Tamanho máximo permitido do ficheiro é $size';
 $labels['addcc'] = 'Adicionar Cc';
 $labels['addbcc'] = 'Adicionar Bcc';
 $labels['addreplyto'] = 'Adicionar Responder para';
-$labels['addmailreplyto'] = 'Adicionar Mensagem-Responder-Para';
-$labels['addmailfollowupto'] = 'Adicionar Mensagem-Reencaminhar-Para';
+$labels['addfollowupto'] = 'Adicionar Reencaminhar-Para';
 $labels['mdnrequest'] = 'O remetente desta mensagem pediu para ser notificado quando esta mensagem fosse lida. Deseja enviar uma notificação?';
 $labels['receiptread'] = 'Recibo de leitura';
 $labels['yourmessage'] = 'Isto é um recibo de leitura da sua mensagem';
@@ -330,6 +328,7 @@ $labels['replysamefolder'] = 'Guardar as respostas na mesma pasta da mensagem or
 $labels['folder'] = 'Pasta';
 $labels['folders'] = 'Pastas';
 $labels['foldername'] = 'Nome da pasta';
+$labels['subscribed'] = 'Subscrita';
 $labels['messagecount'] = 'Mensagens';
 $labels['create'] = 'Criar';
 $labels['createfolder'] = 'Criar nova pasta';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 99506cdcb..83778a081 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -306,6 +306,7 @@ $labels['afternseconds'] = 'după $n secunde';
 $labels['folder'] = 'Dosar';
 $labels['folders'] = 'Dosare';
 $labels['foldername'] = 'Nume dosar';
+$labels['subscribed'] = 'Înscris';
 $labels['messagecount'] = 'Mesaje';
 $labels['create'] = 'Creează';
 $labels['createfolder'] = 'Creează dosar nou';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index ac84f733f..6aeeff4f4 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -40,8 +40,7 @@ $labels['to'] = 'Кому';
 $labels['cc'] = 'Копия';
 $labels['bcc'] = 'Скрытая';
 $labels['replyto'] = 'Ответить';
-$labels['mailreplyto'] = 'Ответить в списке рассылки';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Followup-To';
 $labels['date'] = 'Дата';
 $labels['size'] = 'Размер';
 $labels['priority'] = 'Приоритет';
@@ -203,8 +202,7 @@ $labels['maxuploadsize'] = 'Максимальный размер файла $si
 $labels['addcc'] = 'Копия';
 $labels['addbcc'] = 'Скрытая копия';
 $labels['addreplyto'] = 'Кому ответить';
-$labels['addmailreplyto'] = 'Кому ответить в списке рассылки';
-$labels['addmailfollowupto'] = 'Добавить Mail-Followup-To';
+$labels['addfollowupto'] = 'Добавить Followup-To';
 $labels['mdnrequest'] = 'Отправитель этого сообщения запросил уведомление о прочтении. Отправить уведомление?';
 $labels['receiptread'] = 'Уведомление о прочтении';
 $labels['yourmessage'] = 'Это уведомление о прочтении вашего сообщения';
@@ -328,6 +326,7 @@ $labels['replysamefolder'] = 'Помещать ответы в ту же пап�
 $labels['folder'] = 'Папка';
 $labels['folders'] = 'Папки';
 $labels['foldername'] = 'Имя папки';
+$labels['subscribed'] = 'Подписан';
 $labels['messagecount'] = 'Сообщения';
 $labels['create'] = 'Создать';
 $labels['createfolder'] = 'Создать новую папку';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 58a3fe959..6b3ad9ef8 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -175,6 +175,7 @@ $labels['never'] = 'කිසි විටෙකත් නැති';
 $labels['folder'] = 'ෆෝල්ඩරය';
 $labels['folders'] = 'ෆෝල්ඩර';
 $labels['foldername'] = 'ෆෝල්ඩරයේ නම';
+$labels['subscribed'] = 'සාමාජික';
 $labels['messagecount'] = 'පනිවුඩ';
 $labels['create'] = 'සෑදීම';
 $labels['createfolder'] = 'අඵත් ෆෝල්ඩරයක් සෑදීම';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 7d6e236cb..ce93f888f 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -314,6 +314,7 @@ $labels['reqmdn'] = 'Vždy požadovať doručenku';
 $labels['folder'] = 'Priečinok';
 $labels['folders'] = 'Priečinky';
 $labels['foldername'] = 'Názov priečinku';
+$labels['subscribed'] = 'Prihlásený k odberu';
 $labels['messagecount'] = 'Počet správ';
 $labels['create'] = 'Vytvoriť';
 $labels['createfolder'] = 'Vytvor nový priečinok';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index 82078df60..191a55251 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -39,16 +39,15 @@ $labels['to'] = 'Prejemnik';
 $labels['cc'] = 'Kp';
 $labels['bcc'] = 'Skp';
 $labels['replyto'] = 'Odgovor na';
-$labels['mailreplyto'] = 'Odgovor na';
-$labels['mailfollowupto'] = 'Odgovor na';
+$labels['followupto'] = 'Odgovor na';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Velikost';
 $labels['priority'] = 'Prioriteta';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Status';
 $labels['reply-to'] = 'Odgovor na';
-$labels['mailreply-to'] = 'Odgovor na';
-$labels['mailfollowup-to'] = 'Odgovor na';
+$labels['mail-reply-to'] = 'Odgovor na';
+$labels['mail-followup-to'] = 'Odgovor na';
 $labels['mailboxlist'] = 'Mape';
 $labels['messagesfromto'] = 'Sporočila $from do $to od $count';
 $labels['threadsfromto'] = 'Nit $from do $to od $count';
@@ -202,8 +201,7 @@ $labels['maxuploadsize'] = 'Največja dovoljena velikost datoteke je $size';
 $labels['addcc'] = 'Dodaj Kp';
 $labels['addbcc'] = 'Dodaj Skp';
 $labels['addreplyto'] = 'Dodaj naslov za odgovor';
-$labels['addmailreplyto'] = 'Dodaj naslov za odgovor';
-$labels['addmailfollowupto'] = 'Dodaj naslov za odgovor';
+$labels['addfollowupto'] = 'Dodaj naslov za odgovor';
 $labels['mdnrequest'] = 'Pošiljatelj tega sporočila je zaprosil za potrdilo o branju. Želite o tem obvestiti pošiljatelja?';
 $labels['receiptread'] = 'Potrdilo o branju';
 $labels['yourmessage'] = 'To je potrdilo o branju.';
@@ -325,6 +323,7 @@ $labels['reqdsn'] = 'Vedno zahtevaj obvestilo o statusu dostave';
 $labels['folder'] = 'Mapa';
 $labels['folders'] = 'Mape';
 $labels['foldername'] = 'Ime mape';
+$labels['subscribed'] = 'Vpisan';
 $labels['messagecount'] = 'Sporočila';
 $labels['create'] = 'Ustvari';
 $labels['createfolder'] = 'Ustvari novo mapo';
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index 4863e182c..51ffb7aa8 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -176,6 +176,7 @@ $labels['never'] = 'kurrë';
 $labels['folder'] = 'Kutia';
 $labels['folders'] = 'Kutitë';
 $labels['foldername'] = 'Emër kutie';
+$labels['subscribed'] = 'Regjistruar';
 $labels['messagecount'] = 'Mesazhe';
 $labels['create'] = 'Krijo';
 $labels['createfolder'] = 'Krijo kuti të re';
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 45ad69449..64f5f373e 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -176,6 +176,7 @@ $labels['never'] = 'никад';
 $labels['folder'] = 'Фасцикла';
 $labels['folders'] = 'Фасцикле';
 $labels['foldername'] = 'Име фасцикле';
+$labels['subscribed'] = 'Потписана';
 $labels['messagecount'] = 'Поруке';
 $labels['create'] = 'Креирај';
 $labels['createfolder'] = 'Креирај нову фасциклу';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 20a29d722..55dfddad0 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -40,8 +40,7 @@ $labels['to'] = 'Mottagare';
 $labels['cc'] = 'Kopia';
 $labels['bcc'] = 'Hemlig kopia';
 $labels['replyto'] = 'Svara till';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Followup-To';
 $labels['date'] = 'Datum';
 $labels['size'] = 'Storlek';
 $labels['priority'] = 'Prioritet';
@@ -203,8 +202,7 @@ $labels['maxuploadsize'] = 'Tillåten filstorlek är $size';
 $labels['addcc'] = 'Kopia';
 $labels['addbcc'] = 'Hemlig kopia';
 $labels['addreplyto'] = 'Svara till';
-$labels['addmailreplyto'] = 'Lägg till Mail-Reply-To';
-$labels['addmailfollowupto'] = 'Lägg till Mail-Followup-To';
+$labels['addfollowupto'] = 'Lägg till Mail-Followup-To';
 $labels['mdnrequest'] = 'Avsändaren har begärt mottagarkvitto för det här meddelandet. Vill du skicka ett mottagarkvitto?';
 $labels['receiptread'] = 'Mottagarkvitto (läst)';
 $labels['yourmessage'] = 'Det här är ett mottagarkvitto för ditt meddelande';
@@ -328,6 +326,7 @@ $labels['replysamefolder'] = 'Placera svar i samma katalog som besvarat meddelan
 $labels['folder'] = 'Katalog';
 $labels['folders'] = 'Kataloger';
 $labels['foldername'] = 'Katalognamn';
+$labels['subscribed'] = 'Ansluten';
 $labels['messagecount'] = 'Meddelanden';
 $labels['create'] = 'Skapa';
 $labels['createfolder'] = 'Ny katalog';
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index 4789d6f88..2045c7b06 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -268,6 +268,7 @@ $labels['insertsignature'] = 'கையோப்பமிடு';
 $labels['folder'] = 'அடைவு';
 $labels['folders'] = 'அடைவுகள்';
 $labels['foldername'] = 'அடைவு பெயர்';
+$labels['subscribed'] = 'சந்தா';
 $labels['messagecount'] = 'செய்திகள்';
 $labels['create'] = 'உருவாக்கு';
 $labels['createfolder'] = 'புது அடைவு உருவாக்கு';
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index a3f636c87..3a6ea4948 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -159,6 +159,7 @@ $labels['never'] = 'ไม่ใช้';
 $labels['folder'] = 'กล่องจดหมาย';
 $labels['folders'] = 'กล่องจดหมาย';
 $labels['foldername'] = 'ชื่อกล่องจดหมาย';
+$labels['subscribed'] = 'ลงชื่อ';
 $labels['create'] = 'สร้าง';
 $labels['createfolder'] = 'สร้างกล่องจดหมาย';
 $labels['managefolders'] = 'จัดการกล่องจดหมาย';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 12aea8f58..31707336d 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -309,6 +309,7 @@ $labels['afternseconds'] = '$n saniye sonra';
 $labels['folder'] = 'Klasör';
 $labels['folders'] = 'Klasörler';
 $labels['foldername'] = 'Klasör ismi';
+$labels['subscribed'] = 'Abonelik';
 $labels['messagecount'] = 'Postalar';
 $labels['create'] = 'Oluştur';
 $labels['createfolder'] = 'Yeni klasör oluştur';
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index 637c1d5a4..877682dd1 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -38,8 +38,7 @@ $labels['to'] = 'Кому';
 $labels['cc'] = 'Копія';
 $labels['bcc'] = 'Прихована';
 $labels['replyto'] = 'Зворотня адреса';
-$labels['mailreplyto'] = 'Mail-Reply-To';
-$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['followupto'] = 'Followup-To';
 $labels['date'] = 'Дата';
 $labels['size'] = 'Розмір';
 $labels['priority'] = 'Пріоритет';
@@ -201,8 +200,7 @@ $labels['maxuploadsize'] = 'Максимальний розмір файлу $si
 $labels['addcc'] = 'Додати копію';
 $labels['addbcc'] = 'Додати приховану копію';
 $labels['addreplyto'] = 'Додати зворотню адресу';
-$labels['addmailreplyto'] = 'Додати Mail-Reply-To';
-$labels['addmailfollowupto'] = 'Додати Mail-Followup-To';
+$labels['addfollowupto'] = 'Додати Followup-To';
 $labels['mdnrequest'] = 'Відправник цього листа запитав про прочитання. Повідомити відправника?';
 $labels['receiptread'] = 'Повідомлення про прочитання';
 $labels['yourmessage'] = 'Повідомлення про прочитання Вашого листа';
@@ -326,6 +324,7 @@ $labels['replysamefolder'] = 'Розмістити відповіді у тій
 $labels['folder'] = 'Папка';
 $labels['folders'] = 'Папки';
 $labels['foldername'] = 'Назва папки';
+$labels['subscribed'] = 'Підписані';
 $labels['messagecount'] = 'Листи';
 $labels['create'] = 'Створити';
 $labels['createfolder'] = 'Створити нову папку';
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index 5aa0e0456..ece0a5ced 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -202,6 +202,7 @@ $labels['dstactive']  = 'Giờ mùa hè';
 $labels['folder']  = 'Thư mục';
 $labels['folders']  = 'Thư mục';
 $labels['foldername']  = 'Tên thư mục';
+$labels['subscribed']  = 'Cho sử dụng';
 $labels['create']  = 'Tạo';
 $labels['createfolder']  = 'Tạo thư mục mới';
 $labels['managefolders']  = 'Quản trị thư mục';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index dff93a4e2..6c3c79ad6 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -307,6 +307,7 @@ $labels['afternseconds'] = '$n 秒之后';
 $labels['folder'] = '邮件夹';
 $labels['folders'] = '邮件夹';
 $labels['foldername'] = '邮件夹名称';
+$labels['subscribed'] = '已订阅';
 $labels['messagecount'] = '邮件数量';
 $labels['create'] = '建立';
 $labels['createfolder'] = '建立新邮件夹';
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 632c94492..886d3a380 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -40,8 +40,7 @@ $labels['to'] = '收件者';
 $labels['cc'] = '副本';
 $labels['bcc'] = '密件副本';
 $labels['replyto'] = '回覆至';
-$labels['mailreplyto'] = '信件回覆至';
-$labels['mailfollowupto'] = '信件跟隨至';
+$labels['followupto'] = '信件跟隨至';
 $labels['date'] = '日期';
 $labels['size'] = '大小';
 $labels['priority'] = '優先順序';
@@ -203,8 +202,7 @@ $labels['maxuploadsize'] = '上傳檔案大小限制為 $size';
 $labels['addcc'] = '新增副本';
 $labels['addbcc'] = '新增密件副本';
 $labels['addreplyto'] = '新增回覆地址';
-$labels['addmailreplyto'] = '新增 信件回覆至';
-$labels['addmailfollowupto'] = '新增 信件跟隨至';
+$labels['addfollowupto'] = '新增 信件跟隨至';
 $labels['mdnrequest'] = '此郵件的寄件者希望在你閱讀此郵件時受到通知。你想要通知寄件者嗎？';
 $labels['receiptread'] = '郵件回條（已閱讀）';
 $labels['yourmessage'] = '這是你郵件的郵件回條';
@@ -328,6 +326,7 @@ $labels['replysamefolder'] = '將回覆與回覆信件放置於相同資料夾';
 $labels['folder'] = '資料夾';
 $labels['folders'] = '資料夾';
 $labels['foldername'] = '資料夾名稱';
+$labels['subscribed'] = '顯示';
 $labels['messagecount'] = '郵件數目';
 $labels['create'] = '建立';
 $labels['createfolder'] = '建立新資料夾';
diff --git a/skins/default/common.css b/skins/default/common.css
index ae649ba5d..622fba949 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -249,6 +249,11 @@ img
   background: url(images/listheader.gif) top left repeat-x #CCC;
 }
 
+.boxtitle .rightalign
+{
+  float: right;
+}
+
 .boxcontent
 {
   padding: 15px 10px 10px 10px;
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 52e5277be..5624f80e3 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -52,12 +52,13 @@
 
 #subscription-table td.name
 {
-  width: 99%;
+  width: auto;
 }
 
 #subscription-table td.subscribed
 {
-  width: 18px;
+  text-align: right;
+  padding-right: 12px;
 }
 
 #identity-frame
diff --git a/skins/default/templates/folders.html b/skins/default/templates/folders.html
index 07ce1c0f0..1710b8ca0 100644
--- a/skins/default/templates/folders.html
+++ b/skins/default/templates/folders.html
@@ -21,7 +21,7 @@
 <div id="mainscreen">
 
 <div id="folder-manager">
-<div id="folder-title" class="boxtitle"><roundcube:label name="folders" /></div>
+<div id="folder-title" class="boxtitle"><roundcube:label name="folders" /><span class="rightalign"><roundcube:label name="subscribed" /></span></div>
 <div class="boxlistcontent">
     <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" noheader="true"
         cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table" />