diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
new file mode 100644
index 000000000..aad1f1073
--- /dev/null
+++ b/program/localization/id_ID/labels.inc
@@ -0,0 +1,185 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/id_ID/labels.inc                                             |
+ |                                                                       |
+ | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundQube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Putu Arya Sabda Wijaya (klunxer@gmail.com)                            |
+ +-----------------------------------------------------------------------+
+ 
+ //04:46 PM 1/9/2007 labels.inc	
+
+ 
+  
+*/
+
+$labels = array();
+$labels['welcome'] = 'Selamat datang di $product';
+$labels['username'] = 'Username';
+$labels['password'] = 'Password';
+$labels['server'] = 'Server';
+$labels['login'] = 'Masuk';
+$labels['logout'] = 'Keluar';
+$labels['mail'] = 'E-Mail';
+$labels['settings'] = 'Pengaturan Pribadi';
+$labels['addressbook'] = 'Buku Alamat';
+$labels['inbox'] = 'Kotak Masuk';
+$labels['drafts'] = 'Daftar tunggu';
+$labels['sent'] = 'Terkirim';
+$labels['trash'] = 'Item-itenm tergapus';
+$labels['junk'] = 'Sampah';
+$labels['subject'] = 'Judul';
+$labels['from'] = 'Pengirim';
+$labels['to'] = 'Penerima';
+$labels['cc'] = 'Kopi karbon';
+$labels['bcc'] = 'Kopi karbon buta';
+$labels['replyto'] = 'Balas kepada';
+$labels['date'] = 'Tangal';
+$labels['size'] = 'Ukuran';
+$labels['priority'] = 'Prioritas';
+$labels['organization'] = 'Organisasi';
+$labels['reply-to'] = 'Balas kepada';
+$labels['mailboxlist'] = 'Map-map';
+$labels['messagesfromto'] = 'Pesan $from kepada $to sebanyak $count';
+$labels['messagenrof'] = 'Pesan $nr sebanyak $count';
+$labels['moveto'] = 'dipindahkan...';
+$labels['download'] = 'unduh';
+$labels['filename'] = 'Nama berkas';
+$labels['filesize'] = 'Ukuran berkas';
+$labels['preferhtml'] = 'Lebih suka HTML';
+$labels['htmlmessage'] = 'Pesan HTML';
+$labels['prettydate'] = 'Tanggal cantik';
+$labels['addtoaddressbook'] = 'Tambahkan ke buku tamu';
+$labels['sun'] = 'Min';
+$labels['mon'] = 'Sen';
+$labels['tue'] = 'Sel';
+$labels['wed'] = 'Rab';
+$labels['thu'] = 'Kam';
+$labels['fri'] = 'Jum';
+$labels['sat'] = 'Sab';
+$labels['sunday'] = 'Minggu';
+$labels['monday'] = 'Senin';
+$labels['tuesday'] = 'Selasa';
+$labels['wednesday'] = 'Rabu';
+$labels['thursday'] = 'Kamis';
+$labels['friday'] = 'Jumat';
+$labels['saturday'] = 'Sabtu';
+$labels['today'] = 'Hari ini';
+$labels['checkmail'] = 'Periksa pesan baru';
+$labels['writenewmessage'] = 'Buat pesan baru';
+$labels['replytomessage'] = 'Balas pesan';
+$labels['replytoallmessage'] = 'balas ke pengirim dan semua penerima';
+$labels['forwardmessage'] = 'Teruskan pesan';
+$labels['deletemessage'] = 'Pindahkan pesan ke tong sampah';
+$labels['printmessage'] = 'cetak pesan ini';
+$labels['previousmessage'] = 'Perlihatkan pesan sebelumnya';
+$labels['previousmessages'] = 'Perlihatkan kumpuan pesan-pesan sebelumnya';
+$labels['firstmessage'] = 'Perlihatkan pesan pertama';
+$labels['firstmessages'] = 'Perlihatkan kumpulan pesan pertama';
+$labels['nextmessage'] = 'Perlihatkan pesan berikutnya';
+$labels['nextmessages'] = 'Perlihatkan kumpuan pesan-pesan berikutnya';
+$labels['lastmessage'] = 'Perlihatkan pesan terakhir';
+$labels['lastmessages'] = 'Perlihatkan kumpulan pesan terkahir';
+$labels['backtolist'] = 'Kembali ke daftar pesan';
+$labels['viewsource'] = 'Perlihatkan kode sumber';
+$labels['select'] = 'Pilih';
+$labels['all'] = 'Semua';
+$labels['none'] = 'Tidak satupun';
+$labels['unread'] = 'Belum terbaca';
+$labels['compact'] = 'Ramping';
+$labels['empty'] = 'Kosong';
+$labels['purge'] = 'Kosongkan';
+$labels['quota'] = 'Penggunaan kandar';
+$labels['unknown'] = 'Tidak dikenal';
+$labels['unlimited'] = 'Tidak terbatas';
+$labels['quicksearch'] = 'Pencarian cepat';
+$labels['resetsearch'] = 'Atur ulang pencarian';
+$labels['compose'] = 'Tulis sebuah pesan';
+$labels['sendmessage'] = 'Kirim pesan sekarang';
+$labels['savemessage'] = 'Simpan daftar tunggu ini';
+$labels['addattachment'] = 'Sisipkan sebuah berkas';
+$labels['charset'] = 'set karakter';
+$labels['editortype'] = 'Tipe editor';
+$labels['returnreceipt'] = 'Kembalikan penerima';
+$labels['checkspelling'] = 'Pemeriksaan ejaan';
+$labels['resumeediting'] = 'Lanjutkan mengedit';
+$labels['revertto'] = 'Balik ke';
+$labels['attachments'] = 'Sisispan';
+$labels['upload'] = 'unggah';
+$labels['close'] = 'Tutup';
+$labels['low'] = 'Rendah';
+$labels['lowest'] = 'Terrendah';
+$labels['normal'] = 'Normal';
+$labels['high'] = 'Tinggi';
+$labels['highest'] = 'tertinggi';
+$labels['nosubject'] = '(tanpa judul)';
+$labels['showimages'] = 'Tampilkan gambar';
+$labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'Text murni';
+$labels['name'] = 'Tampilkan nama';
+$labels['firstname'] = 'Nama depan';
+$labels['surname'] = 'Nama belakang';
+$labels['email'] = 'E-Mail';
+$labels['addcontact'] = 'Tambah kontak baru';
+$labels['editcontact'] = 'Ubah kontak';
+$labels['edit'] = 'Ubah';
+$labels['cancel'] = 'atal';
+$labels['save'] = 'Simpan';
+$labels['delete'] = 'Hapus';
+$labels['newcontact'] = 'Buat kartu kontak baru';
+$labels['deletecontact'] = 'Hapus kontak terpilih';
+$labels['composeto'] = 'Tulis surat kepada';
+$labels['contactsfromto'] = 'Kontak $from kepada $to sebanyak $count';
+$labels['print'] = 'Cetak';
+$labels['export'] = 'Ekspor';
+$labels['previouspage'] = 'Perlihatkan kumpulan sebelumnya';
+$labels['firstpage'] = 'Perlihatkan kumpulan pertama';
+$labels['nextpage'] = 'Perlihatkan kumpulan selanjutnya';
+$labels['lastpage'] = 'Perlihatkan kumpulan terakhir';
+$labels['ldapsearch'] = 'Pencarian direktori LDAP';
+$labels['ldappublicsearchname'] = 'Nama kontak';
+$labels['ldappublicsearchtype'] = 'Tepat betul?';
+$labels['ldappublicserverselect'] = 'Pilih servers';
+$labels['ldappublicsearchfield'] = 'Cari di';
+$labels['ldappublicsearchform'] = 'Mencari kontak';
+$labels['ldappublicsearch'] = 'Pencarian';
+$labels['settingsfor'] = 'Pengaturan untuk';
+$labels['preferences'] = 'Pilihan';
+$labels['userpreferences'] = 'Pilihan pengguna';
+$labels['editpreferences'] = 'Ubah pilihan pengguna';
+$labels['identities'] = 'Identitas';
+$labels['manageidentities'] = 'Atur identitas untuk akun ini';
+$labels['newidentity'] = 'Identitas baru';
+$labels['newitem'] = 'Item baru';
+$labels['edititem'] = 'Ubah item';
+$labels['setdefault'] = 'Pengaturan Awal';
+$labels['language'] = 'Bahasa';
+$labels['timezone'] = 'Daerah Waktu';
+$labels['pagesize'] = 'Baris per halaman';
+$labels['signature'] = 'Tanda tangan';
+$labels['dstactive'] = 'Waktu Musim Panas'; // thanks to Mr. Priyadi (priyadi.net) for helping me on this words 
+$labels['htmleditor'] = 'Tulis pesan HTML';
+$labels['htmlsignature'] = 'Tandatangan HTML';
+$labels['previewpane'] = 'Perlihatkan tempat melihat';
+$labels['autosavedraft'] = 'Otomatis menyimpan pesan tertunda';
+$labels['everynminutes'] = 'setiap $n menit';
+$labels['never'] = 'tidak pernah';
+$labels['folder'] = 'Map';
+$labels['folders'] = 'Map-map';
+$labels['foldername'] = 'Nama map';
+$labels['subscribed'] = 'Subscribed';
+$labels['create'] = 'Buat';
+$labels['createfolder'] = 'Buat map baru';
+$labels['rename'] = 'Namai ulang';
+$labels['renamefolder'] = 'Namai ulang map';
+$labels['deletefolder'] = 'Hapus map';
+$labels['managefolders'] = 'Atur map';
+$labels['sortby'] = 'Urut berdasarkan';
+$labels['sortasc'] = 'Urut menaik';
+$labels['sortdesc'] = 'Urut menurun';
+?>
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
new file mode 100644
index 000000000..367ef5c6c
--- /dev/null
+++ b/program/localization/id_ID/messages.inc
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/id_ID/messages.inc                                           |
+ |                                                                       |
+ | Language file of the RoundCube Webmail client                         |
+ | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Putu Arya Sabda WIjaya (klunxer@gmail.com)                            |
+ +-----------------------------------------------------------------------+
+
+ //04:04 PM 1/9/2007 messages.inc
+ 
+*/
+
+$messages = array();
+$messages['loginfailed'] = 'Gagal masuk';
+$messages['cookiesdisabled'] = 'Browser Anda tidak menerima cookies';
+$messages['sessionerror'] = 'Session Anda invalid atau kadaluwarsa';
+$messages['imaperror'] = 'Koneksi ke IMAP server gagal';
+$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['loadingdata'] = 'Loading data...';
+$messages['checkingmail'] = 'Memeriksa pesan baru...';
+$messages['sendingmessage'] = 'Mengirim pesan...';
+$messages['messagesent'] = 'Pesan terkirim';
+$messages['savingmessage'] = 'Menyimpan pesan...';
+$messages['messagesaved'] = 'MMenyimpan pesan ke daftar tunggu';
+$messages['successfullysaved'] = 'Berhasil disimpan';
+$messages['addedsuccessfully'] = 'Kontak berhasil ditambahkan ke buku alamat';
+$messages['contactexists'] = 'Konatk dengan alamat e-mail ini sudah ada';
+$messages['blockedimages'] = 'Untuk melindungi privasi Anda, gambar-gambar diluar server diblok pada pesan ini.';
+$messages['encryptedmessage'] = 'Pesan ini terenkripsi dan tidak bisa ditampilkan. Maaf!';
+$messages['nocontactsfound'] = 'Kontak tidak ditemukan';
+$messages['sendingfailed'] = 'Pengiriman pesan gagal';
+$messages['errorsaving'] = 'Error ketika menyimpan';
+$messages['errormoving'] = 'Pesan tidak bisa dipindahkan';
+$messages['errordeleting'] = 'Pesan tidak bisa dihapus';
+$messages['deletecontactconfirm'] = 'Apakah anda yakin untuk menghapus kontak terpilih?';
+$messages['deletemessagesconfirm'] = 'Yakin menghapus pesan terpilih?';
+$messages['deletefolderconfirm'] = 'Apakah anda benar-benar ingin menghapus map ini?';
+$messages['purgefolderconfirm'] = 'Yakin menghapus semua pesan pada map ini?';
+$messages['formincomplete'] = 'Blangko tidak terisi semua';
+$messages['noemailwarning'] = 'Tolong masukkan alamat email yang valid';
+$messages['nonamewarning'] = 'Tolong masukkan nama';
+$messages['nopagesizewarning'] = 'Tolong masukkan ukuran halaman';
+$messages['norecipientwarning'] = 'Tolong masukkan sedikitnya satu penerima';
+$messages['nosubjectwarning'] = '\"Judul\" kosong. Isi judul sekarang?';
+$messages['nobodywarning'] = 'Kirim pesan ini tanpa teks?';
+$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['searchsuccessful'] = '$nr pesan ditemukan';
+$messages['searchnomatch'] = 'Pencarian kosong';
+$messages['searching'] = 'Mencari...';
+$messages['checking'] = 'Memeriksa...';
+$messages['nospellerrors'] = 'Tidak ditemkan kesalahan ejaan';
+$messages['folderdeleted'] = 'Map berhasil dihapus';
+$messages['deletedsuccessfully'] = 'Berhasil dihapus';
+$messages['converting'] = 'Mengembalikan pesan ke format awal...';
+$messages['messageopenerror'] = 'Tidak dapat mengambil pesan dari server';
+$messages['fileuploaderror'] = 'Gagal mengunggah berkas';
+$messages['filesizeerror'] = 'Berkas terunggah mencapai ukuran maksimal dari $size';
+?>
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 8278bf750..bf4e6d131 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -42,6 +42,7 @@
 	'el'    => 'Greek',
 	'hr'	=> 'Hrvatski',
 	'hu'    => 'Hungarian',
+	'id_ID'	=> 'Indonesian',
 	'it'    => 'Italiano',
 	'ja'    => 'Japanese (日本語)',
 	'kr'    => 'Korean',
@@ -81,4 +82,4 @@ $rcube_language_aliases = array(
 $rcube_charsets = array();
 
 
-?>
\ No newline at end of file
+?>