diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 42fdf5ea6..9685109e5 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -173,6 +173,7 @@ $labels['revertto'] = 'Dəyişiklikləri ləğv et';
 $labels['attachments'] = 'Əlavələr';
 $labels['upload'] = 'Yüklə';
 $labels['close'] = 'Bağla';
+$labels['messageoptions'] = 'Məktub xüsusiyyətləri...';
 $labels['low'] = 'Alçaq';
 $labels['lowest'] = 'Çox alçaq';
 $labels['normal'] = 'Normal';
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index f16db2732..ed6c4d456 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -152,7 +152,7 @@ $labels['listcolumns'] = 'Seznam sloupců';
 $labels['listsorting'] = 'Třídění sloupců';
 $labels['listorder'] = 'Uspořádání';
 $labels['listmode'] = 'Režim zobrazení seznamu';
-$labels['folderactions'] = 'Složka akcí...';
+$labels['folderactions'] = 'Akce se složkou...';
 $labels['compact'] = 'Zmenšit';
 $labels['empty'] = 'Vymazat';
 $labels['purge'] = 'Vyprázdnit';
@@ -179,6 +179,7 @@ $labels['revertto'] = 'Přejít na';
 $labels['attachments'] = 'Přílohy';
 $labels['upload'] = 'Nahrát';
 $labels['close'] = 'Zavřít';
+$labels['messageoptions'] = 'Nastavení zprávy...';
 $labels['low'] = 'Nízká';
 $labels['lowest'] = 'Nejnižší';
 $labels['normal'] = 'Normální';
@@ -346,4 +347,4 @@ $labels['japanese'] = 'Japonština';
 $labels['korean'] = 'Korejština';
 $labels['chinese'] = 'Čínština';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 5eaaebe76..935b3c696 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -11,7 +11,7 @@
 +-----------------------------------------------------------------------+
 | Author: Moshe Leibovitch  <moish@mln.co.il>                           |
 | Updates: Noor Dawod <noor@comrax.com>                                 |
-| Updates: Moshe Leibovitch  <moish@mln.co.il>  23062010                |
+| Updates: Moshe Leibovitch  <moish@mln.co.il>  04072010                |
 +-----------------------------------------------------------------------+
 */
 
@@ -173,6 +173,7 @@ $labels['revertto'] = 'חזור למצב קודם';
 $labels['attachments'] = 'קבצים מצורפים';
 $labels['upload'] = 'העלאה';
 $labels['close'] = 'סגירה';
+$labels['messageoptions'] = 'אפשרויות הודעה...';
 $labels['low'] = 'נמוך';
 $labels['lowest'] = 'נמוך ביותר';
 $labels['normal'] = 'רגיל';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 252d3b004..e30b417a0 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -46,13 +46,12 @@ $labels['reply-to'] = 'Balas kepada';
 $labels['mailboxlist'] = 'Daftar Kotak Surat';
 $labels['messagesfromto'] = 'Pesan $from kepada $to sebanyak $count';
 $labels['messagenrof'] = 'Pesan $nr sebanyak $count';
+$labels['copy'] = 'Salin';
+$labels['move'] = 'Pindahkan';
 $labels['moveto'] = 'Pindahkan ke...';
 $labels['download'] = 'Dnduh';
 $labels['filename'] = 'Nama berkas';
 $labels['filesize'] = 'Ukuran berkas';
-$labels['preferhtml'] = 'Lebih suka HTML';
-$labels['htmlmessage'] = 'Pesan HTML';
-$labels['prettydate'] = 'Tanggal Cantik';
 $labels['addtoaddressbook'] = 'Tambahkan Pada Buku Tamu';
 $labels['sun'] = 'Min';
 $labels['mon'] = 'Sen';
@@ -120,12 +119,18 @@ $labels['messageactions'] = 'Tindakan lain...';
 $labels['select'] = 'Pilih';
 $labels['all'] = 'Semua';
 $labels['none'] = 'Tidak satupun';
+$labels['currpage'] = 'Halaman sekarang';
 $labels['unread'] = 'Belum terbaca';
 $labels['flagged'] = 'Ditandai';
 $labels['unanswered'] = 'Belum terjawab';
 $labels['deleted'] = 'Terhapus';
 $labels['invert'] = 'Sebaliknya';
 $labels['filter'] = 'Penyaringan';
