diff --git a/po/id.po b/po/id.po
index 6e818e1c..8e4d7eaa 100644
--- a/po/id.po
+++ b/po/id.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: geary master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=geary&keywords=I18N+L10N&component=internationalization\n"
-"POT-Creation-Date: 2017-11-19 07:35+0000\n"
-"PO-Revision-Date: 2017-11-30 13:06+0700\n"
+"POT-Creation-Date: 2018-03-06 05:29+0000\n"
+"PO-Revision-Date: 2018-03-13 13:14+0700\n"
 "Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/geary/"
 "language/id/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -132,7 +132,7 @@ msgstr "Geary menunjukkan penyusun rich text"
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Surat;Surel;Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 
-#: desktop/org.gnome.Geary.desktop.in:20 ui/gtk/menus.ui:7
+#: desktop/org.gnome.Geary.desktop.in:21 ui/gtk/menus.ui:7
 msgid "Compose Message"
 msgstr "Susun Pesan"
 
@@ -157,8 +157,8 @@ msgid "Maximize window"
 msgstr "Maksimalkan jendela"
 
 #: desktop/org.gnome.Geary.gschema.xml:21
-msgid "True if library application is maximized, false otherwise."
-msgstr "True jika pustaka aplikasi dimaksimalkan, false jika sebaliknya."
+msgid "True if the application window is maximized, false otherwise."
+msgstr "True jika jendela aplikasi dimaksimalkan, false jika sebaliknya."
 
 #: desktop/org.gnome.Geary.gschema.xml:26
 msgid "Width of window"
@@ -468,7 +468,7 @@ msgstr "Hak Cipta 2016-2017 Tim Pengembang Geary."
 msgid "Visit the Geary web site"
 msgstr "Kunjungi situs web Geary"
 
-#: src/client/application/geary-application.vala:424
+#: src/client/application/geary-application.vala:423
 #, c-format
 msgid "About %s"
 msgstr "Tentang %s"
@@ -476,12 +476,12 @@ msgstr "Tentang %s"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada.taro@example.com>
-#: src/client/application/geary-application.vala:428
+#: src/client/application/geary-application.vala:427
 msgid "translator-credits"
 msgstr ""
 "Andika Triwidada <andika@gmail.com>, 2012, 2013, 2016, 2017\n"
 "Dani Pratomo <elementaryindo@gmail.com>, 2012.\n"
-"Kukuh Syafaat <syafaatkukuh@gmail.com>, 2017."
+"Kukuh Syafaat <syafaatkukuh@gmail.com>, 2017, 2018."
 
 #: src/client/application/geary-args.vala:10
 msgid "Start Geary with hidden main window"
@@ -565,15 +565,15 @@ msgstr "Gagal mengurai opsi baris perintah: %s\n"
 msgid "Unrecognized command line option “%s”\n"
 msgstr "Opsi baris perintah tidak dikenal \"%s\"\n"
 
-#: src/client/application/geary-controller.vala:616
+#: src/client/application/geary-controller.vala:677
 msgid "Unable to store server trust exception"
 msgstr "Tak bisa menyimpan pengecualian kepercayaan server"
 
-#: src/client/application/geary-controller.vala:851
+#: src/client/application/geary-controller.vala:905
 msgid "Your settings are insecure"
 msgstr "Pengaturan Anda tak aman"
 
-#: src/client/application/geary-controller.vala:852
+#: src/client/application/geary-controller.vala:906
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
@@ -583,17 +583,17 @@ msgstr ""
 "nama pengguna dan sandi Anda bisa dibaca orang lain di jaringan ini. Anda "
 "yakin ingin melakukan ini?"
 
-#: src/client/application/geary-controller.vala:853
+#: src/client/application/geary-controller.vala:907
 msgid "Co_ntinue"
 msgstr "La_njutkan"
 
 #. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: src/client/application/geary-controller.vala:966
+#: src/client/application/geary-controller.vala:1020
 #: src/client/components/status-bar.vala:29
 msgid "Error sending email"
 msgstr "Galat saat mengirim surel"
 
-#: src/client/application/geary-controller.vala:967
+#: src/client/application/geary-controller.vala:1021
 msgid ""
 "Geary encountered an error sending an email.  If the problem persists, "
 "please manually delete the email from your Outbox folder."
@@ -603,12 +603,12 @@ msgstr ""
 
 #. Displayed in the space-limited status bar when a message fails to be uploaded
 #. to Sent Mail after being sent.
-#: src/client/application/geary-controller.vala:971
+#: src/client/application/geary-controller.vala:1025
 #: src/client/components/status-bar.vala:33
 msgid "Error saving sent mail"
 msgstr "Galat saat menyimpan surel terkirim"
 
