diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile
index 92ca7d45b..a7afca3a4 100644
--- a/SoObjects/Mailer/GNUmakefile
+++ b/SoObjects/Mailer/GNUmakefile
@@ -92,7 +92,7 @@ Mailer_RESOURCE_FILES += \
 	SOGoMailWelshReply.wo
 
 
-Mailer_LANGUAGES = English French
+Mailer_LANGUAGES = Arabic BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
 
 Mailer_LOCALIZED_RESOURCE_FILES = Localizable.strings
 
diff --git a/UI/MailerUI/Arabic.lproj/Localizable.strings b/UI/MailerUI/Arabic.lproj/Localizable.strings
index 1de5b21db..deb1bc17e 100644
--- a/UI/MailerUI/Arabic.lproj/Localizable.strings
+++ b/UI/MailerUI/Arabic.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "البريد الوارد";
 "DraftsFolderName" = "مسودات";
 "SieveFolderName"  = "فلاتر";
-"OtherUsersFolderName"   = "مستخدمين أخرين";
-"SharedFoldersName" = "مجلدات مشتركة";
 "Folders"          = "مجلدات"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings
index 9e03c615d..f23eb5b69 100644
--- a/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Entrada";
 "DraftsFolderName" = "Rascunhos";
 "SieveFolderName"  = "Filtros";
-"OtherUsersFolderName"   = "Outros Usuários";
-"SharedFoldersName" = "Pastas Compartilhadas";
 "Folders"          = "Pastas"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Catalan.lproj/Localizable.strings b/UI/MailerUI/Catalan.lproj/Localizable.strings
index b79834487..c5c6f293c 100644
--- a/UI/MailerUI/Catalan.lproj/Localizable.strings
+++ b/UI/MailerUI/Catalan.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Safata d'entrada";
 "DraftsFolderName" = "Esborranys";
 "SieveFolderName"  = "Filtres";
-"OtherUsersFolderName"   = "Altres usuaris";
-"SharedFoldersName" = "Carpetes compartides";
 "Folders"          = "Carpetes"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Czech.lproj/Localizable.strings b/UI/MailerUI/Czech.lproj/Localizable.strings
index 60d42d5d0..fd58de7af 100644
--- a/UI/MailerUI/Czech.lproj/Localizable.strings
+++ b/UI/MailerUI/Czech.lproj/Localizable.strings
@@ -169,8 +169,6 @@
 "InboxFolderName"  = "Doručená pošta";
 "DraftsFolderName" = "Koncepty";
 "SieveFolderName"  = "Filtry";
-"OtherUsersFolderName"   = "Ostatní uživatelé";
-"SharedFoldersName" = "Sdílené složky";
 "Folders"          = "Složky"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Danish.lproj/Localizable.strings b/UI/MailerUI/Danish.lproj/Localizable.strings
index a73b7a3be..7a60b99c7 100644
--- a/UI/MailerUI/Danish.lproj/Localizable.strings
+++ b/UI/MailerUI/Danish.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Indbakke";
 "DraftsFolderName" = "Kladder";
 "SieveFolderName"  = "Filtre";
-"OtherUsersFolderName"   = "Andre brugere";
-"SharedFoldersName" = "Delte mapper";
 "Folders"          = "Mapper"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Dutch.lproj/Localizable.strings b/UI/MailerUI/Dutch.lproj/Localizable.strings
index 850923362..75493fac3 100644
--- a/UI/MailerUI/Dutch.lproj/Localizable.strings
+++ b/UI/MailerUI/Dutch.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Postvak IN";
 "DraftsFolderName" = "Concepten";
 "SieveFolderName"  = "Berichtregel";
-"OtherUsersFolderName"   = "Andere Gebruikers";
-"SharedFoldersName" = "Gedeelde Mappen";
 "Folders"          = "Mappen"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index 02d512726..47d70ffab 100644
--- a/UI/MailerUI/English.lproj/Localizable.strings
+++ b/UI/MailerUI/English.lproj/Localizable.strings
@@ -169,8 +169,6 @@
 "InboxFolderName"  = "Inbox";
 "DraftsFolderName" = "Drafts";
 "SieveFolderName"  = "Filters";
-"OtherUsersFolderName"   = "Other Users";
-"SharedFoldersName" = "Shared Folders";
 "Folders"          = "Folders"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Finnish.lproj/Localizable.strings b/UI/MailerUI/Finnish.lproj/Localizable.strings
index 734bb155b..b6b9762ba 100644
--- a/UI/MailerUI/Finnish.lproj/Localizable.strings
+++ b/UI/MailerUI/Finnish.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Saapuneet";
 "DraftsFolderName" = "Luonnokset";
 "SieveFolderName"  = "Suodattimet";