+$labels['list'] = 'list';
+$labels['attachment'] = 'Lampiran';
+$labels['nonesort'] = 'Tidak ada';
+$labels['sentdate'] = 'Tanggal kirim';
+$labels['arrival'] = 'Tanggal masuk';
 $labels['compact'] = 'Ramping';
 $labels['empty'] = 'Kosong';
 $labels['purge'] = 'Kosongkan';
@@ -152,6 +157,7 @@ $labels['revertto'] = 'Balik ke';
 $labels['attachments'] = 'Sisispan';
 $labels['upload'] = 'Unggah';
 $labels['close'] = 'Tutup';
+$labels['messageoptions'] = 'Opsi pesan...';
 $labels['low'] = 'Rendah';
 $labels['lowest'] = 'Paling Rendah';
 $labels['normal'] = 'Normal';
@@ -178,6 +184,7 @@ $labels['surname'] = 'Nama belakang';
 $labels['email'] = 'E-Mail';
 $labels['addcontact'] = 'Tambah kontak baru';
 $labels['editcontact'] = 'Ubah kontak';
+$labels['contacts'] = 'Daftar kontak';
 $labels['edit'] = 'Ubah';
 $labels['cancel'] = 'Batal';
 $labels['save'] = 'Simpan';
@@ -189,10 +196,12 @@ $labels['contactsfromto'] = 'Kontak $from kepada $to sebanyak $count';
 $labels['print'] = 'Cetak';
 $labels['export'] = 'Ekspor';
 $labels['exportvcards'] = 'Ekspor kontak dalam format vCard';
+$labels['newcontactgroup'] = 'Buat Grup baru';
 $labels['previouspage'] = 'Perlihatkan kumpulan sebelumnya';
 $labels['firstpage'] = 'Perlihatkan kumpulan pertama';
 $labels['nextpage'] = 'Perlihatkan kumpulan selanjutnya';
 $labels['lastpage'] = 'Perlihatkan kumpulan terakhir';
+$labels['group'] = 'Kelompok';
 $labels['groups'] = 'Kelompok';
 $labels['personaladrbook'] = 'Alamat personal';
 $labels['import'] = 'Import';
@@ -210,6 +219,10 @@ $labels['manageidentities'] = 'Atur identitas untuk akun ini';
 $labels['newidentity'] = 'Identitas baru';
 $labels['newitem'] = 'Item baru';
 $labels['edititem'] = 'Ubah item';
+$labels['preferhtml'] = 'Lebih suka HTML';
+$labels['defaultcharset'] = 'Default Character';
+$labels['htmlmessage'] = 'Pesan HTML';
+$labels['prettydate'] = 'Tanggal Cantik';
 $labels['setdefault'] = 'Pengaturan Awal';
 $labels['autodetect'] = 'Otomatis';
 $labels['language'] = 'Bahasa';
@@ -233,6 +246,7 @@ $labels['ignore'] = 'acuhkan';
 $labels['readwhendeleted'] = 'Tandai pesan sebagai terbaca saat dihapus';
 $labels['flagfordeletion'] = 'Tandai pesan untuk penghapusan daripada dihapus';
 $labels['skipdeleted'] = 'Jangan tampilkan pesan terhapus';
+$labels['deletealways'] = 'Jika gagal memindakan ke tempat sampah, langsung hapus';
 $labels['showremoteimages'] = 'Tampilkan remote inline images';
 $labels['fromknownsenders'] = 'dari pengirim yang dikenal';
 $labels['always'] = 'selalu';
@@ -241,12 +255,14 @@ $labels['autosavedraft'] = 'Otomatis menyimpan pesan tertunda';
 $labels['everynminutes'] = 'setiap $n menit';
 $labels['keepalive'] = 'Periksa pesan baru saat';
 $labels['never'] = 'tidak pernah';
+$labels['immediately'] = 'segera';
 $labels['messagesdisplaying'] = 'Penampilan Pesan';
 $labels['messagescomposition'] = 'Pengaturan Pesan';
 $labels['mimeparamfolding'] = 'Nama lampiran';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Gunakan MIME encoding untuk 8-bit karakter';
 $labels['advancedoptions'] = 'Pilihan canggih';
 $labels['focusonnewmessage'] = 'Pusatkan jendela broswer saat ada pesan baru';
 $labels['checkallfolders'] = 'Periksa semua map untuk pesan baru';