-#: src/client/application/geary-controller.vala:972
+#: src/client/application/geary-controller.vala:1026
 msgid ""
 "Geary encountered an error saving a sent message to Sent Mail.  The message "
 "will stay in your Outbox folder until you delete it."
@@ -616,19 +616,19 @@ msgstr ""
 "Gary menemui galat ketika menyimpan sebuah surel terkirim ke Sent Mail.  "
 "Pesan akan tetap berada di folder Kotak Keluar Anda sampai Anda menghapusnya."
 
-#: src/client/application/geary-controller.vala:1045
+#: src/client/application/geary-controller.vala:1093
 msgid "Labels"
 msgstr "Label"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: src/client/application/geary-controller.vala:1057
+#: src/client/application/geary-controller.vala:1105
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Tak bisa membuka basis data bagi %s"
 
-#: src/client/application/geary-controller.vala:1058
+#: src/client/application/geary-controller.vala:1106
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -652,20 +652,20 @@ msgstr ""
 "Membangun ulang basis data akan menghancurkan semua surel lokal dan "
 "lampirannya. <b>Surat pada server Anda tak akan terpengaruh.</b>"
 
-#: src/client/application/geary-controller.vala:1060
+#: src/client/application/geary-controller.vala:1108
 msgid "_Rebuild"
 msgstr "_Bangun Ulang"
 
-#: src/client/application/geary-controller.vala:1060
+#: src/client/application/geary-controller.vala:1108
 msgid "E_xit"
 msgstr "_Keluar"
 
-#: src/client/application/geary-controller.vala:1069
+#: src/client/application/geary-controller.vala:1117
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Tak bisa membangun ulang basis data bagi \"%s\""
 
-#: src/client/application/geary-controller.vala:1070
+#: src/client/application/geary-controller.vala:1118
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -678,14 +678,14 @@ msgstr ""
 
 #. some other problem opening the account ... as with other flow path, can't run
 #. Geary today with an account in unopened state, so have to exit
-#: src/client/application/geary-controller.vala:1092
-#: src/client/application/geary-controller.vala:1102
-#: src/client/application/geary-controller.vala:1113
+#: src/client/application/geary-controller.vala:1140
+#: src/client/application/geary-controller.vala:1150
+#: src/client/application/geary-controller.vala:1161
 #, c-format
 msgid "Unable to open local mailbox for %s"
 msgstr "Tak bisa membuka kotak surat bagi %s"
 
-#: src/client/application/geary-controller.vala:1093
+#: src/client/application/geary-controller.vala:1141
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -704,7 +704,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/geary-controller.vala:1103
+#: src/client/application/geary-controller.vala:1151
 msgid ""
 "The version number of the local mail database is formatted for a newer "
 "version of Geary. Unfortunately, the database cannot be “rolled back” to "
@@ -718,7 +718,7 @@ msgstr ""
 "\n"
 "Harap pasang versi Geary terbaru dan coba lagi."
 
-#: src/client/application/geary-controller.vala:1114
+#: src/client/application/geary-controller.vala:1162
 msgid ""
 "There was an error opening the local account. This is probably due to "
 "connectivity issues.\n"
@@ -729,15 +729,15 @@ msgstr ""
 "\n"
 "Harap periksa koneksi jaringan Anda dan start ulang Geary."
 
-#: src/client/application/geary-controller.vala:1901
+#: src/client/application/geary-controller.vala:1946
 msgid "Undo move (Ctrl+Z)"
 msgstr "Tak jadi pindah (Ctrl+Z)"
 
-#: src/client/application/geary-controller.vala:1911
+#: src/client/application/geary-controller.vala:1956
 msgid "Are you sure you want to open these attachments?"
 msgstr "Anda yakin ingin membuka lampiran-lampiran ini?"
 
-#: src/client/application/geary-controller.vala:1912
+#: src/client/application/geary-controller.vala:1957
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -745,76 +745,75 @@ msgstr ""
 "Lampiran berpotensi bahaya jika dibuka. Hanya buka berkas dari sumber "
 "terpercaya."
 
-#: src/client/application/geary-controller.vala:1913
+#: src/client/application/geary-controller.vala:1958
 msgid "Don’t _ask me again"
 msgstr "Jangan tanya s_aya lagi"
 
-#: src/client/application/geary-controller.vala:2009
+#: src/client/application/geary-controller.vala:2054
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Berkas bernama \"%s\" sudah ada. Anda ingin menimpanya?"
 
-#: src/client/application/geary-controller.vala:2011
+#: src/client/application/geary-controller.vala:2056
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr "Berkas telah ada di \"%s\".  Kalau ditimpa isi sebelumnya hilang."
 