-"OtherUsersFolderName"   = "Muut käyttäjät";
-"SharedFoldersName" = "Jaetut kansiot";
 "Folders"          = "Kansiot"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings
index 5201806cd..373bfbaf9 100644
--- a/UI/MailerUI/French.lproj/Localizable.strings
+++ b/UI/MailerUI/French.lproj/Localizable.strings
@@ -169,8 +169,6 @@
 "InboxFolderName"  = "Courrier entrant";
 "DraftsFolderName" = "Brouillons";
 "SieveFolderName"  = "Filtres";
-"OtherUsersFolderName"   = "Autres utilisateurs";
-"SharedFoldersName" = "Dossiers partagés";
 "Folders"          = "Dossiers"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/German.lproj/Localizable.strings b/UI/MailerUI/German.lproj/Localizable.strings
index 9096d6c68..03efba019 100644
--- a/UI/MailerUI/German.lproj/Localizable.strings
+++ b/UI/MailerUI/German.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Posteingang";
 "DraftsFolderName" = "Entwürfe";
 "SieveFolderName"  = "Filter";
-"OtherUsersFolderName"   = "Andere Benutzer";
-"SharedFoldersName" = "Gemeinsame Ordner";
 "Folders"          = "Ordner"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Hungarian.lproj/Localizable.strings b/UI/MailerUI/Hungarian.lproj/Localizable.strings
index cc957d651..6aa1076d6 100644
--- a/UI/MailerUI/Hungarian.lproj/Localizable.strings
+++ b/UI/MailerUI/Hungarian.lproj/Localizable.strings
@@ -169,8 +169,6 @@
 "InboxFolderName"  = "Beérkezett üzenetek";
 "DraftsFolderName" = "Piszkozatok";
 "SieveFolderName"  = "Szűrők";
-"OtherUsersFolderName"   = "Egyéb felhasználók";
-"SharedFoldersName" = "Megosztott mappák";
 "Folders"          = "Mappák"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Icelandic.lproj/Localizable.strings b/UI/MailerUI/Icelandic.lproj/Localizable.strings
index 345af9765..21cf027cf 100644
--- a/UI/MailerUI/Icelandic.lproj/Localizable.strings
+++ b/UI/MailerUI/Icelandic.lproj/Localizable.strings
@@ -165,8 +165,6 @@
 "InboxFolderName"  = "Innhólf";
 "DraftsFolderName" = "Drög";
 "SieveFolderName"  = "Síur";
-"OtherUsersFolderName"   = "Aðrir Notendur";
-"SharedFoldersName" = "Samnýttar Möppur";
 "Folders"          = "Möppur"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Italian.lproj/Localizable.strings b/UI/MailerUI/Italian.lproj/Localizable.strings
index 7adcab42f..79ae3f99a 100644
--- a/UI/MailerUI/Italian.lproj/Localizable.strings
+++ b/UI/MailerUI/Italian.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Posta in arrivo";
 "DraftsFolderName" = "Bozze";
 "SieveFolderName"  = "Filtri";
-"OtherUsersFolderName"   = "Altri Utenti";
-"SharedFoldersName" = "Cartelle Condivise";
 "Folders"          = "Cartelle"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings b/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings
index 8d55d640b..7904d6acc 100644
--- a/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings
+++ b/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Innboks";
 "DraftsFolderName" = "Kladder";
 "SieveFolderName"  = "Filter";
-"OtherUsersFolderName"   = "Andre brukere";
-"SharedFoldersName" = "Delte mapper";
 "Folders"          = "Mapper"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings
index db7bdaa9f..6cd8f6e8f 100644
--- a/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings
+++ b/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings
@@ -165,8 +165,6 @@
 "InboxFolderName"  = "Innboks";
 "DraftsFolderName" = "Kladder";
 "SieveFolderName"  = "Filter";
-"OtherUsersFolderName"   = "Other Users";
-"SharedFoldersName" = "Shared Folders";
 "Folders"          = "Mapper"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Polish.lproj/Localizable.strings b/UI/MailerUI/Polish.lproj/Localizable.strings
index b427b01b1..a90f48de4 100644
--- a/UI/MailerUI/Polish.lproj/Localizable.strings
+++ b/UI/MailerUI/Polish.lproj/Localizable.strings
@@ -169,8 +169,6 @@
 "InboxFolderName"  = "Odebrane";
 "DraftsFolderName" = "Szkice";
 "SieveFolderName"  = "Filtry";