@@ -256,6 +272,20 @@ $labels['section'] = 'Bagian';
 $labels['maintenance'] = 'Perbaikan';
 $labels['newmessage'] = 'Pesan baru';
 $labels['listoptions'] = 'Daftar Pilihan';
+$labels['signatureoptions'] = 'Opsi tanda tangan';
+$labels['whenreplying'] = 'Ketika membalas';
+$labels['replytopposting'] = 'Tulis pesan baru diatas pesan asli';
+$labels['replybottomposting'] = 'Tulis pesan baru dibawah pesan asli';
+$labels['replyremovesignature'] = 'ketika membalas pesan hapus tanda tangan dari pesan';
+$labels['autoaddsignature'] = 'Otomatis tambahkan tanda tangan';
+$labels['newmessageonly'] = 'Hanya untuk pesan baru';
+$labels['replyandforwardonly'] = 'Hanya untuk dijawab dan diteruskan';
+$labels['replysignaturepos'] = 'ketika membalas atau meneruskan pesan tambahkan tanda tangan';
+$labels['belowquote'] = 'Dibawah kutipan';
+$labels['abovequote'] = 'Diatas kutipan';
+$labels['insertsignature'] = 'Isi tanda tangan';
+$labels['previewpanemarkread'] = 'Tandai pesan yang sudah dilihat ';
+$labels['afternseconds'] = 'setelah $n detik';
 $labels['folder'] = 'Map';
 $labels['folders'] = 'Map-map';
 $labels['foldername'] = 'Nama map';
@@ -275,5 +305,22 @@ $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Inggris';
+$labels['westerneuropean'] = 'Eropa Barat';
+$labels['easterneuropean'] = 'Eropa Timur';
+$labels['southeasterneuropean'] = 'Eropa Tenggara';
+$labels['baltic'] = 'Balkan';
+$labels['cyrillic'] = 'Rusia';
+$labels['arabic'] = 'Arab';
+$labels['greek'] = 'Yunani';
+$labels['hebrew'] = 'Yahudi';
+$labels['turkish'] = 'Turki';
+$labels['nordic'] = 'Nordik';
+$labels['thai'] = 'Thailand';
+$labels['vietnamese'] = 'Vietnam';
+$labels['japanese'] = 'Jepang';
+$labels['korean'] = 'Korea';
+$labels['chinese'] = 'Cina';
 
 ?>
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index b21b77e82..3737f3fc9 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -28,6 +28,7 @@ $messages['nomessagesfound'] = 'Surat tidak ditemukan di kotak masuk ini';
 $messages['loggedout'] = 'Anda berhasil mengakhiri session. Selamat Tinggal!';
 $messages['mailboxempty'] = 'Kotak masuk kosong';
 $messages['loading'] = 'Loading...';
+$messages['uploading'] = 'Mengupload file ...';
 $messages['loadingdata'] = 'Loading data...';
 $messages['checkingmail'] = 'Memeriksa pesan baru...';
 $messages['sendingmessage'] = 'Mengirim pesan...';
@@ -46,6 +47,7 @@ $messages['senttooquickly'] = 'Mohon tunggu $sec detik. sebelum mengirim pesan i
 $messages['errorsavingsent'] = 'Error ketika menyimpan pesan terkirim';
 $messages['errorsaving'] = 'Error ketika menyimpan';
 $messages['errormoving'] = 'Pesan tidak bisa dipindahkan';
+$messages['errorcopying'] = 'Pesan tidak dapat disalin';
 $messages['errordeleting'] = 'Pesan tidak bisa dihapus';
 $messages['errormarking'] = 'Tidak dapat menandai pesan';
 $messages['deletecontactconfirm'] = 'Apakah anda yakin untuk menghapus kontak terpilih?';
@@ -68,6 +70,7 @@ $messages['notsentwarning'] = 'Pesan belum terkirim. Buang pesan Anda?';
 $messages['noldapserver'] = 'Tolong pilih server LDAP untuk pencarian';
 $messages['nocontactsreturned'] = 'Kontak kosong';
 $messages['nosearchname'] = 'Tolong masukkan nama kontak atau alamat email';
+$messages['notuploadedwarning'] = 'Proses upload belum selesai. Silahkan tunggu atau batalkan proses upload';
 $messages['searchsuccessful'] = '$nr pesan ditemukan';
 $messages['searchnomatch'] = 'Pencarian kosong';
 $messages['searching'] = 'Mencari...';