-#: src/client/application/geary-controller.vala:2014
+#: src/client/application/geary-controller.vala:2059
 msgid "_Replace"
 msgstr "Timp_a"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: src/client/application/geary-controller.vala:2249
-msgid "Close open draft messages?"
-msgstr "Tutup draf pesan yang terbuka?"
+#: src/client/application/geary-controller.vala:2299
+msgid "Close the draft message?"
+msgid_plural "Close all draft messages?"
+msgstr[0] "Tutup semua draf pesan?"
 
-#: src/client/application/geary-controller.vala:2375
+#: src/client/application/geary-controller.vala:2425
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Kosongkan semua surel dari folder %s Anda?"
 
-#: src/client/application/geary-controller.vala:2376
+#: src/client/application/geary-controller.vala:2426
 msgid "This removes the email from Geary and your email server."
 msgstr "Ini menghapus surel dari Geary dan server surel Anda."
 
-#: src/client/application/geary-controller.vala:2377
+#: src/client/application/geary-controller.vala:2427
 msgid "This cannot be undone."
 msgstr "Ini tidak bisa dibatalkan."
 
-#: src/client/application/geary-controller.vala:2378
+#: src/client/application/geary-controller.vala:2428
 #, c-format
 msgid "Empty %s"
 msgstr "Kosongkan %s"
 
-#: src/client/application/geary-controller.vala:2395
+#: src/client/application/geary-controller.vala:2445
 #, c-format
 msgid "Error emptying %s"
 msgstr "Galat saat mengosongkan %s"
 
-#: src/client/application/geary-controller.vala:2425
+#: src/client/application/geary-controller.vala:2477
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Anda mau membuang pesan ini secara permanen?"
 
-#: src/client/application/geary-controller.vala:2427
+#: src/client/application/geary-controller.vala:2479
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/client/application/geary-controller.vala:2459
+#: src/client/application/geary-controller.vala:2511
 msgid "Undo archive (Ctrl+Z)"
 msgstr "Tak jadi arsipkan (Ctrl+Z)"
 
-#: src/client/application/geary-controller.vala:2474
+#: src/client/application/geary-controller.vala:2526
 msgid "Undo trash (Ctrl+Z)"
 msgstr "Tak jadi buang ke tong sampah (Ctrl+Z)"
 
-#: src/client/application/geary-controller.vala:2530
+#: src/client/application/geary-controller.vala:2582
 msgid "Undo (Ctrl+Z)"
 msgstr "Tak jadi (Ctrl+Z)"
 
-#: src/client/application/geary-controller.vala:2648
+#: src/client/application/geary-controller.vala:2694
 msgid "Failed to open default text editor."
 msgstr "Gagal membuka penyunting teks utama."
 
@@ -867,7 +866,7 @@ msgstr "Pindahkan percakapan"
 msgid "Move conversations"
 msgstr "Pindahkan percakapan"
 
-#: src/client/components/main-window.vala:395
+#: src/client/components/main-window.vala:397
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -914,10 +913,10 @@ msgstr "Masalah dengan koneksi ke server masuk untuk %s"
 #: src/client/components/main-window-info-bar.vala:73
 #: src/client/components/main-window-info-bar.vala:81
 #, c-format
-msgid "Network error talking to %s, check your Internet access try again"
+msgid "Network error talking to %s, check your Internet access and try again"
 msgstr ""
 "Terjadi kesalahan jaringan saat berbicara dengan %s, periksa akses Internet "
-"Anda coba lagi"
+"Anda dan coba lagi"
 
 #: src/client/components/main-window-info-bar.vala:74
 #: src/client/components/main-window-info-bar.vala:82
@@ -957,10 +956,11 @@ msgstr "Masalah berkomunikasi dengan server surat keluar"
 #: src/client/components/main-window-info-bar.vala:97
 #, c-format
 msgid ""
-"Could now communicate with %s for %s, server name and try again in a moment"
+"Could not communicate with %s for %s, check the server name and try again in "
+"a moment"
 msgstr ""
-"Tidak dapat berkomunikasi dengan %s untuk %s, nama server dan coba lagi "
-"dalam sekejap"
+"Tidak dapat berkomunikasi dengan %s untuk %s, periksa nama server dan coba "
+"lagi dalam sekejap"
 
 #. Translators: String substitution is the account name
 #: src/client/components/main-window-info-bar.vala:103
@@ -1146,23 +1146,23 @@ msgstr "URL tautan tidak valid"
 msgid "Invalid email address"
 msgstr "Alamat surel tidak valid"
 
-#: src/client/composer/composer-widget.vala:154
+#: src/client/composer/composer-widget.vala:158
 msgid "Saved"
 msgstr "Disimpan"
 