-"OtherUsersFolderName"   = "Inni użytkownicy";
-"SharedFoldersName" = "Foldery współdzielone";
 "Folders"          = "Foldery"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Russian.lproj/Localizable.strings b/UI/MailerUI/Russian.lproj/Localizable.strings
index 5e2202404..ea6500111 100644
--- a/UI/MailerUI/Russian.lproj/Localizable.strings
+++ b/UI/MailerUI/Russian.lproj/Localizable.strings
@@ -169,8 +169,6 @@
 "InboxFolderName"  = "Входящие";
 "DraftsFolderName" = "Черновики";
 "SieveFolderName"  = "Папки";
-"OtherUsersFolderName"   = "Другие пользователи";
-"SharedFoldersName" = "Общие папки";
 "Folders"          = "Папки"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Slovak.lproj/Localizable.strings b/UI/MailerUI/Slovak.lproj/Localizable.strings
index 4e2a34637..28820b5b6 100644
--- a/UI/MailerUI/Slovak.lproj/Localizable.strings
+++ b/UI/MailerUI/Slovak.lproj/Localizable.strings
@@ -169,8 +169,6 @@
 "InboxFolderName"  = "Prijaté";
 "DraftsFolderName" = "Koncepty";
 "SieveFolderName"  = "Filtre";
-"OtherUsersFolderName"   = "Ostatní užívatelia";
-"SharedFoldersName" = "Zdielané adresáre";
 "Folders"          = "Adresáre"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings b/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings
index 357fdb6ab..c8211dfeb 100644
--- a/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings
+++ b/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Bandeja de entrada";
 "DraftsFolderName" = "Borradores";
 "SieveFolderName"  = "Filtros";
-"OtherUsersFolderName"   = "Otros usuarios";
-"SharedFoldersName" = "Carpetas compartidas";
 "Folders"          = "Carpetas"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/SpanishSpain.lproj/Localizable.strings b/UI/MailerUI/SpanishSpain.lproj/Localizable.strings
index f2bb7d703..5accd9ba4 100644
--- a/UI/MailerUI/SpanishSpain.lproj/Localizable.strings
+++ b/UI/MailerUI/SpanishSpain.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Bandeja de entrada";
 "DraftsFolderName" = "Borradores";
 "SieveFolderName"  = "Filtros";
-"OtherUsersFolderName"   = "Otros usuarios";
-"SharedFoldersName" = "Carpetas compartidas";
 "Folders"          = "Carpetas"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Swedish.lproj/Localizable.strings b/UI/MailerUI/Swedish.lproj/Localizable.strings
index d7151af2f..207ab4c15 100644
--- a/UI/MailerUI/Swedish.lproj/Localizable.strings
+++ b/UI/MailerUI/Swedish.lproj/Localizable.strings
@@ -165,8 +165,6 @@
 "InboxFolderName"  = "Inkorgen";
 "DraftsFolderName" = "Utkast";
 "SieveFolderName"  = "Filter";
-"OtherUsersFolderName"   = "Other Users";
-"SharedFoldersName" = "Shared Folders";
 "Folders"          = "Mappar"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Ukrainian.lproj/Localizable.strings b/UI/MailerUI/Ukrainian.lproj/Localizable.strings
index 4e0555af3..f9a64ebac 100644
--- a/UI/MailerUI/Ukrainian.lproj/Localizable.strings
+++ b/UI/MailerUI/Ukrainian.lproj/Localizable.strings
@@ -168,8 +168,6 @@
 "InboxFolderName"  = "Вхідні";
 "DraftsFolderName" = "Чернетки";
 "SieveFolderName"  = "Теки";
-"OtherUsersFolderName"   = "Інші користувачі";
-"SharedFoldersName" = "Спільні теки";
 "Folders"          = "Всі теки"; /* title line */
 
 /* MailMoveToPopUp */
diff --git a/UI/MailerUI/Welsh.lproj/Localizable.strings b/UI/MailerUI/Welsh.lproj/Localizable.strings
index 1da56be42..87fc7fec3 100644
--- a/UI/MailerUI/Welsh.lproj/Localizable.strings
+++ b/UI/MailerUI/Welsh.lproj/Localizable.strings
@@ -165,8 +165,6 @@
 "InboxFolderName"  = "Newydd";
 "DraftsFolderName" = "Draffts";
 "SieveFolderName"  = "Ffilteri";
-"OtherUsersFolderName"   = "Other Users";
-"SharedFoldersName" = "Shared Folders";
 "Folders"          = "Ffolderi"; /* title line */
 
 /* MailMoveToPopUp */