@@ -84,6 +87,7 @@ $messages['copyerror'] = 'Tidak bisa menyalin alamat manapun';
 $messages['sourceisreadonly'] = 'Sumber dari alamat ini hanya dapat dibaca';
 $messages['errorsavingcontact'] = 'Tidak bisa menyimpan alamat kontak';
 $messages['movingmessage'] = 'Memindahkan pesan...';
+$messages['copyingmessage'] = 'Menyalin pesan...';
 $messages['receiptsent'] = 'Berhasil mengirim pemberitahuan tanda terima telah terbaca';
 $messages['errorsendingreceipt'] = 'Tidak dapat mengirim tanda terima';
 $messages['nodeletelastidentity'] = 'Anda tidak bida mengapus identitas ini, ini identitas yang terakhir';
@@ -91,6 +95,8 @@ $messages['addsubfolderhint'] = 'Folder ini akan dibuat sebagai subfolder pada f
 $messages['forbiddencharacter'] = 'Nama folder mengandung karakter terlarang';
 $messages['selectimportfile'] = 'Mohon pilih sebuah berkas untuk diunggah';
 $messages['addresswriterror'] = 'Buku alamat terpilih tidak dapat ditulisi';
+$messages['contactaddedtogroup'] = 'Berhasil menambahkan kontak kedalam grup ini';
+$messages['contactremovedfromgroup'] = 'Berhasil menghapus kontak dari grup ini';
 $messages['importwait'] = 'Sedang mengimpor, harap menunggu...';
 $messages['importerror'] = 'Gagal mengimpor! Berkas terunggah bukan berkas vCard yang valid';
 $messages['importconfirm'] = '<b>Berhasil mengimpor $inserted kontak, $skipped entri dilewati</b>:<p><em>$names</em></p>';
@@ -104,5 +110,9 @@ $messages['smtpfromerror'] = 'SMTP Error ($code): Gagal mengatur pengirim "$from
 $messages['smtptoerror'] = 'SMTP Error ($code): Gagal menambah penerima "$to" ($msg)';
 $messages['smtprecipientserror'] = 'SMTP Error ($code): Tidak dapat menguraikan daftar penerima';
 $messages['smtperror'] = 'SMTP Error : $msg';
+$messages['emailformaterror'] = 'Alamat e-mail salah: $email';
+$messages['toomanyrecipients'] = 'Terlalu banyak penerima. Batas maksimal penerima adalah $max';
+$messages['maxgroupmembersreached'] = 'Jumlah grup melebihi jumlah maksimum $max';
+$messages['internalerror'] = 'Terjadi kesalahan internal. Silahkan diulang kembali';
 
 ?>
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 83443d864..247cbffbd 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -152,6 +152,7 @@ $labels['listcolumns'] = 'Kolommen';
 $labels['listsorting'] = 'Sorteerkolom';
 $labels['listorder'] = 'Sorteervolgorde';
 $labels['listmode'] = 'Lijstweergave mode';
+$labels['folderactions'] = 'Acties voor map...';
 $labels['compact'] = 'Opschonen';
 $labels['empty'] = 'Legen';
 $labels['purge'] = 'Verwijderen';
@@ -178,6 +179,7 @@ $labels['revertto'] = 'Wijzig terug in';
 $labels['attachments'] = 'Bijlages';
 $labels['upload'] = 'Toevoegen';
 $labels['close'] = 'Sluit';
+$labels['messageoptions'] = 'Acties voor bericht...';
 $labels['low'] = 'Laag';
 $labels['lowest'] = 'Laagste';
 $labels['normal'] = 'Normaal';
@@ -204,6 +206,7 @@ $labels['surname'] = 'Achternaam';
 $labels['email'] = 'E-Mail';
 $labels['addcontact'] = 'Nieuwe contactpersoon toevoegen';
 $labels['editcontact'] = 'Contactpersoon wijzigen';
+$labels['contacts'] = 'Contacten';
 $labels['edit'] = 'Wijzig';
 $labels['cancel'] = 'Annuleer';
 $labels['save'] = 'Opslaan';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 359694937..2caf0fe0f 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -116,5 +116,6 @@ $messages['smtperror'] = 'SMTP Fout: $msg';
 $messages['emailformaterror'] = 'Ongeldig e-mailadres: $email';
 $messages['toomanyrecipients'] = 'Te veel geadresseerden. Verminder de hoeveelheid geadresseerden tot $max';
 $messages['maxgroupmembersreached'] = 'Het aantal leden van de groep groter is dan de maximale van $max';