-#: src/client/composer/composer-widget.vala:155
+#: src/client/composer/composer-widget.vala:159
 msgid "Saving"
 msgstr "Menyimpan"
 
-#: src/client/composer/composer-widget.vala:156
+#: src/client/composer/composer-widget.vala:160
 msgid "Error saving"
 msgstr "Galat saat menyimpan"
 
-#: src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:161
 msgid "Press Backspace to delete quote"
 msgstr "Tekan Backspace untuk menghapus kutip"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:162
 msgid "New Message"
 msgstr "Pesan Baru"
 
@@ -1170,7 +1170,7 @@ msgstr "Pesan Baru"
 #. characters, that suggest an attachment; since this is full-word
 #. checking, include all variants of each word.  No spaces are
 #. allowed.
-#: src/client/composer/composer-widget.vala:167
+#: src/client/composer/composer-widget.vala:171
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1179,28 +1179,37 @@ msgstr ""
 "attachment|attachments|attached|enclose|enclosed|enclosing|encloses|"
 "enclosure|enclosures"
 
-#: src/client/composer/composer-widget.vala:1131
-#: src/client/composer/composer-widget.vala:1150
-msgid "Do you want to discard this message?"
-msgstr "Anda mau membuang pesan ini?"
+#. Translators: This dialog text is displayed to the
+#. user when closing a composer where the options are
+#. Keep, Discard or Cancel.
+#: src/client/composer/composer-widget.vala:1130
+msgid "Do you want to keep or discard this draft message?"
+msgstr "Anda mau menyimpan atau membuang draf pesan ini?"
 
-#: src/client/composer/composer-widget.vala:1254
+#. Translators: This dialog text is displayed to the
+#. user when closing a composer where the options are
+#. only Discard or Cancel.
+#: src/client/composer/composer-widget.vala:1158
+msgid "Do you want to discard this draft message?"
+msgstr "Anda mau membuang draf pesan ini?"
+
+#: src/client/composer/composer-widget.vala:1266
 msgid "Send message with an empty subject and body?"
 msgstr "Kirim pesan dengan subjek dan isi kosong?"
 
-#: src/client/composer/composer-widget.vala:1256
+#: src/client/composer/composer-widget.vala:1268
 msgid "Send message with an empty subject?"
 msgstr "Kirim pesan dengan subjek kosong?"
 
-#: src/client/composer/composer-widget.vala:1258
+#: src/client/composer/composer-widget.vala:1270
 msgid "Send message with an empty body?"
 msgstr "Kirim pesan tanpa isi?"
 
-#: src/client/composer/composer-widget.vala:1262
+#: src/client/composer/composer-widget.vala:1274
 msgid "Send message without an attachment?"
 msgstr "Kirim pesan tanpa lampiran?"
 
-#: src/client/composer/composer-widget.vala:1524
+#: src/client/composer/composer-widget.vala:1536
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "\"%s\" sudah dilampirkan untuk pengiriman."
@@ -1210,73 +1219,73 @@ msgstr "\"%s\" sudah dilampirkan untuk pengiriman."
 #. description of the document type, the second will
 #. be a human-friendly size string. For example:
 #. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1532
+#: src/client/composer/composer-widget.vala:1544
 #: src/client/conversation-viewer/conversation-email.vala:138
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: src/client/composer/composer-widget.vala:1569
+#: src/client/composer/composer-widget.vala:1581
 #, c-format
 msgid "“%s” could not be found."
 msgstr "\"%s\" tidak ditemukan."
 
-#: src/client/composer/composer-widget.vala:1575
+#: src/client/composer/composer-widget.vala:1587
 #, c-format
 msgid "“%s” is a folder."
 msgstr "\"%s\" adalah sebuah folder."
 
-#: src/client/composer/composer-widget.vala:1581
+#: src/client/composer/composer-widget.vala:1593
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "\"%s\" adalah berkas kosong."
 
-#: src/client/composer/composer-widget.vala:1594
+#: src/client/composer/composer-widget.vala:1606
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "\"%s\" tak bisa dibuka untuk dibaca."
 
-#: src/client/composer/composer-widget.vala:1602
+#: src/client/composer/composer-widget.vala:1614
 msgid "Cannot add attachment"
 msgstr "Tak bisa menambah lampiran"
 
-#: src/client/composer/composer-widget.vala:1654
+#: src/client/composer/composer-widget.vala:1666
 msgid "To: "
 msgstr "Kepada: "
 
-#: src/client/composer/composer-widget.vala:1657
+#: src/client/composer/composer-widget.vala:1669
 msgid "Cc: "
 msgstr "Cc: "
 
-#: src/client/composer/composer-widget.vala:1660
+#: src/client/composer/composer-widget.vala:1672
 msgid "Bcc: "
 msgstr "Bcc: "
 
-#: src/client/composer/composer-widget.vala:1663
+#: src/client/composer/composer-widget.vala:1675
 msgid "Reply-To: "
 msgstr "Balas-Ke: "
 
-#: src/client/composer/composer-widget.vala:1795
+#: src/client/composer/composer-widget.vala:1808
 msgid "Select Color"
 msgstr "Pilih Warna"
 
 #. Displayed in the From dropdown to indicate an "alternate email address"
 #. for an account.  The first printf argument will be the alternate email
 #. address, and the second will be the account's primary email address.
-#: src/client/composer/composer-widget.vala:1995
+#: src/client/composer/composer-widget.vala:2016
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s via %2$s"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2037
+#: src/client/composer/composer-widget.vala:2062
 msgid "_From:"
 msgstr "_Dari:"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2262
+#: src/client/composer/composer-widget.vala:2287
 msgid "Images"
 msgstr "Citra"
 
@@ -1292,40 +1301,40 @@ msgstr "Tambahkan bahasa ini ke daftar yang disukai"
 msgid "Search for more languages"
 msgstr "Cari lebih banyak bahasa lagi"
 
-#: src/client/conversation-list/conversation-list-view.vala:289
+#: src/client/conversation-list/conversation-list-view.vala:283
 msgid "Delete conversation"
 msgstr "Hapus percakapan"
 
-#: src/client/conversation-list/conversation-list-view.vala:292
+#: src/client/conversation-list/conversation-list-view.vala:286
 #: ui/main-toolbar-menus.ui:16
 msgid "Mark as _Read"
 msgstr "Tandai Sudah Di_baca"
 
-#: src/client/conversation-list/conversation-list-view.vala:295
+#: src/client/conversation-list/conversation-list-view.vala:289
 #: ui/main-toolbar-menus.ui:20
 msgid "Mark as _Unread"
 msgstr "Tandai _Belum Dibaca"
 
-#: src/client/conversation-list/conversation-list-view.vala:298
+#: src/client/conversation-list/conversation-list-view.vala:292
 #: ui/main-toolbar-menus.ui:28
 msgid "U_nstar"
 msgstr "Hapus bi_ntang"
 
-#: src/client/conversation-list/conversation-list-view.vala:300
+#: src/client/conversation-list/conversation-list-view.vala:294
 #: ui/main-toolbar-menus.ui:24
 msgid "_Star"
 msgstr "_Bintangi"
 
-#: src/client/conversation-list/conversation-list-view.vala:303
+#: src/client/conversation-list/conversation-list-view.vala:297
 #: ui/conversation-email-menus.ui:8
 msgid "_Reply"
 msgstr "B_alas"
 
-#: src/client/conversation-list/conversation-list-view.vala:304
+#: src/client/conversation-list/conversation-list-view.vala:298
 msgid "R_eply All"
 msgstr "Balas S_emua"
 
-#: src/client/conversation-list/conversation-list-view.vala:305
+#: src/client/conversation-list/conversation-list-view.vala:299
 #: ui/conversation-email-menus.ui:18
 msgid "_Forward"
 msgstr "_Teruskan"
@@ -1340,52 +1349,56 @@ msgstr "Aku"
 msgid "Unknown"
 msgstr "Tak dikenal"
 
+#: src/client/conversation-viewer/conversation-message.vala:60
+msgid "This email address may have been forged"
+msgstr "Alamat surel ini mungkin telah dipalsukan"
+
 #. Preview headers
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:325
+#: src/client/conversation-viewer/conversation-message.vala:330
 msgid "No sender"
 msgstr "Tidak ada pengirim"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the header preview for a message.
-#: src/client/conversation-viewer/conversation-message.vala:580
+#: src/client/conversation-viewer/conversation-message.vala:588
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:701
+#: src/client/conversation-viewer/conversation-message.vala:687
 msgid "Image"
 msgstr "Citra"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:72
+#: src/client/conversation-viewer/conversation-viewer.vala:74
 msgid "No conversations selected"
 msgstr "Tidak ada percakapan yang dipilih"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:74
+#: src/client/conversation-viewer/conversation-viewer.vala:76
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Memilih suatu percakapan dari daftar akan menampilkannya di sini"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:79
+#: src/client/conversation-viewer/conversation-viewer.vala:81
 msgid "Multiple conversations selected"
 msgstr "Beberapa percakapan dipilih"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:81
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "Memilih suatu aksi akan berlaku ke semua percakapan yang dipilih"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:86
-#: src/client/conversation-viewer/conversation-viewer.vala:93
+#: src/client/conversation-viewer/conversation-viewer.vala:88
+#: src/client/conversation-viewer/conversation-viewer.vala:95
 msgid "No conversations found"
 msgstr "Tidak ditemukan percakapan"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:88