+$messages['internalerror'] = 'Er is een interne fout opgetreden. Probeer het nogmaals';
 
 ?>
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index bab87bc7b..771a03969 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -174,6 +174,7 @@ $labels['revertto'] = 'Отменить правки';
 $labels['attachments'] = 'Вложения';
 $labels['upload'] = 'Загрузить';
 $labels['close'] = 'Закрыть';
+$labels['messageoptions'] = 'Настройки сообщений...';
 $labels['low'] = 'Низкий';
 $labels['lowest'] = 'Нижайш.';
 $labels['normal'] = 'Норм.';
@@ -200,6 +201,7 @@ $labels['surname'] = 'Фамилия';
 $labels['email'] = 'E-Mail';
 $labels['addcontact'] = 'Добавить выбранные контакты в список контактов';
 $labels['editcontact'] = 'Редактировать контакт';
+$labels['contacts'] = 'Контакты';
 $labels['edit'] = 'Правка';
 $labels['cancel'] = 'Отмена';
 $labels['save'] = 'Сохранить';
@@ -321,6 +323,21 @@ $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
+$labels['unicode'] = 'Unicode';
+$labels['english'] = 'Английский';
+$labels['westerneuropean'] = 'Западноевропейский';
+$labels['easterneuropean'] = 'Восточноевропейский';
+$labels['southeasterneuropean'] = 'Юго-Восточноевропейский';
 $labels['cyrillic'] = 'Кириллица';
+$labels['arabic'] = 'Арабский';
+$labels['greek'] = 'Греческий';
+$labels['hebrew'] = 'Иврит';
+$labels['turkish'] = 'Турецкий';
+$labels['thai'] = 'Тайский';
+$labels['celtic'] = 'Кельтский';
+$labels['vietnamese'] = 'Вьетнамский';
+$labels['japanese'] = 'Японский';
+$labels['korean'] = 'Корейский';
+$labels['chinese'] = 'Китайский';
 
 ?>
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index 6e0468ba5..1a1d9c723 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -113,5 +113,6 @@ $messages['smtperror'] = 'SMTP Error ($code): $msg';
 $messages['emailformaterror'] = 'Неверный адрес: $email';
 $messages['toomanyrecipients'] = 'Слишком много получателей, уменьшите их количество до $max.';
 $messages['maxgroupmembersreached'] = 'Размер группы больше максимально разрешенного - $max';
+$messages['internalerror'] = 'Произошла внутренняя ошибка. Попробуйте ещё раз';
 
 ?>
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 08c3342e8..4079cb2b2 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -151,7 +151,7 @@ $labels['listcolumns'] = 'Zoznam stĺpcov';
 $labels['listsorting'] = 'Triedenie stĺpcov';
 $labels['listorder'] = 'Usporiadanie';
 $labels['listmode'] = 'Režim zobrazenia zoznamu';
-$labels['folderactions'] = 'Zložka akcií...';
+$labels['folderactions'] = 'Akcie so zložkou...';
 $labels['compact'] = 'Zhustiť priečinok';
 $labels['empty'] = 'Prázdne';
 $labels['purge'] = 'Vyprázdniť';
@@ -178,6 +178,7 @@ $labels['revertto'] = 'Vrátiť sa na';
 $labels['attachments'] = 'Prílohy';
 $labels['upload'] = 'Nahrať';
 $labels['close'] = 'Zatvoriť';
+$labels['messageoptions'] = 'Nastavenia správy...';
 $labels['low'] = 'Nízka';
 $labels['lowest'] = 'Najnižšia';
 $labels['normal'] = 'Normálna';
@@ -345,4 +346,4 @@ $labels['japanese'] = 'Japončina';
 $labels['korean'] = 'Korejčina';
 $labels['chinese'] = 'Čínština';
 
-?>
\ No newline at end of file
+?>
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 55892474f..52f37fb26 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -177,6 +177,7 @@ $labels['revertto'] = '恢復至';
 $labels['attachments'] = '附加檔案';
 $labels['upload'] = '上傳';
 $labels['close'] = '關閉';
+$labels['messageoptions'] = '郵件選項...';
 $labels['low'] = '低';
 $labels['lowest'] = '最低';
 $labels['normal'] = '普通';