+#: src/client/conversation-viewer/conversation-viewer.vala:90
 msgid "This folder does not contain any conversations"
 msgstr "Folder ini tak memuat percakapan apapun"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:95
+#: src/client/conversation-viewer/conversation-viewer.vala:97
 msgid "Your search returned no results, try refining your search terms"
 msgstr ""
 "Pencarian Anda tidak mengembalikan hasil, cobalah memperbaiki istilah yang "
@@ -1521,19 +1534,19 @@ msgstr[0] "%d hasil"
 msgid "%s — New Messages"
 msgstr "%s - Pesan Baru"
 
-#: src/client/notification/libnotify.vala:74
+#: src/client/notification/libnotify.vala:70
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d pesan baru"
 
-#: src/client/notification/libnotify.vala:77
+#: src/client/notification/libnotify.vala:73
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, total %d pesan baru"
 
-#: src/client/notification/libnotify.vala:109
+#: src/client/notification/libnotify.vala:105
 #, c-format
 msgid ""
 "%s\n"
@@ -1545,7 +1558,7 @@ msgstr[0] ""
 "%s\n"
 "(%d pesan baru lain bagi %s)"
 
-#: src/client/notification/libnotify.vala:165
+#: src/client/notification/libnotify.vala:161
 msgid "Open"
 msgstr "Buka"
 
@@ -1627,7 +1640,7 @@ msgstr "Kemarin"
 msgid "%A"
 msgstr "%A"
 
-#: src/client/util/util-email.vala:30 src/engine/rfc822/rfc822-message.vala:908
+#: src/client/util/util-email.vala:30 src/engine/rfc822/rfc822-message.vala:899
 msgid "(no subject)"
 msgstr "(tanpa perihal)"
 
@@ -1737,7 +1750,7 @@ msgstr "Nihil"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:101
+#: src/engine/imap-db/imap-db-account.vala:100
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "attachment"
@@ -1750,7 +1763,7 @@ msgstr "attachment"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:110
+#: src/engine/imap-db/imap-db-account.vala:109
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "bcc"
@@ -1762,7 +1775,7 @@ msgstr "bcc"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:118
+#: src/engine/imap-db/imap-db-account.vala:117
 msgctxt "Search operator"
 msgid "body"
 msgstr "body"
@@ -1775,7 +1788,7 @@ msgstr "body"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:127
+#: src/engine/imap-db/imap-db-account.vala:126
 msgctxt "Search operator"
 msgid "cc"
 msgstr "cc"
@@ -1788,7 +1801,7 @@ msgstr "cc"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:136
+#: src/engine/imap-db/imap-db-account.vala:135
 msgctxt "Search operator"
 msgid "from"
 msgstr "from"
@@ -1800,7 +1813,7 @@ msgstr "from"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:144
+#: src/engine/imap-db/imap-db-account.vala:143
 msgctxt "Search operator"
 msgid "is"
 msgstr "is"
@@ -1812,7 +1825,7 @@ msgstr "is"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: src/engine/imap-db/imap-db-account.vala:152
+#: src/engine/imap-db/imap-db-account.vala:151
 msgctxt "Search operator"
 msgid "subject"
 msgstr "subject"
@@ -1825,7 +1838,7 @@ msgstr "subject"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:161
+#: src/engine/imap-db/imap-db-account.vala:160
 msgctxt "Search operator"
 msgid "to"
 msgstr "to"
@@ -1838,7 +1851,7 @@ msgstr "to"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:182
+#: src/engine/imap-db/imap-db-account.vala:181
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "me"
@@ -1850,7 +1863,7 @@ msgstr "me"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:194
+#: src/engine/imap-db/imap-db-account.vala:193
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "me"
@@ -1862,7 +1875,7 @@ msgstr "me"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:206
+#: src/engine/imap-db/imap-db-account.vala:205
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "read"
@@ -1875,7 +1888,7 @@ msgstr "read"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:217
+#: src/engine/imap-db/imap-db-account.vala:216
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "starred"
@@ -1887,7 +1900,7 @@ msgstr "starred"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:227
+#: src/engine/imap-db/imap-db-account.vala:226
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "unread"
@@ -1896,7 +1909,7 @@ msgstr "unread"
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:647
+#: src/engine/imap-engine/imap-engine-generic-account.vala:871
 msgid "Drafts | Draft"
 msgstr "Draf"
 
@@ -1904,13 +1917,13 @@ msgstr "Draf"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:656
+#: src/engine/imap-engine/imap-engine-generic-account.vala:880
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Sent | Sent Mail | Sent Email | Sent E-Mail | Surat Keluar | Terkirim"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:661
+#: src/engine/imap-engine/imap-engine-generic-account.vala:885
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Dikirim"
@@ -1919,7 +1932,7 @@ msgstr "Dikirim"
 #. Spam mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:671
+#: src/engine/imap-engine/imap-engine-generic-account.vala:895
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -1931,13 +1944,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:681
+#: src/engine/imap-engine/imap-engine-generic-account.vala:905
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Trash | Rubbish | Rubbish Bin | Sampah | Tong Sampah | Tempat Sampah"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:686
+#: src/engine/imap-engine/imap-engine-generic-account.vala:910
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Dihapus"
@@ -1946,7 +1959,7 @@ msgstr "Dihapus"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:696
+#: src/engine/imap-engine/imap-engine-generic-account.vala:920
 msgid "Archive | Archives"
 msgstr "Arsip | Archive | Archives"
 
@@ -2051,31 +2064,31 @@ msgstr "_Percayai Server Ini"
 msgid "_Don’t Trust This Server"
 msgstr "_Jangan Percayai Server Ini"
 
-#: ui/composer-headerbar.ui:26 ui/composer-headerbar.ui:138
+#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:173
 msgid "Detach (Ctrl+D)"
 msgstr "Lepas (Ctrl+D)"
 
-#: ui/composer-headerbar.ui:51 ui/composer-headerbar.ui:75
+#: ui/composer-headerbar.ui:56 ui/composer-headerbar.ui:82
 msgid "Attach File (Ctrl+T)"
 msgstr "Lampirkan Berkas (Ctrl+T)"
 
-#: ui/composer-headerbar.ui:92
+#: ui/composer-headerbar.ui:106
 msgid "Include Original Attachments"
 msgstr "Sertakan Lampiran Asli"
 
-#: ui/composer-headerbar.ui:162
-msgid "Send (Ctrl+Enter)"
-msgstr "Kirim (Ctrl+Enter)"
-
-#: ui/composer-headerbar.ui:163
+#: ui/composer-headerbar.ui:201
 msgid "_Send"
 msgstr "_Kirim"
 
-#: ui/composer-headerbar.ui:186
+#: ui/composer-headerbar.ui:206
+msgid "Send (Ctrl+Enter)"
+msgstr "Kirim (Ctrl+Enter)"
+
+#: ui/composer-headerbar.ui:229
 msgid "Discard and Close"
 msgstr "Buang dan Tutup"
 
-#: ui/composer-headerbar.ui:203
+#: ui/composer-headerbar.ui:253
 msgid "Save and Close"
 msgstr "Simpan dan Tutup"
 
@@ -2172,84 +2185,92 @@ msgid "_Inspect…"
 msgstr "Per_iksa…"
 
 #. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:55
+#: ui/composer-widget.ui:56
 msgid "_To"
 msgstr "_Ke"
 
-#: ui/composer-widget.ui:74
+#: ui/composer-widget.ui:75
 msgid "_Cc"
 msgstr "_Cc"
 
-#: ui/composer-widget.ui:129
+#: ui/composer-widget.ui:130
 msgid "_Subject"
 msgstr "_Perihal"
 
-#: ui/composer-widget.ui:148
+#: ui/composer-widget.ui:149
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: ui/composer-widget.ui:178
+#: ui/composer-widget.ui:179
 msgid "_Reply-To"
 msgstr "B_alas-Ke"
 
 #. Geary account mail will be sent from
-#: ui/composer-widget.ui:207
+#: ui/composer-widget.ui:208
 msgid "From"
 msgstr "Dari"
 
-#: ui/composer-widget.ui:292
+#: ui/composer-widget.ui:293
 msgid "Drop files here"
 msgstr "Jatuhkan berkas di sini"
 
-#: ui/composer-widget.ui:308
+#: ui/composer-widget.ui:309
 msgid "To add them as attachments"
 msgstr "Untuk menambahkan mereka sebagai lampiran"
 
-#: ui/composer-widget.ui:347
+#: ui/composer-widget.ui:348
 msgid "Undo last edit (Ctrl+Z)"
 msgstr "Batalkan penyuntingan terakhir (Ctrl+Z)"
 
-#: ui/composer-widget.ui:371
+#: ui/composer-widget.ui:372
 msgid "Redo last edit  (Ctrl+Shift+Z)"
 msgstr "Ulangi penyuntingan terakhir (Ctrl+Shift+Z)"
 
-#: ui/composer-widget.ui:409
+#: ui/composer-widget.ui:410
 msgid "Bold (Ctrl+B)"
 msgstr "Tebal (Ctrl+B)"
 
-#: ui/composer-widget.ui:433
+#: ui/composer-widget.ui:434
 msgid "Italic (Ctrl+I)"
 msgstr "Miring (Ctrl+I)"
 
-#: ui/composer-widget.ui:457
+#: ui/composer-widget.ui:458
 msgid "Underline (Ctrl+U)"
 msgstr "Garis bawah (Ctrl+U)"
 
-#: ui/composer-widget.ui:481
+#: ui/composer-widget.ui:482
 msgid "Strikethrough (Ctrl+K)"
 msgstr "Coret (Ctrl+K)"
 
-#: ui/composer-widget.ui:519
+#: ui/composer-widget.ui:520
+msgid "Insert unordered list"
+msgstr "Masukkan daftar tidak berurutan"
+
+#: ui/composer-widget.ui:544
+msgid "Insert ordered list"
+msgstr "Masukkan daftar berurutan"
+
+#: ui/composer-widget.ui:582
 msgid "Quote text  (Ctrl+])"
 msgstr "Kutip teks (Ctrl+])"
 
-#: ui/composer-widget.ui:543
+#: ui/composer-widget.ui:606
 msgid "Unquote text  (Ctrl+[)"
 msgstr "Tidak mengutip teks (Ctrl+[)"
 
-#: ui/composer-widget.ui:581
+#: ui/composer-widget.ui:644
 msgid "Insert or update selection link (Ctrl+L)"
 msgstr "Sisipkan atau mutakhirkan tautan yang dipilih (Ctrl+L)"
 
-#: ui/composer-widget.ui:605
+#: ui/composer-widget.ui:668
 msgid "Insert an image (Ctrl+G)"
 msgstr "Sisipkan citra (Ctrl+G)"
 
-#: ui/composer-widget.ui:639
+#: ui/composer-widget.ui:702
 msgid "Remove selection formatting (Ctrl+Space)"
 msgstr "Hapus format bagian yang dipilih (Ctrl+Space)"
 
-#: ui/composer-widget.ui:663
+#: ui/composer-widget.ui:726
 msgid "Select spell checking languages"
 msgstr "Pilih bahasa pemeriksaan ejaan"
 
@@ -2860,31 +2881,31 @@ msgstr "Penyimpanan"
 msgid "_Download mail"
 msgstr "Un_duh surat"
 
-#: ui/main-toolbar.ui:50
+#: ui/main-toolbar.ui:51
 msgid "Toggle search bar"
 msgstr "Jungkitkan bilah pencarian"
 
-#: ui/main-toolbar.ui:70
+#: ui/main-toolbar.ui:72
 msgid "Empty Spam or Trash folders"
 msgstr "Kosongkan folder Spam atau Sampah"
 
-#: ui/main-toolbar.ui:109
+#: ui/main-toolbar.ui:112
 msgid "Reply"
 msgstr "Balas"
 
-#: ui/main-toolbar.ui:131
+#: ui/main-toolbar.ui:135
 msgid "Reply All"
 msgstr "Balas Semua"
 
-#: ui/main-toolbar.ui:153
+#: ui/main-toolbar.ui:158
 msgid "Forward"
 msgstr "Teruskan"
 
-#: ui/main-toolbar.ui:255
+#: ui/main-toolbar.ui:264
 msgid "Toggle find bar"
 msgstr "Jungkitkan bilah pencarian"
 
-#: ui/main-toolbar.ui:295
+#: ui/main-toolbar.ui:306
 msgid "_Archive"
 msgstr "_Arsip"
 
@@ -2965,12 +2986,12 @@ msgid "Show _notifications for new mail"
 msgstr "Tu_njukkan pemberitahuan bagi surat baru"
 
 #: ui/preferences-dialog.ui:164
-msgid "Always _watch for new mail"
-msgstr "Selalu a_wasi surat baru"
+msgid "_Watch for new mail when closed"
+msgstr "A_wasi surat baru ketika ditutup"
 
 #: ui/preferences-dialog.ui:168
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary akan berjalan di latar dan memberitahukan adanya surel baru"
+msgid "Geary will keep running after all windows are closed"
+msgstr "Geary akan terus berjalan setelah semua jendela ditutup"
 
 #: ui/preferences-dialog.ui:195
 msgid "Preferences"
@@ -3004,6 +3025,9 @@ msgstr "Alamat surel:"
 msgid "Geary update in progress…"
 msgstr "Pemutakhiran Geary sedang berlangsung…"
 
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary akan berjalan di latar dan memberitahukan adanya surel baru"
+
 #~ msgid "Geary Email"
 #~ msgstr "Surel Geary"