talons

commit 5c1007bd92da34345084261acfa128dd999db28b
parent d96ced2e4fcab70ec8e2ddaa162da26fc5b14647
Author: paul <paul@claws-mail.org>
Date:   Thu,  8 Jul 2021 09:52:47 +0100

update en_GB translation

Diffstat:
M
po/en_GB.po
 | 
6766
++++++++++++++++++++++++++++++++++++++++++-------------------------------------

1 file changed, 3629 insertions(+), 3137 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Claws Mail 3.17.5\n"
+"Project-Id-Version: Claws Mail 4.0.0\n"
 "Report-Msgid-Bugs-To: paul@claws-mail.org\n"
-"POT-Creation-Date: 2020-02-17 12:21+0000\n"
-"PO-Revision-Date: 2008-09-28 08:00+0000\n"
+"POT-Creation-Date: 2021-07-08 09:43+0100\n"
+"PO-Revision-Date: 2021-07-08 09:43+0100\n"
 "Last-Translator: Paul Mangan <paul@claws-mail.org>\n"
 "Language-Team: Paul Mangan <paul@claws-mail.org>\n"
 "Language: en_GB\n"
@@ -40,61 +40,158 @@ msgid ""
 "indicates the default account."
 msgstr ""
 
-#: src/account.c:823
+#: src/account.c:822
 msgid " _Set as default account "
 msgstr ""
 
-#: src/account.c:915
+#: src/account.c:829 src/action.c:1405 src/addrduplicates.c:843
+#: src/addressadd.c:601 src/addressbook.c:427 src/addressbook.c:1437
+#: src/addressbook.c:3258 src/addressbook.c:3309 src/addressbook.c:4176
+#: src/addressbook.c:4182 src/addressbook.c:4298 src/addrindex.c:1836
+#: src/alertpanel.c:129 src/alertpanel.c:193 src/browseldap.c:301
+#: src/compose.c:631 src/exphtmldlg.c:293 src/expldifdlg.c:323
+#: src/gtk/about.c:912 src/gtk/gtkutils.c:90 src/gtk/icon_legend.c:184
+#: src/gtk/pluginwindow.c:391 src/gtk/prefswindow.c:509
+#: src/gtk/sslcertwindow.c:374 src/importldif.c:438 src/inc.c:841
+#: src/message_search.c:320 src/messageview.c:225
+#: src/plugins/managesieve/sieve_editor.c:88
+#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_manager.c:785
+#: src/plugins/pdf_viewer/poppler_viewer.c:1228
+#: src/plugins/pgpcore/sgpgme.c:815 src/prefs_actions.c:887
+#: src/prefs_actions.c:892 src/prefs_actions.c:918 src/prefs_filtering.c:1465
+#: src/prefs_filtering.c:1487 src/prefs_filtering.c:1509
+#: src/prefs_matcher.c:2162 src/prefs_template.c:567 src/prefs_template.c:592
+#: src/prefs_template.c:597 src/summary_search.c:785
+msgid "_Close"
+msgstr ""
+
+#: src/account.c:914
 msgid "Accounts with remote folders cannot be copied."
 msgstr ""
 
-#: src/account.c:922
+#: src/account.c:921
 #, c-format
 msgid "Copy of %s"
 msgstr ""
 
-#: src/account.c:1119
+#: src/account.c:1125
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr ""
 
-#: src/account.c:1121
+#: src/account.c:1127
 msgid "(Untitled)"
 msgstr ""
 
-#: src/account.c:1122
+#: src/account.c:1128
 msgid "Delete account"
 msgstr ""
 
-#: src/account.c:1596
+#: src/account.c:1129 src/addrcustomattr.c:162 src/addrcustomattr.c:187
+#: src/addrcustomattr.c:495 src/addrduplicates.c:147 src/addrduplicates.c:793
+#: src/addressadd.c:300 src/addressbook.c:1483 src/addressbook.c:1490
+#: src/addressbook.c:2957 src/addressbook.c:2969 src/addressbook.c:2982
+#: src/addressbook.c:2989 src/addressbook_foldersel.c:212 src/addrgather.c:554
+#: src/compose.c:3681 src/compose.c:3809 src/compose.c:5115 src/compose.c:5152
+#: src/compose.c:5189 src/compose.c:5232 src/compose.c:5796 src/compose.c:5859
+#: src/compose.c:6091 src/compose.c:9516 src/compose.c:10694
+#: src/compose.c:10699 src/compose.c:10773 src/compose.c:11665
+#: src/compose.c:12183 src/editaddress.c:172 src/editaddress.c:815
+#: src/editaddress.c:820 src/editbook.c:196 src/editgroup.c:407
+#: src/editjpilot.c:305 src/editldap_basedn.c:238 src/editldap.c:362
+#: src/edittags.c:222 src/edittags.c:258 src/editvcard.c:203
+#: src/exphtmldlg.c:603 src/exphtmldlg.c:678 src/expldifdlg.c:671
+#: src/expldifdlg.c:747 src/export.c:174 src/foldersel.c:350
+#: src/folderview.c:2480 src/folderview.c:2538 src/grouplistdialog.c:241
+#: src/gtk/foldersort.c:243 src/gtk/gtkaspell.c:1513 src/gtk/inputdialog.c:368
+#: src/gtk/prefswindow.c:504 src/gtk/progressdialog.c:97 src/imap.c:1178
+#: src/imap_gtk.c:369 src/imap_gtk.c:515 src/imap_gtk.c:574 src/import.c:173
+#: src/import.c:204 src/importldif.c:923 src/importldif.c:989
+#: src/importmutt.c:250 src/importpine.c:249 src/inc.c:888 src/main.c:2249
+#: src/mainwindow.c:4000 src/mainwindow.c:4202 src/mbox.c:552
+#: src/messageview.c:2065 src/messageview.c:2076 src/mh_gtk.c:207
+#: src/mh_gtk.c:375 src/mimeview.c:1905 src/mimeview.c:1930 src/mimeview.c:2355
+#: src/news.c:409 src/news_gtk.c:252 src/password_gtk.c:214
+#: src/plugins/archive/archiver_gtk.c:117
+#: src/plugins/archive/archiver_gtk.c:575
+#: src/plugins/archive/archiver_gtk.c:622
+#: src/plugins/archive/archiver_gtk.c:945
+#: src/plugins/archive/archiver_gtk.c:1046
+#: src/plugins/att_remover/att_remover.c:388
+#: src/plugins/att_remover/att_remover.c:430
+#: src/plugins/attachwarner/attachwarner.c:217
+#: src/plugins/clamd/clamav_plugin_gtk.c:91
+#: src/plugins/gdata/cm_gdata_contacts.c:136
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/mailmbox/plugin_gtk.c:334
+#: src/plugins/managesieve/sieve_editor.c:336
+#: src/plugins/managesieve/sieve_editor.c:434
+#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_manager.c:330
+#: src/plugins/notification/notification_foldercheck.c:590
+#: src/plugins/notification/notification_trayicon.c:550
+#: src/plugins/pgpcore/passphrase.c:122 src/plugins/rssyl/rssyl_cb_menu.c:157
+#: src/plugins/rssyl/rssyl_cb_menu.c:323
+#: src/plugins/rssyl/rssyl_feed_props.c:492
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:50
+#: src/plugins/vcalendar/vcalendar.c:122 src/plugins/vcalendar/vcalendar.c:1058
+#: src/plugins/vcalendar/vcal_folder.c:1997
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:931 src/prefs_actions.c:217
+#: src/prefs_actions.c:702 src/prefs_actions.c:723 src/prefs_customheader.c:177
+#: src/prefs_customheader.c:693 src/prefs_display_header.c:246
+#: src/prefs_filtering_action.c:392 src/prefs_filtering.c:351
+#: src/prefs_filtering.c:1194 src/prefs_filtering.c:1213
+#: src/prefs_folder_column.c:341 src/prefs_folder_item.c:1761
+#: src/prefs_matcher.c:572 src/prefs_other.c:148 src/prefs_summaries.c:287
+#: src/prefs_summary_column.c:355 src/prefs_summary_open.c:181
+#: src/prefs_template.c:399 src/prefs_template.c:899 src/prefs_template.c:912
+#: src/prefs_themes.c:596 src/send_message.c:294 src/ssl_manager.c:448
+#: src/summaryview.c:1327 src/summaryview.c:4550 src/summaryview.c:5012
+#: src/summaryview.c:5066 src/summaryview.c:5805 src/textview.c:2884
+#: src/toolbar.c:3054 src/wizard.c:1814
+msgid "_Cancel"
+msgstr ""
+
+#: src/account.c:1129 src/addrcustomattr.c:216 src/addressbook.c:437
+#: src/addressbook.c:462 src/addressbook.c:479 src/edittags.c:285
+#: src/imap_gtk.c:369 src/plugins/archive/archiver_gtk.c:1313
+#: src/plugins/mailmbox/plugin_gtk.c:334
+#: src/plugins/managesieve/sieve_manager.c:330
+#: src/plugins/vcalendar/vcal_folder.c:1997 src/prefs_actions.c:1077
+#: src/prefs_customheader.c:693 src/prefs_filtering.c:1681
+#: src/prefs_template.c:1105 src/summaryview.c:4550
+msgid "_Delete"
+msgstr ""
+
+#: src/account.c:1602
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr ""
 
-#: src/account.c:1602
+#: src/account.c:1608
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr ""
 
-#: src/account.c:1609 src/addrduplicates.c:472 src/addressadd.c:223
-#: src/addressbook.c:128 src/compose.c:7473 src/editaddress.c:1474
-#: src/editaddress.c:1503 src/editaddress.c:1519
-#: src/editaddress_other_attributes_ldap.c:371
-#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
-#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
-#: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
+#: src/account.c:1615 src/addrduplicates.c:472 src/addressadd.c:220
+#: src/addressbook.c:128 src/compose.c:7467 src/editaddress.c:1475
+#: src/editaddress.c:1497 src/editaddress.c:1516
+#: src/editaddress_other_attributes_ldap.c:369
+#: src/editaddress_other_attributes_ldap.c:389 src/editbook.c:168
+#: src/editgroup.c:288 src/editjpilot.c:255 src/editldap.c:426
+#: src/editvcard.c:171 src/importmutt.c:221 src/importpine.c:220
 #: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
-#: src/plugins/pdf_viewer/poppler_viewer.c:1846
-#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:385
-#: src/prefs_filtering.c:1875 src/prefs_summaries.c:477 src/prefs_template.c:79
-#: src/prefs_themes.c:990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1849
+#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:384
+#: src/prefs_filtering.c:1854 src/prefs_summaries.c:477 src/prefs_template.c:78
+#: src/prefs_themes.c:993
 msgid "Name"
 msgstr ""
 
-#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4624
+#: src/account.c:1623 src/prefs_account.c:1267 src/prefs_account.c:4955
 msgid "Protocol"
 msgstr ""
 
-#: src/account.c:1625 src/ssl_manager.c:109
+#: src/account.c:1631 src/ssl_manager.c:109
 msgid "Server"
 msgstr ""
 
@@ -138,7 +235,8 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
+#: src/action.c:999 src/compose.c:5265 src/compose.c:5270 src/compose.c:9669
+#: src/compose.c:9708 src/ldaputil.c:333
 #: src/plugins/bogofilter/bogofilter.c:858
 #: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
@@ -148,25 +246,25 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
-#: src/action.c:1218 src/action.c:1390
+#: src/action.c:1218 src/action.c:1395
 msgid "Completed"
 msgstr ""
 
-#: src/action.c:1254
+#: src/action.c:1255
 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 
-#: src/action.c:1258
+#: src/action.c:1259
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 
-#: src/action.c:1304
+#: src/action.c:1305
 msgid "Action's input/output"
 msgstr ""
 
-#: src/action.c:1636
+#: src/action.c:1641
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -174,11 +272,11 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1641
+#: src/action.c:1646
 msgid "Action's hidden user argument"
 msgstr ""
 
-#: src/action.c:1645
+#: src/action.c:1650
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -186,7 +284,7 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: src/action.c:1650
+#: src/action.c:1655
 msgid "Action's user argument"
 msgstr ""
 
@@ -202,107 +300,168 @@ msgstr ""
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr ""
 
-#: src/addr_compl.c:689 src/addressbook.c:5018
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/addr_compl.c:699 src/addressbook.c:5006
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:321
 msgid "Group"
 msgstr ""
 
-#: src/addrcustomattr.c:65
+#: src/addrcustomattr.c:64
 msgid "date of birth"
 msgstr ""
 
-#: src/addrcustomattr.c:66
+#: src/addrcustomattr.c:65
 msgid "address"
 msgstr ""
 
-#: src/addrcustomattr.c:67
+#: src/addrcustomattr.c:66
 msgid "phone"
 msgstr ""
 
-#: src/addrcustomattr.c:68
+#: src/addrcustomattr.c:67
 msgid "mobile phone"
 msgstr ""
 
-#: src/addrcustomattr.c:69
+#: src/addrcustomattr.c:68
 msgid "organization"
 msgstr "organisation"
 
-#: src/addrcustomattr.c:70
+#: src/addrcustomattr.c:69
 msgid "office address"
 msgstr ""
 
-#: src/addrcustomattr.c:71
+#: src/addrcustomattr.c:70
 msgid "office phone"
 msgstr ""
 
-#: src/addrcustomattr.c:72
+#: src/addrcustomattr.c:71
 msgid "fax"
 msgstr ""
 
-#: src/addrcustomattr.c:73
+#: src/addrcustomattr.c:72
 msgid "website"
 msgstr ""
 
-#: src/addrcustomattr.c:146
+#: src/addrcustomattr.c:145
 msgid "Attribute name"
 msgstr ""
 
-#: src/addrcustomattr.c:161
+#: src/addrcustomattr.c:160
 msgid "Delete all attribute names"
 msgstr ""
 
-#: src/addrcustomattr.c:162
+#: src/addrcustomattr.c:161
 msgid "Do you really want to delete all attribute names?"
 msgstr ""
 
-#: src/addrcustomattr.c:186
+#: src/addrcustomattr.c:185
 msgid "Delete attribute name"
 msgstr ""
 
-#: src/addrcustomattr.c:187
+#: src/addrcustomattr.c:186
 msgid "Do you really want to delete this attribute name?"
 msgstr ""
 
-#: src/addrcustomattr.c:196
+#: src/addrcustomattr.c:195
 msgid "Reset to default"
 msgstr ""
 
-#: src/addrcustomattr.c:197
+#: src/addrcustomattr.c:196
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
 msgstr ""
 
-#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
-#: src/addressbook.c:484 src/edittags.c:286
-#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
-#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
-msgid "_Delete"
-msgstr ""
-
-#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1087
-#: src/prefs_filtering.c:1701 src/prefs_template.c:1113
+#: src/addrcustomattr.c:197 src/compose.c:9783 src/exphtmldlg.c:181
+#: src/expldifdlg.c:191 src/expldifdlg.c:247 src/file_checker.c:83
+#: src/file_checker.c:107 src/folderview.c:880 src/folderview.c:1102
+#: src/folderview.c:2526 src/folderview.c:2628 src/inc.c:1668 src/main.c:407
+#: src/mainwindow.c:2868 src/mainwindow.c:2873 src/message_search.c:335
+#: src/plugins/libravatar/libravatar_prefs.c:175
+#: src/plugins/pgpcore/pgp_viewer.c:182 src/plugins/pgpcore/select-keys.c:708
+#: src/plugins/pgpcore/sgpgme.c:899 src/plugins/pgpcore/sgpgme.c:1021
+#: src/plugins/vcalendar/vcalendar.c:961 src/prefs_migration.c:61
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/prefs_themes.c:573
+#: src/summary_search.c:796 src/summaryview.c:1327 src/summaryview.c:1940
+#: src/summaryview.c:1988 src/summaryview.c:2025 src/summaryview.c:2073
+#: src/summaryview.c:2107 src/summaryview.c:2140 src/summaryview.c:2174
+#: src/summaryview.c:2203 src/summaryview.c:4264 src/summaryview.c:4310
+#: src/summaryview.c:6072 src/toolbar.c:3034
+msgid "_No"
+msgstr ""
+
+#: src/addrcustomattr.c:197 src/compose.c:9783 src/compose.c:12183
+#: src/exphtmldlg.c:181 src/expldifdlg.c:191 src/expldifdlg.c:247
+#: src/file_checker.c:83 src/file_checker.c:107 src/folderview.c:880
+#: src/folderview.c:1102 src/folderview.c:2526 src/folderview.c:2628
+#: src/inc.c:1668 src/main.c:407 src/mainwindow.c:2868 src/mainwindow.c:2873
+#: src/message_search.c:335 src/plugins/libravatar/libravatar_prefs.c:175
+#: src/plugins/pgpcore/select-keys.c:708 src/plugins/pgpcore/sgpgme.c:899
+#: src/plugins/pgpcore/sgpgme.c:1021 src/plugins/vcalendar/vcalendar.c:122
+#: src/plugins/vcalendar/vcalendar.c:961 src/prefs_migration.c:61
+#: src/prefs_themes.c:508 src/prefs_themes.c:564 src/prefs_themes.c:573
+#: src/summary_search.c:796 src/summaryview.c:1327 src/summaryview.c:1940
+#: src/summaryview.c:1988 src/summaryview.c:2025 src/summaryview.c:2073
+#: src/summaryview.c:2107 src/summaryview.c:2140 src/summaryview.c:2174
+#: src/summaryview.c:2203 src/summaryview.c:4264 src/summaryview.c:4310
+#: src/summaryview.c:5066 src/summaryview.c:6072 src/toolbar.c:3034
+msgid "_Yes"
+msgstr ""
+
+#: src/addrcustomattr.c:217 src/edittags.c:286 src/prefs_actions.c:1078
+#: src/prefs_filtering.c:1682 src/prefs_template.c:1106
 msgid "Delete _all"
 msgstr ""
 
-#: src/addrcustomattr.c:219
+#: src/addrcustomattr.c:218
 msgid "_Reset to default"
 msgstr ""
 
-#: src/addrcustomattr.c:410
+#: src/addrcustomattr.c:407
 msgid "Attribute name is not set."
 msgstr ""
 
-#: src/addrcustomattr.c:469
+#: src/addrcustomattr.c:466
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr ""
 
-#: src/addrcustomattr.c:483
+#: src/addrcustomattr.c:480
 msgid "New attribute name:"
 msgstr ""
 
-#: src/addrcustomattr.c:520
+#: src/addrcustomattr.c:496 src/addressadd.c:301
+#: src/addressbook_foldersel.c:213 src/addrgather.c:555 src/alertpanel.c:363
+#: src/compose.c:5859 src/compose.c:9517 src/editaddress.c:172
+#: src/editaddress.c:816 src/editaddress.c:821 src/editbook.c:197
+#: src/editgroup.c:408 src/editjpilot.c:306 src/editldap_basedn.c:239
+#: src/editldap.c:363 src/editvcard.c:204 src/export.c:175 src/foldersel.c:351
+#: src/grouplistdialog.c:242 src/gtk/foldersort.c:244 src/gtk/gtkaspell.c:1514
+#: src/gtk/inputdialog.c:369 src/gtk/prefswindow.c:505 src/import.c:174
+#: src/import.c:204 src/importmutt.c:251 src/importpine.c:250 src/main.c:2249
+#: src/mimeview.c:1906 src/password_gtk.c:215
+#: src/plugins/archive/archiver_gtk.c:575
+#: src/plugins/archive/archiver_gtk.c:622
+#: src/plugins/archive/archiver_gtk.c:749
+#: src/plugins/archive/archiver_gtk.c:1048
+#: src/plugins/att_remover/att_remover.c:389
+#: src/plugins/gdata/cm_gdata_contacts.c:137
+#: src/plugins/managesieve/sieve_editor.c:632
+#: src/plugins/notification/notification_foldercheck.c:591
+#: src/plugins/notification/notification_trayicon.c:550
+#: src/plugins/pgpcore/passphrase.c:123
+#: src/plugins/rssyl/rssyl_feed_props.c:509
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:51
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1789
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1913 src/prefs_actions.c:218
+#: src/prefs_customheader.c:178 src/prefs_display_header.c:247
+#: src/prefs_filtering_action.c:393 src/prefs_filtering.c:352
+#: src/prefs_folder_column.c:342 src/prefs_matcher.c:573 src/prefs_other.c:149
+#: src/prefs_summaries.c:288 src/prefs_summary_column.c:356
+#: src/prefs_summary_open.c:182 src/prefs_template.c:400
+msgid "_OK"
+msgstr ""
+
+#: src/addrcustomattr.c:517
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -333,7 +492,7 @@ msgstr ""
 msgid "Duplicate email addresses"
 msgstr ""
 
-#: src/addrduplicates.c:443 src/addressadd.c:235
+#: src/addrduplicates.c:443 src/addressadd.c:233
 #: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
 #: src/toolbar.c:529
 msgid "Address"
@@ -343,11 +502,11 @@ msgstr ""
 msgid "Address book path"
 msgstr ""
 
-#: src/addrduplicates.c:791 src/addressbook.c:1445 src/addressbook.c:1498
+#: src/addrduplicates.c:791 src/addressbook.c:1435 src/addressbook.c:1488
 msgid "Delete address(es)"
 msgstr ""
 
-#: src/addrduplicates.c:792 src/addressbook.c:1499
+#: src/addrduplicates.c:792 src/addressbook.c:1489
 msgid "Really delete the address(es)?"
 msgstr ""
 
@@ -355,28 +514,28 @@ msgstr ""
 msgid "Delete address"
 msgstr ""
 
-#: src/addrduplicates.c:842 src/addressbook.c:1446
+#: src/addrduplicates.c:842 src/addressbook.c:1436
 msgid "This address data is readonly and cannot be deleted."
 msgstr ""
 
-#: src/addressadd.c:192 src/prefs_filtering_action.c:195
+#: src/addressadd.c:190 src/prefs_filtering_action.c:193
 msgid "Add to address book"
 msgstr ""
 
-#: src/addressadd.c:215
+#: src/addressadd.c:213
 msgid "Contact"
 msgstr ""
 
-#: src/addressadd.c:246 src/addressbook.c:130 src/editaddress.c:1258
-#: src/editaddress.c:1302 src/editgroup.c:292
+#: src/addressadd.c:243 src/addressbook.c:130 src/editaddress.c:1256
+#: src/editaddress.c:1301 src/editgroup.c:290
 msgid "Remarks"
 msgstr ""
 
-#: src/addressadd.c:289 src/addressbook_foldersel.c:158
+#: src/addressadd.c:288 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr ""
 
-#: src/addressadd.c:599 src/addressbook.c:3268 src/addressbook.c:3319
+#: src/addressadd.c:599 src/addressbook.c:3256 src/addressbook.c:3307
 msgid "Add address(es)"
 msgstr ""
 
@@ -384,8 +543,8 @@ msgstr ""
 msgid "Can't add the specified address"
 msgstr ""
 
-#: src/addressbook.c:129 src/addressbook.c:5006 src/editaddress.c:1247
-#: src/editaddress.c:1285 src/editgroup.c:291 src/expldifdlg.c:517
+#: src/addressbook.c:129 src/addressbook.c:4994 src/editaddress.c:1245
+#: src/editaddress.c:1282 src/editgroup.c:289 src/expldifdlg.c:507
 #: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
 msgstr ""
@@ -394,411 +553,395 @@ msgstr ""
 msgid "_Book"
 msgstr ""
 
-#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
+#: src/addressbook.c:406 src/addressbook.c:436 src/addressbook.c:461
+#: src/addressbook.c:478 src/compose.c:610 src/mainwindow.c:517
 #: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr ""
 
-#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
+#: src/addressbook.c:407 src/compose.c:615 src/mainwindow.c:520
 #: src/messageview.c:215
 msgid "_Tools"
 msgstr ""
 
-#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
-#: src/messageview.c:216
-msgid "_Help"
-msgstr ""
-
-#: src/addressbook.c:411 src/addressbook.c:469
+#: src/addressbook.c:410 src/addressbook.c:464
 msgid "New _Book"
 msgstr ""
 
-#: src/addressbook.c:412 src/addressbook.c:470
+#: src/addressbook.c:411 src/addressbook.c:465
 msgid "New _Folder"
 msgstr ""
 
-#: src/addressbook.c:413
+#: src/addressbook.c:412
 msgid "New _vCard"
 msgstr ""
 
-#: src/addressbook.c:417
+#: src/addressbook.c:416
 msgid "New _JPilot"
 msgstr ""
 
-#: src/addressbook.c:420
+#: src/addressbook.c:419
 msgid "New LDAP _Server"
 msgstr ""
 
-#: src/addressbook.c:424
+#: src/addressbook.c:423
 msgid "_Edit book"
 msgstr ""
 
-#: src/addressbook.c:425
+#: src/addressbook.c:424
 msgid "_Delete book"
 msgstr ""
 
-#: src/addressbook.c:427 src/compose.c:624
+#: src/addressbook.c:426 src/compose.c:627 src/gtk/gtkutils.c:69
 #: src/plugins/managesieve/sieve_editor.c:85
 #: src/plugins/managesieve/sieve_editor.c:434
-#: src/plugins/managesieve/sieve_editor.c:633
+#: src/plugins/managesieve/sieve_editor.c:633 src/wizard.c:1813
 msgid "_Save"
 msgstr ""
 
-#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
-#: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:631
-msgid "_Close"
-msgstr ""
-
-#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
+#: src/addressbook.c:430 src/addressbook.c:476 src/messageview.c:229
 msgid "_Select all"
 msgstr ""
 
-#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
+#: src/addressbook.c:432 src/addressbook.c:468 src/addressbook.c:484
 msgid "C_ut"
 msgstr ""
 
-#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
-#: src/plugins/managesieve/sieve_editor.c:96
+#: src/addressbook.c:433 src/addressbook.c:469 src/addressbook.c:485
+#: src/compose.c:639 src/gtk/gtkutils.c:71 src/mainwindow.c:551
+#: src/messageview.c:228 src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr ""
 
-#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
-#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:434 src/addressbook.c:470 src/addressbook.c:486
+#: src/compose.c:640 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr ""
 
-#: src/addressbook.c:440 src/addressbook.c:486
+#: src/addressbook.c:439 src/addressbook.c:481
 msgid "New _Address"
 msgstr ""
 
-#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
+#: src/addressbook.c:440 src/addressbook.c:466 src/addressbook.c:482
 msgid "New _Group"
 msgstr ""
 
-#: src/addressbook.c:443 src/addressbook.c:493
+#: src/addressbook.c:442 src/addressbook.c:488
 msgid "_Mail To"
 msgstr ""
 
-#: src/addressbook.c:444 src/addressbook.c:497
+#: src/addressbook.c:443 src/addressbook.c:492
 msgid "_Merge"
 msgstr ""
 
-#: src/addressbook.c:448
+#: src/addressbook.c:447
 msgid "Import _LDIF file..."
 msgstr ""
 
-#: src/addressbook.c:449
+#: src/addressbook.c:448
 msgid "Import M_utt file..."
 msgstr ""
 
-#: src/addressbook.c:450
+#: src/addressbook.c:449
 msgid "Import _Pine file..."
 msgstr ""
 
-#: src/addressbook.c:452
+#: src/addressbook.c:451
 msgid "Export _HTML..."
 msgstr ""
 
-#: src/addressbook.c:453
+#: src/addressbook.c:452
 msgid "Export LDI_F..."
 msgstr ""
 
-#: src/addressbook.c:455
+#: src/addressbook.c:454
 msgid "Find duplicates..."
 msgstr ""
 
-#: src/addressbook.c:456
+#: src/addressbook.c:455
 msgid "Edit custom attributes..."
 msgstr ""
 
-#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
-#: src/messageview.c:340
-msgid "_About"
-msgstr ""
-
-#: src/addressbook.c:495
+#: src/addressbook.c:490
 msgid "_Browse Entry"
 msgstr ""
 
-#: src/addressbook.c:509 src/crash.c:457 src/crash.c:476 src/importldif.c:114
+#: src/addressbook.c:504 src/crash.c:457 src/crash.c:476 src/importldif.c:114
 #: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
-#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
-#: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
+#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:397
+#: src/plugins/vcalendar/month-view.c:424 src/prefs_themes.c:819
 #: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr ""
 
-#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
+#: src/addressbook.c:511 src/addressbook.c:530 src/importldif.c:121
 msgid "Success"
 msgstr ""
 
-#: src/addressbook.c:517 src/importldif.c:122
+#: src/addressbook.c:512 src/importldif.c:122
 msgid "Bad arguments"
 msgstr ""
 
-#: src/addressbook.c:518 src/importldif.c:123
+#: src/addressbook.c:513 src/importldif.c:123
 msgid "File not specified"
 msgstr ""
 
-#: src/addressbook.c:519 src/importldif.c:124
+#: src/addressbook.c:514 src/importldif.c:124
 msgid "Error opening file"
 msgstr ""
 
-#: src/addressbook.c:520 src/importldif.c:125
+#: src/addressbook.c:515 src/importldif.c:125
 msgid "Error reading file"
 msgstr ""
 
-#: src/addressbook.c:521 src/importldif.c:126
+#: src/addressbook.c:516 src/importldif.c:126
 msgid "End of file encountered"
 msgstr ""
 
-#: src/addressbook.c:522 src/importldif.c:127
+#: src/addressbook.c:517 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr ""
 
-#: src/addressbook.c:523 src/importldif.c:128
+#: src/addressbook.c:518 src/importldif.c:128
 msgid "Bad file format"
 msgstr ""
 
-#: src/addressbook.c:524 src/importldif.c:129
+#: src/addressbook.c:519 src/importldif.c:129
 msgid "Error writing to file"
 msgstr ""
 
-#: src/addressbook.c:525 src/importldif.c:130
+#: src/addressbook.c:520 src/importldif.c:130
 msgid "Error opening directory"
 msgstr ""
 
-#: src/addressbook.c:526 src/importldif.c:131
+#: src/addressbook.c:521 src/importldif.c:131
 msgid "No path specified"
 msgstr ""
 
-#: src/addressbook.c:536
+#: src/addressbook.c:531
 msgid "Error connecting to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:537
+#: src/addressbook.c:532
 msgid "Error initializing LDAP"
 msgstr ""
 
-#: src/addressbook.c:538
+#: src/addressbook.c:533
 msgid "Error binding to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:539
+#: src/addressbook.c:534
 msgid "Error searching LDAP database"
 msgstr ""
 
-#: src/addressbook.c:540
+#: src/addressbook.c:535
 msgid "Timeout performing LDAP operation"
 msgstr ""
 
-#: src/addressbook.c:541
+#: src/addressbook.c:536
 msgid "Error in LDAP search criteria"
 msgstr ""
 
-#: src/addressbook.c:542
+#: src/addressbook.c:537
 msgid "No LDAP entries found for search criteria"
 msgstr ""
 
-#: src/addressbook.c:543
+#: src/addressbook.c:538
 msgid "LDAP search terminated on request"
 msgstr ""
 
-#: src/addressbook.c:544
+#: src/addressbook.c:539
 msgid "Error starting STARTTLS connection"
 msgstr ""
 
-#: src/addressbook.c:545
+#: src/addressbook.c:540
 msgid "Distinguished Name (dn) is missing"
 msgstr ""
 
-#: src/addressbook.c:546
+#: src/addressbook.c:541
 msgid "Missing required information"
 msgstr ""
 
-#: src/addressbook.c:547
+#: src/addressbook.c:542
 msgid "Another contact exists with that key"
 msgstr ""
 
-#: src/addressbook.c:548
+#: src/addressbook.c:543
 msgid "Strong(er) authentication required"
 msgstr ""
 
-#: src/addressbook.c:916
+#: src/addressbook.c:911
 msgid "Sources"
 msgstr ""
 
-#: src/addressbook.c:920 src/prefs_matcher.c:643 src/prefs_other.c:493
+#: src/addressbook.c:915 src/prefs_matcher.c:642 src/prefs_other.c:491
 #: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr ""
 
-#: src/addressbook.c:1118 src/editldap.c:794
+#: src/addressbook.c:1108 src/editldap.c:777
 msgid "Search"
 msgstr ""
 
-#: src/addressbook.c:1490
+#: src/addressbook.c:1480
 msgid "Delete group"
 msgstr ""
 
-#: src/addressbook.c:1491
+#: src/addressbook.c:1481
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2218
+#: src/addressbook.c:2208
 msgid "Cannot paste. Target address book is readonly."
 msgstr ""
 
-#: src/addressbook.c:2228
+#: src/addressbook.c:2218
 msgid "Cannot paste into an address group."
 msgstr ""
 
-#: src/addressbook.c:2965
+#: src/addressbook.c:2953
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr ""
 
-#: src/addressbook.c:2968 src/addressbook.c:2994 src/addressbook.c:3001
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
+#: src/addressbook.c:2956 src/addressbook.c:2982 src/addressbook.c:2989
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:171
 #: src/toolbar.c:497
 msgid "Delete"
 msgstr ""
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:2965
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
 "contains will be moved into the parent folder."
 msgstr ""
 
-#: src/addressbook.c:2980 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
+#: src/addressbook.c:2968 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:333 src/plugins/rssyl/rssyl_cb_menu.c:156
 msgid "Delete folder"
 msgstr ""
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2969
 msgid "Delete _folder only"
 msgstr ""
 
-#: src/addressbook.c:2981
+#: src/addressbook.c:2969
 msgid "Delete folder and _addresses"
 msgstr ""
 
-#: src/addressbook.c:2992
+#: src/addressbook.c:2980
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will not be lost."
 msgstr ""
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:2987
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
 "The addresses it contains will be lost."
 msgstr ""
 
-#: src/addressbook.c:3113
+#: src/addressbook.c:3101
 #, c-format
 msgid "Search '%s'"
 msgstr ""
 
-#: src/addressbook.c:3251 src/addressbook.c:3300
+#: src/addressbook.c:3239 src/addressbook.c:3288
 msgid "New Contacts"
 msgstr ""
 
-#: src/addressbook.c:4137
+#: src/addressbook.c:4125
 msgid "New user, could not save index file."
 msgstr ""
 
-#: src/addressbook.c:4141
+#: src/addressbook.c:4129
 msgid "New user, could not save address book files."
 msgstr ""
 
-#: src/addressbook.c:4151
+#: src/addressbook.c:4139
 msgid "Old address book converted successfully."
 msgstr ""
 
-#: src/addressbook.c:4156
+#: src/addressbook.c:4144
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4169
+#: src/addressbook.c:4157
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgstr ""
 
-#: src/addressbook.c:4175
+#: src/addressbook.c:4163
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
 msgstr ""
 
-#: src/addressbook.c:4180
+#: src/addressbook.c:4168
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr ""
 
-#: src/addressbook.c:4187 src/addressbook.c:4193
+#: src/addressbook.c:4175 src/addressbook.c:4181
 msgid "Addressbook conversion error"
 msgstr ""
 
-#: src/addressbook.c:4308
+#: src/addressbook.c:4296
 msgid "Addressbook Error"
 msgstr ""
 
-#: src/addressbook.c:4309
+#: src/addressbook.c:4297
 msgid "Could not read address index"
 msgstr ""
 
-#: src/addressbook.c:4640
+#: src/addressbook.c:4628
 msgid "Busy searching..."
 msgstr ""
 
-#: src/addressbook.c:4970 src/prefs_send.c:220
+#: src/addressbook.c:4958 src/prefs_send.c:220
 msgid "Interface"
 msgstr ""
 
-#: src/addressbook.c:4982
+#: src/addressbook.c:4970
 msgid "Address Books"
 msgstr ""
 
-#: src/addressbook.c:4994
+#: src/addressbook.c:4982
 msgid "Person"
 msgstr ""
 
-#: src/addressbook.c:5030 src/exporthtml.c:885 src/folderview.c:361
-#: src/folderview.c:449 src/prefs_account.c:3149 src/prefs_folder_column.c:77
+#: src/addressbook.c:5018 src/exporthtml.c:885 src/folderview.c:361
+#: src/folderview.c:449 src/prefs_account.c:3420 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr ""
 
-#: src/addressbook.c:5042
+#: src/addressbook.c:5030
 msgid "vCard"
 msgstr ""
 
-#: src/addressbook.c:5054 src/addressbook.c:5066
+#: src/addressbook.c:5042 src/addressbook.c:5054
 msgid "JPilot"
 msgstr ""
 
-#: src/addressbook.c:5078
+#: src/addressbook.c:5066
 msgid "LDAP servers"
 msgstr ""
 
-#: src/addressbook.c:5090
+#: src/addressbook.c:5078
 msgid "LDAP Query"
 msgstr ""
 
-#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:985 src/importldif.c:541
+#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:369 src/expldifdlg.c:386
+#: src/exporthtml.c:985 src/importldif.c:539
 msgid "Address Book"
 msgstr ""
 
@@ -826,53 +969,53 @@ msgstr ""
 msgid "Addresses collected successfully."
 msgstr ""
 
-#: src/addrgather.c:360
+#: src/addrgather.c:358
 msgid "Current folder:"
 msgstr ""
 
-#: src/addrgather.c:371
+#: src/addrgather.c:367
 msgid "Address book name:"
 msgstr ""
 
-#: src/addrgather.c:398
+#: src/addrgather.c:395
 msgid "Address book folder size:"
 msgstr ""
 
-#: src/addrgather.c:402 src/addrgather.c:411
+#: src/addrgather.c:399 src/addrgather.c:409
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr ""
 
-#: src/addrgather.c:415
+#: src/addrgather.c:412
 msgid "Process these mail header fields"
 msgstr ""
 
-#: src/addrgather.c:434
+#: src/addrgather.c:432
 msgid "Include subfolders"
 msgstr ""
 
-#: src/addrgather.c:492 src/prefs_filtering_action.c:1384
+#: src/addrgather.c:490 src/prefs_filtering_action.c:1384
 msgid "Header Name"
 msgstr ""
 
-#: src/addrgather.c:498
+#: src/addrgather.c:496
 msgid "Address Count"
 msgstr ""
 
-#: src/addrgather.c:586
+#: src/addrgather.c:584
 msgid "Header Fields"
 msgstr ""
 
-#: src/addrgather.c:587 src/exphtmldlg.c:659 src/expldifdlg.c:723
-#: src/importldif.c:982
+#: src/addrgather.c:585 src/exphtmldlg.c:635 src/expldifdlg.c:703
+#: src/importldif.c:965
 msgid "Finish"
 msgstr ""
 
-#: src/addrgather.c:645
+#: src/addrgather.c:643
 msgid "Collect email addresses from selected messages"
 msgstr ""
 
-#: src/addrgather.c:649
+#: src/addrgather.c:647
 msgid "Collect email addresses from folder"
 msgstr ""
 
@@ -900,18 +1043,18 @@ msgstr ""
 msgid "Update failed. Changes not written to Directory."
 msgstr ""
 
-#: src/alertpanel.c:144 src/compose.c:9795
+#: src/alertpanel.c:144 src/compose.c:9783
 msgid "Notice"
 msgstr ""
 
-#: src/alertpanel.c:157 src/compose.c:5856 src/compose.c:6401
-#: src/compose.c:12258 src/file_checker.c:84 src/file_checker.c:108
-#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:811
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5091
+#: src/alertpanel.c:157 src/compose.c:5859 src/compose.c:6404
+#: src/compose.c:12183 src/file_checker.c:83 src/file_checker.c:107
+#: src/messageview.c:855 src/plugins/pgpcore/sgpgme.c:811
+#: src/plugins/vcalendar/vcalendar.c:122 src/summaryview.c:5066
 msgid "Warning"
 msgstr ""
 
-#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5793 src/inc.c:726
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5796 src/inc.c:731
 #: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr ""
@@ -920,19 +1063,19 @@ msgstr ""
 msgid "_View log"
 msgstr ""
 
-#: src/alertpanel.c:346
+#: src/alertpanel.c:350
 msgid "Show this message next time"
 msgstr ""
 
-#: src/browseldap.c:223
+#: src/browseldap.c:221
 msgid "Browse Directory Entry"
 msgstr ""
 
-#: src/browseldap.c:243
+#: src/browseldap.c:240
 msgid "Server Name:"
 msgstr ""
 
-#: src/browseldap.c:253
+#: src/browseldap.c:251
 msgid "Distinguished Name (dn):"
 msgstr ""
 
@@ -1024,36 +1167,36 @@ msgstr ""
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr ""
 
-#: src/common/session.c:201 src/imap.c:1233
+#: src/common/session.c:201 src/imap.c:1246
 msgid "SSL/TLS handshake failed\n"
 msgstr ""
 
-#: src/common/smtp.c:179
+#: src/common/smtp.c:185
 msgid "No SMTP AUTH method available\n"
 msgstr ""
 
-#: src/common/smtp.c:182
+#: src/common/smtp.c:188
 msgid "Selected SMTP AUTH method not available\n"
 msgstr ""
 
-#: src/common/smtp.c:501 src/common/smtp.c:555
+#: src/common/smtp.c:539 src/common/smtp.c:594
 msgid "bad SMTP response\n"
 msgstr ""
 
-#: src/common/smtp.c:526 src/common/smtp.c:544 src/common/smtp.c:658
+#: src/common/smtp.c:565 src/common/smtp.c:583 src/common/smtp.c:698
 msgid "error occurred on SMTP session\n"
 msgstr ""
 
-#: src/common/smtp.c:535 src/pop.c:907
+#: src/common/smtp.c:574 src/pop.c:934
 msgid "error occurred on authentication\n"
 msgstr ""
 
-#: src/common/smtp.c:585
+#: src/common/smtp.c:624
 #, c-format
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr ""
 
-#: src/common/smtp.c:617 src/pop.c:900
+#: src/common/smtp.c:656 src/pop.c:927
 msgid "couldn't start STARTTLS session\n"
 msgstr ""
 
@@ -1159,10 +1302,10 @@ msgstr ""
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr ""
 
-#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:87
-#: src/gtk/sslcertwindow.c:94 src/gtk/sslcertwindow.c:109
-#: src/gtk/sslcertwindow.c:114 src/gtk/sslcertwindow.c:121
-#: src/gtk/sslcertwindow.c:136
+#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:85
+#: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
+#: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
+#: src/gtk/sslcertwindow.c:134
 msgid "<not in certificate>"
 msgstr ""
 
@@ -1190,636 +1333,645 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
-#: src/common/utils.c:4028
+#: src/common/utils.c:4087
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr ""
 
-#: src/common/utils.c:4029
+#: src/common/utils.c:4088
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr ""
 
-#: src/common/utils.c:4030
+#: src/common/utils.c:4089
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr ""
 
-#: src/common/utils.c:4031
+#: src/common/utils.c:4090
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr ""
 
-#: src/common/utils.c:4032
+#: src/common/utils.c:4091
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr ""
 
-#: src/common/utils.c:4033
+#: src/common/utils.c:4092
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr ""
 
-#: src/common/utils.c:4034
+#: src/common/utils.c:4093
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr ""
 
-#: src/common/utils.c:4036
+#: src/common/utils.c:4095
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr ""
 
-#: src/common/utils.c:4037
+#: src/common/utils.c:4096
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr ""
 
-#: src/common/utils.c:4038
+#: src/common/utils.c:4097
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr ""
 
-#: src/common/utils.c:4039
+#: src/common/utils.c:4098
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr ""
 
-#: src/common/utils.c:4040
+#: src/common/utils.c:4099
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4041
+#: src/common/utils.c:4100
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr ""
 
-#: src/common/utils.c:4042
+#: src/common/utils.c:4101
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr ""
 
-#: src/common/utils.c:4043
+#: src/common/utils.c:4102
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr ""
 
-#: src/common/utils.c:4044
+#: src/common/utils.c:4103
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr ""
 
-#: src/common/utils.c:4045
+#: src/common/utils.c:4104
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr ""
 
-#: src/common/utils.c:4046
+#: src/common/utils.c:4105
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr ""
 
-#: src/common/utils.c:4047
+#: src/common/utils.c:4106
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr ""
 
-#: src/common/utils.c:4049
+#: src/common/utils.c:4108
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr ""
 
-#: src/common/utils.c:4050
+#: src/common/utils.c:4109
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr ""
 
-#: src/common/utils.c:4051
+#: src/common/utils.c:4110
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr ""
 
-#: src/common/utils.c:4052
+#: src/common/utils.c:4111
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr ""
 
-#: src/common/utils.c:4053
+#: src/common/utils.c:4112
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr ""
 
-#: src/common/utils.c:4054
+#: src/common/utils.c:4113
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr ""
 
-#: src/common/utils.c:4055
+#: src/common/utils.c:4114
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr ""
 
-#: src/common/utils.c:4057
+#: src/common/utils.c:4116
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr ""
 
-#: src/common/utils.c:4058
+#: src/common/utils.c:4117
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr ""
 
-#: src/common/utils.c:4059
+#: src/common/utils.c:4118
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr ""
 
-#: src/common/utils.c:4060
+#: src/common/utils.c:4119
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr ""
 
-#: src/common/utils.c:4061
+#: src/common/utils.c:4120
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr ""
 
-#: src/common/utils.c:4062
+#: src/common/utils.c:4121
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr ""
 
-#: src/common/utils.c:4063
+#: src/common/utils.c:4122
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr ""
 
-#: src/common/utils.c:4064
+#: src/common/utils.c:4123
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr ""
 
-#: src/common/utils.c:4065
+#: src/common/utils.c:4124
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr ""
 
-#: src/common/utils.c:4066
+#: src/common/utils.c:4125
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr ""
 
-#: src/common/utils.c:4067
+#: src/common/utils.c:4126
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr ""
 
-#: src/common/utils.c:4068
+#: src/common/utils.c:4127
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr ""
 
-#: src/common/utils.c:4079
+#: src/common/utils.c:4138
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr ""
 
-#: src/common/utils.c:4080
+#: src/common/utils.c:4139
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr ""
 
-#: src/common/utils.c:4081
+#: src/common/utils.c:4140
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr ""
 
-#: src/common/utils.c:4082
+#: src/common/utils.c:4141
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr ""
 
-#: src/compose.c:596
+#: src/compose.c:201
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+
+#: src/compose.c:599
 msgid "_Add..."
 msgstr ""
 
-#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:323
+#: src/compose.c:600 src/gtk/gtkutils.c:86
+#: src/plugins/mailmbox/plugin_gtk.c:302 src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr ""
 
-#: src/compose.c:599 src/folderview.c:254
+#: src/compose.c:602 src/folderview.c:254
 msgid "_Properties..."
 msgstr ""
 
-#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
+#: src/compose.c:609 src/mainwindow.c:519 src/messageview.c:214
 msgid "_Message"
 msgstr ""
 
-#: src/compose.c:609
+#: src/compose.c:612
 msgid "_Spelling"
 msgstr ""
 
-#: src/compose.c:611 src/compose.c:678
+#: src/compose.c:614 src/compose.c:681
 msgid "_Options"
 msgstr ""
 
-#: src/compose.c:615
+#: src/compose.c:616 src/mainwindow.c:522 src/messageview.c:216
+msgid "_Help"
+msgstr ""
+
+#: src/compose.c:618
 msgid "S_end"
 msgstr ""
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "Send _later"
 msgstr ""
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "_Attach file"
 msgstr ""
 
-#: src/compose.c:620
+#: src/compose.c:623
 msgid "_Insert file"
 msgstr ""
 
-#: src/compose.c:621
+#: src/compose.c:624
 msgid "Insert si_gnature"
 msgstr ""
 
-#: src/compose.c:622
+#: src/compose.c:625
 msgid "_Replace signature"
 msgstr ""
 
-#: src/compose.c:626
+#: src/compose.c:629
 msgid "_Print"
 msgstr ""
 
-#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:634 src/gtk/gtkutils.c:76
+#: src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr ""
 
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr ""
 
-#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:638 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr ""
 
-#: src/compose.c:639
+#: src/compose.c:642
 msgid "_Special paste"
 msgstr ""
 
-#: src/compose.c:640
+#: src/compose.c:643
 msgid "As _quotation"
 msgstr ""
 
-#: src/compose.c:641
+#: src/compose.c:644
 msgid "_Wrapped"
 msgstr ""
 
-#: src/compose.c:642
+#: src/compose.c:645
 msgid "_Unwrapped"
 msgstr ""
 
-#: src/compose.c:644 src/mainwindow.c:558
+#: src/compose.c:647 src/mainwindow.c:552
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr ""
 
-#: src/compose.c:646
+#: src/compose.c:649
 msgid "A_dvanced"
 msgstr ""
 
-#: src/compose.c:647
+#: src/compose.c:650
 msgid "Move a character backward"
 msgstr ""
 
-#: src/compose.c:648
+#: src/compose.c:651
 msgid "Move a character forward"
 msgstr ""
 
-#: src/compose.c:649
+#: src/compose.c:652
 msgid "Move a word backward"
 msgstr ""
 
-#: src/compose.c:650
+#: src/compose.c:653
 msgid "Move a word forward"
 msgstr ""
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Move to beginning of line"
 msgstr ""
 
-#: src/compose.c:652
+#: src/compose.c:655
 msgid "Move to end of line"
 msgstr ""
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Move to previous line"
 msgstr ""
 
-#: src/compose.c:654
+#: src/compose.c:657
 msgid "Move to next line"
 msgstr ""
 
-#: src/compose.c:655
+#: src/compose.c:658
 msgid "Delete a character backward"
 msgstr ""
 
-#: src/compose.c:656
+#: src/compose.c:659
 msgid "Delete a character forward"
 msgstr ""
 
-#: src/compose.c:657
+#: src/compose.c:660
 msgid "Delete a word backward"
 msgstr ""
 
-#: src/compose.c:658
+#: src/compose.c:661
 msgid "Delete a word forward"
 msgstr ""
 
-#: src/compose.c:659
+#: src/compose.c:662
 msgid "Delete line"
 msgstr ""
 
-#: src/compose.c:660
+#: src/compose.c:663
 msgid "Delete to end of line"
 msgstr ""
 
-#: src/compose.c:663 src/messageview.c:231
+#: src/compose.c:666 src/gtk/gtkutils.c:73 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr ""
 
-#: src/compose.c:666
+#: src/compose.c:669
 msgid "_Wrap current paragraph"
 msgstr ""
 
-#: src/compose.c:667
+#: src/compose.c:670
 msgid "Wrap all long _lines"
 msgstr ""
 
-#: src/compose.c:669
+#: src/compose.c:672
 msgid "Edit with e_xternal editor"
 msgstr ""
 
-#: src/compose.c:672
+#: src/compose.c:675
 msgid "_Check all or check selection"
 msgstr ""
 
-#: src/compose.c:673
+#: src/compose.c:676
 msgid "_Highlight all misspelled words"
 msgstr ""
 
-#: src/compose.c:674
+#: src/compose.c:677
 msgid "Check _backwards misspelled word"
 msgstr ""
 
-#: src/compose.c:675
+#: src/compose.c:678
 msgid "_Forward to next misspelled word"
 msgstr ""
 
-#: src/compose.c:682
+#: src/compose.c:685
 msgid "Reply _mode"
 msgstr ""
 
-#: src/compose.c:684
+#: src/compose.c:687
 msgid "Privacy _System"
 msgstr ""
 
-#: src/compose.c:688
+#: src/compose.c:691
 msgid "_Priority"
 msgstr ""
 
-#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
+#: src/compose.c:693 src/mainwindow.c:614 src/messageview.c:267
 msgid "Character _encoding"
 msgstr ""
 
-#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
+#: src/compose.c:698 src/mainwindow.c:619 src/messageview.c:272
 msgid "Western European"
 msgstr ""
 
-#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
+#: src/compose.c:699 src/mainwindow.c:620 src/messageview.c:273
 msgid "Baltic"
 msgstr ""
 
-#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
+#: src/compose.c:700 src/mainwindow.c:621 src/messageview.c:274
 msgid "Hebrew"
 msgstr ""
 
-#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
+#: src/compose.c:701 src/mainwindow.c:622 src/messageview.c:275
 msgid "Arabic"
 msgstr ""
 
-#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
+#: src/compose.c:702 src/mainwindow.c:623 src/messageview.c:276
 msgid "Cyrillic"
 msgstr ""
 
-#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
+#: src/compose.c:703 src/mainwindow.c:624 src/messageview.c:277
 msgid "Japanese"
 msgstr ""
 
-#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
+#: src/compose.c:704 src/mainwindow.c:625 src/messageview.c:278
 msgid "Chinese"
 msgstr ""
 
-#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
+#: src/compose.c:705 src/mainwindow.c:626 src/messageview.c:279
 msgid "Korean"
 msgstr ""
 
-#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
+#: src/compose.c:706 src/mainwindow.c:627 src/messageview.c:280
 msgid "Thai"
 msgstr ""
 
-#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
+#: src/compose.c:709 src/mainwindow.c:737 src/messageview.c:316
 msgid "_Address book"
 msgstr ""
 
-#: src/compose.c:708
+#: src/compose.c:711
 msgid "_Template"
 msgstr ""
 
-#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
+#: src/compose.c:713 src/mainwindow.c:765 src/messageview.c:336
 msgid "Actio_ns"
 msgstr ""
 
-#: src/compose.c:719
+#: src/compose.c:717 src/mainwindow.c:819 src/messageview.c:340
+msgid "_About"
+msgstr ""
+
+#: src/compose.c:722
 msgid "Aut_o wrapping"
 msgstr ""
 
-#: src/compose.c:720
+#: src/compose.c:723
 msgid "Auto _indent"
 msgstr ""
 
-#: src/compose.c:721
+#: src/compose.c:724
 msgid "Si_gn"
 msgstr ""
 
-#: src/compose.c:722
+#: src/compose.c:725
 msgid "_Encrypt"
 msgstr ""
 
-#: src/compose.c:723
+#: src/compose.c:726
 msgid "_Request Return Receipt"
 msgstr ""
 
-#: src/compose.c:724
+#: src/compose.c:727
 msgid "Remo_ve references"
 msgstr ""
 
-#: src/compose.c:725
+#: src/compose.c:728
 msgid "Show _ruler"
 msgstr ""
 
-#: src/compose.c:730 src/compose.c:740
+#: src/compose.c:733 src/compose.c:743
 msgid "_Normal"
 msgstr ""
 
-#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
-#: src/summaryview.c:433
+#: src/compose.c:734 src/mainwindow.c:668 src/messageview.c:305
+#: src/summaryview.c:428
 msgid "_All"
 msgstr ""
 
-#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
-#: src/summaryview.c:434
+#: src/compose.c:735 src/mainwindow.c:669 src/messageview.c:306
+#: src/summaryview.c:429
 msgid "_Sender"
 msgstr ""
 
-#: src/compose.c:733
+#: src/compose.c:736
 msgid "_Mailing-list"
 msgstr ""
 
-#: src/compose.c:738
+#: src/compose.c:741
 msgid "_Highest"
 msgstr ""
 
-#: src/compose.c:739
+#: src/compose.c:742
 msgid "Hi_gh"
 msgstr ""
 
-#: src/compose.c:741
+#: src/compose.c:744
 msgid "Lo_w"
 msgstr ""
 
-#: src/compose.c:742
+#: src/compose.c:745
 msgid "_Lowest"
 msgstr ""
 
-#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
+#: src/compose.c:750 src/mainwindow.c:884 src/messageview.c:353
 msgid "_Automatic"
 msgstr ""
 
-#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
+#: src/compose.c:751 src/mainwindow.c:885 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr ""
 
-#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
+#: src/compose.c:752 src/mainwindow.c:886 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr ""
 
-#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
+#: src/compose.c:756 src/mainwindow.c:890 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr ""
 
-#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
+#: src/compose.c:759 src/mainwindow.c:893 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr ""
 
-#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
+#: src/compose.c:764 src/mainwindow.c:898 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr ""
 
-#: src/compose.c:1015 src/compose.c:1697
-msgid ""
-"You have opted to sign and/or encrypt this message but have not selected a "
-"privacy system.\n"
-"\n"
-"Signing and encrypting have been disabled for this message."
-msgstr ""
-
-#: src/compose.c:1051
+#: src/compose.c:1035
 msgid "New message From format error."
 msgstr ""
 
-#: src/compose.c:1144
+#: src/compose.c:1128
 msgid "New message subject format error."
 msgstr ""
 
-#: src/compose.c:1176 src/quote_fmt.c:563
+#: src/compose.c:1160 src/quote_fmt.c:565
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:1445
+#: src/compose.c:1429
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr ""
 
-#: src/compose.c:1630 src/quote_fmt.c:580
+#: src/compose.c:1614 src/quote_fmt.c:582
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1679 src/quote_fmt.c:583
+#: src/compose.c:1663 src/quote_fmt.c:585
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
+#: src/compose.c:1804 src/compose.c:2005 src/quote_fmt.c:602
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/compose.c:1883 src/quote_fmt.c:603
+#: src/compose.c:1865 src/quote_fmt.c:605
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2059
+#: src/compose.c:2048
 msgid "Fw: multiple emails"
 msgstr ""
 
-#: src/compose.c:2566
+#: src/compose.c:2559
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:2633 src/gtk/headers.h:14
+#: src/compose.c:2630 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr ""
 
-#: src/compose.c:2636 src/gtk/headers.h:15
+#: src/compose.c:2633 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr ""
 
-#: src/compose.c:2639 src/gtk/headers.h:12
+#: src/compose.c:2636 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr ""
 
-#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
+#: src/compose.c:2639 src/compose.c:5014 src/compose.c:5016
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr ""
 
-#: src/compose.c:2645 src/gtk/headers.h:34
+#: src/compose.c:2642 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr ""
 
-#: src/compose.c:2648 src/gtk/headers.h:17
+#: src/compose.c:2645 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr ""
 
-#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
-#: src/gtk/headers.h:13 src/summary_search.c:422
+#: src/compose.c:2649 src/compose.c:5011 src/compose.c:5019
+#: src/gtk/headers.h:13 src/summary_search.c:429
 msgid "To:"
 msgstr ""
 
-#: src/compose.c:2842
+#: src/compose.c:2845
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr ""
 
-#: src/compose.c:2848
+#: src/compose.c:2851
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1830,131 +1982,131 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:3128
+#: src/compose.c:3131
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr ""
 
-#: src/compose.c:3657
+#: src/compose.c:3660
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr ""
 
-#: src/compose.c:3675
+#: src/compose.c:3678
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr ""
 
-#: src/compose.c:3678
+#: src/compose.c:3681
 msgid "Are you sure?"
 msgstr ""
 
-#: src/compose.c:3679 src/compose.c:10844 src/compose.c:11738
+#: src/compose.c:3682 src/compose.c:10773 src/compose.c:11665
 msgid "_Insert"
 msgstr ""
 
-#: src/compose.c:3804
+#: src/compose.c:3807
 #, c-format
 msgid "File %s is empty."
 msgstr ""
 
-#: src/compose.c:3805
+#: src/compose.c:3808
 msgid "Empty file"
 msgstr ""
 
-#: src/compose.c:3806
+#: src/compose.c:3809
 msgid "_Attach anyway"
 msgstr ""
 
-#: src/compose.c:3815
+#: src/compose.c:3818
 #, c-format
 msgid "Can't read %s."
 msgstr ""
 
-#: src/compose.c:3842
+#: src/compose.c:3845
 #, c-format
 msgid "Message: %s"
 msgstr ""
 
-#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
+#: src/compose.c:4855 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr ""
 
-#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4862 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4862 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4865 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr ""
 
-#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4867 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr ""
 
-#: src/compose.c:4891 src/messageview.c:887
+#: src/compose.c:4894 src/messageview.c:884
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 
-#: src/compose.c:5108 src/compose.c:5145
+#: src/compose.c:5111 src/compose.c:5148
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr ""
 
-#: src/compose.c:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
-#: src/prefs_account.c:3758 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5113 src/compose.c:5150 src/compose.c:5188 src/compose.c:5231
+#: src/prefs_account.c:4072 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr ""
 
-#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
-#: src/compose.c:5794 src/folderview.c:2546 src/messageview.c:859
+#: src/compose.c:5115 src/compose.c:5152 src/compose.c:5189 src/compose.c:5232
+#: src/compose.c:5797 src/folderview.c:2538 src/messageview.c:856
 #: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr ""
 
-#: src/compose.c:5166
+#: src/compose.c:5169
 msgid "Recipient is not specified."
 msgstr ""
 
-#: src/compose.c:5181
+#: src/compose.c:5184
 #, c-format
 msgid "Subject is empty. %s"
 msgstr ""
 
-#: src/compose.c:5182 src/compose.c:5225
+#: src/compose.c:5185 src/compose.c:5228
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:5183 src/compose.c:5226
+#: src/compose.c:5186 src/compose.c:5229
 #: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr ""
 
-#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
+#: src/compose.c:5188 src/compose.c:5231 src/toolbar.c:520
 msgid "Send later"
 msgstr ""
 
-#: src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5189 src/compose.c:5232
 msgid "_Queue"
 msgstr ""
 
-#: src/compose.c:5224
+#: src/compose.c:5227
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr ""
 
-#: src/compose.c:5253
+#: src/compose.c:5256
 msgid "Could not queue message."
 msgstr ""
 
-#: src/compose.c:5256
+#: src/compose.c:5259
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -1962,7 +2114,7 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/compose.c:5260
+#: src/compose.c:5263
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1970,7 +2122,7 @@ msgid ""
 "Signature failed: %s"
 msgstr ""
 
-#: src/compose.c:5265
+#: src/compose.c:5268
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1978,34 +2130,34 @@ msgid ""
 "Encryption failed: %s"
 msgstr ""
 
-#: src/compose.c:5270
+#: src/compose.c:5273
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Charset conversion failed."
 msgstr ""
 
-#: src/compose.c:5274
+#: src/compose.c:5277
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 "Couldn't get recipient encryption key."
 msgstr ""
 
-#: src/compose.c:5337 src/compose.c:5397
+#: src/compose.c:5340 src/compose.c:5400
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5393
+#: src/compose.c:5396
 #, c-format
 msgid ""
 "%s\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
 
-#: src/compose.c:5790
+#: src/compose.c:5793
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2013,7 +2165,7 @@ msgid ""
 "Send it as %s?"
 msgstr ""
 
-#: src/compose.c:5852
+#: src/compose.c:5855
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2022,260 +2174,281 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:6087
+#: src/compose.c:6090
 msgid "Encryption warning"
 msgstr ""
 
-#: src/compose.c:6088
+#: src/compose.c:6091
 msgid "C_ontinue"
 msgstr ""
 
-#: src/compose.c:6137
+#: src/compose.c:6140
 msgid "No account for sending mails available!"
 msgstr ""
 
-#: src/compose.c:6146
+#: src/compose.c:6149
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr ""
 
-#: src/compose.c:6400
+#: src/compose.c:6403
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr ""
 
-#: src/compose.c:6402 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
+#: src/compose.c:6405 src/mainwindow.c:659 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr ""
 
-#: src/compose.c:6402
+#: src/compose.c:6405
 msgid "Ignore attachment"
 msgstr ""
 
-#: src/compose.c:6458
+#: src/compose.c:6461
 #, c-format
 msgid "Original %s part"
 msgstr ""
 
-#: src/compose.c:7058
+#: src/compose.c:7061
 msgid "Add to address _book"
 msgstr ""
 
-#: src/compose.c:7225
+#: src/compose.c:7216
 msgid "Delete entry contents"
 msgstr ""
 
-#: src/compose.c:7229 src/plugins/vcalendar/vcal_meeting_gtk.c:290
+#: src/compose.c:7220 src/plugins/vcalendar/vcal_meeting_gtk.c:302
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr ""
 
-#: src/compose.c:7461
+#: src/compose.c:7455
 msgid "Mime type"
 msgstr ""
 
-#: src/compose.c:7467 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
-#: src/prefs_matcher.c:641 src/prefs_summaries.c:633
-#: src/prefs_summary_column.c:84 src/summaryview.c:472
+#: src/compose.c:7461 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: src/prefs_matcher.c:640 src/prefs_summaries.c:633
+#: src/prefs_summary_column.c:84 src/summaryview.c:467
 msgid "Size"
 msgstr ""
 
-#: src/compose.c:7529
+#: src/compose.c:7523
 msgid "Save Message to "
 msgstr ""
 
-#: src/compose.c:7560 src/editjpilot.c:276 src/editldap.c:518
-#: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
-#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
+#: src/compose.c:7556 src/editjpilot.c:277 src/editldap.c:514
+#: src/editvcard.c:193 src/export.c:161 src/gtk/gtkutils.c:77 src/import.c:160
+#: src/importmutt.c:240 src/importpine.c:239
+#: src/plugins/archive/archiver_gtk.c:1081
 #: src/plugins/bogofilter/bogofilter_gtk.c:213
 #: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
 #: src/plugins/clamd/clamav_plugin_gtk.c:295
-#: src/plugins/spamassassin/spamassassin_gtk.c:434
+#: src/plugins/spamassassin/spamassassin_gtk.c:429
 msgid "_Browse"
 msgstr ""
 
-#: src/compose.c:7576
+#: src/compose.c:7572
 msgid "Select folder to save message to"
 msgstr ""
 
-#: src/compose.c:8033
+#: src/compose.c:8022
 msgid "Hea_der"
 msgstr ""
 
-#: src/compose.c:8038
+#: src/compose.c:8027
 msgid "_Attachments"
 msgstr ""
 
-#: src/compose.c:8052
+#: src/compose.c:8041
 msgid "Othe_rs"
 msgstr ""
 
-#: src/compose.c:8067
+#: src/compose.c:8056
 msgid "S_ubject:"
 msgstr ""
 
-#: src/compose.c:8291
+#: src/compose.c:8280
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 "%s"
 msgstr ""
 
-#: src/compose.c:8438
+#: src/compose.c:8431
 msgid "_From:"
 msgstr ""
 
-#: src/compose.c:8455
+#: src/compose.c:8439
 msgid "Account to use for this email"
 msgstr ""
 
-#: src/compose.c:8457
+#: src/compose.c:8441
 msgid "Sender address to be used"
 msgstr ""
 
-#: src/compose.c:8639
+#: src/compose.c:8623
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr ""
 
-#: src/compose.c:8750 src/plugins/archive/archiver_gtk.c:1180
+#: src/compose.c:8734 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr ""
 
-#: src/compose.c:8851 src/prefs_template.c:752
+#: src/compose.c:8835 src/prefs_template.c:745
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr ""
 
-#: src/compose.c:8948
+#: src/compose.c:8932
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr ""
 
-#: src/compose.c:9372
+#: src/compose.c:9356
 msgid "Invalid MIME type."
 msgstr ""
 
-#: src/compose.c:9387
+#: src/compose.c:9371
 msgid "File doesn't exist or is empty."
 msgstr ""
 
-#: src/compose.c:9461
+#: src/compose.c:9442
 msgid "Properties"
 msgstr ""
 
-#: src/compose.c:9479
+#: src/compose.c:9460
 msgid "MIME type"
 msgstr ""
 
-#: src/compose.c:9512
+#: src/compose.c:9493
 msgid "Encoding"
 msgstr ""
 
-#: src/compose.c:9532
+#: src/compose.c:9513
 msgid "Path"
 msgstr ""
 
-#: src/compose.c:9533
+#: src/compose.c:9514
 msgid "File name"
 msgstr ""
 
-#: src/compose.c:9792
+#: src/compose.c:9609
+#, c-format
+msgid ""
+"Could not write the body to file:\n"
+"%s"
+msgstr ""
+
+#: src/compose.c:9667
+#, c-format
+msgid ""
+"Could not spawn the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#: src/compose.c:9706
+#, c-format
+msgid "External editor stopped with an error:%s"
+msgstr ""
+
+#: src/compose.c:9780
 #, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process?\n"
-"process group id: %d"
+"process id: %d"
 msgstr ""
 
-#: src/compose.c:10265 src/messageview.c:1088
+#: src/compose.c:10187 src/messageview.c:1085
 msgid "Claws Mail needs network access in order to send this email."
 msgstr ""
 
-#: src/compose.c:10458
+#: src/compose.c:10389
 msgid "Could not save draft."
 msgstr ""
 
-#: src/compose.c:10462
+#: src/compose.c:10393
 msgid "Could not save draft"
 msgstr ""
 
-#: src/compose.c:10463
+#: src/compose.c:10394
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
 msgstr ""
 
-#: src/compose.c:10465
+#: src/compose.c:10396
 msgid "_Cancel exit"
 msgstr ""
 
-#: src/compose.c:10465
+#: src/compose.c:10396
 msgid "_Discard email"
 msgstr ""
 
-#: src/compose.c:10654 src/compose.c:10668
+#: src/compose.c:10585 src/compose.c:10599
 msgid "Select file"
 msgstr ""
 
-#: src/compose.c:10682
+#: src/compose.c:10613
 #, c-format
 msgid "File '%s' could not be read."
 msgstr ""
 
-#: src/compose.c:10684
+#: src/compose.c:10615
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 "for the current encoding, insertion may be incorrect."
 msgstr ""
 
-#: src/compose.c:10763
+#: src/compose.c:10692
 msgid "Discard message"
 msgstr ""
 
-#: src/compose.c:10764
+#: src/compose.c:10693
 msgid "This message has been modified. Discard it?"
 msgstr ""
 
-#: src/compose.c:10765 src/plugins/managesieve/sieve_editor.c:434
+#: src/compose.c:10694 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr ""
 
-#: src/compose.c:10765 src/compose.c:10770
+#: src/compose.c:10694 src/compose.c:10699
 msgid "_Save to Drafts"
 msgstr ""
 
-#: src/compose.c:10768 src/plugins/managesieve/sieve_editor.c:432
+#: src/compose.c:10697 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr ""
 
-#: src/compose.c:10769
+#: src/compose.c:10698
 msgid "This message has been modified. Save the latest changes?"
 msgstr ""
 
-#: src/compose.c:10770
+#: src/compose.c:10699
 msgid "_Don't save"
 msgstr ""
 
-#: src/compose.c:10841
+#: src/compose.c:10770
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr ""
 
-#: src/compose.c:10843
+#: src/compose.c:10772
 msgid "Apply template"
 msgstr ""
 
-#: src/compose.c:10844 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
-#: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
-#: src/prefs_toolbar.c:1018
+#: src/compose.c:10773 src/gtk/gtkutils.c:75 src/prefs_actions.c:326
+#: src/prefs_filtering_action.c:585 src/prefs_matcher.c:796
+#: src/prefs_toolbar.c:1003
 msgid "_Replace"
 msgstr ""
 
-#: src/compose.c:11731
+#: src/compose.c:11658
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2286,20 +2459,20 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/compose.c:11737
+#: src/compose.c:11664
 msgid "Insert or attach?"
 msgstr ""
 
-#: src/compose.c:11738
+#: src/compose.c:11665
 msgid "_Attach"
 msgstr ""
 
-#: src/compose.c:11956
+#: src/compose.c:11881
 #, c-format
 msgid "Quote format error at line %d."
 msgstr ""
 
-#: src/compose.c:12252
+#: src/compose.c:12177
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2326,7 +2499,7 @@ msgstr ""
 msgid "Debug log"
 msgstr ""
 
-#: src/crash.c:252 src/toolbar.c:539
+#: src/crash.c:252 src/expldifdlg.c:202 src/printing.c:508 src/toolbar.c:539
 msgid "Close"
 msgstr ""
 
@@ -2382,11 +2555,11 @@ msgstr ""
 msgid "An Email address must be supplied."
 msgstr ""
 
-#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:204
 msgid "A Name and Value must be supplied."
 msgstr ""
 
-#: src/editaddress.c:820 src/prefs_folder_item.c:1784
+#: src/editaddress.c:820 src/prefs_folder_item.c:1761
 msgid "Discard"
 msgstr ""
 
@@ -2417,34 +2590,34 @@ msgstr ""
 msgid "_Unset picture"
 msgstr ""
 
-#: src/editaddress.c:1050
+#: src/editaddress.c:1048
 msgid "Photo"
 msgstr ""
 
-#: src/editaddress.c:1097 src/editaddress.c:1099 src/expldifdlg.c:516
+#: src/editaddress.c:1095 src/editaddress.c:1097 src/expldifdlg.c:506
 #: src/exporthtml.c:762 src/ldif.c:747
 msgid "Display Name"
 msgstr ""
 
-#: src/editaddress.c:1108 src/editaddress.c:1112 src/ldif.c:755
+#: src/editaddress.c:1106 src/editaddress.c:1110 src/ldif.c:755
 msgid "Last Name"
 msgstr ""
 
-#: src/editaddress.c:1109 src/editaddress.c:1111 src/ldif.c:751
+#: src/editaddress.c:1107 src/editaddress.c:1109 src/ldif.c:751
 msgid "First Name"
 msgstr ""
 
-#: src/editaddress.c:1115 src/editaddress.c:1117
+#: src/editaddress.c:1113 src/editaddress.c:1115
 msgid "Nickname"
 msgstr ""
 
-#: src/editaddress.c:1253 src/editaddress.c:1294
+#: src/editaddress.c:1251 src/editaddress.c:1292
 msgid "Alias"
 msgstr ""
 
-#: src/editaddress.c:1479 src/editaddress.c:1512 src/editaddress.c:1528
-#: src/editaddress_other_attributes_ldap.c:376
-#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:223
+#: src/editaddress.c:1480 src/editaddress.c:1507 src/editaddress.c:1526
+#: src/editaddress_other_attributes_ldap.c:374
+#: src/editaddress_other_attributes_ldap.c:411 src/prefs_customheader.c:217
 msgid "Value"
 msgstr ""
 
@@ -2467,95 +2640,95 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/editbook.c:109
+#: src/editbook.c:108
 msgid "File appears to be OK."
 msgstr ""
 
-#: src/editbook.c:112
+#: src/editbook.c:111
 msgid "File does not appear to be a valid address book format."
 msgstr ""
 
-#: src/editbook.c:115 src/editjpilot.c:191 src/editvcard.c:98
+#: src/editbook.c:114 src/editjpilot.c:190 src/editvcard.c:97
 msgid "Could not read file."
 msgstr ""
 
-#: src/editbook.c:149 src/editbook.c:263
+#: src/editbook.c:147 src/editbook.c:258
 msgid "Edit Addressbook"
 msgstr ""
 
-#: src/editbook.c:178 src/editjpilot.c:264 src/editvcard.c:181
+#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
 msgid " Check File "
 msgstr ""
 
-#: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
-#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2158
-#: src/wizard.c:1198 src/wizard.c:1618
+#: src/editbook.c:181 src/editjpilot.c:268 src/editvcard.c:184
+#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2442
+#: src/wizard.c:1201 src/wizard.c:1632
 msgid "File"
 msgstr ""
 
-#: src/editbook.c:282
+#: src/editbook.c:277
 msgid "Add New Addressbook"
 msgstr ""
 
-#: src/editgroup.c:101
+#: src/editgroup.c:100
 msgid "A Group Name must be supplied."
 msgstr ""
 
-#: src/editgroup.c:296
+#: src/editgroup.c:294
 msgid "Edit Group Data"
 msgstr ""
 
-#: src/editgroup.c:326 src/exporthtml.c:598
+#: src/editgroup.c:323 src/exporthtml.c:598
 msgid "Group Name"
 msgstr ""
 
-#: src/editgroup.c:345
+#: src/editgroup.c:344
 msgid "Addresses in Group"
 msgstr ""
 
-#: src/editgroup.c:379
+#: src/editgroup.c:378
 msgid "Available Addresses"
 msgstr ""
 
-#: src/editgroup.c:453
+#: src/editgroup.c:452
 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr ""
 
-#: src/editgroup.c:501
+#: src/editgroup.c:500
 msgid "Edit Group Details"
 msgstr ""
 
-#: src/editgroup.c:504
+#: src/editgroup.c:503
 msgid "Add New Group"
 msgstr ""
 
-#: src/editgroup.c:553
+#: src/editgroup.c:552
 msgid "Edit folder"
 msgstr ""
 
-#: src/editgroup.c:553
+#: src/editgroup.c:552
 msgid "Input the new name of folder:"
 msgstr ""
 
-#: src/editgroup.c:556 src/foldersel.c:572 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: src/editgroup.c:555 src/foldersel.c:571 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "New folder"
 msgstr ""
 
-#: src/editgroup.c:557 src/foldersel.c:573 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: src/editgroup.c:556 src/foldersel.c:572 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "Input the name of new folder:"
 msgstr ""
 
-#: src/editjpilot.c:188
+#: src/editjpilot.c:187
 msgid "File does not appear to be JPilot format."
 msgstr ""
 
-#: src/editjpilot.c:200
+#: src/editjpilot.c:199
 msgid "Select JPilot File"
 msgstr ""
 
-#: src/editjpilot.c:236 src/editjpilot.c:365
+#: src/editjpilot.c:235 src/editjpilot.c:364
 msgid "Edit JPilot Entry"
 msgstr ""
 
@@ -2563,38 +2736,38 @@ msgstr ""
 msgid "Additional e-Mail address item(s)"
 msgstr ""
 
-#: src/editjpilot.c:372
+#: src/editjpilot.c:371
 msgid "Add New JPilot Entry"
 msgstr ""
 
-#: src/editldap_basedn.c:153
+#: src/editldap_basedn.c:152
 msgid "Edit LDAP - Select Search Base"
 msgstr ""
 
-#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
+#: src/editldap_basedn.c:171 src/editldap.c:439 src/prefs_account.c:3189
 #: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr ""
 
-#: src/editldap_basedn.c:183 src/editldap.c:458
-#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
+#: src/editldap_basedn.c:180 src/editldap.c:456
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:3196
 #: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr ""
 
-#: src/editldap_basedn.c:193 src/editldap.c:502
+#: src/editldap_basedn.c:189 src/editldap.c:497
 msgid "Search Base"
 msgstr ""
 
-#: src/editldap_basedn.c:221
+#: src/editldap_basedn.c:219
 msgid "Available Search Base(s)"
 msgstr ""
 
-#: src/editldap_basedn.c:327
+#: src/editldap_basedn.c:325
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr ""
 
-#: src/editldap_basedn.c:331 src/editldap.c:281
+#: src/editldap_basedn.c:329 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr ""
 
@@ -2614,15 +2787,15 @@ msgstr ""
 msgid "Connected successfully to server"
 msgstr ""
 
-#: src/editldap.c:335 src/editldap.c:991
+#: src/editldap.c:335 src/editldap.c:974
 msgid "Edit LDAP Server"
 msgstr ""
 
-#: src/editldap.c:437
+#: src/editldap.c:436
 msgid "A name that you wish to call the server."
 msgstr ""
 
-#: src/editldap.c:450
+#: src/editldap.c:449
 msgid ""
 "This is the hostname of the server. For example, \"ldap.example.org\" may be "
 "appropriate for the \"example.org\" organization. An IP address may also be "
@@ -2634,15 +2807,15 @@ msgstr ""
 "used. You may specify \"localhost\" if running an LDAP server on the same "
 "computer as Claws Mail."
 
-#: src/editldap.c:469
+#: src/editldap.c:467
 msgid "STARTTLS"
 msgstr ""
 
-#: src/editldap.c:470 src/prefs_account.c:3831
+#: src/editldap.c:468 src/prefs_account.c:4163
 msgid "SSL/TLS"
 msgstr ""
 
-#: src/editldap.c:474
+#: src/editldap.c:472
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2650,26 +2823,26 @@ msgid ""
 "TLS_REQCERT fields)."
 msgstr ""
 
-#: src/editldap.c:479
+#: src/editldap.c:477
 msgid ""
 "Enable secure connection to the LDAP server via SSL/TLS. If connection "
 "fails, be sure to check the correct configuration in ldap.conf "
 "(TLS_CACERTDIR and TLS_REQCERT fields)."
 msgstr ""
 
-#: src/editldap.c:491
+#: src/editldap.c:487
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr ""
 
-#: src/editldap.c:494
+#: src/editldap.c:490
 msgid " Check Server "
 msgstr ""
 
-#: src/editldap.c:498
+#: src/editldap.c:494
 msgid "Press this button to test the connection to the server."
 msgstr ""
 
-#: src/editldap.c:511
+#: src/editldap.c:507
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2683,37 +2856,37 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organisation Name,c=Country\n"
 
-#: src/editldap.c:522
+#: src/editldap.c:518
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr ""
 
-#: src/editldap.c:578
+#: src/editldap.c:572
 msgid "Search Attributes"
 msgstr ""
 
-#: src/editldap.c:587
+#: src/editldap.c:582
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
 msgstr ""
 
-#: src/editldap.c:590
+#: src/editldap.c:585
 msgid " Defaults "
 msgstr ""
 
-#: src/editldap.c:594
+#: src/editldap.c:589
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
 msgstr ""
 
-#: src/editldap.c:600
+#: src/editldap.c:594
 msgid "Max Query Age (secs)"
 msgstr ""
 
-#: src/editldap.c:614
+#: src/editldap.c:607
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2727,21 +2900,21 @@ msgid ""
 "more memory to cache results."
 msgstr ""
 
-#: src/editldap.c:631
+#: src/editldap.c:623
 msgid "Include server in dynamic search"
 msgstr ""
 
-#: src/editldap.c:636
+#: src/editldap.c:627
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
 msgstr ""
 
-#: src/editldap.c:642
+#: src/editldap.c:632
 msgid "Match names 'containing' search term"
 msgstr ""
 
-#: src/editldap.c:647
+#: src/editldap.c:636
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2750,11 +2923,11 @@ msgid ""
 "searches against other address interfaces."
 msgstr ""
 
-#: src/editldap.c:710
+#: src/editldap.c:697
 msgid "Bind DN"
 msgstr ""
 
-#: src/editldap.c:719
+#: src/editldap.c:707
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2762,100 +2935,100 @@ msgid ""
 "performing a search."
 msgstr ""
 
-#: src/editldap.c:726
+#: src/editldap.c:713
 msgid "Bind Password"
 msgstr ""
 
-#: src/editldap.c:736
+#: src/editldap.c:724
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr ""
 
-#: src/editldap.c:739 src/prefs_account.c:1405 src/prefs_account.c:2003
-#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
-#: src/prefs_proxy.c:146
+#: src/editldap.c:727 src/prefs_account.c:1444 src/prefs_account.c:2073
+#: src/prefs_account.c:3001 src/prefs_account.c:3029 src/prefs_account.c:3230
+#: src/prefs_proxy.c:142
 msgid "Show password"
 msgstr ""
 
-#: src/editldap.c:748
+#: src/editldap.c:734
 msgid "Timeout (secs)"
 msgstr ""
 
-#: src/editldap.c:761
+#: src/editldap.c:746
 msgid "The timeout period in seconds."
 msgstr ""
 
-#: src/editldap.c:765
+#: src/editldap.c:749
 msgid "Maximum Entries"
 msgstr ""
 
-#: src/editldap.c:778
+#: src/editldap.c:761
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
-#: src/editldap.c:793 src/prefs_account.c:3722
+#: src/editldap.c:776 src/prefs_account.c:4036
 msgid "Basic"
 msgstr ""
 
-#: src/editldap.c:795 src/gtk/quicksearch.c:706
+#: src/editldap.c:778 src/gtk/quicksearch.c:877
 msgid "Extended"
 msgstr ""
 
-#: src/editldap.c:996
+#: src/editldap.c:979
 msgid "Add New LDAP Server"
 msgstr ""
 
-#: src/edittags.c:192 src/prefs_filtering_action.c:1403
-#: src/prefs_summaries.c:640
+#: src/edittags.c:191 src/gtk/quicksearch.c:865
+#: src/prefs_filtering_action.c:1403 src/prefs_summaries.c:640
 msgid "Tag"
 msgstr ""
 
-#: src/edittags.c:221
+#: src/edittags.c:220
 msgid "Delete tag"
 msgstr ""
 
-#: src/edittags.c:222
+#: src/edittags.c:221
 msgid "Do you really want to delete this tag?"
 msgstr ""
 
-#: src/edittags.c:257
+#: src/edittags.c:256
 msgid "Delete all tags"
 msgstr ""
 
-#: src/edittags.c:258
+#: src/edittags.c:257
 msgid "Do you really want to delete all tags?"
 msgstr ""
 
-#: src/edittags.c:430
+#: src/edittags.c:427
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr ""
 
-#: src/edittags.c:472
+#: src/edittags.c:469
 msgid "Tag is not set."
 msgstr ""
 
-#: src/edittags.c:550
+#: src/edittags.c:547
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr ""
 
-#: src/edittags.c:567
+#: src/edittags.c:564
 msgid "New tag:"
 msgstr ""
 
-#: src/edittags.c:600
+#: src/edittags.c:597
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr ""
 
-#: src/editvcard.c:95
+#: src/editvcard.c:94
 msgid "File does not appear to be vCard format."
 msgstr ""
 
-#: src/editvcard.c:107
+#: src/editvcard.c:106
 msgid "Select vCard File"
 msgstr ""
 
-#: src/editvcard.c:152 src/editvcard.c:257
+#: src/editvcard.c:150 src/editvcard.c:257
 msgid "Edit vCard Entry"
 msgstr ""
 
@@ -2917,99 +3090,99 @@ msgstr ""
 msgid "Select HTML output file"
 msgstr ""
 
-#: src/exphtmldlg.c:383
+#: src/exphtmldlg.c:378
 msgid "HTML Output File"
 msgstr ""
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:173 src/import.c:171
-#: src/importldif.c:568
+#: src/exphtmldlg.c:387 src/expldifdlg.c:404 src/export.c:167 src/import.c:166
+#: src/importldif.c:565
 msgid "B_rowse"
 msgstr ""
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
+#: src/exphtmldlg.c:436 src/plugins/fancy/fancy_prefs.c:302
 msgid "Stylesheet"
 msgstr ""
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
-#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
-#: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1040
-#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
+#: src/exphtmldlg.c:443 src/gtk/colorlabel.c:368 src/gtk/colorlabel.c:494
+#: src/gtk/gtkaspell.c:1572 src/gtk/gtkaspell.c:2207 src/gtk/menu.c:126
+#: src/mainwindow.c:1175 src/plugins/archive/archiver_prefs.c:313
+#: src/plugins/libravatar/libravatar_prefs.c:315 src/prefs_account.c:1111
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1420 src/summaryview.c:6246
 msgid "None"
 msgstr ""
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
-#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
-#: src/prefs_other.c:129 src/prefs_other.c:417
+#: src/exphtmldlg.c:444 src/prefs_folder_item.c:531
+#: src/prefs_folder_item.c:1178 src/prefs_folder_item.c:1208
+#: src/prefs_other.c:128 src/prefs_other.c:416
 msgid "Default"
 msgstr ""
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
+#: src/exphtmldlg.c:445 src/plugins/pgpcore/select-keys.c:240
 #: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
 msgid "Full"
 msgstr ""
 
-#: src/exphtmldlg.c:456
+#: src/exphtmldlg.c:446
 msgid "Custom"
 msgstr ""
 
-#: src/exphtmldlg.c:457
+#: src/exphtmldlg.c:447
 msgid "Custom-2"
 msgstr ""
 
-#: src/exphtmldlg.c:458
+#: src/exphtmldlg.c:448
 msgid "Custom-3"
 msgstr ""
 
-#: src/exphtmldlg.c:459
+#: src/exphtmldlg.c:449
 msgid "Custom-4"
 msgstr ""
 
-#: src/exphtmldlg.c:466
+#: src/exphtmldlg.c:454
 msgid "Full Name Format"
 msgstr ""
 
-#: src/exphtmldlg.c:474
+#: src/exphtmldlg.c:461
 msgid "First Name, Last Name"
 msgstr ""
 
-#: src/exphtmldlg.c:475
+#: src/exphtmldlg.c:462
 msgid "Last Name, First Name"
 msgstr ""
 
-#: src/exphtmldlg.c:482
+#: src/exphtmldlg.c:467
 msgid "Color Banding"
 msgstr "Colour Banding"
 
-#: src/exphtmldlg.c:488
+#: src/exphtmldlg.c:471
 msgid "Format Email Links"
 msgstr ""
 
-#: src/exphtmldlg.c:494
+#: src/exphtmldlg.c:475
 msgid "Format User Attributes"
 msgstr ""
 
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:850
+#: src/exphtmldlg.c:517 src/expldifdlg.c:593 src/importldif.c:837
 msgid "Address Book:"
 msgstr ""
 
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:860
+#: src/exphtmldlg.c:526 src/expldifdlg.c:602 src/importldif.c:846
 msgid "File Name:"
 msgstr ""
 
-#: src/exphtmldlg.c:559
+#: src/exphtmldlg.c:535
 msgid "Open with Web Browser"
 msgstr ""
 
-#: src/exphtmldlg.c:591
+#: src/exphtmldlg.c:567
 msgid "Export Address Book to HTML File"
 msgstr ""
 
-#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:980
+#: src/exphtmldlg.c:633 src/expldifdlg.c:701 src/importldif.c:963
 msgid "File Info"
 msgstr ""
 
-#: src/exphtmldlg.c:658
+#: src/exphtmldlg.c:634
 msgid "Format"
 msgstr ""
 
@@ -3057,18 +3230,18 @@ msgstr ""
 msgid "Select LDIF output file"
 msgstr ""
 
-#: src/expldifdlg.c:400
+#: src/expldifdlg.c:395
 msgid "LDIF Output File"
 msgstr ""
 
-#: src/expldifdlg.c:431
+#: src/expldifdlg.c:425
 msgid ""
 "The address book Unique ID is used to create a DN that is formatted similar "
 "to:\n"
 "  uid=102376,ou=people,dc=claws-mail,dc=org"
 msgstr ""
 
-#: src/expldifdlg.c:437
+#: src/expldifdlg.c:431
 msgid ""
 "The address book Display Name is used to create a DN that is formatted "
 "similar to:\n"
@@ -3078,7 +3251,7 @@ msgstr ""
 "similar to:\n"
 "  cn=Joe Bloggs,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:443
+#: src/expldifdlg.c:437
 msgid ""
 "The first Email Address belonging to a person is used to create a DN that is "
 "formatted similar to:\n"
@@ -3088,11 +3261,11 @@ msgstr ""
 "formatted similar to:\n"
 "  mail=joe.bloggs@domain.com,ou=people,dc=claws-mail,dc=org"
 
-#: src/expldifdlg.c:489
+#: src/expldifdlg.c:481
 msgid "Suffix"
 msgstr ""
 
-#: src/expldifdlg.c:499
+#: src/expldifdlg.c:491
 msgid ""
 "The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
 "entry. Examples include:\n"
@@ -3106,15 +3279,15 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organisation Name,c=Country\n"
 
-#: src/expldifdlg.c:507
+#: src/expldifdlg.c:498
 msgid "Relative DN"
 msgstr ""
 
-#: src/expldifdlg.c:515
+#: src/expldifdlg.c:505
 msgid "Unique ID"
 msgstr ""
 
-#: src/expldifdlg.c:523
+#: src/expldifdlg.c:512
 msgid ""
 "The LDIF file contains several data records that are usually loaded into an "
 "LDAP server. Each data record in the LDIF file is uniquely identified by a "
@@ -3123,11 +3296,11 @@ msgid ""
 "available RDN options that will be used to create the DN."
 msgstr ""
 
-#: src/expldifdlg.c:543
+#: src/expldifdlg.c:529
 msgid "Use DN attribute if present in data"
 msgstr ""
 
-#: src/expldifdlg.c:548
+#: src/expldifdlg.c:533
 msgid ""
 "The addressbook may contain entries that were previously imported from an "
 "LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
@@ -3135,57 +3308,57 @@ msgid ""
 "above will be used if the DN user attribute is not found."
 msgstr ""
 
-#: src/expldifdlg.c:558
+#: src/expldifdlg.c:542
 msgid "Exclude record if no Email Address"
 msgstr ""
 
-#: src/expldifdlg.c:563
+#: src/expldifdlg.c:546
 msgid ""
 "An addressbook may contain entries without Email Addresses. Check this "
 "option to ignore these records."
 msgstr ""
 
-#: src/expldifdlg.c:655
+#: src/expldifdlg.c:635
 msgid "Export Address Book to LDIF File"
 msgstr ""
 
-#: src/expldifdlg.c:722
+#: src/expldifdlg.c:702
 msgid "Distinguished Name"
 msgstr ""
 
-#: src/export.c:113 src/summaryview.c:8482
+#: src/export.c:112 src/summaryview.c:8456
 msgid "Export to mbox file"
 msgstr ""
 
-#: src/export.c:132
+#: src/export.c:131
 msgid "Locate the folder to export and specify the mbox file."
 msgstr ""
 
-#: src/export.c:143
+#: src/export.c:142
 msgid "Source folder:"
 msgstr ""
 
-#: src/export.c:149 src/import.c:143
+#: src/export.c:146 src/import.c:142
 msgid "Mbox file:"
 msgstr ""
 
-#: src/export.c:205
+#: src/export.c:198
 msgid "Target mbox filename can't be left empty."
 msgstr ""
 
-#: src/export.c:210
+#: src/export.c:203
 msgid "Source folder can't be left empty."
 msgstr ""
 
-#: src/export.c:223
+#: src/export.c:216
 msgid "Couldn't find the source folder."
 msgstr ""
 
-#: src/export.c:247
+#: src/export.c:240
 msgid "Select exporting file"
 msgstr ""
 
-#: src/export.c:270
+#: src/export.c:263
 msgid "Select folder to export"
 msgstr ""
 
@@ -3193,7 +3366,7 @@ msgstr ""
 msgid "Full Name"
 msgstr ""
 
-#: src/exporthtml.c:772 src/importldif.c:981
+#: src/exporthtml.c:772 src/importldif.c:964
 #: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr ""
@@ -3218,17 +3391,17 @@ msgstr ""
 msgid "Not specified."
 msgstr ""
 
-#: src/file_checker.c:82
+#: src/file_checker.c:81
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr ""
 
-#: src/file_checker.c:91 src/file_checker.c:115
+#: src/file_checker.c:90 src/file_checker.c:114
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr ""
 
-#: src/file_checker.c:106
+#: src/file_checker.c:105
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3318,51 +3491,51 @@ msgstr ""
 msgid "no further processing after action [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:809
+#: src/filtering.c:820
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:813
+#: src/filtering.c:824
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:831
+#: src/filtering.c:842
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:835
+#: src/filtering.c:846
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr ""
 
-#: src/filtering.c:873
+#: src/filtering.c:884
 msgid "undetermined"
 msgstr ""
 
-#: src/filtering.c:877
+#: src/filtering.c:888
 msgid "incorporation"
 msgstr ""
 
-#: src/filtering.c:881
+#: src/filtering.c:892
 msgid "manually"
 msgstr ""
 
-#: src/filtering.c:885
+#: src/filtering.c:896
 msgid "folder processing"
 msgstr ""
 
-#: src/filtering.c:889
+#: src/filtering.c:900
 msgid "pre-processing"
 msgstr ""
 
-#: src/filtering.c:893
+#: src/filtering.c:904
 msgid "post-processing"
 msgstr ""
 
-#: src/filtering.c:908
+#: src/filtering.c:919
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3373,18 +3546,18 @@ msgid ""
 "%s%s %s\n"
 msgstr ""
 
-#: src/filtering.c:910 src/filtering.c:919
+#: src/filtering.c:921 src/filtering.c:930
 msgid ": "
 msgstr ""
 
-#: src/filtering.c:917
+#: src/filtering.c:928
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
 "%smessage file: %s\n"
 msgstr ""
 
-#: src/folder.c:1595 src/prefs_folder_item.c:319
+#: src/folder.c:1595 src/prefs_folder_item.c:318
 msgid "Inbox"
 msgstr ""
 
@@ -3393,15 +3566,15 @@ msgid "Sent"
 msgstr ""
 
 #: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
-#: src/prefs_folder_item.c:322
+#: src/prefs_folder_item.c:321
 msgid "Queue"
 msgstr ""
 
-#: src/folder.c:1607 src/prefs_folder_item.c:323
+#: src/folder.c:1607 src/prefs_folder_item.c:322
 msgid "Trash"
 msgstr "Wastebin"
 
-#: src/folder.c:1611 src/prefs_folder_item.c:321
+#: src/folder.c:1611 src/prefs_folder_item.c:320
 msgid "Drafts"
 msgstr ""
 
@@ -3410,66 +3583,74 @@ msgstr ""
 msgid "Processing (%s)...\n"
 msgstr ""
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3289
+#: src/folder.c:3294
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr ""
 
-#: src/folder.c:3599
+#: src/folder.c:3604
 #, c-format
 msgid "Updating cache for %s..."
 msgstr ""
 
-#: src/folder.c:4461
+#: src/folder.c:4466
 msgid "Processing messages..."
 msgstr ""
 
-#: src/folder.c:4596
+#: src/folder.c:4601
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr ""
 
-#: src/folder.c:4855
+#: src/folder.c:4860
 msgid "A folder name cannot begin or end with a dot."
 msgstr ""
 
-#: src/folder.c:4859
+#: src/folder.c:4864
 msgid "A folder name can not end with a space."
 msgstr ""
 
-#: src/foldersel.c:250
+#: src/foldersel.c:251
 msgid "Select folder"
 msgstr ""
 
-#: src/foldersel.c:574 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
+#: src/foldersel.c:349
+msgid "_New"
+msgstr ""
+
+#: src/foldersel.c:573 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:247 src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "NewFolder"
 msgstr ""
 
-#: src/foldersel.c:582 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:574 src/imap_gtk.c:198 src/mh_gtk.c:147
+msgid "Inherit properties and processing rules from parent folder"
+msgstr ""
+
+#: src/foldersel.c:584 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
-#: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
+#: src/plugins/mailmbox/plugin_gtk.c:255 src/plugins/mailmbox/plugin_gtk.c:431
 #: src/plugins/rssyl/rssyl_cb_menu.c:202
 #: src/plugins/vcalendar/vcal_folder.c:2068
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr ""
 
-#: src/foldersel.c:597 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
-#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
+#: src/foldersel.c:599 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:270
+#: src/plugins/mailmbox/plugin_gtk.c:443 src/plugins/rssyl/rssyl_cb_menu.c:214
 #: src/plugins/vcalendar/vcal_folder.c:2075
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr ""
 
-#: src/foldersel.c:604 src/imap_gtk.c:230 src/mh_gtk.c:173
-#: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
+#: src/foldersel.c:606 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/plugins/mailmbox/plugin_gtk.c:277 src/plugins/rssyl/opml_import.c:91
 #: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
 msgid "Can't create the folder '%s'."
@@ -3495,7 +3676,7 @@ msgstr ""
 msgid "R_un processing rules"
 msgstr ""
 
-#: src/folderview.c:253 src/mainwindow.c:562
+#: src/folderview.c:253 src/mainwindow.c:556
 msgid "_Search folder..."
 msgstr ""
 
@@ -3517,13 +3698,13 @@ msgstr ""
 
 #: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:401 src/summaryview.c:6518
 msgid "New"
 msgstr ""
 
 #: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:400 src/summaryview.c:6520
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr ""
@@ -3534,189 +3715,189 @@ msgid "Total"
 msgstr ""
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:453 src/summaryview.c:473
+#: src/folderview.c:453 src/summaryview.c:468
 msgid "#"
 msgstr "No."
 
-#: src/folderview.c:783
+#: src/folderview.c:781
 msgid "Setting folder info..."
 msgstr ""
 
-#: src/folderview.c:868 src/summaryview.c:4288
+#: src/folderview.c:866 src/summaryview.c:4262
 msgid "Mark all as read"
 msgstr ""
 
-#: src/folderview.c:869
+#: src/folderview.c:867
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
 msgstr ""
 
-#: src/folderview.c:871 src/summaryview.c:4289
+#: src/folderview.c:869 src/summaryview.c:4263
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr ""
 
-#: src/folderview.c:874 src/summaryview.c:4334
+#: src/folderview.c:872 src/summaryview.c:4308
 msgid "Mark all as unread"
 msgstr ""
 
-#: src/folderview.c:875
+#: src/folderview.c:873
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
 msgstr ""
 
-#: src/folderview.c:877 src/summaryview.c:4335
+#: src/folderview.c:875 src/summaryview.c:4309
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr ""
 
-#: src/folderview.c:1067 src/imap.c:4643
+#: src/folderview.c:1065 src/imap.c:4686
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr ""
 
-#: src/folderview.c:1070 src/imap.c:4647 src/mainwindow.c:5280 src/setup.c:96
+#: src/folderview.c:1068 src/imap.c:4690 src/mainwindow.c:5223 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr ""
 
-#: src/folderview.c:1101
+#: src/folderview.c:1099
 msgid "Rebuild folder tree"
 msgstr ""
 
-#: src/folderview.c:1102
+#: src/folderview.c:1100
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr ""
 
-#: src/folderview.c:1112
+#: src/folderview.c:1110
 msgid "Rebuilding folder tree..."
 msgstr ""
 
-#: src/folderview.c:1114
+#: src/folderview.c:1112
 msgid "Scanning folder tree..."
 msgstr ""
 
-#: src/folderview.c:1205
+#: src/folderview.c:1202
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr ""
 
-#: src/folderview.c:1259
+#: src/folderview.c:1256
 msgid "Checking for new messages in all folders..."
 msgstr ""
 
-#: src/folderview.c:2233
+#: src/folderview.c:2225
 #, c-format
 msgid "Closing folder %s..."
 msgstr ""
 
-#: src/folderview.c:2328
+#: src/folderview.c:2320
 #, c-format
 msgid "Opening folder %s..."
 msgstr ""
 
-#: src/folderview.c:2346
+#: src/folderview.c:2338
 msgid "Folder could not be opened."
 msgstr ""
 
-#: src/folderview.c:2486 src/mainwindow.c:2896 src/mainwindow.c:2901
+#: src/folderview.c:2478 src/mainwindow.c:2866 src/mainwindow.c:2871
 msgid "Empty trash"
 msgstr "Empty wastebin"
 
-#: src/folderview.c:2487
+#: src/folderview.c:2479
 msgid "Delete all messages in trash?"
 msgstr "Delete all messages in wastebin?"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2480
 msgid "_Empty trash"
 msgstr "_Empty wastebin"
 
-#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
+#: src/folderview.c:2524 src/inc.c:1666 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr ""
 
-#: src/folderview.c:2533 src/toolbar.c:3033
+#: src/folderview.c:2525 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr ""
 
-#: src/folderview.c:2544 src/toolbar.c:3052
+#: src/folderview.c:2536 src/toolbar.c:3052
 msgid "Send queued messages"
 msgstr ""
 
-#: src/folderview.c:2545 src/toolbar.c:3053
+#: src/folderview.c:2537 src/toolbar.c:3053
 msgid "Send all queued messages?"
 msgstr ""
 
-#: src/folderview.c:2554 src/toolbar.c:3072
+#: src/folderview.c:2546 src/toolbar.c:3072
 msgid "Some errors occurred while sending queued messages."
 msgstr ""
 
-#: src/folderview.c:2557 src/main.c:2812 src/toolbar.c:3075
+#: src/folderview.c:2549 src/main.c:2882 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
 "%s"
 msgstr ""
 
-#: src/folderview.c:2632
+#: src/folderview.c:2624
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr ""
 
-#: src/folderview.c:2633
+#: src/folderview.c:2625
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr ""
 
-#: src/folderview.c:2635
+#: src/folderview.c:2627
 msgid "Copy folder"
 msgstr ""
 
-#: src/folderview.c:2635
+#: src/folderview.c:2627
 msgid "Move folder"
 msgstr ""
 
-#: src/folderview.c:2646
+#: src/folderview.c:2638
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2646
+#: src/folderview.c:2638
 #, c-format
 msgid "Moving %s to %s..."
 msgstr ""
 
-#: src/folderview.c:2680
+#: src/folderview.c:2672
 msgid "Source and destination are the same."
 msgstr ""
 
-#: src/folderview.c:2683
+#: src/folderview.c:2675
 msgid "Can't copy a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2684
+#: src/folderview.c:2676
 msgid "Can't move a folder to one of its children."
 msgstr ""
 
-#: src/folderview.c:2687
+#: src/folderview.c:2679
 msgid "A folder cannot be moved between different mailboxes."
 msgstr ""
 
-#: src/folderview.c:2690
+#: src/folderview.c:2682
 msgid "Copy failed!"
 msgstr ""
 
-#: src/folderview.c:2690
+#: src/folderview.c:2682
 msgid "Move failed!"
 msgstr ""
 
-#: src/folderview.c:2740
+#: src/folderview.c:2732
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr ""
 
-#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
+#: src/folderview.c:3155 src/summaryview.c:4717 src/summaryview.c:4823
 msgid "The destination folder can only be used to store subfolders."
 msgstr ""
 
@@ -3728,49 +3909,49 @@ msgstr ""
 msgid "Select newsgroups for subscription:"
 msgstr ""
 
-#: src/grouplistdialog.c:184
+#: src/grouplistdialog.c:192
 msgid "Find groups:"
 msgstr ""
 
-#: src/grouplistdialog.c:192
+#: src/grouplistdialog.c:201
 msgid " Search "
 msgstr ""
 
-#: src/grouplistdialog.c:204
+#: src/grouplistdialog.c:215
 msgid "Newsgroup name"
 msgstr ""
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:188
+#: src/grouplistdialog.c:216 src/prefs_send.c:188
 msgid "Messages"
 msgstr ""
 
-#: src/grouplistdialog.c:206
+#: src/grouplistdialog.c:217
 msgid "Type"
 msgstr ""
 
-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:357
 msgid "moderated"
 msgstr ""
 
-#: src/grouplistdialog.c:348
+#: src/grouplistdialog.c:359
 msgid "readonly"
 msgstr ""
 
-#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/grouplistdialog.c:361 src/plugins/att_remover/att_remover.c:303
 #: src/plugins/vcalendar/vcal_manager.c:115
 #: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr ""
 
-#: src/grouplistdialog.c:424
+#: src/grouplistdialog.c:436
 msgid "Can't retrieve newsgroup list."
 msgstr ""
 
-#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
+#: src/grouplistdialog.c:473 src/gtk/gtkutils.c:1877 src/summaryview.c:1669
 msgid "Done."
 msgstr ""
 
-#: src/grouplistdialog.c:494
+#: src/grouplistdialog.c:506
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr ""
@@ -3794,9 +3975,9 @@ msgid ""
 "the Claws Mail project you can do so at:"
 msgstr ""
 
-#: src/gtk/about.c:163 src/gtk/about.c:852
+#: src/gtk/about.c:163 src/gtk/about.c:857
 msgid ""
-"Copyright (C) 1999-2020\n"
+"Copyright (C) 1999-2021\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
@@ -3826,101 +4007,101 @@ msgid ""
 "Operating System: unknown"
 msgstr ""
 
-#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
+#: src/gtk/about.c:249 src/prefs_themes.c:842 src/wizard.c:529
 msgid "The Claws Mail Team"
 msgstr ""
 
-#: src/gtk/about.c:267
+#: src/gtk/about.c:268
 msgid "Previous team members"
 msgstr ""
 
-#: src/gtk/about.c:286
+#: src/gtk/about.c:287
 msgid "The translation team"
 msgstr ""
 
-#: src/gtk/about.c:305
+#: src/gtk/about.c:306
 msgid "Documentation team"
 msgstr ""
 
-#: src/gtk/about.c:323
+#: src/gtk/about.c:324
 msgid "Logo"
 msgstr ""
 
-#: src/gtk/about.c:342
+#: src/gtk/about.c:343
 msgid "Icons"
 msgstr ""
 
-#: src/gtk/about.c:361
+#: src/gtk/about.c:362
 msgid "Contributors"
 msgstr ""
 
-#: src/gtk/about.c:409
+#: src/gtk/about.c:411
 msgid "Compiled-in Features"
 msgstr ""
 
-#: src/gtk/about.c:426
+#: src/gtk/about.c:428
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr ""
 
-#: src/gtk/about.c:436
+#: src/gtk/about.c:438
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr ""
 
-#: src/gtk/about.c:446
+#: src/gtk/about.c:448
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr ""
 
-#: src/gtk/about.c:456
+#: src/gtk/about.c:458
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr ""
 
-#: src/gtk/about.c:467
+#: src/gtk/about.c:469
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr ""
 
-#: src/gtk/about.c:477
+#: src/gtk/about.c:479
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr ""
 
-#: src/gtk/about.c:487
+#: src/gtk/about.c:489
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr ""
 
-#: src/gtk/about.c:497
+#: src/gtk/about.c:499
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr ""
 
-#: src/gtk/about.c:507
+#: src/gtk/about.c:509
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr ""
 
-#: src/gtk/about.c:517
+#: src/gtk/about.c:519
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr ""
 
-#: src/gtk/about.c:527
+#: src/gtk/about.c:529
 msgctxt "librSVG"
 msgid "adds support for SVG themes\n"
 msgstr ""
 
-#: src/gtk/about.c:559
+#: src/gtk/about.c:562
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
 "Software Foundation; either version 3, or (at your option) any later version."
 msgstr ""
 
-#: src/gtk/about.c:566
+#: src/gtk/about.c:569
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -3928,151 +4109,151 @@ msgid ""
 "more details."
 msgstr ""
 
-#: src/gtk/about.c:585
+#: src/gtk/about.c:587
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
 msgstr ""
 
-#: src/gtk/about.c:718 src/main.c:2636
+#: src/gtk/about.c:722 src/main.c:2706
 msgid "Session statistics\n"
 msgstr ""
 
-#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2646 src/main.c:2649
+#: src/gtk/about.c:732 src/gtk/about.c:735 src/main.c:2716 src/main.c:2719
 #, c-format
 msgid "Started: %s\n"
 msgstr ""
 
-#: src/gtk/about.c:738 src/main.c:2655
+#: src/gtk/about.c:742 src/main.c:2725
 msgid "Incoming traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:741 src/main.c:2658
+#: src/gtk/about.c:745 src/main.c:2728
 #, c-format
 msgid "Received messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:748 src/main.c:2664
+#: src/gtk/about.c:752 src/main.c:2734
 msgid "Outgoing traffic\n"
 msgstr ""
 
-#: src/gtk/about.c:751 src/main.c:2667
+#: src/gtk/about.c:755 src/main.c:2737
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:756 src/main.c:2671
+#: src/gtk/about.c:760 src/main.c:2741
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:761 src/main.c:2675
+#: src/gtk/about.c:765 src/main.c:2745
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:766 src/main.c:2679
+#: src/gtk/about.c:770 src/main.c:2749
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr ""
 
-#: src/gtk/about.c:793
+#: src/gtk/about.c:797
 msgid "About Claws Mail"
 msgstr ""
 
-#: src/gtk/about.c:866
+#: src/gtk/about.c:872
 msgid "_Info"
 msgstr ""
 
-#: src/gtk/about.c:872
+#: src/gtk/about.c:878
 msgid "_Authors"
 msgstr ""
 
-#: src/gtk/about.c:878
+#: src/gtk/about.c:884
 msgid "_Features"
 msgstr ""
 
-#: src/gtk/about.c:884
+#: src/gtk/about.c:890
 msgid "_License"
 msgstr ""
 
-#: src/gtk/about.c:892
+#: src/gtk/about.c:898
 msgid "_Release Notes"
 msgstr ""
 
-#: src/gtk/about.c:898
+#: src/gtk/about.c:904
 msgid "_Statistics"
 msgstr ""
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
+#: src/gtk/colorlabel.c:37 src/prefs_common.c:365
 msgid "Orange"
 msgstr ""
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:369
 msgid "Red"
 msgstr ""
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:373
 msgid "Pink"
 msgstr ""
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:381
 msgid "Blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:385
 msgid "Green"
 msgstr ""
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:389
 msgid "Brown"
 msgstr ""
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:393
 msgid "Grey"
 msgstr ""
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:397
 msgid "Light brown"
 msgstr ""
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:401
 msgid "Dark red"
 msgstr ""
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr ""
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr ""
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:413
 msgid "Gold"
 msgstr ""
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:417
 msgid "Bright green"
 msgstr ""
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:421
 msgid "Magenta"
 msgstr ""
 
-#: src/gtk/foldersort.c:241
+#: src/gtk/foldersort.c:229
 msgid "Set mailbox order"
 msgstr ""
 
-#: src/gtk/foldersort.c:277
+#: src/gtk/foldersort.c:265
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr ""
 
-#: src/gtk/foldersort.c:311
+#: src/gtk/foldersort.c:299
 msgid "Mailboxes"
 msgstr ""
 
@@ -4094,181 +4275,252 @@ msgstr ""
 msgid "Couldn't initialize %s dictionary:"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1070
+#: src/gtk/gtkaspell.c:1067
 msgid "No misspelled word found."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1451
+#: src/gtk/gtkaspell.c:1445
 msgid "Replace unknown word"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1467
+#: src/gtk/gtkaspell.c:1461
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1510
+#: src/gtk/gtkaspell.c:1505
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
+#: src/gtk/gtkaspell.c:1806 src/gtk/gtkaspell.c:1943
 msgid "More..."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1867
+#: src/gtk/gtkaspell.c:1862
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1883
+#: src/gtk/gtkaspell.c:1877
 msgid "Accept in this session"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1893
+#: src/gtk/gtkaspell.c:1887
 msgid "Add to personal dictionary"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1903
+#: src/gtk/gtkaspell.c:1897
 msgid "Replace with..."
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1916
+#: src/gtk/gtkaspell.c:1910
 #, c-format
 msgid "Check with %s"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:1938
+#: src/gtk/gtkaspell.c:1932
 msgid "(no suggestions)"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2012
+#: src/gtk/gtkaspell.c:2006
 #, c-format
 msgid "Dictionary: %s"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2027
+#: src/gtk/gtkaspell.c:2020
 #, c-format
 msgid "Use alternate (%s)"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2038
+#: src/gtk/gtkaspell.c:2031
 msgid "Use both dictionaries"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2047 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2154
+#: src/gtk/gtkaspell.c:2129
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
 "%s"
 msgstr ""
 
-#: src/gtk/gtkaspell.c:2210
+#: src/gtk/gtkaspell.c:2185
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
 "%s"
 msgstr ""
 
-#: src/gtk/gtkutils.c:1862
-msgid "Failed: no service record found."
+#: src/gtk/gtkutils.c:66 src/gtk/quicksearch.c:991 src/gtk/quicksearch.c:1020
+msgid "_Information"
 msgstr ""
 
-#: src/gtk/gtkutils.c:1865
-msgid "Failed: network error."
+#: src/gtk/gtkutils.c:67 src/mimeview.c:221
+msgid "_Open"
 msgstr ""
 
-#: src/gtk/gtkutils.c:1868
-#, c-format
-msgid "Failed: unknown error (%d)."
+#: src/gtk/gtkutils.c:68
+msgid "_Properties"
 msgstr ""
 
-#: src/gtk/gtkutils.c:1938
-msgid "Configuring..."
+#: src/gtk/gtkutils.c:70 src/gtk/quicksearch.c:993 src/gtk/quicksearch.c:1022
+msgid "C_lear"
 msgstr ""
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
-#: src/prefs_matcher.c:646 src/prefs_matcher.c:2217 src/prefs_summaries.c:634
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:471
-msgid "Date"
+#: src/gtk/gtkutils.c:72
+msgid "D_elete"
 msgstr ""
 
-#: src/gtk/headers.h:9
-msgid "Date:"
+#: src/gtk/gtkutils.c:74
+msgid "Find and _Replace"
 msgstr ""
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1222
-#: src/prefs_matcher.c:2214 src/prefs_summaries.c:636
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:469
-msgid "From"
+#: src/gtk/gtkutils.c:78
+msgid "_Bottom"
 msgstr ""
 
-#: src/gtk/headers.h:10 src/summary_search.c:415
-msgid "From:"
+#: src/gtk/gtkutils.c:79
+msgid "_Down"
 msgstr ""
 
-#: src/gtk/headers.h:11
-msgid "Sender"
+#: src/gtk/gtkutils.c:80 src/wizard.c:1812
+msgid "_Next"
 msgstr ""
 
-#: src/gtk/headers.h:11
-msgid "Sender:"
+#: src/gtk/gtkutils.c:81 src/wizard.c:1811
+msgid "_Previous"
 msgstr ""
 
-#: src/gtk/headers.h:12
-msgid "Reply-To"
+#: src/gtk/gtkutils.c:82
+msgid "_Top"
 msgstr ""
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1223
-#: src/prefs_matcher.c:2215 src/prefs_summaries.c:637
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:470
-msgid "To"
+#: src/gtk/gtkutils.c:83
+msgid "_Up"
 msgstr ""
 
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
-#: src/prefs_matcher.c:2216 src/quote_fmt.c:58
-msgid "Cc"
+#: src/gtk/gtkutils.c:84 src/mainwindow.c:681
+msgid "Help"
 msgstr ""
 
-#: src/gtk/headers.h:15
-msgid "Bcc"
+#: src/gtk/gtkutils.c:85
+msgid "_Add"
 msgstr ""
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
-#: src/prefs_matcher.c:2218 src/quote_fmt.c:61
-msgid "Message-ID"
+#: src/gtk/gtkutils.c:87
+msgid "_Stop"
 msgstr ""
 
-#: src/gtk/headers.h:16
-msgid "Message-ID:"
+#: src/gtk/gtkutils.c:88
+msgid "_Execute"
 msgstr ""
 
-#: src/gtk/headers.h:17
-msgid "In-Reply-To"
+#: src/gtk/gtkutils.c:89
+msgid "_Refresh"
 msgstr ""
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
-#: src/prefs_matcher.c:2220 src/quote_fmt.c:60
-msgid "References"
+#: src/gtk/gtkutils.c:1882
+msgid "Failed: no service record found."
+msgstr ""
+
+#: src/gtk/gtkutils.c:1885
+msgid "Failed: network error."
+msgstr ""
+
+#: src/gtk/gtkutils.c:1888
+#, c-format
+msgid "Failed: unknown error (%d)."
+msgstr ""
+
+#: src/gtk/gtkutils.c:1958
+msgid "Configuring..."
+msgstr ""
+
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
+#: src/prefs_matcher.c:645 src/prefs_matcher.c:2212 src/prefs_summaries.c:634
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:48 src/summaryview.c:466
+msgid "Date"
+msgstr ""
+
+#: src/gtk/headers.h:9
+msgid "Date:"
+msgstr ""
+
+#: src/gtk/headers.h:10 src/gtk/quicksearch.c:853
+#: src/prefs_filtering_action.c:1222 src/prefs_matcher.c:2209
+#: src/prefs_summaries.c:636 src/prefs_summary_column.c:81 src/quote_fmt.c:49
+#: src/summaryview.c:464
+msgid "From"
+msgstr ""
+
+#: src/gtk/headers.h:10 src/summary_search.c:423
+msgid "From:"
+msgstr ""
+
+#: src/gtk/headers.h:11
+msgid "Sender"
+msgstr ""
+
+#: src/gtk/headers.h:11
+msgid "Sender:"
+msgstr ""
+
+#: src/gtk/headers.h:12
+msgid "Reply-To"
+msgstr ""
+
+#: src/gtk/headers.h:13 src/gtk/quicksearch.c:859
+#: src/prefs_filtering_action.c:1223 src/prefs_matcher.c:2210
+#: src/prefs_summaries.c:637 src/prefs_summary_column.c:82 src/quote_fmt.c:56
+#: src/summaryview.c:465
+msgid "To"
+msgstr ""
+
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
+#: src/prefs_matcher.c:2211 src/quote_fmt.c:57
+msgid "Cc"
+msgstr ""
+
+#: src/gtk/headers.h:15
+msgid "Bcc"
+msgstr ""
+
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
+#: src/prefs_matcher.c:2213 src/quote_fmt.c:60
+msgid "Message-ID"
+msgstr ""
+
+#: src/gtk/headers.h:16
+msgid "Message-ID:"
+msgstr ""
+
+#: src/gtk/headers.h:17
+msgid "In-Reply-To"
+msgstr ""
+
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
+#: src/prefs_matcher.c:2215 src/quote_fmt.c:59
+msgid "References"
 msgstr ""
 
 #: src/gtk/headers.h:18
 msgid "References:"
 msgstr ""
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1221
-#: src/prefs_matcher.c:2213 src/prefs_summaries.c:638
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:468
+#: src/gtk/headers.h:19 src/gtk/quicksearch.c:847
+#: src/prefs_filtering_action.c:1221 src/prefs_matcher.c:2208
+#: src/prefs_summaries.c:638 src/prefs_summary_column.c:80 src/quote_fmt.c:55
+#: src/summaryview.c:463
 msgid "Subject"
 msgstr ""
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
-#: src/summary_search.c:429
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/summary_search.c:435
 msgid "Subject:"
 msgstr ""
 
@@ -4284,7 +4536,7 @@ msgstr ""
 msgid "Keywords"
 msgstr ""
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:711
 msgid "Keywords:"
 msgstr ""
 
@@ -4361,7 +4613,7 @@ msgid "Received:"
 msgstr ""
 
 #: src/gtk/headers.h:33 src/prefs_filtering_action.c:1227
-#: src/prefs_matcher.c:2219 src/quote_fmt.c:59
+#: src/prefs_matcher.c:2214 src/quote_fmt.c:58
 msgid "Newsgroups"
 msgstr ""
 
@@ -4386,9 +4638,9 @@ msgid "Seen:"
 msgstr ""
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:190 src/prefs_summaries.c:642
-#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
-#: src/summaryview.c:2898
+#: src/gtk/sslcertwindow.c:188 src/prefs_summaries.c:642
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1031 src/ssl_manager.c:124
+#: src/summaryview.c:2888
 msgid "Status"
 msgstr ""
 
@@ -4460,7 +4712,7 @@ msgstr ""
 msgid "Precedence:"
 msgstr ""
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1169
+#: src/gtk/headers.h:46 src/prefs_account.c:1238
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4588,148 +4840,148 @@ msgstr ""
 msgid "From, To or Subject:"
 msgstr ""
 
-#: src/gtk/icon_legend.c:67
+#: src/gtk/icon_legend.c:66
 msgid "New message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:68
+#: src/gtk/icon_legend.c:67
 msgid "Unread message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:69
+#: src/gtk/icon_legend.c:68
 msgid "Message has been replied to"
 msgstr ""
 
-#: src/gtk/icon_legend.c:70
+#: src/gtk/icon_legend.c:69
 msgid "Message has been forwarded"
 msgstr ""
 
-#: src/gtk/icon_legend.c:71
+#: src/gtk/icon_legend.c:70
 msgid "Message has been forwarded and replied to"
 msgstr ""
 
-#: src/gtk/icon_legend.c:72
+#: src/gtk/icon_legend.c:71
 msgid "Message is in an ignored thread"
 msgstr ""
 
-#: src/gtk/icon_legend.c:73
+#: src/gtk/icon_legend.c:72
 msgid "Message is in a watched thread"
 msgstr ""
 
-#: src/gtk/icon_legend.c:74
+#: src/gtk/icon_legend.c:73
 msgid "Message is spam"
 msgstr ""
 
-#: src/gtk/icon_legend.c:76
+#: src/gtk/icon_legend.c:75
 msgid "Message has attachment(s)"
 msgstr ""
 
-#: src/gtk/icon_legend.c:77
+#: src/gtk/icon_legend.c:76
 msgid "Digitally signed message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:78
+#: src/gtk/icon_legend.c:77
 msgid "Encrypted message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:79
+#: src/gtk/icon_legend.c:78
 msgid "Message is signed and has attachment(s)"
 msgstr ""
 
-#: src/gtk/icon_legend.c:80
+#: src/gtk/icon_legend.c:79
 msgid "Message is encrypted and has attachment(s)"
 msgstr ""
 
-#: src/gtk/icon_legend.c:82
+#: src/gtk/icon_legend.c:81
 msgid "Marked message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:83
+#: src/gtk/icon_legend.c:82
 msgid "Message is marked for deletion"
 msgstr ""
 
-#: src/gtk/icon_legend.c:84
+#: src/gtk/icon_legend.c:83
 msgid "Message is marked for moving"
 msgstr ""
 
-#: src/gtk/icon_legend.c:85
+#: src/gtk/icon_legend.c:84
 msgid "Message is marked for copying"
 msgstr ""
 
-#: src/gtk/icon_legend.c:87
+#: src/gtk/icon_legend.c:86
 msgid "Locked message"
 msgstr ""
 
-#: src/gtk/icon_legend.c:89
+#: src/gtk/icon_legend.c:88
 msgid "Folder (normal, opened)"
 msgstr ""
 
-#: src/gtk/icon_legend.c:90
+#: src/gtk/icon_legend.c:89
 msgid "Folder with read messages hidden"
 msgstr ""
 
-#: src/gtk/icon_legend.c:91
+#: src/gtk/icon_legend.c:90
 msgid "Folder contains marked messages"
 msgstr ""
 
-#: src/gtk/icon_legend.c:92
+#: src/gtk/icon_legend.c:91
 msgid "IMAP folder which contains sub-folders only"
 msgstr ""
 
-#: src/gtk/icon_legend.c:93
+#: src/gtk/icon_legend.c:92
 msgid "IMAP mailbox showing only subscribed folders"
 msgstr ""
 
-#: src/gtk/icon_legend.c:127
+#: src/gtk/icon_legend.c:126
 msgid "Icon Legend"
 msgstr ""
 
-#: src/gtk/icon_legend.c:146
+#: src/gtk/icon_legend.c:145
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr ""
 
-#: src/gtk/inputdialog.c:228 src/gtk/inputdialog.c:250
+#: src/gtk/inputdialog.c:227 src/gtk/inputdialog.c:249
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr ""
 
-#: src/gtk/inputdialog.c:231 src/gtk/inputdialog.c:234
-#: src/gtk/inputdialog.c:253 src/gtk/inputdialog.c:256
+#: src/gtk/inputdialog.c:230 src/gtk/inputdialog.c:233
+#: src/gtk/inputdialog.c:252 src/gtk/inputdialog.c:255
 #, c-format
 msgid "Input password for %s:"
 msgstr ""
 
-#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:259
+#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:258
 msgid "Input password:"
 msgstr ""
 
-#: src/gtk/inputdialog.c:238 src/gtk/inputdialog.c:266
-#: src/gtk/inputdialog.c:278
+#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:265
+#: src/gtk/inputdialog.c:277
 msgid "Input password"
 msgstr ""
 
-#: src/gtk/inputdialog.c:268
+#: src/gtk/inputdialog.c:267
 msgid "Remember password for this session"
 msgstr ""
 
-#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
+#: src/gtk/inputdialog.c:364 src/gtk/inputdialog.c:411
 msgid "Remember this"
 msgstr ""
 
-#: src/gtk/logwindow.c:450
+#: src/gtk/logwindow.c:419
 msgid "_Go to last error"
 msgstr ""
 
-#: src/gtk/logwindow.c:457
+#: src/gtk/logwindow.c:426
 msgid "Clear _Log"
 msgstr ""
 
-#: src/gtk/menu.c:139
+#: src/gtk/menu.c:138
 msgid "Warning:"
 msgstr ""
 
-#: src/gtk/menu.c:140
+#: src/gtk/menu.c:139
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -4763,395 +5015,394 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
-#: src/plugins/address_keeper/address_keeper_prefs.c:273
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:776
+#: src/plugins/address_keeper/address_keeper_prefs.c:280
 #: src/plugins/archive/archiver_prefs.c:106
-#: src/plugins/attachwarner/attachwarner_prefs.c:229
+#: src/plugins/attachwarner/attachwarner_prefs.c:230
 #: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
 #: src/plugins/clamd/clamav_plugin_gtk.c:537
 #: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
-#: src/plugins/gdata/cm_gdata_prefs.c:137
-#: src/plugins/libravatar/libravatar_prefs.c:545
+#: src/plugins/gdata/cm_gdata_prefs.c:141
+#: src/plugins/libravatar/libravatar_prefs.c:563
+#: src/plugins/litehtml_viewer/lh_prefs.c:73
 #: src/plugins/managesieve/sieve_prefs.c:423
-#: src/plugins/notification/notification_prefs.c:398
-#: src/plugins/notification/notification_prefs.c:413
-#: src/plugins/notification/notification_prefs.c:432
-#: src/plugins/notification/notification_prefs.c:450
-#: src/plugins/notification/notification_prefs.c:468
-#: src/plugins/notification/notification_prefs.c:486
-#: src/plugins/notification/notification_prefs.c:504
-#: src/plugins/notification/notification_prefs.c:522
+#: src/plugins/notification/notification_prefs.c:403
+#: src/plugins/notification/notification_prefs.c:419
+#: src/plugins/notification/notification_prefs.c:438
+#: src/plugins/notification/notification_prefs.c:456
+#: src/plugins/notification/notification_prefs.c:474
+#: src/plugins/notification/notification_prefs.c:492
+#: src/plugins/notification/notification_prefs.c:510
+#: src/plugins/notification/notification_prefs.c:528
 #: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:670
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
+#: src/plugins/spamassassin/spamassassin_gtk.c:665
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:923
 msgid "Plugins"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:338
 msgid "_Load..."
 msgstr ""
 
-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:339
 msgid "_Unload"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:237
+#: src/gtk/pluginwindow.c:353 src/prefs_summaries.c:237
 msgid "Description"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:376
+#: src/gtk/pluginwindow.c:378
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr ""
 
-#: src/gtk/pluginwindow.c:417
+#: src/gtk/pluginwindow.c:419
 msgid "Click here to load one or more plugins"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:420
+#: src/gtk/pluginwindow.c:422
 msgid "Unload the selected plugin"
 msgstr ""
 
-#: src/gtk/pluginwindow.c:485
+#: src/gtk/pluginwindow.c:488
 msgid "Loaded plugins"
 msgstr ""
 
-#: src/gtk/prefswindow.c:640
+#: src/gtk/prefswindow.c:503 src/gtk/prefswindow.c:508
+#: src/plugins/archive/archiver_gtk.c:946
+#: src/plugins/clamd/clamav_plugin_gtk.c:92
+msgid "_Apply"
+msgstr ""
+
+#: src/gtk/prefswindow.c:639
 msgid "Page Index"
 msgstr ""
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:847
 msgid "_Hide"
 msgstr ""
 
 #: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
-#: src/prefs_account.c:3721 src/prefs_account.c:3739 src/prefs_account.c:3757
-#: src/prefs_account.c:3775 src/prefs_account.c:3793 src/prefs_account.c:3811
-#: src/prefs_account.c:3830 src/prefs_account.c:3923 src/prefs_account.c:3941
-#: src/prefs_filtering_action.c:1380 src/prefs_filtering.c:398
-#: src/prefs_filtering.c:1884
+#: src/prefs_account.c:4035 src/prefs_account.c:4053 src/prefs_account.c:4071
+#: src/prefs_account.c:4089 src/prefs_account.c:4107 src/prefs_account.c:4125
+#: src/prefs_account.c:4143 src/prefs_account.c:4162 src/prefs_account.c:4255
+#: src/prefs_account.c:4273 src/prefs_filtering_action.c:1380
+#: src/prefs_filtering.c:395 src/prefs_filtering.c:1863
 msgid "Account"
 msgstr ""
 
-#: src/gtk/quicksearch.c:472
+#: src/gtk/quicksearch.c:407
 msgid "all messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:473
+#: src/gtk/quicksearch.c:408
 msgid "messages whose age is greater than # days"
 msgstr ""
 
-#: src/gtk/quicksearch.c:474
+#: src/gtk/quicksearch.c:409
 msgid "messages whose age is less than # days"
 msgstr ""
 
-#: src/gtk/quicksearch.c:475
+#: src/gtk/quicksearch.c:410
 msgid "messages whose age is greater than # hours"
 msgstr ""
 
-#: src/gtk/quicksearch.c:476
+#: src/gtk/quicksearch.c:411
 msgid "messages whose age is less than # hours"
 msgstr ""
 
-#: src/gtk/quicksearch.c:477
+#: src/gtk/quicksearch.c:412
 msgid "messages which contain S in the message body"
 msgstr ""
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:413
 msgid "messages which contain S in the whole message"
 msgstr ""
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:414
 msgid "messages carbon-copied to S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:415
 msgid "message is either To: or Cc: to S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:416
 msgid "deleted messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:417
 msgid "messages whose date is after requested date (time is optional)"
 msgstr ""
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:419
 msgid "messages whose date is before requested date (time is optional)"
 msgstr ""
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:421
 msgid "messages which contain S in the Sender field"
 msgstr ""
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:422
 msgid "true if execute \"S\" succeeds"
 msgstr ""
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:423
 msgid "messages originating from user S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:424
 msgid "forwarded messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:425
 msgid "messages which have attachments"
 msgstr ""
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:426
 msgid "messages which contain S in any header name or value"
 msgstr ""
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:427
 msgid "messages which contain S in the value of any header"
 msgstr ""
 
-#: src/gtk/quicksearch.c:493
+#: src/gtk/quicksearch.c:428
 msgid "messages which contain S in Message-ID header"
 msgstr ""
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:429
 msgid "messages which contain S in In-Reply-To header"
 msgstr ""
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:430
 msgid "messages which are marked with color #"
 msgstr "messages which are marked with colour #"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:431
 msgid "locked messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:432
 msgid "messages which are in newsgroup S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:433
 msgid "new messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:434
 msgid "old messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:435
 msgid "incomplete messages (not entirely downloaded)"
 msgstr ""
 
-#: src/gtk/quicksearch.c:501
+#: src/gtk/quicksearch.c:436
 msgid "messages which you have replied to"
 msgstr ""
 
-#: src/gtk/quicksearch.c:502
+#: src/gtk/quicksearch.c:437
 msgid "read messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:438
 msgid "messages which contain S in subject"
 msgstr ""
 
-#: src/gtk/quicksearch.c:504
+#: src/gtk/quicksearch.c:439
 msgid "messages whose score is equal to # points"
 msgstr ""
 
-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:440
 msgid "messages whose score is greater than # points"
 msgstr ""
 
-#: src/gtk/quicksearch.c:506
+#: src/gtk/quicksearch.c:441
 msgid "messages whose score is lower than # points"
 msgstr ""
 
-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:442
 msgid "messages whose size is equal to # bytes"
 msgstr ""
 
-#: src/gtk/quicksearch.c:508
+#: src/gtk/quicksearch.c:443
 msgid "messages whose size is greater than # bytes"
 msgstr ""
 
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:444
 msgid "messages whose size is smaller than # bytes"
 msgstr ""
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:445
 msgid "messages which have been sent to S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:511
+#: src/gtk/quicksearch.c:446
 msgid "messages which tags contain S"
 msgstr ""
 
-#: src/gtk/quicksearch.c:512
+#: src/gtk/quicksearch.c:447
 msgid "messages which have tag(s)"
 msgstr ""
 
-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:448
 msgid "marked messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:514
+#: src/gtk/quicksearch.c:449
 msgid "unread messages"
 msgstr ""
 
-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:450
 msgid "messages which contain S in References header"
 msgstr ""
 
-#: src/gtk/quicksearch.c:516
+#: src/gtk/quicksearch.c:451
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr ""
 
-#: src/gtk/quicksearch.c:517
+#: src/gtk/quicksearch.c:452
 msgid "messages which contain S in X-Label header"
 msgstr ""
 
-#: src/gtk/quicksearch.c:519
+#: src/gtk/quicksearch.c:454
 msgid "logical AND operator"
 msgstr ""
 
-#: src/gtk/quicksearch.c:520
+#: src/gtk/quicksearch.c:455
 msgid "logical OR operator"
 msgstr ""
 
-#: src/gtk/quicksearch.c:521
+#: src/gtk/quicksearch.c:456
 msgid "logical NOT operator"
 msgstr ""
 
-#: src/gtk/quicksearch.c:522
+#: src/gtk/quicksearch.c:457
 msgid "case sensitive search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:458
 msgid "match using regular expressions instead of substring search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:525
+#: src/gtk/quicksearch.c:460
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
 msgstr ""
 
-#: src/gtk/quicksearch.c:535 src/summary_search.c:462
+#: src/gtk/quicksearch.c:470 src/summary_search.c:465
 msgid "Extended Search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:536
+#: src/gtk/quicksearch.c:471
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
 "The following symbols can be used:"
 msgstr ""
 
-#: src/gtk/quicksearch.c:640
+#: src/gtk/quicksearch.c:587
 msgid "Something went wrong during search. Please check your logs."
 msgstr ""
 
-#: src/gtk/quicksearch.c:702
+#: src/gtk/quicksearch.c:871
 msgid "From/To/Cc/Subject/Tag"
 msgstr ""
 
-#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:889 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr ""
 
-#: src/gtk/quicksearch.c:722
+#: src/gtk/quicksearch.c:895
 msgid "Sticky"
 msgstr ""
 
-#: src/gtk/quicksearch.c:732
+#: src/gtk/quicksearch.c:901
 msgid "Type-ahead"
 msgstr ""
 
-#: src/gtk/quicksearch.c:744
+#: src/gtk/quicksearch.c:907
 msgid "Run on select"
 msgstr ""
 
-#: src/gtk/quicksearch.c:780
+#: src/gtk/quicksearch.c:934
 msgid "Clear the current search"
 msgstr ""
 
-#: src/gtk/quicksearch.c:790 src/summary_search.c:413
+#: src/gtk/quicksearch.c:944 src/summary_search.c:421
 msgid "Edit search criteria"
 msgstr ""
 
-#: src/gtk/quicksearch.c:799
+#: src/gtk/quicksearch.c:953
 msgid "Information about extended symbols"
 msgstr ""
 
-#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
-msgid "_Information"
-msgstr ""
-
-#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
+#: src/gtk/quicksearch.c:992 src/gtk/quicksearch.c:1021
+#: src/gtk/quicksearch.c:1027
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:349
-#: src/prefs_filtering.c:496 src/prefs_template.c:330
-msgid "C_lear"
-msgstr ""
-
-#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:301
+#: src/gtk/sslcertwindow.c:179 src/ssl_manager.c:302
 #, c-format
 msgid "Correct%s"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
-#: src/ssl_manager.c:301 src/ssl_manager.c:305
+#: src/gtk/sslcertwindow.c:179 src/gtk/sslcertwindow.c:181
+#: src/ssl_manager.c:302 src/ssl_manager.c:306
 msgid " (expired)"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:188
+#: src/gtk/sslcertwindow.c:186
 msgid "Owner"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:189
+#: src/gtk/sslcertwindow.c:187
 msgid "Signer"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
+#: src/gtk/sslcertwindow.c:194 src/gtk/sslcertwindow.c:233
 msgid "Name: "
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:207 src/gtk/sslcertwindow.c:246
 msgid "Organization: "
 msgstr "Organisation: "
 
-#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
+#: src/gtk/sslcertwindow.c:220 src/gtk/sslcertwindow.c:259
 msgid "Location: "
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:244
+#: src/gtk/sslcertwindow.c:272
 msgid "Fingerprint: \n"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:254
+#: src/gtk/sslcertwindow.c:288
 msgid "Signature status: "
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:301
 msgid "Expired on: "
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:261
+#: src/gtk/sslcertwindow.c:301
 msgid "Expires on: "
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:328
+#: src/gtk/sslcertwindow.c:373
 #, c-format
 msgid "SSL/TLS certificate for %s"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:344
+#: src/gtk/sslcertwindow.c:389
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5159,88 +5410,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:409
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
 "%sDo you want to accept it?"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
-#: src/gtk/sslcertwindow.c:488
+#: src/gtk/sslcertwindow.c:419 src/gtk/sslcertwindow.c:469
+#: src/gtk/sslcertwindow.c:533
 msgid "Correct"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
-#: src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:421 src/gtk/sslcertwindow.c:471
+#: src/gtk/sslcertwindow.c:535
 #, c-format
 msgid "Signature status: %s"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
+#: src/gtk/sslcertwindow.c:429 src/gtk/sslcertwindow.c:479
 msgid "_View certificate"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:435
 msgid "SSL/TLS certificate is invalid"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:392
+#: src/gtk/sslcertwindow.c:437
 msgid "SSL/TLS certificate is unknown"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:445
-#: src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:490
+#: src/gtk/sslcertwindow.c:552
 msgid "_Cancel connection"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
+#: src/gtk/sslcertwindow.c:440 src/gtk/sslcertwindow.c:552
 msgid "_Accept and save"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:413
+#: src/gtk/sslcertwindow.c:458
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
 "%sDo you want to continue?"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:440
+#: src/gtk/sslcertwindow.c:485
 msgid "SSL/TLS certificate is invalid and expired"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:442
+#: src/gtk/sslcertwindow.c:487
 msgid "SSL/TLS certificate is expired"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:490
 msgid "_Accept"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:465
+#: src/gtk/sslcertwindow.c:510
 msgid "New certificate:"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:470
+#: src/gtk/sslcertwindow.c:515
 msgid "Known certificate:"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:522
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
 "%sDo you want to accept it?"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:498
+#: src/gtk/sslcertwindow.c:543
 msgid "_View certificates"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:503
+#: src/gtk/sslcertwindow.c:548
 msgid "SSL/TLS certificate changed and is invalid"
 msgstr ""
 
-#: src/gtk/sslcertwindow.c:505
+#: src/gtk/sslcertwindow.c:550
 msgid "SSL/TLS certificate changed"
 msgstr ""
 
@@ -5250,15 +5501,15 @@ msgstr ""
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3499
-#: src/summaryview.c:3517 src/summaryview.c:3556
+#: src/plugins/notification/notification_trayicon.c:885 src/summaryview.c:3484
+#: src/summaryview.c:3502 src/summaryview.c:3541
 msgid "(No From)"
 msgstr ""
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3568
-#: src/summaryview.c:3571
+#: src/plugins/notification/notification_trayicon.c:888 src/summaryview.c:3553
+#: src/summaryview.c:3556
 msgid "(No Subject)"
 msgstr ""
 
@@ -5266,207 +5517,207 @@ msgstr ""
 msgid "Error:"
 msgstr ""
 
-#: src/image_viewer.c:312 src/mimeview.c:2666
-#: src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/image_viewer.c:316 src/mimeview.c:2672
+#: src/plugins/att_remover/att_remover.c:307
+#: src/plugins/pdf_viewer/poppler_viewer.c:705
 msgid "Filename:"
 msgstr ""
 
-#: src/image_viewer.c:319
+#: src/image_viewer.c:321
 msgid "Filesize:"
 msgstr ""
 
-#: src/image_viewer.c:368
+#: src/image_viewer.c:366
 msgid "Load Image"
 msgstr ""
 
-#: src/imap.c:577
+#: src/imap.c:583
 msgid "IMAP connection broken\n"
 msgstr ""
 
-#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
-#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
-#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
-#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
-#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
-#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
-#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
-#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
-#: src/imap.c:745 src/imap.c:749
+#: src/imap.c:628 src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640
+#: src/imap.c:644 src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:657
+#: src/imap.c:660 src/imap.c:663 src/imap.c:666 src/imap.c:669 src/imap.c:672
+#: src/imap.c:675 src/imap.c:678 src/imap.c:681 src/imap.c:684 src/imap.c:687
+#: src/imap.c:690 src/imap.c:693 src/imap.c:696 src/imap.c:699 src/imap.c:702
+#: src/imap.c:705 src/imap.c:708 src/imap.c:711 src/imap.c:714 src/imap.c:717
+#: src/imap.c:720 src/imap.c:723 src/imap.c:726 src/imap.c:729 src/imap.c:732
+#: src/imap.c:735 src/imap.c:738 src/imap.c:741 src/imap.c:744 src/imap.c:747
+#: src/imap.c:751 src/imap.c:755
 #, c-format
 msgid "IMAP error on %s:"
 msgstr ""
 
-#: src/imap.c:622
+#: src/imap.c:628
 msgid "authenticated"
 msgstr ""
 
-#: src/imap.c:625
+#: src/imap.c:631
 msgid "not authenticated"
 msgstr ""
 
-#: src/imap.c:628
+#: src/imap.c:634
 msgid "bad state"
 msgstr ""
 
-#: src/imap.c:631
+#: src/imap.c:637
 msgid "stream error"
 msgstr ""
 
-#: src/imap.c:634
+#: src/imap.c:640
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr ""
 
-#: src/imap.c:638
+#: src/imap.c:644
 msgid "connection refused"
 msgstr ""
 
-#: src/imap.c:641
+#: src/imap.c:647
 msgid "memory error"
 msgstr ""
 
-#: src/imap.c:644
+#: src/imap.c:650
 msgid "fatal error"
 msgstr ""
 
-#: src/imap.c:647
+#: src/imap.c:653
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr ""
 
-#: src/imap.c:651
+#: src/imap.c:657
 msgid "connection not accepted"
 msgstr ""
 
-#: src/imap.c:654
+#: src/imap.c:660
 msgid "APPEND error"
 msgstr ""
 
-#: src/imap.c:657
+#: src/imap.c:663
 msgid "NOOP error"
 msgstr ""
 
-#: src/imap.c:660
+#: src/imap.c:666
 msgid "LOGOUT error"
 msgstr ""
 
-#: src/imap.c:663
+#: src/imap.c:669
 msgid "CAPABILITY error"
 msgstr ""
 
-#: src/imap.c:666
+#: src/imap.c:672
 msgid "CHECK error"
 msgstr ""
 
-#: src/imap.c:669
+#: src/imap.c:675
 msgid "CLOSE error"
 msgstr ""
 
-#: src/imap.c:672
+#: src/imap.c:678
 msgid "EXPUNGE error"
 msgstr ""
 
-#: src/imap.c:675
+#: src/imap.c:681
 msgid "COPY error"
 msgstr ""
 
-#: src/imap.c:678
+#: src/imap.c:684
 msgid "UID COPY error"
 msgstr ""
 
-#: src/imap.c:681
+#: src/imap.c:687
 msgid "CREATE error"
 msgstr ""
 
-#: src/imap.c:684
+#: src/imap.c:690
 msgid "DELETE error"
 msgstr ""
 
-#: src/imap.c:687
+#: src/imap.c:693
 msgid "EXAMINE error"
 msgstr ""
 
-#: src/imap.c:690
+#: src/imap.c:696
 msgid "FETCH error"
 msgstr ""
 
-#: src/imap.c:693
+#: src/imap.c:699
 msgid "UID FETCH error"
 msgstr ""
 
-#: src/imap.c:696
+#: src/imap.c:702
 msgid "LIST error"
 msgstr ""
 
-#: src/imap.c:699
+#: src/imap.c:705
 msgid "LOGIN error"
 msgstr ""
 
-#: src/imap.c:702
+#: src/imap.c:708
 msgid "LSUB error"
 msgstr ""
 
-#: src/imap.c:705
+#: src/imap.c:711
 msgid "RENAME error"
 msgstr ""
 
-#: src/imap.c:708
+#: src/imap.c:714
 msgid "SEARCH error"
 msgstr ""
 
-#: src/imap.c:711
+#: src/imap.c:717
 msgid "UID SEARCH error"
 msgstr ""
 
-#: src/imap.c:714
+#: src/imap.c:720
 msgid "SELECT error"
 msgstr ""
 
-#: src/imap.c:717
+#: src/imap.c:723
 msgid "STATUS error"
 msgstr ""
 
-#: src/imap.c:720
+#: src/imap.c:726
 msgid "STORE error"
 msgstr ""
 
-#: src/imap.c:723
+#: src/imap.c:729
 msgid "UID STORE error"
 msgstr ""
 
-#: src/imap.c:726
+#: src/imap.c:732
 msgid "SUBSCRIBE error"
 msgstr ""
 
-#: src/imap.c:729
+#: src/imap.c:735
 msgid "UNSUBSCRIBE error"
 msgstr ""
 
-#: src/imap.c:732
+#: src/imap.c:738
 msgid "STARTTLS error"
 msgstr ""
 
-#: src/imap.c:735
+#: src/imap.c:741
 msgid "INVAL error"
 msgstr ""
 
-#: src/imap.c:738
+#: src/imap.c:744
 msgid "EXTENSION error"
 msgstr ""
 
-#: src/imap.c:741
+#: src/imap.c:747
 msgid "SASL error"
 msgstr ""
 
-#: src/imap.c:745
+#: src/imap.c:751
 msgid "SSL/TLS error"
 msgstr ""
 
-#: src/imap.c:749
+#: src/imap.c:755
 #, c-format
 msgid "Unknown error [%d]"
 msgstr ""
 
-#: src/imap.c:955
+#: src/imap.c:968
 msgid ""
 "\n"
 "\n"
@@ -5474,7 +5725,7 @@ msgid ""
 "and the CRAM-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:961
+#: src/imap.c:974
 msgid ""
 "\n"
 "\n"
@@ -5482,7 +5733,7 @@ msgid ""
 "and the DIGEST-MD5 SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:967
+#: src/imap.c:980
 msgid ""
 "\n"
 "\n"
@@ -5490,7 +5741,7 @@ msgid ""
 "and the SCRAM SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:973
+#: src/imap.c:986
 msgid ""
 "\n"
 "\n"
@@ -5498,7 +5749,7 @@ msgid ""
 "the PLAIN SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:979
+#: src/imap.c:992
 msgid ""
 "\n"
 "\n"
@@ -5506,36 +5757,36 @@ msgid ""
 "the LOGIN SASL plugin is installed."
 msgstr ""
 
-#: src/imap.c:986
+#: src/imap.c:999
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr ""
 
-#: src/imap.c:990
+#: src/imap.c:1003
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr ""
 
-#: src/imap.c:1008
+#: src/imap.c:1021
 #, c-format
 msgid "Connecting to %s failed"
 msgstr ""
 
-#: src/imap.c:1015 src/imap.c:1018
+#: src/imap.c:1028 src/imap.c:1031
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 
-#: src/imap.c:1048 src/imap.c:3693 src/imap.c:4352 src/imap.c:4446
-#: src/imap.c:4624 src/imap.c:5435
+#: src/imap.c:1061 src/imap.c:3736 src/imap.c:4395 src/imap.c:4489
+#: src/imap.c:4667 src/imap.c:5478
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr ""
 
-#: src/imap.c:1158 src/inc.c:876 src/news.c:402 src/send_message.c:286
+#: src/imap.c:1171 src/inc.c:881 src/news.c:402 src/send_message.c:287
 msgid "Insecure connection"
 msgstr ""
 
-#: src/imap.c:1159 src/inc.c:877 src/news.c:403 src/send_message.c:287
+#: src/imap.c:1172 src/inc.c:882 src/news.c:403 src/send_message.c:288
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5544,128 +5795,128 @@ msgid ""
 "not be secure."
 msgstr ""
 
-#: src/imap.c:1165 src/inc.c:883 src/news.c:409 src/send_message.c:293
+#: src/imap.c:1178 src/inc.c:888 src/news.c:409 src/send_message.c:294
 msgid "Con_tinue connecting"
 msgstr ""
 
-#: src/imap.c:1174
+#: src/imap.c:1187
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr ""
 
-#: src/imap.c:1239
+#: src/imap.c:1252
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr ""
 
-#: src/imap.c:1242
+#: src/imap.c:1255
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr ""
 
-#: src/imap.c:1274 src/imap.c:4114
+#: src/imap.c:1287 src/imap.c:4157
 msgid "Can't start STARTTLS session.\n"
 msgstr ""
 
-#: src/imap.c:1343
+#: src/imap.c:1359
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr ""
 
-#: src/imap.c:1346
+#: src/imap.c:1362
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr ""
 
-#: src/imap.c:1774
+#: src/imap.c:1790
 msgid "Adding messages..."
 msgstr ""
 
-#: src/imap.c:1979 src/mh.c:530
+#: src/imap.c:1995 src/mh.c:530
 msgid "Copying messages..."
 msgstr ""
 
-#: src/imap.c:2504
+#: src/imap.c:2521
 msgid "Search failed due to server error."
 msgstr ""
 
-#: src/imap.c:2586
+#: src/imap.c:2605
 msgid "can't set deleted flags\n"
 msgstr ""
 
-#: src/imap.c:2593 src/imap.c:5065
+#: src/imap.c:2612 src/imap.c:5108
 msgid "can't expunge\n"
 msgstr ""
 
-#: src/imap.c:2944
+#: src/imap.c:2987
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr ""
 
-#: src/imap.c:2947
+#: src/imap.c:2990
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr ""
 
-#: src/imap.c:3235
+#: src/imap.c:3278
 msgid "can't create mailbox: LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3248
+#: src/imap.c:3291
 msgid "can't create mailbox\n"
 msgstr ""
 
-#: src/imap.c:3379
+#: src/imap.c:3422
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr ""
 
-#: src/imap.c:3492
+#: src/imap.c:3535
 msgid "can't delete mailbox\n"
 msgstr ""
 
-#: src/imap.c:3771
+#: src/imap.c:3814
 msgid "LIST failed\n"
 msgstr ""
 
-#: src/imap.c:3856
+#: src/imap.c:3899
 msgid "Flagging messages..."
 msgstr ""
 
-#: src/imap.c:3959
+#: src/imap.c:4002
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr ""
 
-#: src/imap.c:4111
+#: src/imap.c:4154
 msgid "Server requires STARTTLS to log in.\n"
 msgstr ""
 
-#: src/imap.c:4121
+#: src/imap.c:4164
 msgid "Can't refresh capabilities.\n"
 msgstr ""
 
-#: src/imap.c:4126
+#: src/imap.c:4169
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
 "compiled without STARTTLS support.\n"
 msgstr ""
 
-#: src/imap.c:4134
+#: src/imap.c:4177
 msgid "Server logins are disabled.\n"
 msgstr ""
 
-#: src/imap.c:4357
+#: src/imap.c:4400
 msgid "Fetching message..."
 msgstr ""
 
-#: src/imap.c:5058
+#: src/imap.c:5101
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
-#: src/imap.c:6093
+#: src/imap.c:6136
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -5673,24 +5924,24 @@ msgid ""
 "You probably need to install libetpan and recompile Claws Mail."
 msgstr ""
 
-#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:59
+#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/plugins/mailmbox/plugin_gtk.c:60
 msgid "Create _new folder..."
 msgstr ""
 
 #: src/imap_gtk.c:65 src/mh_gtk.c:56 src/news_gtk.c:61
-#: src/plugins/mailmbox/plugin_gtk.c:60
+#: src/plugins/mailmbox/plugin_gtk.c:61
 msgid "_Rename folder..."
 msgstr ""
 
-#: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:61
+#: src/imap_gtk.c:66 src/mh_gtk.c:57 src/plugins/mailmbox/plugin_gtk.c:62
 msgid "M_ove folder..."
 msgstr ""
 
-#: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:62
+#: src/imap_gtk.c:67 src/mh_gtk.c:58 src/plugins/mailmbox/plugin_gtk.c:63
 msgid "Cop_y folder..."
 msgstr ""
 
-#: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:63
+#: src/imap_gtk.c:69 src/mh_gtk.c:59 src/plugins/mailmbox/plugin_gtk.c:64
 #: src/plugins/rssyl/rssyl_gtk.c:55
 msgid "_Delete folder..."
 msgstr ""
@@ -5716,15 +5967,15 @@ msgid "_Unsubscribe..."
 msgstr ""
 
 #: src/imap_gtk.c:80 src/mh_gtk.c:60 src/news_gtk.c:63
-#: src/plugins/mailmbox/plugin_gtk.c:64
+#: src/plugins/mailmbox/plugin_gtk.c:65
 msgid "_Check for new messages"
 msgstr ""
 
-#: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:65
+#: src/imap_gtk.c:81 src/mh_gtk.c:61 src/plugins/mailmbox/plugin_gtk.c:66
 msgid "C_heck for new folders"
 msgstr ""
 
-#: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:66
+#: src/imap_gtk.c:82 src/mh_gtk.c:62 src/plugins/mailmbox/plugin_gtk.c:67
 msgid "R_ebuild folder tree"
 msgstr ""
 
@@ -5739,37 +5990,33 @@ msgid ""
 "only and no mail, append '/' to the folder name)"
 msgstr ""
 
-#: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties and processing rules from parent folder"
-msgstr ""
-
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
+#: src/plugins/mailmbox/plugin_gtk.c:420 src/plugins/rssyl/rssyl_cb_menu.c:196
 #: src/plugins/vcalendar/vcal_folder.c:2060
 #, c-format
 msgid "Input new name for '%s':"
 msgstr ""
 
-#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
+#: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:421
 #: src/plugins/rssyl/rssyl_cb_menu.c:197
 #: src/plugins/vcalendar/vcal_folder.c:2061
 msgid "Rename folder"
 msgstr ""
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
+#: src/plugins/mailmbox/plugin_gtk.c:451 src/plugins/rssyl/rssyl_cb_menu.c:220
 #: src/plugins/vcalendar/vcal_folder.c:2081
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgstr ""
 
-#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:372
+#: src/imap_gtk.c:317 src/mh_gtk.c:307 src/plugins/mailmbox/plugin_gtk.c:373
 #, c-format
 msgid "Select folder to move folder '%s' to"
 msgstr ""
 
-#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:392
+#: src/imap_gtk.c:337 src/mh_gtk.c:327 src/plugins/mailmbox/plugin_gtk.c:393
 #, c-format
 msgid "Select folder to copy folder '%s' to"
 msgstr ""
@@ -5783,7 +6030,7 @@ msgid ""
 "Do you really want to delete?"
 msgstr ""
 
-#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
+#: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:348
 #: src/plugins/rssyl/rssyl_cb_menu.c:172
 #: src/plugins/vcalendar/vcal_folder.c:2014
 #, c-format
@@ -5812,7 +6059,7 @@ msgstr ""
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr ""
 
-#: src/imap_gtk.c:536 src/mainwindow.c:689
+#: src/imap_gtk.c:536 src/mainwindow.c:683
 msgid "Subscribe"
 msgstr ""
 
@@ -5841,8 +6088,8 @@ msgstr ""
 msgid "unsubscribe"
 msgstr ""
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
-#: src/prefs_folder_item.c:1593
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1514 src/prefs_folder_item.c:1542
+#: src/prefs_folder_item.c:1570
 msgid "Apply to subfolders"
 msgstr ""
 
@@ -5854,37 +6101,41 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: src/import.c:113 src/import.c:208
+#: src/import.c:112 src/import.c:203
 msgid "Import mbox file"
 msgstr ""
 
-#: src/import.c:132
+#: src/import.c:131
 msgid "Locate the mbox file and specify the destination folder."
 msgstr ""
 
-#: src/import.c:149
+#: src/import.c:146
 msgid "Destination folder:"
 msgstr ""
 
-#: src/import.c:203
+#: src/import.c:198
 msgid "Source mbox filename can't be left empty."
 msgstr ""
 
-#: src/import.c:208
+#: src/import.c:203
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
 msgstr ""
 
-#: src/import.c:230
+#: src/import.c:225
 msgid "Can't find the destination folder."
 msgstr ""
 
-#: src/import.c:263
+#: src/import.c:230
+msgid "Importing mbox file..."
+msgstr ""
+
+#: src/import.c:252
 msgid "Select importing file"
 msgstr ""
 
-#: src/import.c:281
+#: src/import.c:270
 msgid "Select folder to import to"
 msgstr ""
 
@@ -5916,49 +6167,49 @@ msgstr ""
 msgid "Select LDIF File"
 msgstr ""
 
-#: src/importldif.c:551
+#: src/importldif.c:549
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr ""
 
-#: src/importldif.c:556
+#: src/importldif.c:553
 msgid "File Name"
 msgstr ""
 
-#: src/importldif.c:566
+#: src/importldif.c:563
 msgid "The full file specification of the LDIF file to import."
 msgstr ""
 
-#: src/importldif.c:573
+#: src/importldif.c:569
 msgid "Select the LDIF file to import."
 msgstr ""
 
-#: src/importldif.c:705
+#: src/importldif.c:700
 msgid "R"
 msgstr ""
 
-#: src/importldif.c:710 src/summaryview.c:466
+#: src/importldif.c:705 src/summaryview.c:461
 msgid "S"
 msgstr ""
 
-#: src/importldif.c:716
+#: src/importldif.c:711
 msgid "LDIF Field Name"
 msgstr ""
 
-#: src/importldif.c:721
+#: src/importldif.c:716
 msgid "Attribute Name"
 msgstr ""
 
-#: src/importldif.c:740
+#: src/importldif.c:734
 msgid "LDIF Field"
 msgstr ""
 
-#: src/importldif.c:752
+#: src/importldif.c:745
 msgid "Attribute"
 msgstr ""
 
-#: src/importldif.c:764
+#: src/importldif.c:756
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -5969,35 +6220,35 @@ msgid ""
 "field for import."
 msgstr ""
 
-#: src/importldif.c:779
+#: src/importldif.c:772
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr ""
 
-#: src/importldif.c:784
+#: src/importldif.c:775
 msgid "Select for Import"
 msgstr ""
 
-#: src/importldif.c:789
+#: src/importldif.c:779
 msgid "Select the LDIF field for import into the address book."
 msgstr ""
 
-#: src/importldif.c:791
+#: src/importldif.c:781
 msgid " Modify "
 msgstr ""
 
-#: src/importldif.c:796
+#: src/importldif.c:785
 msgid "This button will update the list above with the data supplied."
 msgstr ""
 
-#: src/importldif.c:870
+#: src/importldif.c:855
 msgid "Records Imported:"
 msgstr ""
 
-#: src/importldif.c:902
+#: src/importldif.c:887
 msgid "Import LDIF file into Address Book"
 msgstr ""
 
-#: src/importldif.c:940
+#: src/importldif.c:925
 msgid "Proceed"
 msgstr ""
 
@@ -6009,11 +6260,11 @@ msgstr ""
 msgid "Select MUTT File"
 msgstr ""
 
-#: src/importmutt.c:203
+#: src/importmutt.c:202
 msgid "Import MUTT file into Address Book"
 msgstr ""
 
-#: src/importmutt.c:289 src/importpine.c:289
+#: src/importmutt.c:290 src/importpine.c:290
 msgid "Please select a file to import."
 msgstr ""
 
@@ -6025,246 +6276,246 @@ msgstr ""
 msgid "Select Pine File"
 msgstr ""
 
-#: src/importpine.c:202
+#: src/importpine.c:201
 msgid "Import Pine file into Address Book"
 msgstr ""
 
-#: src/inc.c:191 src/inc.c:299 src/inc.c:325
+#: src/inc.c:192 src/inc.c:300 src/inc.c:326
 msgid "Claws Mail needs network access in order to get mails."
 msgstr ""
 
-#: src/inc.c:344
+#: src/inc.c:345
 #, c-format
 msgid "%s failed\n"
 msgstr ""
 
-#: src/inc.c:476
+#: src/inc.c:477
 msgid "Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:534
+#: src/inc.c:535
 msgid "Standby"
 msgstr ""
 
-#: src/inc.c:678 src/inc.c:732
+#: src/inc.c:683 src/inc.c:737
 msgid "Cancelled"
 msgstr ""
 
-#: src/inc.c:689
+#: src/inc.c:694
 msgid "Retrieving"
 msgstr ""
 
-#: src/inc.c:698
+#: src/inc.c:703
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:704
+#: src/inc.c:709
 msgid "Done (no new messages)"
 msgstr ""
 
-#: src/inc.c:709
+#: src/inc.c:714
 msgid "Connection failed"
 msgstr ""
 
-#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
+#: src/inc.c:717 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr ""
 
-#: src/inc.c:719 src/prefs_matcher.c:407 src/prefs_summaries.c:645
-#: src/prefs_summary_column.c:87 src/summaryview.c:2894 src/summaryview.c:6569
+#: src/inc.c:724 src/prefs_matcher.c:406 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:87 src/summaryview.c:2884 src/summaryview.c:6544
 msgid "Locked"
 msgstr ""
 
-#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:394
+#: src/inc.c:734 src/plugins/spamassassin/spamassassin_gtk.c:389
 msgid "Timeout"
 msgstr ""
 
-#: src/inc.c:815
+#: src/inc.c:820
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:819
+#: src/inc.c:824
 msgid "Finished (no new messages)"
 msgstr ""
 
-#: src/inc.c:860
+#: src/inc.c:865
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr ""
 
-#: src/inc.c:889
+#: src/inc.c:894
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr ""
 
-#: src/inc.c:923
+#: src/inc.c:928
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr ""
 
-#: src/inc.c:927
+#: src/inc.c:932
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr ""
 
-#: src/inc.c:1007 src/plugins/managesieve/managesieve.c:424
-#: src/send_message.c:515
+#: src/inc.c:1012 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:519
 msgid "Authenticating..."
 msgstr ""
 
-#: src/inc.c:1009
+#: src/inc.c:1014
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr ""
 
-#: src/inc.c:1015
+#: src/inc.c:1020
 msgid "Getting the number of new messages (STAT)..."
 msgstr ""
 
-#: src/inc.c:1019
+#: src/inc.c:1024
 msgid "Getting the number of new messages (LAST)..."
 msgstr ""
 
-#: src/inc.c:1023
+#: src/inc.c:1028
 msgid "Getting the number of new messages (UIDL)..."
 msgstr ""
 
-#: src/inc.c:1027
+#: src/inc.c:1032
 msgid "Getting the size of messages (LIST)..."
 msgstr ""
 
-#: src/inc.c:1034 src/send_message.c:533
+#: src/inc.c:1039 src/send_message.c:537
 msgid "Quitting"
 msgstr ""
 
-#: src/inc.c:1059
+#: src/inc.c:1064
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr ""
 
-#: src/inc.c:1072
+#: src/inc.c:1077
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1227
+#: src/inc.c:1232
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr ""
 
-#: src/inc.c:1232
+#: src/inc.c:1237
 msgid "Error occurred while processing mail."
 msgstr ""
 
-#: src/inc.c:1238
+#: src/inc.c:1243
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1244
+#: src/inc.c:1249
 msgid "No disk space left."
 msgstr ""
 
-#: src/inc.c:1249
+#: src/inc.c:1254
 msgid "Can't write file."
 msgstr ""
 
-#: src/inc.c:1254
+#: src/inc.c:1259
 msgid "Socket error."
 msgstr ""
 
-#: src/inc.c:1257
+#: src/inc.c:1262
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr ""
 
-#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
+#: src/inc.c:1267 src/send_message.c:448 src/send_message.c:711
 msgid "Connection closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1265
+#: src/inc.c:1270
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr ""
 
-#: src/inc.c:1270
+#: src/inc.c:1275
 msgid "Mailbox is locked."
 msgstr ""
 
-#: src/inc.c:1274
+#: src/inc.c:1279
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1280 src/send_message.c:692
+#: src/inc.c:1285 src/send_message.c:696
 msgid "Authentication failed."
 msgstr ""
 
-#: src/inc.c:1286 src/send_message.c:695
+#: src/inc.c:1291 src/send_message.c:699
 #, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr ""
 
-#: src/inc.c:1291 src/send_message.c:711
+#: src/inc.c:1296 src/send_message.c:715
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr ""
 
-#: src/inc.c:1296
+#: src/inc.c:1301
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr ""
 
-#: src/inc.c:1334
+#: src/inc.c:1339
 msgid "Incorporation cancelled\n"
 msgstr ""
 
-#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
-#: src/plugins/notification/notification_prefs.c:1367
-#: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1766
-#: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:551
+#: src/inc.c:1631 src/plugins/notification/notification_prefs.c:1071
+#: src/plugins/notification/notification_prefs.c:1362
+#: src/plugins/notification/notification_prefs.c:1668
+#: src/plugins/spamassassin/spamassassin_gtk.c:402 src/prefs_account.c:1834
+#: src/prefs_other.c:567 src/prefs_receive.c:203 src/prefs_summaries.c:551
 msgid "seconds"
 msgstr ""
 
-#: src/inc.c:1636 src/inc.c:1646
+#: src/inc.c:1641 src/inc.c:1651
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1639
+#: src/inc.c:1644
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/inc.c:1651
+#: src/inc.c:1656
 #, c-format
 msgid "%s%sYou're working offline. Override for %d %s?"
 msgstr ""
 
-#: src/inc.c:1657
+#: src/inc.c:1662
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr ""
 
-#: src/inc.c:1664
+#: src/inc.c:1669
 msgid "On_ly once"
 msgstr ""
 
@@ -6301,21 +6552,21 @@ msgstr ""
 msgid "Nick Name"
 msgstr ""
 
-#: src/main.c:250
+#: src/main.c:251
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Can't create folder."
 msgstr ""
 
-#: src/main.c:375
+#: src/main.c:381
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
 "Do you want to migrate this configuration?"
 msgstr ""
 
-#: src/main.c:377
+#: src/main.c:383
 #, c-format
 msgid ""
 "\n"
@@ -6324,42 +6575,42 @@ msgid ""
 "script available at %s."
 msgstr ""
 
-#: src/main.c:389
+#: src/main.c:395
 msgid "Keep old configuration"
 msgstr ""
 
-#: src/main.c:392
+#: src/main.c:398
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
 "on your disk."
 msgstr ""
 
-#: src/main.c:400
+#: src/main.c:406
 msgid "Migration of configuration"
 msgstr ""
 
-#: src/main.c:411
+#: src/main.c:417
 msgid "Copying configuration... This may take a while..."
 msgstr ""
 
-#: src/main.c:420
+#: src/main.c:426
 msgid "Migration failed!"
 msgstr ""
 
-#: src/main.c:429
+#: src/main.c:435
 msgid "Migrating configuration..."
 msgstr ""
 
-#: src/main.c:1141
+#: src/main.c:1130
 msgid "g_thread is not supported by glib.\n"
 msgstr ""
 
-#: src/main.c:1161 src/main.c:1165 src/main.c:1169
+#: src/main.c:1150 src/main.c:1154 src/main.c:1158
 msgid "(or older)"
 msgstr ""
 
-#: src/main.c:1510
+#: src/main.c:1499
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6372,50 +6623,90 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.c:1552
+#: src/main.c:1541
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
 "mailbox parent folder's context menu to try to fix it."
 msgstr ""
 
-#: src/main.c:1558
+#: src/main.c:1547
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
 "plugin and try again."
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1791
 msgid "Missing filename\n"
 msgstr ""
 
-#: src/main.c:1806
+#: src/main.c:1798
 msgid "Cannot open filename for reading\n"
 msgstr ""
 
-#: src/main.c:1817
+#: src/main.c:1809
 msgid "Malformed header\n"
 msgstr ""
 
-#: src/main.c:1824
+#: src/main.c:1816
 msgid "Duplicated 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1835
+#: src/main.c:1827
 msgid "Missing required 'To:' header\n"
 msgstr ""
 
-#: src/main.c:1980
+#: src/main.c:1853
+#, c-format
+msgid "%s. Try -h or --help for usage.\n"
+msgstr ""
+
+#: src/main.c:1880 src/main.c:1943
+#, c-format
+msgid "Missing file argument for option %s"
+msgstr ""
+
+#: src/main.c:1902
+#, c-format
+msgid "Missing or empty uri argument for option %s"
+msgstr ""
+
+#: src/main.c:1905
+#, c-format
+msgid "Missing uri argument for option %s"
+msgstr ""
+
+#: src/main.c:1938
+#, c-format
+msgid "Missing at least one non-empty file argument for option %s"
+msgstr ""
+
+#: src/main.c:2007
+#, c-format
+msgid "Missing folder, type and request arguments for option %s"
+msgstr ""
+
+#: src/main.c:2010
+#, c-format
+msgid "Missing type and request arguments for option %s"
+msgstr ""
+
+#: src/main.c:2013
+#, c-format
+msgid "Missing request argument for option %s"
+msgstr ""
+
+#: src/main.c:2029
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:1982
+#: src/main.c:2031
 msgid "  --compose [address]    open composition window"
 msgstr ""
 
-#: src/main.c:1983
+#: src/main.c:2032
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6426,41 +6717,41 @@ msgid ""
 "                         empty line, then mail body until end of file."
 msgstr ""
 
-#: src/main.c:1988
+#: src/main.c:2037
 msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr ""
 
-#: src/main.c:1989
+#: src/main.c:2038
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:1992
+#: src/main.c:2041
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         inserted"
 msgstr ""
 
-#: src/main.c:1995
+#: src/main.c:2044
 msgid "  --receive              receive new messages"
 msgstr ""
 
-#: src/main.c:1996
+#: src/main.c:2045
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 
-#: src/main.c:1997
+#: src/main.c:2046
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr ""
 
-#: src/main.c:1998
+#: src/main.c:2047
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr ""
 
-#: src/main.c:1999
+#: src/main.c:2048
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6471,931 +6762,943 @@ msgid ""
 "                         recursive: false if arg. starts with 0, n, N, f or F"
 msgstr ""
 
-#: src/main.c:2006
+#: src/main.c:2055
 msgid "  --send                 send all queued messages"
 msgstr ""
 
-#: src/main.c:2007
+#: src/main.c:2056
 msgid "  --status [folder]...   show the total number of messages"
 msgstr ""
 
-#: src/main.c:2008
+#: src/main.c:2057
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr ""
 
-#: src/main.c:2010
+#: src/main.c:2059
 msgid "  --statistics           show session statistics"
 msgstr ""
 
-#: src/main.c:2011
+#: src/main.c:2060
 msgid "  --reset-statistics     reset session statistics"
 msgstr ""
 
-#: src/main.c:2012
+#: src/main.c:2061
 msgid ""
-"  --select folder[/msg]  jumps to the specified folder/message\n"
-"                         folder is a folder id like 'folder/sub_folder'"
+"  --select folder[/msg]  jump to the specified folder/message\n"
+"                         folder is a folder id like 'folder/sub_folder', a "
+"file:// uri or an absolute path"
 msgstr ""
 
-#: src/main.c:2014
+#: src/main.c:2063
 msgid "  --online               switch to online mode"
 msgstr ""
 
-#: src/main.c:2015
+#: src/main.c:2064
 msgid "  --offline              switch to offline mode"
 msgstr ""
 
-#: src/main.c:2016
+#: src/main.c:2065
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr ""
 
-#: src/main.c:2017
-msgid "  --debug                debug mode"
+#: src/main.c:2066
+msgid "  --debug -d             debug mode"
 msgstr ""
 
-#: src/main.c:2018
+#: src/main.c:2067
 msgid "  --toggle-debug         toggle debug mode"
 msgstr ""
 
-#: src/main.c:2019
-msgid "  --help -h              display this help and exit"
+#: src/main.c:2068
+msgid "  --help -h              display this help"
 msgstr ""
 
-#: src/main.c:2020
-msgid "  --version -v           output version information and exit"
+#: src/main.c:2069
+msgid "  --version -v           output version information"
 msgstr ""
 
-#: src/main.c:2021
+#: src/main.c:2070
 msgid ""
-"  --version-full -V      output version and built-in features information "
-"and exit"
+"  --version-full -V      output version and built-in features information"
 msgstr ""
 
-#: src/main.c:2022
+#: src/main.c:2071
 msgid "  --config-dir           output configuration directory"
 msgstr ""
 
-#: src/main.c:2023
+#: src/main.c:2072
 msgid ""
 "  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
 msgstr ""
 
-#: src/main.c:2025
+#: src/main.c:2074
 msgid ""
-"  --geometry -geometry WxH+X+Y\n"
+"  --geometry -geometry [WxH][+X+Y]\n"
 "                         set geometry for main window"
 msgstr ""
 
-#: src/main.c:2078
-msgid "Unknown option. Try -h or --help for usage.\n"
+#: src/main.c:2091
+#, c-format
+msgid "Missing directory argument for option %s"
 msgstr ""
 
-#: src/main.c:2096
+#: src/main.c:2099
+#, c-format
+msgid "Missing geometry argument for option %s"
+msgstr ""
+
+#: src/main.c:2110
+#, c-format
+msgid "Missing folder argument for option %s"
+msgstr ""
+
+#: src/main.c:2143 src/main.c:2146
+#, c-format
+msgid "Unknown option %s"
+msgstr ""
+
+#: src/main.c:2162
 #, c-format
 msgid "Processing (%s)..."
 msgstr ""
 
-#: src/main.c:2099
+#: src/main.c:2165
 msgid "top level folder"
 msgstr ""
 
-#: src/main.c:2181
+#: src/main.c:2247
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:2182
+#: src/main.c:2248
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 
-#: src/main.c:2940
+#: src/main.c:3010
 msgid "NetworkManager: network is online.\n"
 msgstr ""
 
-#: src/main.c:2946
+#: src/main.c:3016
 msgid "NetworkManager: network is offline.\n"
 msgstr ""
 
-#: src/mainwindow.c:522 src/messageview.c:211
+#: src/mainwindow.c:516 src/messageview.c:211
 msgid "_File"
 msgstr ""
 
-#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:447
+#: src/mainwindow.c:518 src/messageview.c:213 src/summaryview.c:442
 msgid "_View"
 msgstr ""
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:521
 msgid "_Configuration"
 msgstr ""
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:525
 msgid "_Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:526
 msgid "MH..."
 msgstr ""
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:529
 msgid "Change mailbox order..."
 msgstr ""
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:532
 msgid "_Import mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:533
 msgid "_Export to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:534
 msgid "_Export selected to mbox file..."
 msgstr ""
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:536
 msgid "Empty all _Trash folders"
 msgstr "Empty all Was_tebin folders"
 
-#: src/mainwindow.c:545 src/messageview.c:220
+#: src/mainwindow.c:539 src/messageview.c:220
 msgid "_Save email as..."
 msgstr ""
 
-#: src/mainwindow.c:546 src/messageview.c:221
+#: src/mainwindow.c:540 src/messageview.c:221
 msgid "_Save part as..."
 msgstr ""
 
-#: src/mainwindow.c:549 src/messageview.c:222
+#: src/mainwindow.c:543 src/messageview.c:222
 msgid "Page setup..."
 msgstr ""
 
-#: src/mainwindow.c:550 src/messageview.c:223
+#: src/mainwindow.c:544 src/messageview.c:223
 msgid "_Print..."
 msgstr ""
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:546
 msgid "Synchronise folders"
 msgstr ""
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:548
 msgid "E_xit"
 msgstr ""
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:553
 msgid "Select _thread"
 msgstr ""
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:555
 msgid "_Find in current message..."
 msgstr ""
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:557
 msgid "_Quick search"
 msgstr ""
 
-#: src/mainwindow.c:566
+#: src/mainwindow.c:560
 msgid "Show or hi_de"
 msgstr ""
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:561
 msgid "_Toolbar"
 msgstr ""
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:563
 msgid "Set displayed _columns"
 msgstr ""
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:564
 msgid "In _folder list..."
 msgstr ""
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:565
 msgid "In _message list..."
 msgstr ""
 
-#: src/mainwindow.c:576
+#: src/mainwindow.c:570
 msgid "La_yout"
 msgstr ""
 
-#: src/mainwindow.c:578
+#: src/mainwindow.c:572
 msgid "_Sort"
 msgstr ""
 
-#: src/mainwindow.c:580
+#: src/mainwindow.c:574
 msgid "_Attract by subject"
 msgstr ""
 
-#: src/mainwindow.c:582
+#: src/mainwindow.c:576
 msgid "E_xpand all threads"
 msgstr ""
 
-#: src/mainwindow.c:583
+#: src/mainwindow.c:577
 msgid "Co_llapse all threads"
 msgstr ""
 
-#: src/mainwindow.c:585 src/messageview.c:234
+#: src/mainwindow.c:579 src/messageview.c:234
 msgid "_Go to"
 msgstr ""
 
-#: src/mainwindow.c:586 src/messageview.c:235
+#: src/mainwindow.c:580 src/messageview.c:235
 msgid "_Previous message"
 msgstr ""
 
-#: src/mainwindow.c:587 src/messageview.c:236
+#: src/mainwindow.c:581 src/messageview.c:236
 msgid "_Next message"
 msgstr ""
 
-#: src/mainwindow.c:589 src/messageview.c:238
+#: src/mainwindow.c:583 src/messageview.c:238
 msgid "P_revious unread message"
 msgstr ""
 
-#: src/mainwindow.c:590 src/messageview.c:239
+#: src/mainwindow.c:584 src/messageview.c:239
 msgid "N_ext unread message"
 msgstr ""
 
-#: src/mainwindow.c:592 src/messageview.c:241
+#: src/mainwindow.c:586 src/messageview.c:241
 msgid "Previous ne_w message"
 msgstr ""
 
-#: src/mainwindow.c:593 src/messageview.c:242
+#: src/mainwindow.c:587 src/messageview.c:242
 msgid "Ne_xt new message"
 msgstr ""
 
-#: src/mainwindow.c:595 src/messageview.c:244
+#: src/mainwindow.c:589 src/messageview.c:244
 msgid "Previous _marked message"
 msgstr ""
 
-#: src/mainwindow.c:596 src/messageview.c:245
+#: src/mainwindow.c:590 src/messageview.c:245
 msgid "Next m_arked message"
 msgstr ""
 
-#: src/mainwindow.c:598 src/messageview.c:247
+#: src/mainwindow.c:592 src/messageview.c:247
 msgid "Previous _labeled message"
 msgstr "Previous _labelled message"
 
-#: src/mainwindow.c:599 src/messageview.c:248
+#: src/mainwindow.c:593 src/messageview.c:248
 msgid "Next la_beled message"
 msgstr "Next la_belled message"
 
-#: src/mainwindow.c:601 src/messageview.c:250
+#: src/mainwindow.c:595 src/messageview.c:250
 msgid "Previous opened message"
 msgstr ""
 
-#: src/mainwindow.c:602 src/messageview.c:251
+#: src/mainwindow.c:596 src/messageview.c:251
 msgid "Next opened message"
 msgstr ""
 
-#: src/mainwindow.c:604 src/messageview.c:253
+#: src/mainwindow.c:598 src/messageview.c:253
 msgid "Parent message"
 msgstr ""
 
-#: src/mainwindow.c:606 src/messageview.c:255
+#: src/mainwindow.c:600 src/messageview.c:255
 msgid "Next unread _folder"
 msgstr ""
 
-#: src/mainwindow.c:607 src/messageview.c:256
+#: src/mainwindow.c:601 src/messageview.c:256
 msgid "F_older..."
 msgstr ""
 
-#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:230
+#: src/mainwindow.c:603 src/messageview.c:258 src/mimeview.c:230
 msgid "Next part"
 msgstr ""
 
-#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:231
+#: src/mainwindow.c:604 src/messageview.c:259 src/mimeview.c:231
 msgid "Previous part"
 msgstr ""
 
-#: src/mainwindow.c:613 src/messageview.c:260
+#: src/mainwindow.c:607 src/messageview.c:260
 msgid "Message scroll"
 msgstr ""
 
-#: src/mainwindow.c:614 src/messageview.c:261
+#: src/mainwindow.c:608 src/messageview.c:261
 msgid "Previous line"
 msgstr ""
 
-#: src/mainwindow.c:615 src/messageview.c:262
+#: src/mainwindow.c:609 src/messageview.c:262
 msgid "Next line"
 msgstr ""
 
-#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:476
+#: src/mainwindow.c:610 src/messageview.c:263 src/printing.c:482
 msgid "Previous page"
 msgstr ""
 
-#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:482
+#: src/mainwindow.c:611 src/messageview.c:264 src/printing.c:488
 msgid "Next page"
 msgstr ""
 
-#: src/mainwindow.c:635 src/messageview.c:282
+#: src/mainwindow.c:629 src/messageview.c:282
 msgid "Decode"
 msgstr ""
 
-#: src/mainwindow.c:642
+#: src/mainwindow.c:636
 msgid "Open in new _window"
 msgstr ""
 
-#: src/mainwindow.c:643 src/messageview.c:289
+#: src/mainwindow.c:637 src/messageview.c:289
 msgid "Mess_age source"
 msgstr ""
 
-#: src/mainwindow.c:645 src/messageview.c:290
+#: src/mainwindow.c:639 src/messageview.c:290
 msgid "Message part"
 msgstr ""
 
-#: src/mainwindow.c:646 src/messageview.c:291
+#: src/mainwindow.c:640 src/messageview.c:291
 msgid "View as text"
 msgstr ""
 
-#: src/mainwindow.c:647 src/messageview.c:292 src/toolbar.c:494
+#: src/mainwindow.c:641 src/messageview.c:292 src/toolbar.c:494
 msgid "Open"
 msgstr ""
 
-#: src/mainwindow.c:649 src/messageview.c:294
+#: src/mainwindow.c:643 src/messageview.c:294
 msgid "Open with..."
 msgstr ""
 
-#: src/mainwindow.c:653 src/messageview.c:297
+#: src/mainwindow.c:647 src/messageview.c:297
 msgid "Quotes"
 msgstr ""
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:649
 msgid "_Update summary"
 msgstr ""
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:652
 msgid "Recei_ve"
 msgstr ""
 
-#: src/mainwindow.c:659
+#: src/mainwindow.c:653
 msgid "Get from _current account"
 msgstr ""
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:654
 msgid "Get from _all accounts"
 msgstr ""
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:655
 msgid "Cancel receivin_g"
 msgstr ""
 
-#: src/mainwindow.c:664
+#: src/mainwindow.c:658
 msgid "_Send queued messages"
 msgstr ""
 
-#: src/mainwindow.c:669
+#: src/mainwindow.c:663
 msgid "Compose a_n email message"
 msgstr ""
 
-#: src/mainwindow.c:670
+#: src/mainwindow.c:664
 msgid "Compose a news message"
 msgstr ""
 
-#: src/mainwindow.c:672 src/messageview.c:303
-#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:431
+#: src/mainwindow.c:666 src/messageview.c:303
+#: src/plugins/notification/notification_banner.c:97 src/summaryview.c:426
 msgid "_Reply"
 msgstr ""
 
-#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:432
+#: src/mainwindow.c:667 src/messageview.c:304 src/summaryview.c:427
 msgid "Repl_y to"
 msgstr ""
 
-#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:435
+#: src/mainwindow.c:670 src/messageview.c:307 src/summaryview.c:430
 msgid "Mailing _list"
 msgstr ""
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:671
 msgid "Follow-up and reply to"
 msgstr ""
 
-#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:437
+#: src/mainwindow.c:674 src/messageview.c:310 src/summaryview.c:432
 #: src/toolbar.c:2449
 msgid "_Forward"
 msgstr ""
 
-#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/mainwindow.c:675 src/messageview.c:311 src/summaryview.c:433
 #: src/toolbar.c:2450
 msgid "For_ward as attachment"
 msgstr ""
 
-#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/mainwindow.c:676 src/messageview.c:312 src/summaryview.c:434
 #: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr ""
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:678
 msgid "Mailing-_List"
 msgstr ""
 
-#: src/mainwindow.c:685
+#: src/mainwindow.c:679
 msgid "Post"
 msgstr ""
 
-#: src/mainwindow.c:687
-msgid "Help"
-msgstr ""
-
-#: src/mainwindow.c:691
+#: src/mainwindow.c:685
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:687
 msgid "View archive"
 msgstr ""
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:689
 msgid "Contact owner"
 msgstr ""
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:693
 msgid "M_ove..."
 msgstr ""
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:694
 msgid "_Copy..."
 msgstr ""
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:695
 msgid "Move to _trash"
 msgstr "Move to was_tebin"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:696
 msgid "_Delete..."
 msgstr ""
 
-#: src/mainwindow.c:703
+#: src/mainwindow.c:697
 msgid "Move thread to tr_ash"
 msgstr "Move thread to was_tebin"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:698
 msgid "Delete t_hread"
 msgstr ""
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:699
 msgid "Cancel a news message"
 msgstr ""
 
-#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:440
+#: src/mainwindow.c:702 src/mainwindow.c:703 src/summaryview.c:435
 msgid "_Mark"
 msgstr ""
 
-#: src/mainwindow.c:710
+#: src/mainwindow.c:704
 msgid "_Unmark"
 msgstr ""
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:707
 msgid "Mark as rea_d"
 msgstr ""
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:708
 msgid "Mark as unr_ead"
 msgstr ""
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:710
 msgid "Mark all read in folder"
 msgstr ""
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:711
 msgid "Mark all unread in folder"
 msgstr ""
 
-#: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
+#: src/mainwindow.c:713 src/prefs_filtering_action.c:191 src/toolbar.c:242
 #: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr ""
 
-#: src/mainwindow.c:720
+#: src/mainwindow.c:714
 msgid "Unignore thread"
 msgstr ""
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:194 src/toolbar.c:243
+#: src/mainwindow.c:715 src/prefs_filtering_action.c:192 src/toolbar.c:243
 #: src/toolbar.c:504
 msgid "Watch thread"
 msgstr ""
 
-#: src/mainwindow.c:722
+#: src/mainwindow.c:716
 msgid "Unwatch thread"
 msgstr ""
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:719
 msgid "Mark as _spam"
 msgstr ""
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:720
 msgid "Mark as _ham"
 msgstr ""
 
-#: src/mainwindow.c:729 src/prefs_filtering_action.c:177 src/toolbar.c:507
+#: src/mainwindow.c:723 src/prefs_filtering_action.c:175 src/toolbar.c:507
 msgid "Lock"
 msgstr ""
 
-#: src/mainwindow.c:730 src/prefs_filtering_action.c:178 src/toolbar.c:508
+#: src/mainwindow.c:724 src/prefs_filtering_action.c:176 src/toolbar.c:508
 msgid "Unlock"
 msgstr ""
 
-#: src/mainwindow.c:732 src/summaryview.c:441
+#: src/mainwindow.c:726 src/summaryview.c:436
 msgid "Color la_bel"
 msgstr "Colour la_bel"
 
-#: src/mainwindow.c:733 src/summaryview.c:442
+#: src/mainwindow.c:727 src/summaryview.c:437
 msgid "Ta_gs"
 msgstr ""
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:730
 msgid "Re-_edit"
 msgstr ""
 
-#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1048
+#: src/mainwindow.c:733 src/messageview.c:313 src/mimeview.c:1051
 msgid "Check signature"
 msgstr ""
 
-#: src/mainwindow.c:744 src/messageview.c:317
+#: src/mainwindow.c:738 src/messageview.c:317
 msgid "Add sender to address boo_k"
 msgstr ""
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:740
 msgid "C_ollect addresses"
 msgstr ""
 
-#: src/mainwindow.c:747
+#: src/mainwindow.c:741
 msgid "From current _folder..."
 msgstr ""
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:742
 msgid "From selected _messages..."
 msgstr ""
 
-#: src/mainwindow.c:751
+#: src/mainwindow.c:745
 msgid "_Filter all messages in folder"
 msgstr ""
 
-#: src/mainwindow.c:752
+#: src/mainwindow.c:746
 msgid "Filter _selected messages"
 msgstr ""
 
-#: src/mainwindow.c:753
+#: src/mainwindow.c:747
 msgid "Run folder pr_ocessing rules"
 msgstr ""
 
-#: src/mainwindow.c:755 src/messageview.c:320
+#: src/mainwindow.c:749 src/messageview.c:320
 msgid "_Create filter rule"
 msgstr ""
 
-#: src/mainwindow.c:756 src/mainwindow.c:762 src/messageview.c:321
+#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
 #: src/messageview.c:327
 msgid "_Automatically"
 msgstr ""
 
-#: src/mainwindow.c:757 src/mainwindow.c:763 src/mainwindow.c:870
+#: src/mainwindow.c:751 src/mainwindow.c:757 src/mainwindow.c:864
 #: src/messageview.c:322 src/messageview.c:328
 msgid "By _From"
 msgstr ""
 
-#: src/mainwindow.c:758 src/mainwindow.c:764 src/mainwindow.c:871
+#: src/mainwindow.c:752 src/mainwindow.c:758 src/mainwindow.c:865
 #: src/messageview.c:323 src/messageview.c:329
 msgid "By _To"
 msgstr ""
 
-#: src/mainwindow.c:759 src/mainwindow.c:765 src/messageview.c:324
+#: src/mainwindow.c:753 src/mainwindow.c:759 src/messageview.c:324
 #: src/messageview.c:330
 msgid "By _Subject"
 msgstr ""
 
-#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:445
+#: src/mainwindow.c:755 src/messageview.c:326 src/summaryview.c:440
 msgid "Create processing rule"
 msgstr ""
 
-#: src/mainwindow.c:768 src/messageview.c:333
+#: src/mainwindow.c:762 src/messageview.c:333
 msgid "List _URLs..."
 msgstr ""
 
-#: src/mainwindow.c:775
+#: src/mainwindow.c:769
 msgid "Ch_eck for new messages in all folders"
 msgstr ""
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:770
 msgid "Delete du_plicated messages"
 msgstr ""
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:771
 msgid "In selected folder"
 msgstr ""
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:772
 msgid "In all folders"
 msgstr ""
 
-#: src/mainwindow.c:781
+#: src/mainwindow.c:775
 msgid "E_xecute"
 msgstr ""
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:776
 msgid "Exp_unge"
 msgstr ""
 
-#: src/mainwindow.c:785
+#: src/mainwindow.c:779
 msgid "SSL/TLS cer_tificates"
 msgstr ""
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:782
 msgid "Filtering Lo_g"
 msgstr ""
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:783
 msgid "Network _Log"
 msgstr ""
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:785
 msgid "Debug _Log"
 msgstr ""
 
-#: src/mainwindow.c:794
+#: src/mainwindow.c:788
 msgid "_Forget all session passwords"
 msgstr ""
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:790
 msgid "Forget _master passphrase"
 msgstr ""
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:794
 msgid "C_hange current account"
 msgstr ""
 
-#: src/mainwindow.c:802
+#: src/mainwindow.c:796
 msgid "_Preferences for current account..."
 msgstr ""
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:797
 msgid "Create _new account..."
 msgstr ""
 
-#: src/mainwindow.c:804
+#: src/mainwindow.c:798
 msgid "_Edit accounts..."
 msgstr ""
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:801
 msgid "P_references..."
 msgstr ""
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:802
 msgid "Pre-pr_ocessing..."
 msgstr ""
 
-#: src/mainwindow.c:809
+#: src/mainwindow.c:803
 msgid "Post-pro_cessing..."
 msgstr ""
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:804
 msgid "_Filtering..."
 msgstr ""
 
-#: src/mainwindow.c:811
+#: src/mainwindow.c:805
 msgid "_Templates..."
 msgstr ""
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:806
 msgid "_Actions..."
 msgstr ""
 
-#: src/mainwindow.c:813
+#: src/mainwindow.c:807
 msgid "Tag_s..."
 msgstr ""
 
-#: src/mainwindow.c:815
+#: src/mainwindow.c:809
 msgid "Plu_gins..."
 msgstr ""
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:812
 msgid "_Manual"
 msgstr ""
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:813
 msgid "_Online User-contributed FAQ"
 msgstr ""
 
-#: src/mainwindow.c:820
+#: src/mainwindow.c:814
 msgid "Icon _Legend"
 msgstr ""
 
-#: src/mainwindow.c:822
+#: src/mainwindow.c:816
 msgid "Set as default client"
 msgstr ""
 
-#: src/mainwindow.c:829
+#: src/mainwindow.c:823
 msgid "Offline _mode"
 msgstr ""
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:824
 msgid "Men_ubar"
 msgstr ""
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:825
 msgid "_Message view"
 msgstr ""
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:827
 msgid "Status _bar"
 msgstr ""
 
-#: src/mainwindow.c:835
+#: src/mainwindow.c:829
 msgid "Column headers"
 msgstr ""
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:830
 msgid "Th_read view"
 msgstr ""
 
-#: src/mainwindow.c:837 src/prefs_summaries.c:667
+#: src/mainwindow.c:831 src/prefs_summaries.c:667
 msgid "Hide read threads"
 msgstr ""
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:832
 msgid "_Hide read messages"
 msgstr ""
 
-#: src/mainwindow.c:839 src/prefs_summaries.c:673
+#: src/mainwindow.c:833 src/prefs_summaries.c:673
 msgid "Hide deleted messages"
 msgstr ""
 
-#: src/mainwindow.c:840
+#: src/mainwindow.c:834
 msgid "_Fullscreen"
 msgstr ""
 
-#: src/mainwindow.c:841 src/messageview.c:345
+#: src/mainwindow.c:835 src/messageview.c:345
 msgid "Show all _headers"
 msgstr ""
 
-#: src/mainwindow.c:842 src/messageview.c:346
+#: src/mainwindow.c:836 src/messageview.c:346
 msgid "_Collapse all"
 msgstr ""
 
-#: src/mainwindow.c:843 src/messageview.c:347
+#: src/mainwindow.c:837 src/messageview.c:347
 msgid "Collapse from level _2"
 msgstr ""
 
-#: src/mainwindow.c:844 src/messageview.c:348
+#: src/mainwindow.c:838 src/messageview.c:348
 msgid "Collapse from level _3"
 msgstr ""
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:842
 msgid "Text _below icons"
 msgstr ""
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:843
 msgid "Text be_side icons"
 msgstr ""
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:844
 msgid "_Icons only"
 msgstr ""
 
-#: src/mainwindow.c:851
+#: src/mainwindow.c:845
 msgid "_Text only"
 msgstr ""
 
-#: src/mainwindow.c:858
+#: src/mainwindow.c:852
 msgid "_Standard"
 msgstr ""
 
-#: src/mainwindow.c:859
+#: src/mainwindow.c:853
 msgid "_Three columns"
 msgstr ""
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:854
 msgid "_Wide message"
 msgstr ""
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:855
 msgid "W_ide message list"
 msgstr ""
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:856
 msgid "S_mall screen"
 msgstr ""
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:860
 msgid "By _number"
 msgstr ""
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:861
 msgid "By s_ize"
 msgstr ""
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:862
 msgid "By _date"
 msgstr ""
 
-#: src/mainwindow.c:869
+#: src/mainwindow.c:863
 msgid "By thread date"
 msgstr ""
 
-#: src/mainwindow.c:872
+#: src/mainwindow.c:866
 msgid "By s_ubject"
 msgstr ""
 
-#: src/mainwindow.c:873
+#: src/mainwindow.c:867
 msgid "By _color label"
 msgstr "By _colour label"
 
-#: src/mainwindow.c:874
+#: src/mainwindow.c:868
 msgid "By tag"
 msgstr ""
 
-#: src/mainwindow.c:875
+#: src/mainwindow.c:869
 msgid "By _mark"
 msgstr ""
 
-#: src/mainwindow.c:876
+#: src/mainwindow.c:870
 msgid "By _status"
 msgstr ""
 
-#: src/mainwindow.c:877
+#: src/mainwindow.c:871
 msgid "By a_ttachment"
 msgstr ""
 
-#: src/mainwindow.c:878
+#: src/mainwindow.c:872
 msgid "By score"
 msgstr ""
 
-#: src/mainwindow.c:879
+#: src/mainwindow.c:873
 msgid "By locked"
 msgstr ""
 
-#: src/mainwindow.c:880
+#: src/mainwindow.c:874
 msgid "D_on't sort"
 msgstr ""
 
-#: src/mainwindow.c:884 src/prefs_summaries.c:654
+#: src/mainwindow.c:878 src/prefs_summaries.c:654
 msgid "Ascending"
 msgstr ""
 
-#: src/mainwindow.c:885 src/prefs_summaries.c:655
+#: src/mainwindow.c:879 src/prefs_summaries.c:655
 msgid "Descending"
 msgstr ""
 
-#: src/mainwindow.c:927 src/messageview.c:390
+#: src/mainwindow.c:921 src/messageview.c:390
 msgid "_Auto detect"
 msgstr ""
 
-#: src/mainwindow.c:1305 src/summaryview.c:6495
+#: src/mainwindow.c:1299 src/summaryview.c:6472
 msgid "Apply tags..."
 msgstr ""
 
-#: src/mainwindow.c:1961
+#: src/mainwindow.c:1940
 msgid "Some error(s) happened. Click here to view log."
 msgstr ""
 
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1959
 msgid "You are online. Click the icon to go offline"
 msgstr ""
 
-#: src/mainwindow.c:1979
+#: src/mainwindow.c:1962
 msgid "You are offline. Click the icon to go online"
 msgstr ""
 
-#: src/mainwindow.c:1993
+#: src/mainwindow.c:1976
 msgid "Select account"
 msgstr ""
 
-#: src/mainwindow.c:2020 src/prefs_logging.c:136
+#: src/mainwindow.c:2003 src/prefs_logging.c:136
 msgid "Network log"
 msgstr ""
 
-#: src/mainwindow.c:2024
+#: src/mainwindow.c:2007
 msgid "Filtering/Processing debug log"
 msgstr ""
 
-#: src/mainwindow.c:2043 src/prefs_logging.c:378
+#: src/mainwindow.c:2026 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2045 src/prefs_logging.c:380
+#: src/mainwindow.c:2028 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr ""
 
-#: src/mainwindow.c:2479 src/mainwindow.c:2486 src/mainwindow.c:2529
-#: src/mainwindow.c:2562 src/mainwindow.c:2594 src/mainwindow.c:2639
+#: src/mainwindow.c:2449 src/mainwindow.c:2456 src/mainwindow.c:2499
+#: src/mainwindow.c:2532 src/mainwindow.c:2564 src/mainwindow.c:2609
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1087
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1075
 msgid "Untitled"
 msgstr ""
 
-#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2610 src/prefs_summary_open.c:114
 msgid "none"
 msgstr ""
 
-#: src/mainwindow.c:2897 src/mainwindow.c:2902
+#: src/mainwindow.c:2867 src/mainwindow.c:2872
 msgid "Delete all messages in trash folders?"
 msgstr "Delete all messages in wastebin folders?"
 
-#: src/mainwindow.c:2898
+#: src/mainwindow.c:2868
 msgid "Don't quit"
 msgstr ""
 
-#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2899 src/plugins/mailmbox/plugin_gtk.c:190
 msgid "Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2930
+#: src/mainwindow.c:2900
 msgid ""
 "Input the location of the mailbox.\n"
 "The location can be either the full path or relative to the \n"
@@ -7404,129 +7707,133 @@ msgid ""
 "scanned automatically."
 msgstr ""
 
-#: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2908 src/plugins/mailmbox/plugin_gtk.c:197
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr ""
 
-#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/mainwindow.c:2913 src/plugins/mailmbox/plugin_gtk.c:210 src/setup.c:52
 #: src/wizard.c:742
 msgid "Mailbox"
 msgstr ""
 
-#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2918 src/plugins/mailmbox/plugin_gtk.c:216 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
 
-#: src/mainwindow.c:3415
+#: src/mainwindow.c:3385
 msgid "No posting allowed"
 msgstr ""
 
-#: src/mainwindow.c:3997
+#: src/mainwindow.c:3940
 msgid "Mbox import has failed."
 msgstr ""
 
-#: src/mainwindow.c:4006 src/mainwindow.c:4015
+#: src/mainwindow.c:3949 src/mainwindow.c:3958
 msgid "Export to mbox has failed."
 msgstr ""
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:3999 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit"
 msgstr ""
 
-#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:3999 src/plugins/notification/notification_trayicon.c:549
 msgid "Exit Claws Mail?"
 msgstr ""
 
-#: src/mainwindow.c:4257
+#: src/mainwindow.c:4000
+msgid "_Quit"
+msgstr ""
+
+#: src/mainwindow.c:4200
 msgid "Folder synchronisation"
 msgstr ""
 
-#: src/mainwindow.c:4258
+#: src/mainwindow.c:4201
 msgid "Do you want to synchronise your folders now?"
 msgstr ""
 
-#: src/mainwindow.c:4259
+#: src/mainwindow.c:4202
 msgid "_Synchronise"
 msgstr ""
 
-#: src/mainwindow.c:4737
+#: src/mainwindow.c:4680
 msgid "Deleting duplicated messages..."
 msgstr ""
 
-#: src/mainwindow.c:4747
+#: src/mainwindow.c:4690
 msgid "No duplicate message found in selected folder.\n"
 msgstr ""
 
-#: src/mainwindow.c:4753
+#: src/mainwindow.c:4696
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mainwindow.c:4757
+#: src/mainwindow.c:4700
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mainwindow.c:4795
+#: src/mainwindow.c:4738
 msgid "Deleting duplicated messages in all folders..."
 msgstr ""
 
-#: src/mainwindow.c:4801
+#: src/mainwindow.c:4744
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mainwindow.c:4806
+#: src/mainwindow.c:4749
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr ""
 
-#: src/mainwindow.c:4968 src/messageview.c:2634
+#: src/mainwindow.c:4911 src/messageview.c:2631
 msgid "Select folder to go to"
 msgstr ""
 
-#: src/mainwindow.c:5069 src/summaryview.c:5938
+#: src/mainwindow.c:5012 src/summaryview.c:5913
 msgid "Processing rules to apply before folder rules"
 msgstr ""
 
-#: src/mainwindow.c:5077
+#: src/mainwindow.c:5020
 msgid "Processing rules to apply after folder rules"
 msgstr ""
 
-#: src/mainwindow.c:5085 src/summaryview.c:5949
+#: src/mainwindow.c:5028 src/summaryview.c:5924
 msgid "Filtering configuration"
 msgstr ""
 
-#: src/mainwindow.c:5200
+#: src/mainwindow.c:5143
 msgid "Can not register as default client: impossible to get executable path."
 msgstr ""
 
-#: src/mainwindow.c:5259
+#: src/mainwindow.c:5202
 msgid "Claws Mail has been registered as default client."
 msgstr ""
 
-#: src/mainwindow.c:5261
+#: src/mainwindow.c:5204
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr ""
 
-#: src/mainwindow.c:5275 src/setup.c:91
+#: src/mainwindow.c:5218 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr ""
 
-#: src/mainwindow.c:5419
+#: src/mainwindow.c:5362
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
@@ -7556,7 +7863,7 @@ msgid "tag"
 msgstr ""
 
 #: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
-#: src/message_search.c:215 src/prefs_matcher.c:752 src/summary_search.c:455
+#: src/message_search.c:215 src/prefs_matcher.c:748 src/summary_search.c:458
 msgid "Case sensitive"
 msgstr ""
 
@@ -7611,7 +7918,7 @@ msgstr ""
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: src/mbox.c:552 src/mimeview.c:1897 src/prefs_themes.c:596
+#: src/mbox.c:552 src/mimeview.c:1905 src/prefs_themes.c:596
 msgid "Overwrite"
 msgstr ""
 
@@ -7634,11 +7941,11 @@ msgstr ""
 msgid "Find text:"
 msgstr ""
 
-#: src/message_search.c:318 src/summary_search.c:779
+#: src/message_search.c:318 src/summary_search.c:783
 msgid "Search failed"
 msgstr ""
 
-#: src/message_search.c:319 src/summary_search.c:780
+#: src/message_search.c:319 src/summary_search.c:784
 msgid "Search string not found."
 msgstr ""
 
@@ -7650,23 +7957,23 @@ msgstr ""
 msgid "End of message reached; continue from beginning?"
 msgstr ""
 
-#: src/message_search.c:334 src/summary_search.c:791
+#: src/message_search.c:334 src/summary_search.c:795
 msgid "Search finished"
 msgstr ""
 
-#: src/messageview.c:300 src/textview.c:249
+#: src/messageview.c:300 src/textview.c:225
 msgid "Compose _new message"
 msgstr ""
 
-#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
+#: src/messageview.c:711 src/messageview.c:1433 src/messageview.c:1584
 msgid "Claws Mail - Message View"
 msgstr ""
 
-#: src/messageview.c:845
+#: src/messageview.c:842
 msgid "<No Return-Path found>"
 msgstr ""
 
-#: src/messageview.c:852
+#: src/messageview.c:849
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7676,92 +7983,92 @@ msgid ""
 "It is advised to not send the return receipt."
 msgstr ""
 
-#: src/messageview.c:859
+#: src/messageview.c:856
 msgid "_Don't Send"
 msgstr ""
 
-#: src/messageview.c:1366
+#: src/messageview.c:1363
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr ""
 
-#: src/messageview.c:1402 src/procmime.c:957
+#: src/messageview.c:1399 src/procmime.c:996
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr ""
 
-#: src/messageview.c:1483 src/messageview.c:1491
+#: src/messageview.c:1480 src/messageview.c:1488
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr ""
 
-#: src/messageview.c:1868
+#: src/messageview.c:1865
 #, c-format
 msgid "Show all %s."
 msgstr ""
 
-#: src/messageview.c:1870
+#: src/messageview.c:1867
 msgid "Only the first megabyte of text is shown."
 msgstr ""
 
-#: src/messageview.c:1901
+#: src/messageview.c:1898
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr ""
 
-#: src/messageview.c:1904
+#: src/messageview.c:1901
 msgid "You asked for a return receipt in this message."
 msgstr ""
 
-#: src/messageview.c:1910
+#: src/messageview.c:1907
 msgid "This message asks for a return receipt."
 msgstr ""
 
-#: src/messageview.c:1911
+#: src/messageview.c:1908
 msgid "Send receipt"
 msgstr ""
 
-#: src/messageview.c:1954
+#: src/messageview.c:1951
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgstr ""
 
-#: src/messageview.c:1960
+#: src/messageview.c:1957
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s."
 msgstr ""
 
-#: src/messageview.c:1964 src/messageview.c:1986
+#: src/messageview.c:1961 src/messageview.c:1983
 msgid "Mark for download"
 msgstr ""
 
-#: src/messageview.c:1965 src/messageview.c:1977
+#: src/messageview.c:1962 src/messageview.c:1974
 msgid "Mark for deletion"
 msgstr ""
 
-#: src/messageview.c:1970
+#: src/messageview.c:1967
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be downloaded."
 msgstr ""
 
-#: src/messageview.c:1975 src/messageview.c:1988
-#: src/prefs_filtering_action.c:176 src/toolbar.c:506
+#: src/messageview.c:1972 src/messageview.c:1985
+#: src/prefs_filtering_action.c:174 src/toolbar.c:506
 msgid "Unmark"
 msgstr ""
 
-#: src/messageview.c:1981
+#: src/messageview.c:1978
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 "it is %s and will be deleted."
 msgstr ""
 
-#: src/messageview.c:2058
+#: src/messageview.c:2055
 #, c-format
 msgctxt "'%s' stands for 'To' then 'Cc'"
 msgid ""
@@ -7771,20 +8078,15 @@ msgid ""
 "It is advised to not send the return receipt."
 msgstr ""
 
-#: src/messageview.c:2066 src/messageview.c:2074
+#: src/messageview.c:2063 src/messageview.c:2071
 msgid "Return Receipt Notification"
 msgstr ""
 
-#: src/messageview.c:2068 src/messageview.c:2079
-#: src/plugins/rssyl/rssyl_feed_props.c:496
-msgid "_Cancel"
-msgstr ""
-
-#: src/messageview.c:2068 src/messageview.c:2079
+#: src/messageview.c:2065 src/messageview.c:2076
 msgid "_Send Notification"
 msgstr ""
 
-#: src/messageview.c:2075
+#: src/messageview.c:2072
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -7792,30 +8094,30 @@ msgid ""
 "notification:"
 msgstr ""
 
-#: src/messageview.c:2171 src/messageview.c:2190
+#: src/messageview.c:2168 src/messageview.c:2187
 msgid "Cannot print: the message doesn't contain text."
 msgstr ""
 
-#: src/messageview.c:2944
+#: src/messageview.c:2941
 msgid ""
 "\n"
 "  There are no messages in this folder"
 msgstr ""
 
-#: src/messageview.c:2952
+#: src/messageview.c:2949
 msgid ""
 "\n"
 "  Message has been deleted"
 msgstr ""
 
-#: src/messageview.c:2953
+#: src/messageview.c:2950
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
 msgstr ""
 
-#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
-#: src/summaryview.c:7298
+#: src/messageview.c:2983 src/messageview.c:2989 src/summaryview.c:4394
+#: src/summaryview.c:7271
 msgid "An error happened while learning.\n"
 msgstr ""
 
@@ -7827,7 +8129,7 @@ msgstr ""
 msgid "Deleting messages..."
 msgstr ""
 
-#: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:67
+#: src/mh_gtk.c:63 src/plugins/mailmbox/plugin_gtk.c:68
 msgid "Remove _mailbox..."
 msgstr ""
 
@@ -7839,26 +8141,22 @@ msgid ""
 "%s."
 msgstr ""
 
-#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:298
+#: src/mh_gtk.c:372 src/plugins/mailmbox/plugin_gtk.c:299
 #, c-format
 msgid ""
 "Really remove the mailbox '%s'?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
 
-#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:300
+#: src/mh_gtk.c:374 src/plugins/mailmbox/plugin_gtk.c:301
 msgid "Remove mailbox"
 msgstr ""
 
-#: src/mimeview.c:221
-msgid "_Open"
-msgstr ""
-
 #: src/mimeview.c:223
 msgid "Open _with..."
 msgstr ""
 
-#: src/mimeview.c:225 src/prefs_filtering_action.c:172
+#: src/mimeview.c:225 src/prefs_filtering_action.c:170
 msgid "Copy"
 msgstr ""
 
@@ -7882,121 +8180,122 @@ msgstr ""
 msgid "MIME Type"
 msgstr ""
 
-#: src/mimeview.c:1053 src/mimeview.c:1058 src/mimeview.c:1063
-#: src/mimeview.c:1068
+#: src/mimeview.c:1056 src/mimeview.c:1061 src/mimeview.c:1066
+#: src/mimeview.c:1071
 msgid "View full information"
 msgstr ""
 
-#: src/mimeview.c:1074
+#: src/mimeview.c:1077
 msgid "Check again"
 msgstr ""
 
-#: src/mimeview.c:1086
+#: src/mimeview.c:1089
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr ""
 
-#: src/mimeview.c:1088
+#: src/mimeview.c:1091
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr ""
 
-#: src/mimeview.c:1098
+#: src/mimeview.c:1101
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr ""
 
-#: src/mimeview.c:1100
+#: src/mimeview.c:1103
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr ""
 
-#: src/mimeview.c:1345
+#: src/mimeview.c:1348
 msgid "Checking signature..."
 msgstr ""
 
-#: src/mimeview.c:1386
+#: src/mimeview.c:1389
 msgid "Go back to email"
 msgstr ""
 
-#: src/mimeview.c:1815 src/mimeview.c:1907 src/mimeview.c:2149
-#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:440
+#: src/mimeview.c:1823 src/mimeview.c:1915 src/mimeview.c:2157
+#: src/mimeview.c:2193 src/mimeview.c:2305 src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:530
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr ""
 
-#: src/mimeview.c:1894
+#: src/mimeview.c:1902
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr ""
 
-#: src/mimeview.c:1918
+#: src/mimeview.c:1926
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
 "operation or skip error and continue?"
 msgstr ""
 
-#: src/mimeview.c:1921
+#: src/mimeview.c:1929
 msgid "Error saving all message parts"
 msgstr ""
 
-#: src/mimeview.c:1922
+#: src/mimeview.c:1930
 msgid "Skip"
 msgstr ""
 
-#: src/mimeview.c:1922
+#: src/mimeview.c:1930
 msgid "Skip all"
 msgstr ""
 
-#: src/mimeview.c:1932
+#: src/mimeview.c:1940
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mimeview.c:1940
+#: src/mimeview.c:1948
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mimeview.c:1945
+#: src/mimeview.c:1953
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/mimeview.c:1978 src/plugins/archive/archiver_prefs.c:142
+#: src/mimeview.c:1986 src/plugins/archive/archiver_prefs.c:142
 #: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr ""
 
-#: src/mimeview.c:1985 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1993 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr ""
 
-#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
-#: src/summaryview.c:5032
+#: src/mimeview.c:2110 src/plugins/fancy/fancy_viewer.c:800
+#: src/summaryview.c:5006
 msgid "Save as"
 msgstr ""
 
-#: src/mimeview.c:2232 src/mimeview.c:2239
+#: src/mimeview.c:2240 src/mimeview.c:2247
 msgid "Open with"
 msgstr ""
 
-#: src/mimeview.c:2233 src/mimeview.c:2240
+#: src/mimeview.c:2241 src/mimeview.c:2248
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
 "('%s' will be replaced with file name)"
 msgstr ""
 
-#: src/mimeview.c:2335
+#: src/mimeview.c:2343
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8004,11 +8303,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/mimeview.c:2343
+#: src/mimeview.c:2351
 msgid "Execute untrusted binary?"
 msgstr ""
 
-#: src/mimeview.c:2344
+#: src/mimeview.c:2352
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
 "dangerous and could compromise your computer.\n"
@@ -8016,22 +8315,22 @@ msgid ""
 "Do you want to run this file?"
 msgstr ""
 
-#: src/mimeview.c:2348
+#: src/mimeview.c:2356
 msgid "Run binary"
 msgstr ""
 
-#: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2657 src/plugins/att_remover/att_remover.c:305
 msgid "Type:"
 msgstr ""
 
-#: src/mimeview.c:2652 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2788
+#: src/mimeview.c:2658 src/plugins/att_remover/att_remover.c:306
+#: src/plugins/pdf_viewer/poppler_viewer.c:706 src/summaryview.c:2778
 msgid "Size:"
 msgstr ""
 
-#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
+#: src/mimeview.c:2672 src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1608
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1618
 msgid "Description:"
 msgstr ""
 
@@ -8117,21 +8416,90 @@ msgstr ""
 msgid "_Subscribe to newsgroup..."
 msgstr ""
 
-#: src/news_gtk.c:57
-msgid "_Unsubscribe newsgroup"
+#: src/news_gtk.c:57
+msgid "_Unsubscribe newsgroup"
+msgstr ""
+
+#: src/news_gtk.c:250
+#, c-format
+msgid "Really unsubscribe newsgroup '%s'?"
+msgstr ""
+
+#: src/news_gtk.c:251
+msgid "Unsubscribe newsgroup"
+msgstr ""
+
+#: src/news_gtk.c:291
+msgid "Rename newsgroup folder"
+msgstr ""
+
+#: src/oauth2.c:238
+msgid "OAuth2 missing authentication code\n"
+msgstr ""
+
+#: src/oauth2.c:244 src/oauth2.c:359
+msgid "OAuth2 connection error\n"
+msgstr ""
+
+#: src/oauth2.c:253 src/oauth2.c:367
+msgid "OAuth2 SSL connection error\n"
+msgstr ""
+
+#: src/oauth2.c:311 src/oauth2.c:418
+msgid "OAuth2 access token obtained\n"
+msgstr ""
+
+#: src/oauth2.c:313 src/oauth2.c:420 src/oauth2.c:546
+msgid "OAuth2 access token not obtained\n"
+msgstr ""
+
+#: src/oauth2.c:320
+msgid "OAuth2 refresh token obtained\n"
+msgstr ""
+
+#: src/oauth2.c:322
+msgid "OAuth2 refresh token not obtained\n"
+msgstr ""
+
+#: src/oauth2.c:452
+msgid "OAuth2 socket write error\n"
+msgstr ""
+
+#: src/oauth2.c:472
+msgid "OAuth2 socket timeout error \n"
+msgstr ""
+
+#: src/oauth2.c:528
+msgid "OAuth2 access token still fresh\n"
+msgstr ""
+
+#: src/oauth2.c:534
+msgid "OAuth2 obtaining access token using refresh token\n"
+msgstr ""
+
+#: src/oauth2.c:538
+msgid "OAuth2 trying for fresh access token with auth code\n"
+msgstr ""
+
+#: src/oauth2.c:552
+msgid "OAuth2 access token updated\n"
 msgstr ""
 
-#: src/news_gtk.c:250
+#: src/oauth2.c:583
 #, c-format
-msgid "Really unsubscribe newsgroup '%s'?"
+msgid "OAuth2 original: %s\n"
 msgstr ""
 
-#: src/news_gtk.c:251
-msgid "Unsubscribe newsgroup"
+#: src/oauth2.c:584
+#, c-format
+msgid "OAuth2 encoded: %s\n"
 msgstr ""
 
-#: src/news_gtk.c:291
-msgid "Rename newsgroup folder"
+#: src/oauth2.c:585
+#, c-format
+msgid ""
+"OAuth2 decoded: %s\n"
+"\n"
 msgstr ""
 
 #: src/password.c:128 src/password.c:129
@@ -8142,11 +8510,11 @@ msgstr ""
 msgid "Incorrect master passphrase."
 msgstr ""
 
-#: src/password_gtk.c:67
+#: src/password_gtk.c:66
 msgid "New passphrases do not match, try again."
 msgstr ""
 
-#: src/password_gtk.c:80
+#: src/password_gtk.c:79
 msgid "Incorrect old master passphrase entered, try again."
 msgstr ""
 
@@ -8164,115 +8532,115 @@ msgstr ""
 msgid "Old passphrase:"
 msgstr ""
 
-#: src/password_gtk.c:191
+#: src/password_gtk.c:189
 msgid "New passphrase:"
 msgstr ""
 
-#: src/password_gtk.c:202
+#: src/password_gtk.c:200
 msgid "Confirm passphrase:"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:53
+#: src/plugins/acpi_notifier/acpi_notifier.c:55
 msgid "Acpi Notifier"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:75
+#: src/plugins/acpi_notifier/acpi_notifier.c:77
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:76
+#: src/plugins/acpi_notifier/acpi_notifier.c:78
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:209
-#: src/plugins/acpi_notifier/acpi_notifier.c:215
-#: src/plugins/acpi_notifier/acpi_notifier.c:427
+#: src/plugins/acpi_notifier/acpi_notifier.c:211
+#: src/plugins/acpi_notifier/acpi_notifier.c:217
+#: src/plugins/acpi_notifier/acpi_notifier.c:419
 msgid "Control file doesn't exist."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:300
 msgid " : no new or unread mail"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:308
+#: src/plugins/acpi_notifier/acpi_notifier.c:301
 msgid " : unread mail"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
+#: src/plugins/acpi_notifier/acpi_notifier.c:302
 msgid " : new mail"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:311
-#: src/plugins/acpi_notifier/acpi_notifier.c:317
-#: src/plugins/acpi_notifier/acpi_notifier.c:323
+#: src/plugins/acpi_notifier/acpi_notifier.c:304
+#: src/plugins/acpi_notifier/acpi_notifier.c:310
+#: src/plugins/acpi_notifier/acpi_notifier.c:316
 msgid "off"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:313
-#: src/plugins/acpi_notifier/acpi_notifier.c:319
-#: src/plugins/acpi_notifier/acpi_notifier.c:325
+#: src/plugins/acpi_notifier/acpi_notifier.c:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:312
+#: src/plugins/acpi_notifier/acpi_notifier.c:318
 msgid "blinking"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
-#: src/plugins/acpi_notifier/acpi_notifier.c:321
-#: src/plugins/acpi_notifier/acpi_notifier.c:327
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
+#: src/plugins/acpi_notifier/acpi_notifier.c:314
+#: src/plugins/acpi_notifier/acpi_notifier.c:320
 msgid "on"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:349
-#: src/plugins/acpi_notifier/acpi_notifier.c:358
-#: src/plugins/acpi_notifier/acpi_notifier.c:373
+#: src/plugins/acpi_notifier/acpi_notifier.c:341
+#: src/plugins/acpi_notifier/acpi_notifier.c:350
+#: src/plugins/acpi_notifier/acpi_notifier.c:365
 msgid "LED "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:388
+#: src/plugins/acpi_notifier/acpi_notifier.c:380
 msgid "ACPI type: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:397
+#: src/plugins/acpi_notifier/acpi_notifier.c:389
 msgid "ACPI file: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:408
+#: src/plugins/acpi_notifier/acpi_notifier.c:400
 msgid "values - On: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:413
+#: src/plugins/acpi_notifier/acpi_notifier.c:405
 msgid " - Off: "
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:435
+#: src/plugins/acpi_notifier/acpi_notifier.c:427
 msgid "Blink when user interaction is required"
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:869
+#: src/plugins/acpi_notifier/acpi_notifier.c:853
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr ""
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:890
+#: src/plugins/acpi_notifier/acpi_notifier.c:874
 msgid "Laptop LED"
 msgstr ""
 
@@ -8287,44 +8655,44 @@ msgstr ""
 
 #: src/plugins/address_keeper/address_keeper.c:333
 #: src/plugins/address_keeper/address_keeper.h:32
-#: src/plugins/address_keeper/address_keeper_prefs.c:274
+#: src/plugins/address_keeper/address_keeper_prefs.c:281
 msgid "Address Keeper"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:108
+#: src/plugins/address_keeper/address_keeper_prefs.c:111
 msgid "Address book location"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:113
+#: src/plugins/address_keeper/address_keeper_prefs.c:116
 msgid "Keep to folder"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:121
+#: src/plugins/address_keeper/address_keeper_prefs.c:124
 msgid "Address book path where addresses are kept"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:123
+#: src/plugins/address_keeper/address_keeper_prefs.c:126
 #: src/plugins/bogofilter/bogofilter_gtk.c:262
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:463
-#: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
-#: src/prefs_matcher.c:690
+#: src/plugins/spamassassin/spamassassin_gtk.c:458
+#: src/prefs_filtering_action.c:548 src/prefs_filtering_action.c:555
+#: src/prefs_matcher.c:688
 msgid "Select..."
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:139
+#: src/plugins/address_keeper/address_keeper_prefs.c:142
 msgid "Fields to keep addresses from"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:147
-#: src/plugins/address_keeper/address_keeper_prefs.c:161
-#: src/plugins/address_keeper/address_keeper_prefs.c:175
+#: src/plugins/address_keeper/address_keeper_prefs.c:150
+#: src/plugins/address_keeper/address_keeper_prefs.c:164
+#: src/plugins/address_keeper/address_keeper_prefs.c:178
 #, c-format
 msgctxt "address keeper: %s stands for a header name"
 msgid "Keep addresses which appear in '%s' headers"
 msgstr ""
 
-#: src/plugins/address_keeper/address_keeper_prefs.c:185
+#: src/plugins/address_keeper/address_keeper_prefs.c:188
 msgid ""
 "Exclude addresses matching the following regular expressions (one per line)"
 msgstr ""
@@ -8498,16 +8866,16 @@ msgstr ""
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
-#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
+#: src/plugins/pdf_viewer/poppler_viewer.c:725 src/prefs_folder_item.c:533
+#: src/prefs_folder_item.c:1180 src/prefs_folder_item.c:1210
 msgid "Yes"
 msgstr ""
 
 #: src/plugins/archive/archiver_gtk.c:837
 #: src/plugins/archive/archiver_gtk.c:845
 #: src/plugins/archive/archiver_gtk.c:853
-#: src/plugins/pdf_viewer/poppler_viewer.c:724 src/prefs_folder_item.c:524
-#: src/prefs_folder_item.c:1199 src/prefs_folder_item.c:1231
+#: src/plugins/pdf_viewer/poppler_viewer.c:728 src/prefs_folder_item.c:532
+#: src/prefs_folder_item.c:1179 src/prefs_folder_item.c:1209
 #: src/prefs_summaries.c:409
 msgid "No"
 msgstr ""
@@ -8722,7 +9090,6 @@ msgid ""
 msgstr ""
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:771
 msgid "Rename"
 msgstr ""
 
@@ -8730,59 +9097,59 @@ msgstr ""
 msgid "Choose this option to delete mails after archiving"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:337
+#: src/plugins/att_remover/att_remover.c:338
 msgid "Remove attachments"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:363
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
+#: src/plugins/att_remover/att_remover.c:364
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:337
 msgid "Remove"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:643
-#: src/prefs_summary_column.c:79 src/summaryview.c:2882
+#: src/plugins/att_remover/att_remover.c:372 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:79 src/summaryview.c:2872
 msgid "Attachment"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:425
+#: src/plugins/att_remover/att_remover.c:426
 msgid "Destroy attachments"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:426
+#: src/plugins/att_remover/att_remover.c:427
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
 "The deleted data will be unrecoverable."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:469
+#: src/plugins/att_remover/att_remover.c:470
 msgid "The selected messages don't have any attachments."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:472
+#: src/plugins/att_remover/att_remover.c:473
 #, c-format
 msgid "Attachments removed from %d of the %d selected messages."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:475
+#: src/plugins/att_remover/att_remover.c:476
 #, c-format
 msgid "Attachments removed from all %d selected messages."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:504
+#: src/plugins/att_remover/att_remover.c:505
 msgid "This message doesn't have any attachments."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:517
+#: src/plugins/att_remover/att_remover.c:518
 msgid "Remove attachments..."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:529
-#: src/plugins/att_remover/att_remover.c:589
+#: src/plugins/att_remover/att_remover.c:530
+#: src/plugins/att_remover/att_remover.c:590
 msgid "AttRemover"
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:594
+#: src/plugins/att_remover/att_remover.c:595
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -8790,7 +9157,7 @@ msgid ""
 "attachments will be lost forever, and ever, and ever."
 msgstr ""
 
-#: src/plugins/att_remover/att_remover.c:618
+#: src/plugins/att_remover/att_remover.c:619
 msgid "Attachment handling"
 msgstr ""
 
@@ -8827,53 +9194,53 @@ msgstr ""
 msgid "One of the following regular expressions is matched (one per line)"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:87
+#: src/plugins/attachwarner/attachwarner_prefs.c:88
 msgid "Expressions are case sensitive"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:93
+#: src/plugins/attachwarner/attachwarner_prefs.c:94
 msgid "Case sensitive when matching for the regular expressions in the list"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:115
+#: src/plugins/attachwarner/attachwarner_prefs.c:116
 msgid "Lines starting with quotation marks"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:122
+#: src/plugins/attachwarner/attachwarner_prefs.c:123
 msgid ""
 "Exclude quoted lines from checking for the regular expressions above. Note "
 "that handmade quotes cannot be distinguished from quotes generated by "
 "replying."
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:125
+#: src/plugins/attachwarner/attachwarner_prefs.c:126
 msgid "Forwarded or redirected messages"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:132
+#: src/plugins/attachwarner/attachwarner_prefs.c:133
 msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:310
+#: src/plugins/attachwarner/attachwarner_prefs.c:136 src/prefs_msg_colors.c:308
 msgid "Signatures"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:142
+#: src/plugins/attachwarner/attachwarner_prefs.c:143
 msgid ""
 "Exclude lines from the first signature-separator onwards from checking for "
 "the regular expressions above"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:148
+#: src/plugins/attachwarner/attachwarner_prefs.c:149
 msgid "Warn when"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:152
+#: src/plugins/attachwarner/attachwarner_prefs.c:153
 msgid "Excluding"
 msgstr ""
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:230
+#: src/plugins/attachwarner/attachwarner_prefs.c:231
 msgid "Attach Warner"
 msgstr ""
 
@@ -8890,12 +9257,12 @@ msgstr ""
 #: src/plugins/bsfilter/bsfilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:326
 #: src/plugins/spamassassin/spamassassin.c:118
-#: src/plugins/spamassassin/spamassassin_gtk.c:459
-#: src/plugins/spamassassin/spamassassin_gtk.c:508
-#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:686
-#: src/prefs_matcher.c:719 src/prefs_matcher.c:1661 src/prefs_matcher.c:1668
-#: src/prefs_matcher.c:1676 src/prefs_matcher.c:1678 src/prefs_matcher.c:2586
-#: src/prefs_matcher.c:2590
+#: src/plugins/spamassassin/spamassassin_gtk.c:454
+#: src/plugins/spamassassin/spamassassin_gtk.c:503
+#: src/plugins/spamassassin/spamassassin_gtk.c:630 src/prefs_matcher.c:684
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1656 src/prefs_matcher.c:1663
+#: src/prefs_matcher.c:1671 src/prefs_matcher.c:1673 src/prefs_matcher.c:2580
+#: src/prefs_matcher.c:2584
 msgid "Any"
 msgstr ""
 
@@ -8971,25 +9338,25 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:411
 msgid "Process messages on receiving"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:374
+#: src/plugins/spamassassin/spamassassin_gtk.c:369
 msgid "Maximum size"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:383
+#: src/plugins/spamassassin/spamassassin_gtk.c:378
 msgid "Messages larger than this will not be checked"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1616
+#: src/plugins/spamassassin/spamassassin_gtk.c:381 src/prefs_account.c:1684
 msgid "KB"
 msgstr ""
 
@@ -9007,7 +9374,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:432
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr ""
@@ -9015,7 +9382,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:438
+#: src/plugins/spamassassin/spamassassin_gtk.c:433
 msgid "Click this button to select a folder for storing spam"
 msgstr ""
 
@@ -9043,13 +9410,13 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:453
+#: src/plugins/spamassassin/spamassassin_gtk.c:448
 msgid "Whitelist senders found in address book/folder"
 msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:457
+#: src/plugins/spamassassin/spamassassin_gtk.c:452
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9057,7 +9424,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:467
+#: src/plugins/spamassassin/spamassassin_gtk.c:462
 msgid "Click this button to select a book or folder in the address book"
 msgstr ""
 
@@ -9082,7 +9449,7 @@ msgstr ""
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:445
+#: src/plugins/spamassassin/spamassassin_gtk.c:440
 msgid "Mark spam as read"
 msgstr ""
 
@@ -9134,7 +9501,7 @@ msgid ""
 msgstr ""
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:424
+#: src/plugins/spamassassin/spamassassin_gtk.c:419
 msgid "Save spam in"
 msgstr ""
 
@@ -9426,15 +9793,15 @@ msgid "Render embedded objects using plugins"
 msgstr ""
 
 #: src/plugins/fancy/fancy_prefs.c:170
-msgid "Open in Viewer (remote content is enabled)"
+msgid "Open in viewer (remote content is enabled)"
 msgstr ""
 
 #: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
-#: src/prefs_proxy.c:241
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:4256
+#: src/prefs_proxy.c:235
 msgid "Proxy"
 msgstr ""
 
@@ -9447,6 +9814,7 @@ msgid "Use proxy"
 msgstr ""
 
 #: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/litehtml_viewer/lh_prefs.c:114
 msgid "Remote resources"
 msgstr ""
 
@@ -9459,117 +9827,118 @@ msgid ""
 "in the email."
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:245
+#: src/plugins/fancy/fancy_prefs.c:246
+#: src/plugins/litehtml_viewer/lh_prefs.c:122
 msgid "Enable loading of remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:277
+#: src/plugins/fancy/fancy_prefs.c:278
 msgid "When clicking on a link, by default"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:285
-msgid "Open in External Browser"
+#: src/plugins/fancy/fancy_prefs.c:286
+msgid "Open in external browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:299
+#: src/plugins/fancy/fancy_prefs.c:300
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:309
-#: src/plugins/notification/notification_prefs.c:1346
+#: src/plugins/fancy/fancy_prefs.c:310
+#: src/plugins/notification/notification_prefs.c:1341
 #: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
-#: src/prefs_customheader.c:236
+#: src/prefs_account.c:1587 src/prefs_account.c:1706 src/prefs_account.c:2474
+#: src/prefs_customheader.c:228
 msgid "Bro_wse"
 msgstr ""
 
-#: src/plugins/fancy/fancy_prefs.c:351
+#: src/plugins/fancy/fancy_prefs.c:352
 msgid "Select stylesheet"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:409
+#: src/plugins/fancy/fancy_viewer.c:469
 msgid "Remote content loading is disabled."
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:488
+#: src/plugins/fancy/fancy_viewer.c:578
 msgid "Load images"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:490
+#: src/plugins/fancy/fancy_viewer.c:580
 msgid "Enable remote content"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:492
+#: src/plugins/fancy/fancy_viewer.c:582
 msgid "Enable Javascript"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:494
+#: src/plugins/fancy/fancy_viewer.c:584
 msgid "Enable Plugins"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:496
+#: src/plugins/fancy/fancy_viewer.c:586
 msgid "Enable Java"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:498
+#: src/plugins/fancy/fancy_viewer.c:588
 msgid "Open links with external browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:673
+#: src/plugins/fancy/fancy_viewer.c:780
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:733
+#: src/plugins/fancy/fancy_viewer.c:840
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:744
+#: src/plugins/fancy/fancy_viewer.c:851
 msgid "Search the Web"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:755
+#: src/plugins/fancy/fancy_viewer.c:862
 msgid "Open in Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:764
+#: src/plugins/fancy/fancy_viewer.c:871
 msgid "Open in Browser"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:774
+#: src/plugins/fancy/fancy_viewer.c:881
 msgid "Open Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:783
+#: src/plugins/fancy/fancy_viewer.c:890
 msgid "Copy Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:787
+#: src/plugins/fancy/fancy_viewer.c:894
 msgid "Download Link"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:905
 msgid "Save Image As"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:808
+#: src/plugins/fancy/fancy_viewer.c:915
 msgid "Copy Image"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:848
+#: src/plugins/fancy/fancy_viewer.c:953
 msgid "Import feed"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1130
+#: src/plugins/fancy/fancy_viewer.c:1245
 msgid "Fancy"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1158
+#: src/plugins/fancy/fancy_viewer.c:1273
 msgid "Fancy HTML Viewer"
 msgstr ""
 
-#: src/plugins/fancy/fancy_viewer.c:1163
+#: src/plugins/fancy/fancy_viewer.c:1278
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -9653,7 +10022,7 @@ msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:130
 msgid "GData plugin: Authorization required"
-msgstr ""
+msgstr "GData plugin: Authorisation required"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:132
 msgid ""
@@ -9665,6 +10034,13 @@ msgid ""
 "code in the field below to grant Claws Mail access to your Google contact "
 "list."
 msgstr ""
+"You need to authorise Claws Mail to access your Google contact list to use "
+"the GData plugin.\n"
+"\n"
+"Visit Google's authorisation page by pressing the button below. After you "
+"confirmed the authorisation, you will get an authorisation code. Enter that "
+"code in the field below to grant Claws Mail access to your Google contact "
+"list."
 
 #: src/plugins/gdata/cm_gdata_contacts.c:147
 msgid "Step 1:"
@@ -9672,7 +10048,7 @@ msgstr ""
 
 #: src/plugins/gdata/cm_gdata_contacts.c:153
 msgid "Click here to open the Google authorization page in a browser"
-msgstr ""
+msgstr "Click here to open the Google authorisation page in a browser"
 
 #: src/plugins/gdata/cm_gdata_contacts.c:157
 msgid "Step 2:"
@@ -9682,13 +10058,13 @@ msgstr ""
 msgid "Enter code:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:329
+#: src/plugins/gdata/cm_gdata_contacts.c:331
 #, c-format
 msgid "GData plugin: Error querying for contacts: %s\n"
 msgstr ""
 
 #. TRANSLATORS: First part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:345
+#: src/plugins/gdata/cm_gdata_contacts.c:347
 #, c-format
 msgid "Added %d of"
 msgid_plural "Added %d of"
@@ -9696,97 +10072,101 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Second part of "Added X of Y contacts to cache"
-#: src/plugins/gdata/cm_gdata_contacts.c:347
+#: src/plugins/gdata/cm_gdata_contacts.c:349
 #, c-format
 msgid "1 contact to the cache"
 msgid_plural "%d contacts to the cache"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:357
+#: src/plugins/gdata/cm_gdata_contacts.c:359
 msgid "GData plugin: Starting async contacts query\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:378
+#: src/plugins/gdata/cm_gdata_contacts.c:380
 #, c-format
 msgid "GData plugin: Error querying for groups: %s\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:415
+#: src/plugins/gdata/cm_gdata_contacts.c:417
 msgid "GData plugin: Groups received\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:422
+#: src/plugins/gdata/cm_gdata_contacts.c:424
 msgid "GData plugin: Starting async groups query\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:447
+#: src/plugins/gdata/cm_gdata_contacts.c:449
 #, c-format
 msgid "GData plugin: Authorization error: %s\n"
-msgstr ""
+msgstr "GData plugin: Authorisation error: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:454
+#: src/plugins/gdata/cm_gdata_contacts.c:456
 msgid "GData plugin: Authorization successful\n"
-msgstr ""
+msgstr "GData plugin: Authorisation successful\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:474
+#: src/plugins/gdata/cm_gdata_contacts.c:476
 msgid "GData plugin: Starting interactive authorization\n"
-msgstr ""
+msgstr "GData plugin: Starting interactive authorisation\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:481
+#: src/plugins/gdata/cm_gdata_contacts.c:483
 msgid "GData plugin: Got authorization code, requesting authorization\n"
-msgstr ""
+msgstr "GData plugin: Got authorization code, requesting authorisation\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:488
+#: src/plugins/gdata/cm_gdata_contacts.c:490
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr ""
+"GData plugin: No authorisation code received, authorisation request "
+"cancelled\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:494
+#: src/plugins/gdata/cm_gdata_contacts.c:496
 msgid ""
 "GData plugin: Interactive authorization still running, no additional session "
 "started\n"
 msgstr ""
+"GData plugin: Interactive authorisation still running, no additional session "
+"started\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:511
+#: src/plugins/gdata/cm_gdata_contacts.c:513
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
-msgstr ""
+msgstr "GData plugin: Authorisation refresh error: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:535
+#: src/plugins/gdata/cm_gdata_contacts.c:537
 msgid "GData plugin: Authorization refresh successful\n"
-msgstr ""
+msgstr "GData plugin: Authorisation refresh successful\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:595
+#: src/plugins/gdata/cm_gdata_contacts.c:597
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_contacts.c:603
+#: src/plugins/gdata/cm_gdata_contacts.c:605
 msgid "GData plugin: Trying to refresh authorization\n"
-msgstr ""
+msgstr "GData plugin: Trying to refresh authorisation\n"
 
-#: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1921
+#: src/plugins/gdata/cm_gdata_prefs.c:80
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1990
 msgid "Authentication"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
+#: src/plugins/gdata/cm_gdata_prefs.c:86
+#: src/plugins/spam_report/spam_report_prefs.c:170 src/wizard.c:1570
 msgid "Username:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:95
+#: src/plugins/gdata/cm_gdata_prefs.c:99
 msgid "Polling interval (seconds):"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:102
+#: src/plugins/gdata/cm_gdata_prefs.c:106
 msgid "Maximum number of results:"
 msgstr ""
 
-#: src/plugins/gdata/cm_gdata_prefs.c:138 src/plugins/gdata/gdata_plugin.c:102
+#: src/plugins/gdata/cm_gdata_prefs.c:142 src/plugins/gdata/gdata_plugin.c:102
 #: src/plugins/gdata/gdata_plugin.c:165
 msgid "GData"
 msgstr ""
@@ -9814,30 +10194,30 @@ msgstr ""
 msgid "GData integration"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:332
-#: src/plugins/libravatar/libravatar.c:397
-#: src/plugins/libravatar/libravatar.c:457
-#: src/plugins/libravatar/libravatar_prefs.c:546
+#: src/plugins/libravatar/libravatar.c:334
+#: src/plugins/libravatar/libravatar.c:399
+#: src/plugins/libravatar/libravatar.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:564
 msgid "Libravatar"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:339
+#: src/plugins/libravatar/libravatar.c:341
 msgid "Failed to register avatar header update hook"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:348
+#: src/plugins/libravatar/libravatar.c:350
 msgid "Failed to register avatar image render hook"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:356
 msgid "Failed to create avatar image cache directory"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:364
+#: src/plugins/libravatar/libravatar.c:366
 msgid "Failed to load missing items cache"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar.c:407
+#: src/plugins/libravatar/libravatar.c:409
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -9853,33 +10233,33 @@ msgid ""
 "Feedback to <ricardo@mones.org> is welcome.\n"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:137
+#: src/plugins/libravatar/libravatar_prefs.c:146
 msgid "Error reading cache stats"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:141
+#: src/plugins/libravatar/libravatar_prefs.c:150
 #, c-format
 msgid "Using %s in %d files, %d directories, %d others and %d errors"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:150
+#: src/plugins/libravatar/libravatar_prefs.c:159
 #, c-format
 msgid "Using %s in %d files, %d directories and %d others"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:164
+#: src/plugins/libravatar/libravatar_prefs.c:173
 msgid "Clear icon cache"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:165
+#: src/plugins/libravatar/libravatar_prefs.c:174
 msgid "Are you sure you want to remove all cached avatar icons?"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:178
+#: src/plugins/libravatar/libravatar_prefs.c:187
 msgid "Not enough memory for operation"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:183
+#: src/plugins/libravatar/libravatar_prefs.c:192
 #, c-format
 msgid ""
 "Icon cache successfully cleared:\n"
@@ -9887,11 +10267,11 @@ msgid ""
 "• %u files removed."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:188
+#: src/plugins/libravatar/libravatar_prefs.c:197
 msgid "Icon cache successfully cleared!"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:191
+#: src/plugins/libravatar/libravatar_prefs.c:200
 #, c-format
 msgid ""
 "Errors clearing icon cache:\n"
@@ -9901,131 +10281,180 @@ msgid ""
 "• %u files couldn't be removed."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:198
+#: src/plugins/libravatar/libravatar_prefs.c:207
 msgid "Error clearing icon cache."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:213
+#: src/plugins/libravatar/libravatar_prefs.c:222
 msgid "_Use cached icons"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:214
+#: src/plugins/libravatar/libravatar_prefs.c:223
 msgid ""
 "Keep icons on disk for reusing instead of making another network request"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
+#: src/plugins/libravatar/libravatar_prefs.c:238
 msgid "Cache refresh interval"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1595
-#: src/prefs_account.c:1752 src/prefs_matcher.c:340 src/prefs_receive.c:180
+#: src/plugins/libravatar/libravatar_prefs.c:238
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1663
+#: src/prefs_account.c:1820 src/prefs_matcher.c:339 src/prefs_receive.c:180
 msgid "hours"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:305
+#: src/plugins/libravatar/libravatar_prefs.c:316
 msgid "Mystery man"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:306
+#: src/plugins/libravatar/libravatar_prefs.c:317
 msgid "Identicon"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:307
+#: src/plugins/libravatar/libravatar_prefs.c:318
 msgid "MonsterID"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:308
+#: src/plugins/libravatar/libravatar_prefs.c:319
 msgid "Wavatar"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:309
+#: src/plugins/libravatar/libravatar_prefs.c:320
 msgid "Retro"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:310
+#: src/plugins/libravatar/libravatar_prefs.c:321
+msgid "Robohash"
+msgstr ""
+
+#: src/plugins/libravatar/libravatar_prefs.c:322
+msgid "Pagan"
+msgstr ""
+
+#: src/plugins/libravatar/libravatar_prefs.c:323
 msgid "Custom URL"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:313
+#: src/plugins/libravatar/libravatar_prefs.c:326
 msgid "A blank image"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:314
+#: src/plugins/libravatar/libravatar_prefs.c:327
 msgid "The unobtrusive low-contrast greyish silhouette"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:315
+#: src/plugins/libravatar/libravatar_prefs.c:328
 msgid "A generated geometric pattern"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:316
+#: src/plugins/libravatar/libravatar_prefs.c:329
 msgid "A generated full-body monster"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:317
+#: src/plugins/libravatar/libravatar_prefs.c:330
 msgid "A generated almost unique face"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:318
+#: src/plugins/libravatar/libravatar_prefs.c:331
 msgid "A generated 8-bit arcade-style pixelated image"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:319
-msgid "Redirect to a user provided URL"
+#: src/plugins/libravatar/libravatar_prefs.c:332
+msgid "A generated robotic character"
 msgstr ""
 
 #: src/plugins/libravatar/libravatar_prefs.c:333
+msgid "A generated retro adventure game character"
+msgstr ""
+
+#: src/plugins/libravatar/libravatar_prefs.c:334
+msgid "Redirect to a user provided URL"
+msgstr ""
+
+#: src/plugins/libravatar/libravatar_prefs.c:348
 msgid ""
 "Enter the URL you want to be redirected when no user icon is available. "
 "Leave an empty URL to use the default libravatar orange icon."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:382
+#: src/plugins/libravatar/libravatar_prefs.c:398
 msgid "_Allow redirects to other sites"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:383
+#: src/plugins/libravatar/libravatar_prefs.c:399
 msgid ""
 "Follow redirect responses received from libravatar server to other avatar "
 "services like gravatar.com"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:392
+#: src/plugins/libravatar/libravatar_prefs.c:408
 msgid "_Enable federated servers"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:393
+#: src/plugins/libravatar/libravatar_prefs.c:409
 msgid "Try to get avatar from sender's domain libravatar server"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "Request timeout"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:410
+#: src/plugins/libravatar/libravatar_prefs.c:426
 msgid "second(s)"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:411
+#: src/plugins/libravatar/libravatar_prefs.c:427
 msgid ""
 "Set to 0 to use global socket I/O timeout. Maximum value must be also less "
 "than global socket I/O timeout."
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:455
+#: src/plugins/libravatar/libravatar_prefs.c:473
 msgid "Icon cache"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:459
+#: src/plugins/libravatar/libravatar_prefs.c:477
 msgid "Default missing icon mode"
 msgstr ""
 
-#: src/plugins/libravatar/libravatar_prefs.c:463
+#: src/plugins/libravatar/libravatar_prefs.c:481
 msgid "Network"
 msgstr ""
 
+#: src/plugins/litehtml_viewer/lh_prefs.c:116
+msgid ""
+"Loading remote resources can lead to some privacy issues.\n"
+"When remote content loading is disabled, nothing will be requested\n"
+"from the network."
+msgstr ""
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:134
+msgid "Size of image cache in megabytes"
+msgstr ""
+
+#: src/plugins/litehtml_viewer/lh_prefs.c:149
+msgid "Default font"
+msgstr ""
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:92
+msgid "Open Link"
+msgstr ""
+
+#: src/plugins/litehtml_viewer/lh_widget.cpp:96
+msgid "Copy Link Location"
+msgstr ""
+
+#: src/plugins/litehtml_viewer/plugin.c:50
+msgid "LiteHTML viewer"
+msgstr ""
+
+#: src/plugins/litehtml_viewer/plugin.c:55
+msgid ""
+"Viewer plugin for HTML emails, using the litehtml library (http://www."
+"litehtml.com/)."
+msgstr ""
+
 #: src/plugins/mailmbox/plugin.c:58
 msgid "mailmbox folder"
 msgstr ""
@@ -10038,14 +10467,14 @@ msgstr ""
 msgid "MBOX"
 msgstr ""
 
-#: src/plugins/mailmbox/plugin_gtk.c:190
+#: src/plugins/mailmbox/plugin_gtk.c:191
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 
-#: src/plugins/mailmbox/plugin_gtk.c:330
+#: src/plugins/mailmbox/plugin_gtk.c:331
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be deleted.\n"
@@ -10110,7 +10539,7 @@ msgstr ""
 msgid "sending error on Sieve session: %s\n"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5805
 msgid "_Filter"
 msgstr ""
 
@@ -10167,7 +10596,7 @@ msgid "%s - Sieve Filter%s"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_editor.c:744
-#: src/plugins/pdf_viewer/poppler_viewer.c:1315
+#: src/plugins/pdf_viewer/poppler_viewer.c:1326
 msgid "Loading..."
 msgstr ""
 
@@ -10217,6 +10646,10 @@ msgstr ""
 msgid "Manage Sieve Filters"
 msgstr ""
 
+#: src/plugins/managesieve/sieve_manager.c:771
+msgid "_Rename"
+msgstr ""
+
 #: src/plugins/managesieve/sieve_manager.c:806
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr ""
@@ -10238,7 +10671,7 @@ msgstr ""
 msgid "Enable Sieve"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1261
 msgid "Server information"
 msgstr ""
 
@@ -10289,29 +10722,29 @@ msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
-#: src/prefs_account.c:1967
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1432
+#: src/prefs_account.c:2037
 msgid "User ID"
 msgstr ""
 
 #: src/plugins/managesieve/sieve_prefs.c:246
 #: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1394
-#: src/prefs_account.c:1990 src/prefs_account.c:2718 src/prefs_account.c:2746
-#: src/prefs_account.c:2943 src/prefs_proxy.c:134 src/wizard.c:1216
-#: src/wizard.c:1636
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1437
+#: src/prefs_account.c:2060 src/prefs_account.c:2997 src/prefs_account.c:3025
+#: src/prefs_account.c:3220 src/prefs_proxy.c:132 src/wizard.c:1222
+#: src/wizard.c:1652
 msgid "Password"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1678
-#: src/prefs_account.c:1939
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1615
+#: src/prefs_account.c:1745 src/prefs_account.c:2008
 msgid "Authentication method"
 msgstr ""
 
-#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1688
-#: src/prefs_account.c:1948 src/prefs_send.c:265 src/prefs_send.c:336
-#: src/prefs_themes.c:1114
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1755
+#: src/prefs_account.c:2017 src/prefs_send.c:261 src/prefs_send.c:328
+#: src/prefs_themes.c:1116
 msgid "Automatic"
 msgstr ""
 
@@ -10355,7 +10788,7 @@ msgstr ""
 msgid "Log file"
 msgstr ""
 
-#: src/plugins/notification/notification_banner.c:357
+#: src/plugins/notification/notification_banner.c:358
 msgid "Folder:"
 msgstr ""
 
@@ -10371,56 +10804,56 @@ msgstr ""
 msgid "No new messages"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:216
-#: src/plugins/notification/notification_plugin.c:420
-#: src/plugins/notification/notification_prefs.c:399
-#: src/plugins/notification/notification_prefs.c:414
-#: src/plugins/notification/notification_prefs.c:433
-#: src/plugins/notification/notification_prefs.c:451
-#: src/plugins/notification/notification_prefs.c:469
-#: src/plugins/notification/notification_prefs.c:487
-#: src/plugins/notification/notification_prefs.c:505
-#: src/plugins/notification/notification_prefs.c:523
+#: src/plugins/notification/notification_plugin.c:220
+#: src/plugins/notification/notification_plugin.c:424
+#: src/plugins/notification/notification_prefs.c:404
+#: src/plugins/notification/notification_prefs.c:420
+#: src/plugins/notification/notification_prefs.c:439
+#: src/plugins/notification/notification_prefs.c:457
+#: src/plugins/notification/notification_prefs.c:475
+#: src/plugins/notification/notification_prefs.c:493
+#: src/plugins/notification/notification_prefs.c:511
+#: src/plugins/notification/notification_prefs.c:529
 msgid "Notification"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:221
+#: src/plugins/notification/notification_plugin.c:225
 msgid "The Notification plugin needs threading support."
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:228
+#: src/plugins/notification/notification_plugin.c:232
 msgid "Failed to register folder item update hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:236
+#: src/plugins/notification/notification_plugin.c:240
 msgid "Failed to register folder update hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:246
+#: src/plugins/notification/notification_plugin.c:250
 msgid "Failed to register msginfo update hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:256
+#: src/plugins/notification/notification_plugin.c:260
 msgid "Failed to register offline switch hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:267
+#: src/plugins/notification/notification_plugin.c:271
 msgid "Failed to register main window close hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:280
+#: src/plugins/notification/notification_plugin.c:284
 msgid "Failed to register got iconified hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:293
+#: src/plugins/notification/notification_plugin.c:297
 msgid "Failed to register account list changed hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:306
+#: src/plugins/notification/notification_plugin.c:310
 msgid "Failed to register theme change hook in the Notification plugin"
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:425
+#: src/plugins/notification/notification_plugin.c:429
 msgid ""
 "This plugin provides various ways to notify the user of new and unread "
 "email.\n"
@@ -10430,7 +10863,7 @@ msgid ""
 "Feedback to <berndth@gmx.de> is welcome."
 msgstr ""
 
-#: src/plugins/notification/notification_plugin.c:450
+#: src/plugins/notification/notification_plugin.c:454
 msgid "Various tools"
 msgstr ""
 
@@ -10451,7 +10884,7 @@ msgid "New Calendar message"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:337
-#: src/plugins/notification/notification_trayicon.c:907
+#: src/plugins/notification/notification_trayicon.c:906
 msgid "A new calendar message arrived"
 msgstr ""
 
@@ -10460,7 +10893,7 @@ msgid "New RSS feed article"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:341
-#: src/plugins/notification/notification_trayicon.c:910
+#: src/plugins/notification/notification_trayicon.c:909
 msgid "A new article in a RSS feed arrived"
 msgstr ""
 
@@ -10473,7 +10906,7 @@ msgid "Unknown message type arrived"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:378
-#: src/plugins/notification/notification_trayicon.c:679
+#: src/plugins/notification/notification_trayicon.c:678
 msgid "Present main window"
 msgstr ""
 
@@ -10498,7 +10931,7 @@ msgid "Calendar message"
 msgstr ""
 
 #: src/plugins/notification/notification_popup.c:501
-#: src/plugins/notification/notification_trayicon.c:944
+#: src/plugins/notification/notification_trayicon.c:943
 #, c-format
 msgid "%d new calendar message arrived"
 msgid_plural "%d new calendar messages arrived"
@@ -10523,243 +10956,243 @@ msgid_plural "%d new messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_prefs.c:415
+#: src/plugins/notification/notification_prefs.c:421
 msgid "Hotkeys"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:434
+#: src/plugins/notification/notification_prefs.c:440
 msgid "Banner"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:452
+#: src/plugins/notification/notification_prefs.c:458
 msgid "Popup"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:265
+#: src/plugins/notification/notification_prefs.c:476 src/prefs_actions.c:262
 #: src/prefs_receive.c:155
 msgid "Command"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:488
+#: src/plugins/notification/notification_prefs.c:494
 msgid "LCD"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:506
+#: src/plugins/notification/notification_prefs.c:512
 msgid "SysTrayicon"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:524
+#: src/plugins/notification/notification_prefs.c:530
 msgid "Indicator"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:607
+#: src/plugins/notification/notification_prefs.c:613
 msgid "Include folder types"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:616
+#: src/plugins/notification/notification_prefs.c:622
 msgid "Mail folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:624
+#: src/plugins/notification/notification_prefs.c:630
 msgid "News folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:632
+#: src/plugins/notification/notification_prefs.c:638
 msgid "RSSyl folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:640
+#: src/plugins/notification/notification_prefs.c:646
 msgid "vCalendar folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:648
+#: src/plugins/notification/notification_prefs.c:654
 msgid "These settings override folder-specific selections."
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:659
+#: src/plugins/notification/notification_prefs.c:665
 msgid "Global notification settings"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:668
+#: src/plugins/notification/notification_prefs.c:674
 msgid "Set window manager urgency hint when new messages exist"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:677
+#: src/plugins/notification/notification_prefs.c:683
 msgid "Set window manager urgency hint when unread messages exist"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:687
+#: src/plugins/notification/notification_prefs.c:693
 msgid "Use sound theme"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:761
+#: src/plugins/notification/notification_prefs.c:765
 msgid "Show banner"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:766
+#: src/plugins/notification/notification_prefs.c:770
 #: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
 #: src/prefs_receive.c:231
 msgid "Never"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
+#: src/plugins/notification/notification_prefs.c:772 src/prefs_receive.c:229
 #: src/prefs_summaries.c:523 src/prefs_summaries.c:576
 msgid "Always"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:770
+#: src/plugins/notification/notification_prefs.c:774
 msgid "Only when not empty"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:789
+#: src/plugins/notification/notification_prefs.c:793
 msgid "Banner speed"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:826
+#: src/plugins/notification/notification_prefs.c:830
 msgid "Maximum number of messages"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:832
+#: src/plugins/notification/notification_prefs.c:836
 msgid "Limit the number of messages shown, use 0 for unlimited"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:841
+#: src/plugins/notification/notification_prefs.c:845
 msgid "Banner width"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:847
+#: src/plugins/notification/notification_prefs.c:851
 msgid "Limit the size of banner, use 0 for screen width"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:849
+#: src/plugins/notification/notification_prefs.c:853
 msgid "pixel(s)"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:858
+#: src/plugins/notification/notification_prefs.c:862
 msgid "Include unread mails in banner"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:866
+#: src/plugins/notification/notification_prefs.c:870
 msgid "Make banner sticky"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:876
-#: src/plugins/notification/notification_prefs.c:1081
-#: src/plugins/notification/notification_prefs.c:1376
-#: src/plugins/notification/notification_prefs.c:1611
+#: src/plugins/notification/notification_prefs.c:880
+#: src/plugins/notification/notification_prefs.c:1080
+#: src/plugins/notification/notification_prefs.c:1371
+#: src/plugins/notification/notification_prefs.c:1606
 msgid "Only include selected folders"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:885
-#: src/plugins/notification/notification_prefs.c:1090
-#: src/plugins/notification/notification_prefs.c:1385
-#: src/plugins/notification/notification_prefs.c:1620
+#: src/plugins/notification/notification_prefs.c:889
+#: src/plugins/notification/notification_prefs.c:1089
+#: src/plugins/notification/notification_prefs.c:1380
+#: src/plugins/notification/notification_prefs.c:1615
 msgid "Select folders..."
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:897
+#: src/plugins/notification/notification_prefs.c:901
 msgid "Banner colors"
 msgstr "Banner colours"
 
-#: src/plugins/notification/notification_prefs.c:901
-#: src/plugins/notification/notification_prefs.c:1122
+#: src/plugins/notification/notification_prefs.c:905
+#: src/plugins/notification/notification_prefs.c:1121
 msgid "Use custom colors"
 msgstr "Use custom colours"
 
-#: src/plugins/notification/notification_prefs.c:916
+#: src/plugins/notification/notification_prefs.c:920
 #: src/plugins/notification/notification_prefs.c:1135
 msgid "Foreground"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:922
+#: src/plugins/notification/notification_prefs.c:926
 #: src/plugins/notification/notification_prefs.c:1141
 msgid "Foreground color"
 msgstr "Foreground colour"
 
-#: src/plugins/notification/notification_prefs.c:927
-#: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:260 src/prefs_msg_colors.c:273
-#: src/prefs_msg_colors.c:286
+#: src/plugins/notification/notification_prefs.c:931
+#: src/plugins/notification/notification_prefs.c:1147
+#: src/prefs_msg_colors.c:258 src/prefs_msg_colors.c:271
+#: src/prefs_msg_colors.c:284
 msgid "Background"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:933
-#: src/plugins/notification/notification_prefs.c:1152
+#: src/plugins/notification/notification_prefs.c:937
+#: src/plugins/notification/notification_prefs.c:1153
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/plugins/notification/notification_prefs.c:1045
-#: src/plugins/notification/notification_prefs.c:1646
+#: src/plugins/notification/notification_prefs.c:1044
+#: src/plugins/notification/notification_prefs.c:1641
 msgid "Enable popup"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1062
-#: src/plugins/notification/notification_prefs.c:1664
+#: src/plugins/notification/notification_prefs.c:1061
+#: src/plugins/notification/notification_prefs.c:1659
 msgid "Popup timeout"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1101
+#: src/plugins/notification/notification_prefs.c:1100
 msgid "Make popup sticky"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1111
+#: src/plugins/notification/notification_prefs.c:1110
 msgid "Set popup window width and position"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1116
+#: src/plugins/notification/notification_prefs.c:1115
 msgid "(the window manager is free to ignore this)"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1164
-#: src/plugins/notification/notification_prefs.c:1676
+#: src/plugins/notification/notification_prefs.c:1165
+#: src/plugins/notification/notification_prefs.c:1671
 msgid "Display folder name"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1229
+#: src/plugins/notification/notification_prefs.c:1224
 msgid "Sample popup window"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1235
+#: src/plugins/notification/notification_prefs.c:1230
 msgid "Done"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1293
+#: src/plugins/notification/notification_prefs.c:1288
 msgid "Select command"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1322
+#: src/plugins/notification/notification_prefs.c:1317
 msgid "Enable command"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
+#: src/plugins/notification/notification_prefs.c:1334 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1357
+#: src/plugins/notification/notification_prefs.c:1352
 msgid "Block command after execution for"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1464
+#: src/plugins/notification/notification_prefs.c:1459
 msgid "Enable LCD"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1483
+#: src/plugins/notification/notification_prefs.c:1478
 msgid "Hostname:Port of LCDd server"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1568
+#: src/plugins/notification/notification_prefs.c:1563
 msgid "Enable Trayicon"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1584
+#: src/plugins/notification/notification_prefs.c:1579
 msgid "Hide at start-up"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1592
+#: src/plugins/notification/notification_prefs.c:1587
 msgid "Close to tray"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1600
+#: src/plugins/notification/notification_prefs.c:1595
 msgid "Hide when iconified"
 msgstr ""
 
@@ -10769,36 +11202,36 @@ msgstr ""
 #. for that, go for something along the lines of "passive popup"
 #. instead.See also
 #. http://en.wikipedia.org/wiki/Toast_(computing)
-#: src/plugins/notification/notification_prefs.c:1637
+#: src/plugins/notification/notification_prefs.c:1632
 msgid "Passive toaster popup"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1801
+#: src/plugins/notification/notification_prefs.c:1796
 msgid "Add to Indicator Applet"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1815
+#: src/plugins/notification/notification_prefs.c:1810
 msgid "Hide mainwindow when minimized"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1868
+#: src/plugins/notification/notification_prefs.c:1863
 msgid "Enable global hotkeys"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1877
 #, c-format
 msgid "Examples for hotkeys include <b>%s</b> and <b>%s</b>"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1877
 msgid "<control><shift>F11"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1882
+#: src/plugins/notification/notification_prefs.c:1877
 msgid "<alt>N"
 msgstr ""
 
-#: src/plugins/notification/notification_prefs.c:1893
+#: src/plugins/notification/notification_prefs.c:1889
 msgid "Toggle minimize"
 msgstr ""
 
@@ -10839,169 +11272,169 @@ msgstr ""
 msgid "New %d, Unread: %d, Total: %d"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:857
+#: src/plugins/notification/notification_trayicon.c:856
 msgid "New mail message"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:859
+#: src/plugins/notification/notification_trayicon.c:858
 msgid "New news post"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:861
+#: src/plugins/notification/notification_trayicon.c:860
 msgid "New calendar message"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:863
+#: src/plugins/notification/notification_trayicon.c:862
 msgid "New article in RSS feed"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:866
+#: src/plugins/notification/notification_trayicon.c:865
 msgid "New messages arrived"
 msgstr ""
 
-#: src/plugins/notification/notification_trayicon.c:922
+#: src/plugins/notification/notification_trayicon.c:921
 #, c-format
 msgid "%d new mail message arrived"
 msgid_plural "%d new mail messages arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_trayicon.c:933
+#: src/plugins/notification/notification_trayicon.c:932
 #, c-format
 msgid "%d new news post arrived"
 msgid_plural "%d new news posts arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/notification/notification_trayicon.c:955
+#: src/plugins/notification/notification_trayicon.c:954
 #, c-format
 msgid "%d new article in RSS feeds arrived"
 msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Title:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:710
 msgid "Author:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:708
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Creator:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:713
 msgid "Producer:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:712
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Created:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:720
 msgid "Modified:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:719
+#: src/plugins/pdf_viewer/poppler_viewer.c:723
 msgid "Format:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:721
-#: src/plugins/pdf_viewer/poppler_viewer.c:724
+#: src/plugins/pdf_viewer/poppler_viewer.c:725
+#: src/plugins/pdf_viewer/poppler_viewer.c:728
 msgid "Optimized:"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1217
+#: src/plugins/pdf_viewer/poppler_viewer.c:1228
 msgid "PDF properties"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1366
+#: src/plugins/pdf_viewer/poppler_viewer.c:1377
 msgid "Enter password"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1367
+#: src/plugins/pdf_viewer/poppler_viewer.c:1378
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1382
+#: src/plugins/pdf_viewer/poppler_viewer.c:1393
 #, c-format
 msgid "%s Document"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1388
+#: src/plugins/pdf_viewer/poppler_viewer.c:1399
 #, c-format
 msgid "of %d"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1404
+#: src/plugins/pdf_viewer/poppler_viewer.c:1415
 msgid "PDF rendering failed for an unknown reason."
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1776
-#: src/plugins/pdf_viewer/poppler_viewer.c:1993
+#: src/plugins/pdf_viewer/poppler_viewer.c:1787
+#: src/plugins/pdf_viewer/poppler_viewer.c:1996
 msgid "Document Index"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1958
+#: src/plugins/pdf_viewer/poppler_viewer.c:1961
 msgid "First Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1961
+#: src/plugins/pdf_viewer/poppler_viewer.c:1964
 msgid "Previous Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1964
+#: src/plugins/pdf_viewer/poppler_viewer.c:1967
 msgid "Next Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1967
+#: src/plugins/pdf_viewer/poppler_viewer.c:1970
 msgid "Last Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1970
+#: src/plugins/pdf_viewer/poppler_viewer.c:1973
 msgid "Zoom In"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1972
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Zoom Out"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1975
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Fit Page"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1978
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Fit Page Width"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1981
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Rotate Left"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1984
+#: src/plugins/pdf_viewer/poppler_viewer.c:1987
 msgid "Rotate Right"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1987
+#: src/plugins/pdf_viewer/poppler_viewer.c:1990
 msgid "Print Document"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1990
+#: src/plugins/pdf_viewer/poppler_viewer.c:1993
 msgid "Document Info"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1995
+#: src/plugins/pdf_viewer/poppler_viewer.c:1998
 msgid "Page Number"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1997
+#: src/plugins/pdf_viewer/poppler_viewer.c:2000
 msgid "Zoom Factor"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2108
+#: src/plugins/pdf_viewer/poppler_viewer.c:2111
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11010,13 +11443,13 @@ msgid ""
 "Any feedback is welcome: iwkse@claws-mail.org"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2114
-#: src/plugins/pdf_viewer/poppler_viewer.c:2122
-#: src/plugins/pdf_viewer/poppler_viewer.c:2142
+#: src/plugins/pdf_viewer/poppler_viewer.c:2117
+#: src/plugins/pdf_viewer/poppler_viewer.c:2125
+#: src/plugins/pdf_viewer/poppler_viewer.c:2145
 msgid "PDF Viewer"
 msgstr ""
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2118
+#: src/plugins/pdf_viewer/poppler_viewer.c:2121
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11038,93 +11471,101 @@ msgstr ""
 msgid "Passphrase"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:249
+#: src/plugins/pgpcore/passphrase.c:248
 msgid "[no user id]"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:261
+#: src/plugins/pgpcore/passphrase.c:260
 msgid "Please enter the passphrase for the new key:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:264
+#: src/plugins/pgpcore/passphrase.c:263
 msgid "Passphrases did not match.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:268
+#: src/plugins/pgpcore/passphrase.c:267
 msgid "Please re-enter the passphrase for the new key:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:273
+#: src/plugins/pgpcore/passphrase.c:272
 msgid "Please enter the passphrase for:"
 msgstr ""
 
-#: src/plugins/pgpcore/passphrase.c:276
+#: src/plugins/pgpcore/passphrase.c:275
 msgid "Bad passphrase.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:173
+#: src/plugins/pgpcore/pgp_viewer.c:179
 msgid "Key import"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:174
+#: src/plugins/pgpcore/pgp_viewer.c:180
 msgid ""
-"This key is not in your keyring. Do you want Claws Mail to try and import it "
-"from a keyserver?"
+"This key is not in your keyring. Do you want Claws Mail to try and import it?"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:181 src/plugins/pgpcore/pgp_viewer.c:280
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from keyserver"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:182
+msgid "from Web Key Directory"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:187 src/plugins/pgpcore/pgp_viewer.c:297
 msgid ""
 "\n"
 "  Key ID "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:184
+#: src/plugins/pgpcore/pgp_viewer.c:190
 msgid "   This key is not in your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:185
+#: src/plugins/pgpcore/pgp_viewer.c:191
 msgid "   It should be possible to import it "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:193
 msgid ""
 "when working online,\n"
 "   or "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:188
+#: src/plugins/pgpcore/pgp_viewer.c:194
 msgid ""
-"with the following command: \n"
+"with either of the following commands: \n"
 "\n"
 "     "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:191
+#: src/plugins/pgpcore/pgp_viewer.c:199
 msgid ""
 "\n"
 "  Importing key ID "
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:269
+#: src/plugins/pgpcore/pgp_viewer.c:280
 msgid "   This key has been imported to your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:271
+#: src/plugins/pgpcore/pgp_viewer.c:282
 msgid "   This key couldn't be imported to your keyring.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:272
+#: src/plugins/pgpcore/pgp_viewer.c:283
 msgid "   Key servers are sometimes slow.\n"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:273
-msgid ""
-"   You can try to import it manually with the command:\n"
-"\n"
-"     "
+#: src/plugins/pgpcore/pgp_viewer.c:284
+msgid "   You can try to import it manually with the command:"
+msgstr ""
+
+#: src/plugins/pgpcore/pgp_viewer.c:288
+msgid "or"
 msgstr ""
 
-#: src/plugins/pgpcore/pgp_viewer.c:289
+#: src/plugins/pgpcore/pgp_viewer.c:306
 msgid "   This key is in your keyring.\n"
 msgstr ""
 
@@ -11174,8 +11615,8 @@ msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 
 #: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1759
-#: src/prefs_account.c:2056 src/prefs_receive.c:190
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1827
+#: src/prefs_account.c:2126 src/prefs_receive.c:190
 msgid "minutes"
 msgstr ""
 
@@ -11732,36 +12173,36 @@ msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:379
-#: src/plugins/python/python_plugin.c:523
+#: src/plugins/python/python_plugin.c:380
+#: src/plugins/python/python_plugin.c:524
 msgid "Python scripts"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:518
+#: src/plugins/python/python_plugin.c:519
 msgid "Show Python console..."
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:524
+#: src/plugins/python/python_plugin.c:525
 #: src/plugins/rssyl/rssyl_feed_props.c:471
 msgid "Refresh"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:2707
-#: src/prefs_account.c:2735 src/prefs_account.c:3172 src/wizard.c:1206
-#: src/wizard.c:1626
+#: src/plugins/python/python_plugin.c:527 src/prefs_account.c:2986
+#: src/prefs_account.c:3014 src/prefs_account.c:3442 src/wizard.c:1212
+#: src/wizard.c:1642
 msgid "Browse"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:672
-#: src/plugins/python/python_plugin.c:762
+#: src/plugins/python/python_plugin.c:673
+#: src/plugins/python/python_plugin.c:760
 msgid "Python"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:681
+#: src/plugins/python/python_plugin.c:682
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:767
+#: src/plugins/python/python_plugin.c:765
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -11808,7 +12249,7 @@ msgid ""
 "Feedback to <berndth@gmx.de> is welcome."
 msgstr ""
 
-#: src/plugins/python/python_plugin.c:818
+#: src/plugins/python/python_plugin.c:816
 msgid "Python integration"
 msgstr ""
 
@@ -12010,8 +12451,8 @@ msgid "Fetch comments on posts aged less than"
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_feed_props.c:414
-#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1585 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
+#: src/plugins/vcalendar/day-view.c:612 src/plugins/vcalendar/month-view.c:710
+#: src/prefs_account.c:1653 src/prefs_folder_item.c:572 src/prefs_matcher.c:340
 msgid "days"
 msgstr ""
 
@@ -12036,10 +12477,6 @@ msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr ""
 
 #: src/plugins/rssyl/rssyl_feed_props.c:517
-msgid "_OK"
-msgstr ""
-
-#: src/plugins/rssyl/rssyl_feed_props.c:525
 msgid "Set feed properties"
 msgstr ""
 
@@ -12139,13 +12576,13 @@ msgstr ""
 msgid "Feed folder:"
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:73
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:74
 msgid ""
 "Instead of using official title, you can enter a different folder name for "
 "the feed."
 msgstr ""
 
-#: src/plugins/rssyl/rssyl_subscribe_gtk.c:77
+#: src/plugins/rssyl/rssyl_subscribe_gtk.c:78
 msgid "_Edit feed properties after subscribing"
 msgstr ""
 
@@ -12298,16 +12735,16 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:169
+#: src/plugins/spam_report/spam_report_prefs.c:167
 msgid "Forward to:"
 msgstr ""
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
+#: src/plugins/spam_report/spam_report_prefs.c:181 src/wizard.c:1583
 msgid "Password:"
 msgstr ""
 
 #: src/plugins/spamassassin/spamassassin.c:78
-#: src/plugins/spamassassin/spamassassin_gtk.c:671
+#: src/plugins/spamassassin/spamassassin_gtk.c:666
 msgid "SpamAssassin"
 msgstr ""
 
@@ -12362,67 +12799,67 @@ msgid ""
 "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Localhost"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:95
 msgid "TCP"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:94
+#: src/plugins/spamassassin/spamassassin_gtk.c:97
 msgid "Unix Socket"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:122
+#: src/plugins/spamassassin/spamassassin_gtk.c:125
 msgid "Select folder to save spam to"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:274
+#: src/plugins/spamassassin/spamassassin_gtk.c:277
 msgid "Enable SpamAssassin plugin"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:278
+#: src/plugins/spamassassin/spamassassin_gtk.c:281
 msgid "Transport"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:286
+#: src/plugins/spamassassin/spamassassin_gtk.c:289
 msgid "Type of transport"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:307
+#: src/plugins/spamassassin/spamassassin_gtk.c:306
 msgid "User"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:320
+#: src/plugins/spamassassin/spamassassin_gtk.c:317
 msgid "User to use with spamd server"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:322
+#: src/plugins/spamassassin/spamassassin_gtk.c:319
 msgid "spamd"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:340
+#: src/plugins/spamassassin/spamassassin_gtk.c:335
 msgid "Hostname or IP address of spamd server"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:351
+#: src/plugins/spamassassin/spamassassin_gtk.c:346
 msgid "Port of spamd server"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:357
+#: src/plugins/spamassassin/spamassassin_gtk.c:352
 msgid "Path of Unix socket"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/spamassassin/spamassassin_gtk.c:359
 msgid "Use compression"
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:368
+#: src/plugins/spamassassin/spamassassin_gtk.c:363
 msgid "Enable compression if spamd uses it, otherwise disable it."
 msgstr ""
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:403
+#: src/plugins/spamassassin/spamassassin_gtk.c:398
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
@@ -12483,11 +12920,11 @@ msgstr ""
 msgid "_Go to today"
 msgstr ""
 
-#: src/plugins/vcalendar/day-view.c:594 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:591 src/plugins/vcalendar/month-view.c:689
 msgid "Start"
 msgstr ""
 
-#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:604 src/plugins/vcalendar/month-view.c:702
 msgid "Show"
 msgstr ""
 
@@ -12567,15 +13004,15 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:798
+#: src/plugins/vcalendar/month-view.c:790
 msgid "Week number"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:889
+#: src/plugins/vcalendar/month-view.c:875
 msgid "Previous month"
 msgstr ""
 
-#: src/plugins/vcalendar/month-view.c:909
+#: src/plugins/vcalendar/month-view.c:894
 msgid "Next month"
 msgstr ""
 
@@ -12600,177 +13037,177 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:100
+#: src/plugins/vcalendar/vcalendar.c:97
 msgid "Create meeting from message..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:120
+#: src/plugins/vcalendar/vcalendar.c:117
 #, c-format
 msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:140
+#: src/plugins/vcalendar/vcalendar.c:137
 msgid "Creating meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:159
+#: src/plugins/vcalendar/vcalendar.c:156
 msgid "no subject"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:385
+#: src/plugins/vcalendar/vcalendar.c:382
 msgid "Accept"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:386
+#: src/plugins/vcalendar/vcalendar.c:383
 msgid "Tentatively accept"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:387
+#: src/plugins/vcalendar/vcalendar.c:384
 msgid "Decline"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:474
+#: src/plugins/vcalendar/vcalendar.c:473
 msgid "You have a Todo item."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
-#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
-#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:716
+#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:715
 msgid "Details follow:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:481
+#: src/plugins/vcalendar/vcalendar.c:480
 msgid "You have created a meeting."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:486
+#: src/plugins/vcalendar/vcalendar.c:485
 msgid "You have been invited to a meeting."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:494
+#: src/plugins/vcalendar/vcalendar.c:493
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:503
+#: src/plugins/vcalendar/vcalendar.c:502
 msgid "You have been forwarded an appointment."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:557
+#: src/plugins/vcalendar/vcalendar.c:556
 msgid "(this event recurs)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:564
+#: src/plugins/vcalendar/vcalendar.c:563
 msgid "(this event is part of a recurring event)"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:715
+#: src/plugins/vcalendar/vcalendar.c:714
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:719
+#: src/plugins/vcalendar/vcalendar.c:718
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
 "%s has %s the invitation whose details follow:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:798
+#: src/plugins/vcalendar/vcalendar.c:797
 msgid "Error - could not get the calendar MIME part."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:805
+#: src/plugins/vcalendar/vcalendar.c:804
 msgid "Error - no calendar part found."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:819
+#: src/plugins/vcalendar/vcalendar.c:818
 msgid "Error - Unknown calendar component type."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:951
+#: src/plugins/vcalendar/vcalendar.c:950
 msgid "Send a notification to the attendees"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:960
+#: src/plugins/vcalendar/vcalendar.c:959
 msgid "Cancel meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:961
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Are you sure you want to cancel this meeting?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1056
+#: src/plugins/vcalendar/vcalendar.c:1055
 msgid "No account found"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1057
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1059
+#: src/plugins/vcalendar/vcalendar.c:1058
 msgid "Reply anyway"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1188
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Answer"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1189
+#: src/plugins/vcalendar/vcalendar.c:1192
 msgid "Edit meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1190
+#: src/plugins/vcalendar/vcalendar.c:1193
 msgid "Cancel meeting..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1191
+#: src/plugins/vcalendar/vcalendar.c:1194
 msgid "Launch website"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1195
+#: src/plugins/vcalendar/vcalendar.c:1198
 msgid "You are already busy at this time."
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1234
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
+#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1626
 msgid "Event:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1235
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
+#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
 msgid "Organizer:"
 msgstr "Organiser:"
 
-#: src/plugins/vcalendar/vcalendar.c:1236
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
+#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1607
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "Location:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1237
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
+#: src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1616
 msgid "Summary:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1238
+#: src/plugins/vcalendar/vcalendar.c:1241
 msgid "Starting:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1239
+#: src/plugins/vcalendar/vcalendar.c:1242
 msgid "Ending:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1241
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
+#: src/plugins/vcalendar/vcalendar.c:1244
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1619
 msgid "Attendees:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcalendar.c:1243
+#: src/plugins/vcalendar/vcalendar.c:1246
 msgid "Action:"
 msgstr ""
 
@@ -12975,84 +13412,84 @@ msgstr ""
 msgid "Tentatively Accepted: "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:320
 msgid "Individual"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:322
 msgid "Resource"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
 msgid "Room"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:336
 msgid "Add..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:741
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:830
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:916
 msgid "You"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:742
 msgid "You are busy at the time of your planned meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:744
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:746
 #, c-format
 msgid "%d hour sooner"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:748
 #, c-format
 msgid "%d hours sooner"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:750
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:752
 #, c-format
 msgid "%d minutes sooner"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid "%d hour later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid "%d hours later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:763
 #, c-format
 msgid "%d minutes later"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:769
 #, c-format
 msgid ""
 "\n"
@@ -13060,7 +13497,7 @@ msgid ""
 "Everyone would be available %s or %s."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:771
 #, c-format
 msgid ""
 "\n"
@@ -13068,7 +13505,7 @@ msgid ""
 "Everyone would be available %s."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 msgid ""
 "\n"
 "\n"
@@ -13076,139 +13513,139 @@ msgid ""
 "6 hours."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:778
 #, c-format
 msgid "would be available %s or %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
 #, c-format
 msgid "would be available %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:782
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:843
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:913
 msgid "not available"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
 #, c-format
 msgid ", but would be available %s."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:846
 msgid "available"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:848
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1101
 msgid "Free/busy retrieval failed"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:931
 msgid "Send anyway"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:942
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1083
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1110
 msgid "Available"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1109
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1116
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1124
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1123
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1130
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1138
 msgid "Everyone is available."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1139
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1311
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1389
 msgid "Save & Send"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1390
 msgid "Check availability"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1484
 msgid "Starts at:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:771
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1490
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1514 src/prefs_matcher.c:768
 msgid "on:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1508
 msgid "Ends at:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1549
 msgid "New meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1551
 #, c-format
 msgid "%s - Edit meeting"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1630
 msgid "Time:"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1756
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1767
 #, c-format
 msgid "Upcoming event: %s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1768
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -13219,39 +13656,39 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1785
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1911
 msgid "Empty calendar"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1912
 msgid "There is nothing to export."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1952
 msgid "Could not export the calendar."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1969
 msgid "Export calendar to ICS"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1992
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2108
 msgid "Could not export the freebusy info."
 msgstr ""
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2140
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr ""
@@ -13353,695 +13790,741 @@ msgstr ""
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr ""
 
-#: src/pop.c:191 src/pop.c:218
+#: src/pop.c:216 src/pop.c:243
 msgid "POP protocol error\n"
 msgstr ""
 
-#: src/pop.c:264
+#: src/pop.c:289
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr ""
 
-#: src/pop.c:843
+#: src/pop.c:870
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr ""
 
-#: src/pop.c:859
+#: src/pop.c:886
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr ""
 
-#: src/pop.c:891
+#: src/pop.c:918
 msgid "mailbox is locked\n"
 msgstr ""
 
-#: src/pop.c:894
+#: src/pop.c:921
 msgid "Session timeout\n"
 msgstr ""
 
-#: src/pop.c:913
+#: src/pop.c:940
 msgid "command not supported\n"
 msgstr ""
 
-#: src/pop.c:918
+#: src/pop.c:945
 msgid "error occurred on POP session\n"
 msgstr ""
 
-#: src/pop.c:1113
+#: src/pop.c:1145
 msgid "TOP command unsupported\n"
 msgstr ""
 
-#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
+#: src/prefs_account.c:395 src/prefs_account.c:1596 src/prefs_account.c:2914
 msgid "POP"
 msgstr ""
 
-#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
-#: src/wizard.c:1501
+#: src/prefs_account.c:396 src/prefs_account.c:1739 src/prefs_account.c:2929
+#: src/wizard.c:1509
 msgid "IMAP"
 msgstr ""
 
-#: src/prefs_account.c:366
+#: src/prefs_account.c:397
 msgid "News (NNTP)"
 msgstr ""
 
-#: src/prefs_account.c:367 src/wizard.c:1502
+#: src/prefs_account.c:398 src/wizard.c:1510
 msgid "Local mbox file"
 msgstr ""
 
-#: src/prefs_account.c:368
+#: src/prefs_account.c:399
 msgid "None (SMTP only)"
 msgstr ""
 
-#: src/prefs_account.c:1131
+#: src/prefs_account.c:1202
 msgid "Name of account"
 msgstr ""
 
-#: src/prefs_account.c:1140
+#: src/prefs_account.c:1211
 msgid "Set as default"
 msgstr ""
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1219
 msgid "Personal information"
 msgstr ""
 
-#: src/prefs_account.c:1157
+#: src/prefs_account.c:1228
 msgid "Full name"
 msgstr ""
 
-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1233
 msgid "Mail address"
 msgstr ""
 
-#: src/prefs_account.c:1226 src/wizard.c:1525
+#: src/prefs_account.c:1294 src/wizard.c:1532
 msgid "Auto-configure"
 msgstr ""
 
-#: src/prefs_account.c:1228 src/wizard.c:1526
+#: src/prefs_account.c:1296 src/wizard.c:1533
 msgid "Cancel"
 msgstr ""
 
-#: src/prefs_account.c:1245
+#: src/prefs_account.c:1313
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
 msgstr ""
 
-#: src/prefs_account.c:1276
+#: src/prefs_account.c:1342
 msgid "This server requires authentication"
 msgstr ""
 
-#: src/prefs_account.c:1283
+#: src/prefs_account.c:1348
 msgid "Authenticate on connect"
 msgstr ""
 
-#: src/prefs_account.c:1345
+#: src/prefs_account.c:1398
 msgid "News server"
 msgstr ""
 
-#: src/prefs_account.c:1351
+#: src/prefs_account.c:1403
 msgid "Server for receiving"
 msgstr ""
 
-#: src/prefs_account.c:1357
+#: src/prefs_account.c:1408
 msgid "Local mailbox"
 msgstr ""
 
-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1413
 msgid "SMTP server (send)"
 msgstr ""
 
-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1419
 msgid "Use mail command rather than SMTP server"
 msgstr ""
 
-#: src/prefs_account.c:1381
+#: src/prefs_account.c:1427
 msgid "command to send mails"
 msgstr ""
 
-#: src/prefs_account.c:1454
+#: src/prefs_account.c:1492
 #, c-format
 msgid "Account%d"
 msgstr ""
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1571
 msgid "Local"
 msgstr ""
 
-#: src/prefs_account.c:1539 src/prefs_account.c:1628
+#: src/prefs_account.c:1577 src/prefs_account.c:1696
 msgid "Default Inbox"
 msgstr ""
 
-#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
-#: src/prefs_account.c:1642
+#: src/prefs_account.c:1584 src/prefs_account.c:1590 src/prefs_account.c:1703
+#: src/prefs_account.c:1709
 msgid "Unfiltered messages will be stored in this folder"
 msgstr ""
 
-#: src/prefs_account.c:1561
-msgid "Use secure authentication (APOP)"
+#: src/prefs_account.c:1599
+msgid "Authenticate before POP connection"
+msgstr ""
+
+#: src/prefs_account.c:1624 src/prefs_account.c:2224
+msgid "Select"
 msgstr ""
 
-#: src/prefs_account.c:1564
+#: src/prefs_account.c:1632
 msgid "Remove messages on server when received"
 msgstr ""
 
-#: src/prefs_account.c:1575
+#: src/prefs_account.c:1643
 msgid "Remove after"
 msgstr ""
 
-#: src/prefs_account.c:1582 src/prefs_account.c:1592
+#: src/prefs_account.c:1650 src/prefs_account.c:1660
 msgid "0 days and 0 hours : remove immediately"
 msgstr ""
 
-#: src/prefs_account.c:1605
+#: src/prefs_account.c:1673
 msgid "Receive size limit"
 msgstr ""
 
-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1676
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
 
-#: src/prefs_account.c:1648 src/prefs_account.c:2665
+#: src/prefs_account.c:1715 src/prefs_account.c:2944
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account.c:1655
+#: src/prefs_account.c:1722
 msgid "Maximum number of articles to download"
 msgstr ""
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1732
 msgid "unlimited if 0 is specified"
 msgstr ""
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1757
 msgid "Plain text"
 msgstr ""
 
-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1771
 msgid "IMAP server directory"
 msgstr ""
 
-#: src/prefs_account.c:1707
+#: src/prefs_account.c:1775
 msgid "(usually empty)"
 msgstr ""
 
-#: src/prefs_account.c:1721
+#: src/prefs_account.c:1789
 msgid "Show subscribed folders only"
 msgstr ""
 
-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1796
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr ""
 
-#: src/prefs_account.c:1730
+#: src/prefs_account.c:1798
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr ""
 
-#: src/prefs_account.c:1737 src/prefs_receive.c:164
+#: src/prefs_account.c:1805 src/prefs_receive.c:164
 msgid "Automatic checking"
 msgstr ""
 
-#: src/prefs_account.c:1740
+#: src/prefs_account.c:1808
 msgid "Use global settings"
 msgstr ""
 
-#: src/prefs_account.c:1746 src/prefs_receive.c:171
+#: src/prefs_account.c:1814 src/prefs_receive.c:171
 msgid "Check for new mail every"
 msgstr ""
 
-#: src/prefs_account.c:1785
+#: src/prefs_account.c:1853
 msgid "Filter messages on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1801
+#: src/prefs_account.c:1869
 msgid "Allow filtering using plugins on receiving"
 msgstr ""
 
-#: src/prefs_account.c:1805
+#: src/prefs_account.c:1873
 msgid "'Get Mail' checks for new messages on this account"
 msgstr ""
 
-#: src/prefs_account.c:1894 src/prefs_customheader.c:210
-#: src/prefs_matcher.c:634 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
+#: src/prefs_account.c:1963 src/prefs_customheader.c:208
+#: src/prefs_matcher.c:633 src/prefs_matcher.c:2009 src/prefs_matcher.c:2037
 msgid "Header"
 msgstr ""
 
-#: src/prefs_account.c:1896
+#: src/prefs_account.c:1965
 msgid "Generate Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:1968
 msgid "Send account mail address in Message-ID"
 msgstr ""
 
-#: src/prefs_account.c:1902
+#: src/prefs_account.c:1971
 msgid "Add user agent header"
 msgstr ""
 
-#: src/prefs_account.c:1909
+#: src/prefs_account.c:1978
 msgid "Add user-defined header"
 msgstr ""
 
-#: src/prefs_account.c:1924
+#: src/prefs_account.c:1993
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr ""
 
-#: src/prefs_account.c:2022
+#: src/prefs_account.c:2092
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
 
-#: src/prefs_account.c:2033
+#: src/prefs_account.c:2103
 msgid "Authenticate with POP before sending"
 msgstr ""
 
-#: src/prefs_account.c:2048
+#: src/prefs_account.c:2118
 msgid "POP authentication timeout"
 msgstr ""
 
-#: src/prefs_account.c:2136 src/prefs_account.c:2182
+#: src/prefs_account.c:2198
+msgid "Authorization"
+msgstr "Authorisation"
+
+#: src/prefs_account.c:2215
+msgid "Select OAuth2 Email Service Provider"
+msgstr ""
+
+#: src/prefs_account.c:2255
+msgid "Client ID"
+msgstr ""
+
+#: src/prefs_account.c:2266
+msgid "Client secret"
+msgstr ""
+
+#: src/prefs_account.c:2291
+msgid "Obtain authorization code"
+msgstr "Obtain authorisation code"
+
+#: src/prefs_account.c:2295
+msgid "Open default browser with request"
+msgstr ""
+
+#: src/prefs_account.c:2302
+msgid "Copy link"
+msgstr ""
+
+#: src/prefs_account.c:2315
+msgid "Authorization code"
+msgstr "Authorisation code"
+
+#: src/prefs_account.c:2323
+msgid "Paste complete URL from browser or the provided auth token"
+msgstr ""
+
+#: src/prefs_account.c:2330
+msgid "Complete authorization"
+msgstr "Complete authorisation"
+
+#: src/prefs_account.c:2334
+msgid "Authorize"
+msgstr "Authorise"
+
+#: src/prefs_account.c:2420 src/prefs_account.c:2466
 msgid "Signature"
 msgstr ""
 
-#: src/prefs_account.c:2139
+#: src/prefs_account.c:2423
 msgid "Automatically insert signature"
 msgstr ""
 
-#: src/prefs_account.c:2144
+#: src/prefs_account.c:2428
 msgid "Signature separator"
 msgstr ""
 
-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2453
 msgid "Command output"
 msgstr ""
 
-#: src/prefs_account.c:2202
+#: src/prefs_account.c:2486
 msgid "Automatically set the following addresses"
 msgstr ""
 
-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2535
 msgid "Spell check dictionaries"
 msgstr ""
 
-#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
+#: src/prefs_account.c:2545 src/prefs_folder_item.c:1101
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
-#: src/prefs_spelling.c:174
+#: src/prefs_account.c:2557 src/prefs_folder_item.c:1132
+#: src/prefs_spelling.c:171
 msgid "Default alternate dictionary"
 msgstr ""
 
-#: src/prefs_account.c:2363 src/prefs_account.c:3776
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
-#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
-#: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
+#: src/prefs_account.c:2642 src/prefs_account.c:4108
+#: src/prefs_compose_writing.c:364 src/prefs_folder_item.c:1516
+#: src/prefs_folder_item.c:1891 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_spelling.c:324 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr ""
 
-#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
+#: src/prefs_account.c:2657 src/prefs_folder_item.c:1544 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr ""
 
-#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
-#: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2672 src/prefs_filtering_action.c:183
+#: src/prefs_folder_item.c:1572 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr ""
 
-#: src/prefs_account.c:2440
+#: src/prefs_account.c:2719
 msgid "Default privacy system"
 msgstr ""
 
-#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
+#: src/prefs_account.c:2748 src/prefs_folder_item.c:1168
 msgid "Always sign messages"
 msgstr ""
 
-#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
+#: src/prefs_account.c:2750 src/prefs_folder_item.c:1198
 msgid "Always encrypt messages"
 msgstr ""
 
-#: src/prefs_account.c:2473
+#: src/prefs_account.c:2752
 msgid "Always sign messages when replying to a signed message"
 msgstr ""
 
-#: src/prefs_account.c:2476
+#: src/prefs_account.c:2755
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr ""
 
-#: src/prefs_account.c:2479
+#: src/prefs_account.c:2758
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr ""
 
-#: src/prefs_account.c:2481
+#: src/prefs_account.c:2760
 msgid "Save sent encrypted messages as clear text"
 msgstr ""
 
-#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
+#: src/prefs_account.c:2918 src/prefs_account.c:2933 src/prefs_account.c:2947
 msgid "Don't use SSL/TLS"
 msgstr ""
 
-#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
-#: src/prefs_account.c:2688
+#: src/prefs_account.c:2921 src/prefs_account.c:2936 src/prefs_account.c:2956
+#: src/prefs_account.c:2967
 msgid "Use SSL/TLS"
 msgstr ""
 
-#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
+#: src/prefs_account.c:2924 src/prefs_account.c:2939 src/prefs_account.c:2970
 msgid "Use STARTTLS command to start encrypted session"
 msgstr ""
 
-#: src/prefs_account.c:2681
+#: src/prefs_account.c:2960
 msgid "Send (SMTP)"
 msgstr ""
 
-#: src/prefs_account.c:2685
+#: src/prefs_account.c:2964
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr ""
 
-#: src/prefs_account.c:2696
+#: src/prefs_account.c:2975
 msgid "Client certificates"
 msgstr ""
 
-#: src/prefs_account.c:2704
+#: src/prefs_account.c:2983
 msgid "Certificate for receiving"
 msgstr ""
 
-#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
-#: src/prefs_account.c:2739
+#: src/prefs_account.c:2988 src/prefs_account.c:2990 src/prefs_account.c:3016
+#: src/prefs_account.c:3018
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr ""
 
-#: src/prefs_account.c:2732
+#: src/prefs_account.c:3011
 msgid "Certificate for sending"
 msgstr ""
 
-#: src/prefs_account.c:2772
+#: src/prefs_account.c:3051
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr ""
 
-#: src/prefs_account.c:2775
+#: src/prefs_account.c:3054
 msgid "Use non-blocking SSL/TLS"
 msgstr ""
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3066
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr ""
 
-#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+#: src/prefs_account.c:3158 src/prefs_proxy.c:73
 msgid "Use proxy server"
 msgstr ""
 
-#: src/prefs_account.c:2888
+#: src/prefs_account.c:3167
 msgctxt ""
 "In account preferences, referring to whether or not use proxy settings from "
 "common preferences"
 msgid "Use default settings"
 msgstr ""
 
-#: src/prefs_account.c:2890
+#: src/prefs_account.c:3169
 msgid "Use global proxy server settings"
 msgstr ""
 
-#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+#: src/prefs_account.c:3206 src/prefs_proxy.c:115 src/wizard.c:1118
 msgid "Use authentication"
 msgstr ""
 
-#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+#: src/prefs_account.c:3211 src/prefs_proxy.c:123
 msgid "Username"
 msgstr ""
 
-#: src/prefs_account.c:2966
+#: src/prefs_account.c:3240
 msgid "Use proxy server for sending"
 msgstr ""
 
-#: src/prefs_account.c:2968
+#: src/prefs_account.c:3242
 msgid ""
 "If disabled, messages will be sent using direct connection to configured "
 "outgoing server, bypassing any configured proxy server."
 msgstr ""
 
-#: src/prefs_account.c:3079
+#: src/prefs_account.c:3352
 msgid "SMTP port"
 msgstr ""
 
-#: src/prefs_account.c:3086
+#: src/prefs_account.c:3359
 msgid "POP port"
 msgstr ""
 
-#: src/prefs_account.c:3093
+#: src/prefs_account.c:3366
 msgid "IMAP port"
 msgstr ""
 
-#: src/prefs_account.c:3100
+#: src/prefs_account.c:3373
 msgid "NNTP port"
 msgstr ""
 
-#: src/prefs_account.c:3106
+#: src/prefs_account.c:3379
 msgid "Domain name"
 msgstr ""
 
-#: src/prefs_account.c:3109
+#: src/prefs_account.c:3382
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr ""
 
-#: src/prefs_account.c:3123
+#: src/prefs_account.c:3396
 msgid "Use command to communicate with server"
 msgstr ""
 
-#: src/prefs_account.c:3132
+#: src/prefs_account.c:3405
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Mark cross-posted messages as read and colour:"
 
-#: src/prefs_account.c:3185
+#: src/prefs_account.c:3454
 msgid "Put sent messages in"
 msgstr ""
 
-#: src/prefs_account.c:3187
+#: src/prefs_account.c:3456
 msgid "Put queued messages in"
 msgstr ""
 
-#: src/prefs_account.c:3189
+#: src/prefs_account.c:3458
 msgid "Put draft messages in"
 msgstr ""
 
-#: src/prefs_account.c:3191
+#: src/prefs_account.c:3460
 msgid "Put deleted messages in"
 msgstr ""
 
-#: src/prefs_account.c:3248
+#: src/prefs_account.c:3517
 msgid "Account name is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3252
+#: src/prefs_account.c:3521
 msgid "Mail address is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3260
+#: src/prefs_account.c:3529
 msgid "SMTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3265
+#: src/prefs_account.c:3534
 msgid "User ID is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3270
+#: src/prefs_account.c:3539
 msgid "POP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3290
+#: src/prefs_account.c:3559
 msgid "The default Inbox folder doesn't exist."
 msgstr ""
 
-#: src/prefs_account.c:3296
+#: src/prefs_account.c:3565
 msgid "IMAP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3301
+#: src/prefs_account.c:3570
 msgid "NNTP server is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3307
+#: src/prefs_account.c:3576
 msgid "local mailbox filename is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3313
+#: src/prefs_account.c:3582
 msgid "mail command is not entered."
 msgstr ""
 
-#: src/prefs_account.c:3323
+#: src/prefs_account.c:3592
 msgid "User ID cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3328
+#: src/prefs_account.c:3597
 msgid "Password cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3356
+#: src/prefs_account.c:3628
 msgid "SMTP user ID cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3361
+#: src/prefs_account.c:3633
 msgid "SMTP password cannot contain a newline character."
 msgstr ""
 
-#: src/prefs_account.c:3437
+#: src/prefs_account.c:3725
 msgid "domain is not specified."
 msgstr ""
 
-#: src/prefs_account.c:3442
+#: src/prefs_account.c:3730
 msgid "sent folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3447
+#: src/prefs_account.c:3735
 msgid "queue folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3452
+#: src/prefs_account.c:3740
 msgid "draft folder is not selected."
 msgstr ""
 
-#: src/prefs_account.c:3457
+#: src/prefs_account.c:3745
 msgid "trash folder is not selected."
 msgstr "wastebin folder is not selected."
 
-#: src/prefs_account.c:3740
+#: src/prefs_account.c:4054
 msgid "Receive"
 msgstr ""
 
-#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
+#: src/prefs_account.c:4090
+msgid "OAuth2"
+msgstr ""
+
+#: src/prefs_account.c:4126 src/prefs_folder_item.c:1907 src/prefs_quote.c:238
 msgid "Templates"
 msgstr ""
 
-#: src/prefs_account.c:3812
+#: src/prefs_account.c:4144
 msgid "Privacy"
 msgstr ""
 
-#: src/prefs_account.c:3942
+#: src/prefs_account.c:4274
 msgid "Advanced"
 msgstr ""
 
-#: src/prefs_account.c:4291
+#: src/prefs_account.c:4629
 msgid "Preferences for new account"
 msgstr ""
 
-#: src/prefs_account.c:4293
+#: src/prefs_account.c:4631
 #, c-format
 msgid "%s - Account preferences"
 msgstr ""
 
-#: src/prefs_account.c:4412 src/wizard.c:1390
+#: src/prefs_account.c:4743 src/wizard.c:1399
 msgid "Failed (wrong address)"
 msgstr ""
 
-#: src/prefs_account.c:4497
+#: src/prefs_account.c:4828
 msgid "Select signature file"
 msgstr ""
 
-#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
+#: src/prefs_account.c:4846 src/prefs_account.c:4863 src/wizard.c:1066
 msgid "Select certificate file"
 msgstr ""
 
-#: src/prefs_account.c:4628
+#: src/prefs_account.c:4959
 msgid "Protocol:"
 msgstr ""
 
-#: src/prefs_account.c:4799
+#: src/prefs_account.c:5279
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr ""
 
-#: src/prefs_actions.c:225
+#: src/prefs_actions.c:224
 msgid "Actions configuration"
 msgstr ""
 
-#: src/prefs_actions.c:252
+#: src/prefs_actions.c:251
 msgid "Menu name"
 msgstr ""
 
-#: src/prefs_actions.c:285
+#: src/prefs_actions.c:280
 msgid "Shell command"
 msgstr ""
 
-#: src/prefs_actions.c:295
+#: src/prefs_actions.c:290
 msgid "Filter action"
 msgstr ""
 
-#: src/prefs_actions.c:301
+#: src/prefs_actions.c:296
 msgid "Edit filter action"
 msgstr ""
 
-#: src/prefs_actions.c:329
+#: src/prefs_actions.c:324
 msgid "Append the new action above to the list"
 msgstr ""
 
-#: src/prefs_actions.c:337
+#: src/prefs_actions.c:332
 msgid "Replace the selected action in list with the action above"
 msgstr ""
 
-#: src/prefs_actions.c:339 src/prefs_filtering_action.c:589
-#: src/prefs_filtering.c:487 src/prefs_matcher.c:804 src/prefs_template.c:320
-#: src/prefs_toolbar.c:1024
-msgid "D_elete"
-msgstr ""
-
-#: src/prefs_actions.c:347
+#: src/prefs_actions.c:340
 msgid "Delete the selected action from the list"
 msgstr ""
 
-#: src/prefs_actions.c:357 src/prefs_filtering.c:504 src/prefs_template.c:338
+#: src/prefs_actions.c:348 src/prefs_filtering.c:485 src/prefs_template.c:330
 msgid "Clear all the input fields in the dialog"
 msgstr "Clear all the input fields in the dialogue"
 
-#: src/prefs_actions.c:365
+#: src/prefs_actions.c:356
 msgid "Show information on configuring actions"
 msgstr ""
 
-#: src/prefs_actions.c:396
+#: src/prefs_actions.c:387
 msgid "Move the selected action up"
 msgstr ""
 
-#: src/prefs_actions.c:404
+#: src/prefs_actions.c:395
 msgid "Move selected action down"
 msgstr ""
 
-#: src/prefs_actions.c:537 src/prefs_filtering_action.c:678
-#: src/prefs_filtering.c:839 src/prefs_filtering.c:841
-#: src/prefs_filtering.c:842 src/prefs_filtering.c:952 src/prefs_matcher.c:922
-#: src/prefs_template.c:472
+#: src/prefs_actions.c:528 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:820 src/prefs_filtering.c:822
+#: src/prefs_filtering.c:823 src/prefs_filtering.c:933 src/prefs_matcher.c:918
+#: src/prefs_template.c:465
 msgid "(New)"
 msgstr ""
 
-#: src/prefs_actions.c:602
+#: src/prefs_actions.c:593
 msgid "Menu name is not set."
 msgstr ""
 
-#: src/prefs_actions.c:607
+#: src/prefs_actions.c:598
 msgid "A leading '/' is not allowed in the menu name."
 msgstr ""
 
-#: src/prefs_actions.c:612
+#: src/prefs_actions.c:603
 msgid "Colon ':' is not allowed in the menu name."
 msgstr ""
 
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:622
 msgid "Menu name is too long."
 msgstr ""
 
-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:631
 msgid "Command-line not set."
 msgstr ""
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:636
 msgid "Menu name and command are too long."
 msgstr ""
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:642
 #, c-format
 msgid ""
 "The command\n"
@@ -14049,150 +14532,150 @@ msgid ""
 "has a syntax error."
 msgstr ""
 
-#: src/prefs_actions.c:709
+#: src/prefs_actions.c:700
 msgid "Delete action"
 msgstr ""
 
-#: src/prefs_actions.c:710
+#: src/prefs_actions.c:701
 msgid "Do you really want to delete this action?"
 msgstr ""
 
-#: src/prefs_actions.c:730
+#: src/prefs_actions.c:721
 msgid "Delete all actions"
 msgstr ""
 
-#: src/prefs_actions.c:731
+#: src/prefs_actions.c:722
 msgid "Do you really want to delete all the actions?"
 msgstr ""
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
-#: src/prefs_filtering.c:1526 src/prefs_matcher.c:2165 src/prefs_template.c:572
-#: src/prefs_template.c:597
+#: src/prefs_actions.c:885 src/prefs_actions.c:916 src/prefs_filtering.c:1485
+#: src/prefs_filtering.c:1507 src/prefs_matcher.c:2160 src/prefs_template.c:565
+#: src/prefs_template.c:590
 msgid "Entry not saved"
 msgstr ""
 
-#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1505
-#: src/prefs_filtering.c:1527 src/prefs_template.c:573 src/prefs_template.c:598
+#: src/prefs_actions.c:886 src/prefs_actions.c:917 src/prefs_filtering.c:1486
+#: src/prefs_filtering.c:1508 src/prefs_template.c:566 src/prefs_template.c:591
 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 
-#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
-#: src/prefs_filtering.c:1484 src/prefs_filtering.c:1506
-#: src/prefs_filtering.c:1528 src/prefs_matcher.c:2168 src/prefs_template.c:574
-#: src/prefs_template.c:599 src/prefs_template.c:604
+#: src/prefs_actions.c:887 src/prefs_actions.c:892 src/prefs_actions.c:918
+#: src/prefs_filtering.c:1465 src/prefs_filtering.c:1487
+#: src/prefs_filtering.c:1509 src/prefs_matcher.c:2163 src/prefs_template.c:567
+#: src/prefs_template.c:592 src/prefs_template.c:597
 msgid "_Continue editing"
 msgstr ""
 
-#: src/prefs_actions.c:899
+#: src/prefs_actions.c:890
 msgid "Actions list not saved"
 msgstr ""
 
-#: src/prefs_actions.c:900
+#: src/prefs_actions.c:891
 msgid "The actions list has been modified. Close anyway?"
 msgstr ""
 
-#: src/prefs_actions.c:970
+#: src/prefs_actions.c:961
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:962
 msgid "Use / in menu name to make submenus."
 msgstr ""
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:964
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:965
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:966
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:967
 msgid "to send user provided text to command's standard input"
 msgstr ""
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:968
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:969
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:970
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:971
 msgid "to insert command's standard output without replacing old text"
 msgstr ""
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:972
 msgid "to run command asynchronously"
 msgstr ""
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:973
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr ""
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:974
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr ""
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:975
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:976
 msgid "for the file of the selected decoded message MIME part"
 msgstr ""
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:977
 msgid "for a user provided argument"
 msgstr ""
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:978
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:979
 msgid "for the text selection"
 msgstr ""
 
-#: src/prefs_actions.c:989
+#: src/prefs_actions.c:980
 msgid "apply filtering actions between {} to selected messages"
 msgstr ""
 
-#: src/prefs_actions.c:990
+#: src/prefs_actions.c:981
 msgid "for a literal %"
 msgstr ""
 
-#: src/prefs_actions.c:1000 src/prefs_themes.c:1090
+#: src/prefs_actions.c:991 src/prefs_themes.c:1092
 msgid "Actions"
 msgstr ""
 
-#: src/prefs_actions.c:1001
+#: src/prefs_actions.c:992
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
 msgstr ""
 
-#: src/prefs_actions.c:1088 src/prefs_filtering.c:1702
-#: src/prefs_template.c:1114
+#: src/prefs_actions.c:1079 src/prefs_filtering.c:1683
+#: src/prefs_template.c:1107
 msgid "D_uplicate"
 msgstr ""
 
-#: src/prefs_actions.c:1208
+#: src/prefs_actions.c:1197
 msgid "Current actions"
 msgstr ""
 
-#: src/prefs_actions.c:1307 src/prefs_filtering.c:1079
-#: src/prefs_filtering.c:1137
+#: src/prefs_actions.c:1296 src/prefs_filtering.c:1060
+#: src/prefs_filtering.c:1118
 msgid "Action string is not valid."
 msgstr ""
 
@@ -14210,342 +14693,342 @@ msgid ""
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
 msgstr ""
 
-#: src/prefs_common.c:451
+#: src/prefs_common.c:458
 msgid "%x(%a) %H:%M"
 msgstr ""
 
-#: src/prefs_compose_writing.c:126
+#: src/prefs_compose_writing.c:123
 msgid "Automatic account selection"
 msgstr ""
 
-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:131
 msgid "when replying"
 msgstr ""
 
-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:133
 msgid "when forwarding"
 msgstr ""
 
-#: src/prefs_compose_writing.c:138
+#: src/prefs_compose_writing.c:135
 msgid "when re-editing"
 msgstr ""
 
-#: src/prefs_compose_writing.c:141
+#: src/prefs_compose_writing.c:138
 msgid "Editing"
 msgstr ""
 
-#: src/prefs_compose_writing.c:145
+#: src/prefs_compose_writing.c:142
 msgid "Automatically launch the external editor"
 msgstr ""
 
-#: src/prefs_compose_writing.c:153
+#: src/prefs_compose_writing.c:150
 msgid "Automatically save message to Drafts folder every"
 msgstr ""
 
-#: src/prefs_compose_writing.c:162 src/prefs_wrapping.c:100
+#: src/prefs_compose_writing.c:159 src/prefs_wrapping.c:100
 msgid "characters"
 msgstr ""
 
-#: src/prefs_compose_writing.c:173
+#: src/prefs_compose_writing.c:170
 msgid "Even if message is to be encrypted"
 msgstr ""
 
-#: src/prefs_compose_writing.c:180
+#: src/prefs_compose_writing.c:177
 msgid "Undo level"
 msgstr ""
 
-#: src/prefs_compose_writing.c:197
+#: src/prefs_compose_writing.c:194
 msgid "Warn when inserting a file larger than"
 msgstr ""
 
-#: src/prefs_compose_writing.c:208
+#: src/prefs_compose_writing.c:205
 msgid "KB into message body "
 msgstr ""
 
-#: src/prefs_compose_writing.c:214
+#: src/prefs_compose_writing.c:211
 msgid "Replying"
 msgstr ""
 
-#: src/prefs_compose_writing.c:217
+#: src/prefs_compose_writing.c:214
 msgid "Reply will quote by default"
 msgstr ""
 
-#: src/prefs_compose_writing.c:220
+#: src/prefs_compose_writing.c:217
 msgid "Reply button invokes mailing list reply"
 msgstr ""
 
-#: src/prefs_compose_writing.c:222
+#: src/prefs_compose_writing.c:219
 msgid "Forwarding"
 msgstr ""
 
-#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
+#: src/prefs_compose_writing.c:222 src/prefs_filtering_action.c:184
 msgid "Forward as attachment"
 msgstr ""
 
-#: src/prefs_compose_writing.c:227
+#: src/prefs_compose_writing.c:224
 #, c-format
 msgid "Keep the original '%s' header when redirecting"
 msgstr ""
 
-#: src/prefs_compose_writing.c:233
+#: src/prefs_compose_writing.c:230
 msgid "When dropping files into the Compose window"
 msgstr ""
 
-#: src/prefs_compose_writing.c:242
+#: src/prefs_compose_writing.c:239
 msgid "Ask"
 msgstr ""
 
-#: src/prefs_compose_writing.c:243 src/toolbar.c:522
+#: src/prefs_compose_writing.c:240 src/toolbar.c:522
 msgid "Insert"
 msgstr ""
 
-#: src/prefs_compose_writing.c:244 src/toolbar.c:523
+#: src/prefs_compose_writing.c:241 src/toolbar.c:523
 msgid "Attach"
 msgstr ""
 
-#: src/prefs_compose_writing.c:371
+#: src/prefs_compose_writing.c:365
 msgid "Writing"
 msgstr ""
 
-#: src/prefs_customheader.c:185
+#: src/prefs_customheader.c:183
 msgid "Custom header configuration"
 msgstr ""
 
-#: src/prefs_customheader.c:504 src/prefs_display_header.c:589
-#: src/prefs_matcher.c:1637 src/prefs_matcher.c:1652
+#: src/prefs_customheader.c:494 src/prefs_display_header.c:588
+#: src/prefs_matcher.c:1632 src/prefs_matcher.c:1647
 msgid "Header name is not set."
 msgstr ""
 
-#: src/prefs_customheader.c:514
+#: src/prefs_customheader.c:504
 msgid "This Header name is not allowed as a custom header."
 msgstr ""
 
-#: src/prefs_customheader.c:561
+#: src/prefs_customheader.c:551
 msgid "Choose a PNG file"
 msgstr ""
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:553
 msgid "Choose an XBM file"
 msgstr ""
 
-#: src/prefs_customheader.c:565
+#: src/prefs_customheader.c:555
 msgid "Choose a text file"
 msgstr ""
 
-#: src/prefs_customheader.c:578
+#: src/prefs_customheader.c:568
 msgid "This file isn't an image."
 msgstr ""
 
-#: src/prefs_customheader.c:583
+#: src/prefs_customheader.c:573
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr ""
 
-#: src/prefs_customheader.c:589
+#: src/prefs_customheader.c:579
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr ""
 
-#: src/prefs_customheader.c:594
+#: src/prefs_customheader.c:584
 msgid "The image isn't in the correct format (PNG)."
 msgstr ""
 
-#: src/prefs_customheader.c:603
+#: src/prefs_customheader.c:593
 msgid "The image isn't in the correct format (XBM)."
 msgstr ""
 
-#: src/prefs_customheader.c:612
+#: src/prefs_customheader.c:602
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr ""
 
-#: src/prefs_customheader.c:618
+#: src/prefs_customheader.c:608
 #, c-format
 msgid "Compface error: %s"
 msgstr ""
 
-#: src/prefs_customheader.c:671
+#: src/prefs_customheader.c:661
 msgid "This file contains newlines."
 msgstr ""
 
-#: src/prefs_customheader.c:701
+#: src/prefs_customheader.c:691
 msgid "Delete header"
 msgstr ""
 
-#: src/prefs_customheader.c:702
+#: src/prefs_customheader.c:692
 msgid "Do you really want to delete this header?"
 msgstr ""
 
-#: src/prefs_customheader.c:875
+#: src/prefs_customheader.c:865
 msgid "Current custom headers"
 msgstr ""
 
-#: src/prefs_display_header.c:254
+#: src/prefs_display_header.c:253
 msgid "Displayed header configuration"
 msgstr ""
 
-#: src/prefs_display_header.c:278
+#: src/prefs_display_header.c:277
 msgid "Header name"
 msgstr ""
 
-#: src/prefs_display_header.c:313
+#: src/prefs_display_header.c:312
 msgid "Hidden headers"
 msgstr ""
 
-#: src/prefs_display_header.c:354
+#: src/prefs_display_header.c:353
 msgid "Displayed Headers"
 msgstr ""
 
-#: src/prefs_display_header.c:399
+#: src/prefs_display_header.c:398
 msgid "Show all unspecified headers"
 msgstr ""
 
-#: src/prefs_display_header.c:599
+#: src/prefs_display_header.c:598
 msgid "This header is already in the list."
 msgstr ""
 
-#: src/prefs_ext_prog.c:102
+#: src/prefs_ext_prog.c:100
 #, c-format
 msgid "%s will be replaced with file name / URI"
 msgstr ""
 
-#: src/prefs_ext_prog.c:110
+#: src/prefs_ext_prog.c:108
 msgid "For the text editor, %w will be replaced with GtkSocket ID"
 msgstr ""
 
-#: src/prefs_ext_prog.c:129
+#: src/prefs_ext_prog.c:127
 msgid "Use system defaults when possible"
 msgstr ""
 
-#: src/prefs_ext_prog.c:150
+#: src/prefs_ext_prog.c:146
 msgid "Web browser"
 msgstr ""
 
-#: src/prefs_ext_prog.c:178
+#: src/prefs_ext_prog.c:172
 msgid "Text editor"
 msgstr ""
 
-#: src/prefs_ext_prog.c:210
+#: src/prefs_ext_prog.c:201
 msgid "Command for 'Display as text'"
 msgstr ""
 
-#: src/prefs_ext_prog.c:223
+#: src/prefs_ext_prog.c:212
 msgid ""
 "This option enables MIME parts to be displayed in the message view via a "
 "script when using the 'Display as text' contextual menu item"
 msgstr ""
 
-#: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:351
+#: src/prefs_ext_prog.c:273 src/prefs_image_viewer.c:173
+#: src/prefs_message.c:362
 msgid "Message View"
 msgstr ""
 
-#: src/prefs_ext_prog.c:283
+#: src/prefs_ext_prog.c:274
 msgid "External Programs"
 msgstr ""
 
-#: src/prefs_filtering_action.c:171
+#: src/prefs_filtering_action.c:169
 msgid "Move"
 msgstr ""
 
-#: src/prefs_filtering_action.c:174
+#: src/prefs_filtering_action.c:172
 msgid "Hide"
 msgstr ""
 
+#: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:174
 #: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
 #: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
-#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
 msgid "Message flags"
 msgstr ""
 
-#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:641
-#: src/prefs_summary_column.c:77 src/summaryview.c:2888 src/toolbar.c:505
+#: src/prefs_filtering_action.c:173 src/prefs_summaries.c:641
+#: src/prefs_summary_column.c:77 src/summaryview.c:2878 src/toolbar.c:505
 msgid "Mark"
 msgstr ""
 
-#: src/prefs_filtering_action.c:179
+#: src/prefs_filtering_action.c:177
 msgid "Mark as read"
 msgstr ""
 
-#: src/prefs_filtering_action.c:180
+#: src/prefs_filtering_action.c:178
 msgid "Mark as unread"
 msgstr ""
 
-#: src/prefs_filtering_action.c:181
+#: src/prefs_filtering_action.c:179
 msgid "Mark as spam"
 msgstr ""
 
-#: src/prefs_filtering_action.c:182
+#: src/prefs_filtering_action.c:180
 msgid "Mark as ham"
 msgstr ""
 
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1395
+#: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:1395
 #: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
 msgid "Execute"
 msgstr ""
 
-#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:639
+#: src/prefs_filtering_action.c:182 src/prefs_summaries.c:639
 msgid "Color label"
 msgstr "Colour label"
 
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
-#: src/prefs_filtering_action.c:187
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:185
 msgid "Resend"
 msgstr ""
 
-#: src/prefs_filtering_action.c:187
+#: src/prefs_filtering_action.c:185
 msgid "Redirect"
 msgstr ""
 
-#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
-#: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:640
+#: src/prefs_filtering_action.c:186 src/prefs_filtering_action.c:187
+#: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:639
 #: src/prefs_summaries.c:644 src/prefs_summary_column.c:86
-#: src/summaryview.c:474
+#: src/summaryview.c:469
 msgid "Score"
 msgstr ""
 
-#: src/prefs_filtering_action.c:188
+#: src/prefs_filtering_action.c:186
 msgid "Change score"
 msgstr ""
 
-#: src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:187
 msgid "Set score"
 msgstr ""
 
-#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
-#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:644
-#: src/prefs_summary_column.c:88 src/summaryview.c:476
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:190 src/prefs_matcher.c:643
+#: src/prefs_summary_column.c:88 src/summaryview.c:471
 msgid "Tags"
 msgstr ""
 
-#: src/prefs_filtering_action.c:190
+#: src/prefs_filtering_action.c:188
 msgid "Apply tag"
 msgstr ""
 
-#: src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:189
 msgid "Unset tag"
 msgstr ""
 
-#: src/prefs_filtering_action.c:192
+#: src/prefs_filtering_action.c:190
 msgid "Clear tags"
 msgstr ""
 
-#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
 msgid "Threads"
 msgstr ""
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:194
 msgid "Stop filter"
 msgstr ""
 
-#: src/prefs_filtering_action.c:401
+#: src/prefs_filtering_action.c:399
 msgid "Action configuration"
 msgstr ""
 
-#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1895
-#: src/prefs_matcher.c:597
+#: src/prefs_filtering_action.c:416 src/prefs_filtering.c:1874
+#: src/prefs_matcher.c:595
 msgid "Rule"
 msgstr ""
 
-#: src/prefs_filtering_action.c:431 src/prefs_filtering.c:434
+#: src/prefs_filtering_action.c:430 src/prefs_filtering.c:423
 msgid "Action"
 msgstr ""
 
@@ -14581,25 +15064,25 @@ msgstr ""
 msgid "No action was defined."
 msgstr ""
 
-#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2212
-#: src/quote_fmt.c:79
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2207
+#: src/quote_fmt.c:78
 msgid "literal %"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2221
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2216
 msgid "filename (should not be modified)"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2222
-#: src/quote_fmt.c:87
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2217
+#: src/quote_fmt.c:86
 msgid "new line"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2223
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2218
 msgid "escape character for quotes"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2224
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2219
 msgid "quote character"
 msgstr ""
 
@@ -14634,117 +15117,117 @@ msgstr "Colour"
 msgid "Current action list"
 msgstr ""
 
-#: src/prefs_filtering.c:197 src/prefs_filtering.c:360
+#: src/prefs_filtering.c:196 src/prefs_filtering.c:359
 msgid "Filtering/Processing configuration"
 msgstr ""
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:870
-#: src/prefs_filtering.c:986
+#: src/prefs_filtering.c:265 src/prefs_filtering.c:851
+#: src/prefs_filtering.c:967
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr ""
 
-#: src/prefs_filtering.c:412
+#: src/prefs_filtering.c:405
 msgid "Condition"
 msgstr ""
 
-#: src/prefs_filtering.c:425
+#: src/prefs_filtering.c:416
 msgid " Def_ine... "
 msgstr ""
 
-#: src/prefs_filtering.c:447
+#: src/prefs_filtering.c:434
 msgid " De_fine... "
 msgstr ""
 
-#: src/prefs_filtering.c:476
+#: src/prefs_filtering.c:461
 msgid "Append the new rule above to the list"
 msgstr ""
 
-#: src/prefs_filtering.c:485
+#: src/prefs_filtering.c:470
 msgid "Replace the selected rule in list with the rule above"
 msgstr ""
 
-#: src/prefs_filtering.c:494
+#: src/prefs_filtering.c:477
 msgid "Delete the selected rule from the list"
 msgstr ""
 
-#: src/prefs_filtering.c:535
+#: src/prefs_filtering.c:516
 msgid "Move the selected rule to the top"
 msgstr ""
 
-#: src/prefs_filtering.c:538
+#: src/prefs_filtering.c:519
 msgid "Page u_p"
 msgstr ""
 
-#: src/prefs_filtering.c:546
+#: src/prefs_filtering.c:527
 msgid "Move the selected rule one page up"
 msgstr ""
 
-#: src/prefs_filtering.c:555
+#: src/prefs_filtering.c:536
 msgid "Move the selected rule up"
 msgstr ""
 
-#: src/prefs_filtering.c:563
+#: src/prefs_filtering.c:544
 msgid "Move the selected rule down"
 msgstr ""
 
-#: src/prefs_filtering.c:566
+#: src/prefs_filtering.c:547
 msgid "Page dow_n"
 msgstr ""
 
-#: src/prefs_filtering.c:574
+#: src/prefs_filtering.c:555
 msgid "Move the selected rule one page down"
 msgstr ""
 
-#: src/prefs_filtering.c:583
+#: src/prefs_filtering.c:564
 msgid "Move the selected rule to the bottom"
 msgstr ""
 
-#: src/prefs_filtering.c:1043 src/prefs_filtering.c:1129
+#: src/prefs_filtering.c:1024 src/prefs_filtering.c:1110
 msgid "Condition string is not valid."
 msgstr ""
 
-#: src/prefs_filtering.c:1116
+#: src/prefs_filtering.c:1097
 msgid "Condition string is empty."
 msgstr ""
 
-#: src/prefs_filtering.c:1122
+#: src/prefs_filtering.c:1103
 msgid "Action string is empty."
 msgstr ""
 
-#: src/prefs_filtering.c:1211
+#: src/prefs_filtering.c:1192
 msgid "Delete rule"
 msgstr ""
 
-#: src/prefs_filtering.c:1212
+#: src/prefs_filtering.c:1193
 msgid "Do you really want to delete this rule?"
 msgstr ""
 
-#: src/prefs_filtering.c:1230
+#: src/prefs_filtering.c:1211
 msgid "Delete all rules"
 msgstr ""
 
-#: src/prefs_filtering.c:1231
+#: src/prefs_filtering.c:1212
 msgid "Do you really want to delete all the rules?"
 msgstr ""
 
-#: src/prefs_filtering.c:1482
+#: src/prefs_filtering.c:1463
 msgid "Filtering rules not saved"
 msgstr ""
 
-#: src/prefs_filtering.c:1483
+#: src/prefs_filtering.c:1464
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr ""
 
-#: src/prefs_filtering.c:1705
+#: src/prefs_filtering.c:1686
 msgid "Move one page up"
 msgstr ""
 
-#: src/prefs_filtering.c:1706
+#: src/prefs_filtering.c:1687
 msgid "Move one page down"
 msgstr ""
 
-#: src/prefs_filtering.c:1863
+#: src/prefs_filtering.c:1842
 msgid "Enable"
 msgstr ""
 
@@ -14767,8 +15250,8 @@ msgstr ""
 msgid "Displayed columns"
 msgstr ""
 
-#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:464
-#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1032
+#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:462
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1015
 msgid " Use default "
 msgstr ""
 
@@ -14779,85 +15262,85 @@ msgid ""
 "subfolders\"."
 msgstr ""
 
-#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
+#: src/prefs_folder_item.c:294 src/prefs_folder_item.c:900
 msgid ""
 "Apply to\n"
 "subfolders"
 msgstr ""
 
-#: src/prefs_folder_item.c:318
+#: src/prefs_folder_item.c:317
 msgid "Normal"
 msgstr ""
 
-#: src/prefs_folder_item.c:320
+#: src/prefs_folder_item.c:319
 msgid "Outbox"
 msgstr ""
 
-#: src/prefs_folder_item.c:336
+#: src/prefs_folder_item.c:330
 msgid "Folder type"
 msgstr ""
 
-#: src/prefs_folder_item.c:348
+#: src/prefs_folder_item.c:354
 msgid "Simplify Subject RegExp"
 msgstr ""
 
-#: src/prefs_folder_item.c:374
+#: src/prefs_folder_item.c:384
 msgid "Test string"
 msgstr ""
 
-#: src/prefs_folder_item.c:391
+#: src/prefs_folder_item.c:405
 msgid "Result"
 msgstr ""
 
-#: src/prefs_folder_item.c:406
+#: src/prefs_folder_item.c:423
 msgid "Folder chmod"
 msgstr ""
 
-#: src/prefs_folder_item.c:432
+#: src/prefs_folder_item.c:451
 msgid "Folder color"
 msgstr "Folder colour"
 
-#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
+#: src/prefs_folder_item.c:462 src/prefs_folder_item.c:1745
 msgid "Pick color for folder"
 msgstr "Pick colour for folder"
 
-#: src/prefs_folder_item.c:462
+#: src/prefs_folder_item.c:480
 msgid "Run Processing rules at start-up"
 msgstr ""
 
-#: src/prefs_folder_item.c:477
+#: src/prefs_folder_item.c:493
 msgid "Run Processing rules when opening"
 msgstr ""
 
-#: src/prefs_folder_item.c:491
+#: src/prefs_folder_item.c:505
 msgid "Scan for new mail"
 msgstr ""
 
-#: src/prefs_folder_item.c:493
+#: src/prefs_folder_item.c:507
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
 msgstr ""
 
-#: src/prefs_folder_item.c:513
+#: src/prefs_folder_item.c:523
 msgid "Select the HTML part of multipart messages"
 msgstr ""
 
-#: src/prefs_folder_item.c:530
+#: src/prefs_folder_item.c:538
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
 
-#: src/prefs_folder_item.c:540
+#: src/prefs_folder_item.c:546
 msgid "Synchronise for offline use"
 msgstr ""
 
-#: src/prefs_folder_item.c:561
+#: src/prefs_folder_item.c:564
 msgid "Fetch message bodies from the last"
 msgstr ""
 
-#: src/prefs_folder_item.c:568
+#: src/prefs_folder_item.c:569
 msgid "0: all bodies"
 msgstr ""
 
@@ -14869,114 +15352,130 @@ msgstr ""
 msgid "Discard folder cache"
 msgstr ""
 
-#: src/prefs_folder_item.c:905
+#: src/prefs_folder_item.c:907
 msgid "Request Return Receipt"
 msgstr ""
 
-#: src/prefs_folder_item.c:920
+#: src/prefs_folder_item.c:918
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr ""
 
-#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
-#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
+#: src/prefs_folder_item.c:929 src/prefs_folder_item.c:979
+#: src/prefs_folder_item.c:1004 src/prefs_folder_item.c:1029
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr ""
 
-#: src/prefs_folder_item.c:960
+#: src/prefs_folder_item.c:954
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr ""
 
-#: src/prefs_folder_item.c:1063
+#: src/prefs_folder_item.c:1053
 msgid "Default account"
 msgstr ""
 
-#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+#: src/prefs_folder_item.c:1185 src/prefs_folder_item.c:1215
 msgid "\"Default\" will follow the applicable account preference"
 msgstr ""
 
-#: src/prefs_folder_item.c:1781
+#: src/prefs_folder_item.c:1758
 msgid "Discard cache"
 msgstr ""
 
-#: src/prefs_folder_item.c:1782
+#: src/prefs_folder_item.c:1759
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr ""
 
-#: src/prefs_folder_item.c:1907
+#: src/prefs_folder_item.c:1874
 msgid "General"
 msgstr ""
 
-#: src/prefs_folder_item.c:1986
+#: src/prefs_folder_item.c:1953
 #, c-format
 msgid "Properties for folder %s"
 msgstr ""
 
-#: src/prefs_fonts.c:79
+#: src/prefs_fonts.c:78
 msgid "Folder and Message Lists"
 msgstr ""
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2086
+#: src/prefs_fonts.c:96 src/prefs_matcher.c:2081
 msgid "Message"
 msgstr ""
 
-#: src/prefs_fonts.c:126
+#: src/prefs_fonts.c:119
 msgid "Derive small and bold fonts from Folder and Message Lists font"
 msgstr ""
 
-#: src/prefs_fonts.c:136
+#: src/prefs_fonts.c:127
 msgid "Small"
 msgstr ""
 
-#: src/prefs_fonts.c:158
+#: src/prefs_fonts.c:147
 msgid "Bold"
 msgstr ""
 
-#: src/prefs_fonts.c:180
+#: src/prefs_fonts.c:167
 msgid "Use different font for printing"
 msgstr ""
 
-#: src/prefs_fonts.c:190
+#: src/prefs_fonts.c:175
 msgid "Message Printing"
 msgstr ""
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:776 src/prefs_summaries.c:869
+#: src/prefs_fonts.c:251 src/prefs_msg_colors.c:752 src/prefs_summaries.c:869
 #: src/prefs_themes.c:422
 msgid "Display"
 msgstr ""
 
-#: src/prefs_fonts.c:269
+#: src/prefs_fonts.c:252
 msgid "Fonts"
 msgstr ""
 
-#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr ""
 
-#: src/prefs_image_viewer.c:69
+#: src/prefs_image_viewer.c:77
 msgid "Automatically display attached images"
 msgstr ""
 
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:81
 msgid "Resize attached images by default"
 msgstr ""
 
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:84
 msgid "Clicking image toggles scaling"
 msgstr ""
 
-#: src/prefs_image_viewer.c:83
+#: src/prefs_image_viewer.c:93
+msgid "Fit image"
+msgstr ""
+
+#: src/prefs_image_viewer.c:97
+msgid "Right-clicking image toggles fitting height/width"
+msgstr ""
+
+#: src/prefs_image_viewer.c:100
+msgid "Height"
+msgstr ""
+
+#: src/prefs_image_viewer.c:106
+msgid "Width"
+msgstr ""
+
+#: src/prefs_image_viewer.c:111
 msgid "Display images inline"
 msgstr ""
 
-#: src/prefs_image_viewer.c:89
+#: src/prefs_image_viewer.c:115
 msgid "Print images"
 msgstr ""
 
-#: src/prefs_image_viewer.c:139
+#: src/prefs_image_viewer.c:174
 msgid "Image Viewer"
 msgstr ""
 
@@ -15084,7 +15583,7 @@ msgstr ""
 msgid "Status messages for filtering/processing log"
 msgstr ""
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:153 src/prefs_other.c:815
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:151 src/prefs_other.c:785
 msgid "Other"
 msgstr ""
 
@@ -15092,168 +15591,168 @@ msgstr ""
 msgid "Logging"
 msgstr ""
 
-#: src/prefs_matcher.c:335
+#: src/prefs_matcher.c:334
 msgid "more than"
 msgstr ""
 
-#: src/prefs_matcher.c:336
+#: src/prefs_matcher.c:335
 msgid "less than"
 msgstr ""
 
-#: src/prefs_matcher.c:342
+#: src/prefs_matcher.c:341
 msgid "weeks"
 msgstr ""
 
-#: src/prefs_matcher.c:346
+#: src/prefs_matcher.c:345
 msgid "after"
 msgstr ""
 
-#: src/prefs_matcher.c:347
+#: src/prefs_matcher.c:346
 msgid "before"
 msgstr ""
 
-#: src/prefs_matcher.c:351
+#: src/prefs_matcher.c:350
 msgid "higher than"
 msgstr ""
 
-#: src/prefs_matcher.c:352
+#: src/prefs_matcher.c:351
 msgid "lower than"
 msgstr ""
 
-#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
+#: src/prefs_matcher.c:352 src/prefs_matcher.c:358
 msgid "exactly"
 msgstr ""
 
-#: src/prefs_matcher.c:357
+#: src/prefs_matcher.c:356
 msgid "greater than"
 msgstr ""
 
-#: src/prefs_matcher.c:358
+#: src/prefs_matcher.c:357
 msgid "smaller than"
 msgstr ""
 
-#: src/prefs_matcher.c:363
+#: src/prefs_matcher.c:362
 msgid "bytes"
 msgstr ""
 
-#: src/prefs_matcher.c:364
+#: src/prefs_matcher.c:363
 msgid "kilobytes"
 msgstr ""
 
-#: src/prefs_matcher.c:365
+#: src/prefs_matcher.c:364
 msgid "megabytes"
 msgstr ""
 
-#: src/prefs_matcher.c:369
+#: src/prefs_matcher.c:368
 msgid "contains"
 msgstr ""
 
-#: src/prefs_matcher.c:370
+#: src/prefs_matcher.c:369
 msgid "doesn't contain"
 msgstr ""
 
-#: src/prefs_matcher.c:394
+#: src/prefs_matcher.c:393
 msgid "headers part"
 msgstr ""
 
-#: src/prefs_matcher.c:395
+#: src/prefs_matcher.c:394
 msgid "headers values"
 msgstr ""
 
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:395
 msgid "body part"
 msgstr ""
 
-#: src/prefs_matcher.c:397
+#: src/prefs_matcher.c:396
 msgid "whole message"
 msgstr ""
 
-#: src/prefs_matcher.c:403 src/summaryview.c:6559
+#: src/prefs_matcher.c:402 src/summaryview.c:6534
 msgid "Marked"
 msgstr ""
 
-#: src/prefs_matcher.c:404 src/summaryview.c:6557
+#: src/prefs_matcher.c:403 src/summaryview.c:6532
 msgid "Deleted"
 msgstr ""
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:404
 msgid "Replied"
 msgstr ""
 
-#: src/prefs_matcher.c:406 src/summaryview.c:6551
+#: src/prefs_matcher.c:405 src/summaryview.c:6526
 msgid "Forwarded"
 msgstr ""
 
-#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/prefs_matcher.c:407 src/summaryview.c:6516 src/toolbar.c:515
 #: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr ""
 
-#: src/prefs_matcher.c:409
+#: src/prefs_matcher.c:408
 msgid "Has attachment"
 msgstr ""
 
-#: src/prefs_matcher.c:410 src/summaryview.c:6577
+#: src/prefs_matcher.c:409 src/summaryview.c:6552
 msgid "Signed"
 msgstr ""
 
-#: src/prefs_matcher.c:414
+#: src/prefs_matcher.c:413
 msgid "set"
 msgstr ""
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:414
 msgid "not set"
 msgstr ""
 
-#: src/prefs_matcher.c:419
+#: src/prefs_matcher.c:418
 msgid "yes"
 msgstr ""
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:419
 msgid "no"
 msgstr ""
 
-#: src/prefs_matcher.c:424
+#: src/prefs_matcher.c:423
 msgid "Any tags"
 msgstr ""
 
-#: src/prefs_matcher.c:425
+#: src/prefs_matcher.c:424
 msgid "Specific tag"
 msgstr ""
 
-#: src/prefs_matcher.c:429
+#: src/prefs_matcher.c:428
 msgid "ignored"
 msgstr ""
 
-#: src/prefs_matcher.c:430
+#: src/prefs_matcher.c:429
 msgid "not ignored"
 msgstr ""
 
-#: src/prefs_matcher.c:431
+#: src/prefs_matcher.c:430
 msgid "watched"
 msgstr ""
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:431
 msgid "not watched"
 msgstr ""
 
-#: src/prefs_matcher.c:436
+#: src/prefs_matcher.c:435
 msgid "found"
 msgstr ""
 
-#: src/prefs_matcher.c:437
+#: src/prefs_matcher.c:436
 msgid "not found"
 msgstr ""
 
-#: src/prefs_matcher.c:441
+#: src/prefs_matcher.c:440
 msgid "0 (Passed)"
 msgstr ""
 
-#: src/prefs_matcher.c:442
+#: src/prefs_matcher.c:441
 msgid "non-0 (Failed)"
 msgstr ""
 
-#: src/prefs_matcher.c:580
+#: src/prefs_matcher.c:578
 msgid "Condition configuration"
 msgstr ""
 
@@ -15261,96 +15760,96 @@ msgstr ""
 msgid "Match criteria"
 msgstr ""
 
-#: src/prefs_matcher.c:633
+#: src/prefs_matcher.c:632
 msgid "All messages"
 msgstr ""
 
-#: src/prefs_matcher.c:635
+#: src/prefs_matcher.c:634
 msgid "Age"
 msgstr ""
 
-#: src/prefs_matcher.c:636
+#: src/prefs_matcher.c:635
 msgid "Phrase"
 msgstr ""
 
-#: src/prefs_matcher.c:637
+#: src/prefs_matcher.c:636
 msgid "Flags"
 msgstr ""
 
-#: src/prefs_matcher.c:638 src/prefs_msg_colors.c:380
+#: src/prefs_matcher.c:637 src/prefs_msg_colors.c:378
 msgid "Color labels"
 msgstr "Colour labels"
 
-#: src/prefs_matcher.c:639
+#: src/prefs_matcher.c:638
 msgid "Thread"
 msgstr ""
 
-#: src/prefs_matcher.c:642
+#: src/prefs_matcher.c:641
 msgid "Partially downloaded"
 msgstr ""
 
-#: src/prefs_matcher.c:645
+#: src/prefs_matcher.c:644
 msgid "External program test"
 msgstr ""
 
-#: src/prefs_matcher.c:674
+#: src/prefs_matcher.c:672
 msgid ""
 "Use selector on the right to pick the header name. Type the name of the "
 "header if not available in the list."
 msgstr ""
 
-#: src/prefs_matcher.c:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
-#: src/prefs_matcher.c:2583
+#: src/prefs_matcher.c:715 src/prefs_matcher.c:1653 src/prefs_matcher.c:1668
+#: src/prefs_matcher.c:2577
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr ""
 
-#: src/prefs_matcher.c:753
+#: src/prefs_matcher.c:749
 msgid "Use regexp"
 msgstr ""
 
-#: src/prefs_matcher.c:844
+#: src/prefs_matcher.c:840
 msgid "Message must match"
 msgstr ""
 
-#: src/prefs_matcher.c:848
+#: src/prefs_matcher.c:844
 msgid "at least one"
 msgstr ""
 
-#: src/prefs_matcher.c:849
+#: src/prefs_matcher.c:845
 msgid "all"
 msgstr ""
 
-#: src/prefs_matcher.c:852
+#: src/prefs_matcher.c:848
 msgid "of above rules"
 msgstr ""
 
-#: src/prefs_matcher.c:1564 src/prefs_matcher.c:1642
+#: src/prefs_matcher.c:1560 src/prefs_matcher.c:1637
 msgid "Search pattern is not set."
 msgstr ""
 
-#: src/prefs_matcher.c:1578
+#: src/prefs_matcher.c:1574
 msgid "Invalid hour."
 msgstr ""
 
-#: src/prefs_matcher.c:1587
+#: src/prefs_matcher.c:1583
 msgid "Test command is not set."
 msgstr ""
 
-#: src/prefs_matcher.c:1659
+#: src/prefs_matcher.c:1654
 msgid "all addresses in all headers"
 msgstr ""
 
-#: src/prefs_matcher.c:1662
+#: src/prefs_matcher.c:1657
 msgid "any address in any header"
 msgstr ""
 
-#: src/prefs_matcher.c:1664
+#: src/prefs_matcher.c:1659
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr ""
 
-#: src/prefs_matcher.c:1665
+#: src/prefs_matcher.c:1660
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -15359,97 +15858,97 @@ msgid ""
 "'%s' from the book/folder drop-down list."
 msgstr ""
 
-#: src/prefs_matcher.c:1884
+#: src/prefs_matcher.c:1879
 msgid "Headers part"
 msgstr ""
 
-#: src/prefs_matcher.c:1888
+#: src/prefs_matcher.c:1883
 msgid "Headers values"
 msgstr ""
 
-#: src/prefs_matcher.c:1892
+#: src/prefs_matcher.c:1887
 msgid "Body part"
 msgstr ""
 
-#: src/prefs_matcher.c:1896
+#: src/prefs_matcher.c:1891
 msgid "Whole message"
 msgstr ""
 
-#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
+#: src/prefs_matcher.c:2008 src/prefs_matcher.c:2054
 msgid "in"
 msgstr ""
 
-#: src/prefs_matcher.c:2015
+#: src/prefs_matcher.c:2010
 msgid "content is"
 msgstr ""
 
-#: src/prefs_matcher.c:2019
+#: src/prefs_matcher.c:2014
 msgid "Date is"
 msgstr ""
 
-#: src/prefs_matcher.c:2030
+#: src/prefs_matcher.c:2025
 msgid "Age is"
 msgstr ""
 
-#: src/prefs_matcher.c:2035
+#: src/prefs_matcher.c:2030
 msgid "Flag"
 msgstr ""
 
-#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
+#: src/prefs_matcher.c:2031 src/prefs_matcher.c:2045
 msgid "is"
 msgstr ""
 
-#: src/prefs_matcher.c:2041
+#: src/prefs_matcher.c:2036
 msgid "Name:"
 msgstr ""
 
-#: src/prefs_matcher.c:2049
+#: src/prefs_matcher.c:2044
 msgid "Label"
 msgstr ""
 
-#: src/prefs_matcher.c:2054
+#: src/prefs_matcher.c:2049
 msgid "Value:"
 msgstr ""
 
-#: src/prefs_matcher.c:2069
+#: src/prefs_matcher.c:2064
 msgid "Score is"
 msgstr ""
 
-#: src/prefs_matcher.c:2070
+#: src/prefs_matcher.c:2065
 msgid "points"
 msgstr ""
 
-#: src/prefs_matcher.c:2080
+#: src/prefs_matcher.c:2075
 msgid "Size is"
 msgstr ""
 
-#: src/prefs_matcher.c:2085
+#: src/prefs_matcher.c:2080
 msgid "Scope:"
 msgstr ""
 
-#: src/prefs_matcher.c:2087
+#: src/prefs_matcher.c:2082
 msgid "tags"
 msgstr ""
 
-#: src/prefs_matcher.c:2092
+#: src/prefs_matcher.c:2087
 msgid "type is"
 msgstr ""
 
-#: src/prefs_matcher.c:2096
+#: src/prefs_matcher.c:2091
 msgid "Program returns"
 msgstr ""
 
-#: src/prefs_matcher.c:2166
+#: src/prefs_matcher.c:2161
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
 msgstr ""
 
-#: src/prefs_matcher.c:2233
+#: src/prefs_matcher.c:2228
 msgid "Match Type: 'Test'"
 msgstr ""
 
-#: src/prefs_matcher.c:2234
+#: src/prefs_matcher.c:2229
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -15457,87 +15956,95 @@ msgid ""
 "The following symbols can be used:"
 msgstr ""
 
-#: src/prefs_matcher.c:2333
+#: src/prefs_matcher.c:2328
 msgid "Current condition rules"
 msgstr ""
 
-#: src/prefs_message.c:119
+#: src/prefs_message.c:121
 msgid "Headers"
 msgstr ""
 
-#: src/prefs_message.c:122
+#: src/prefs_message.c:124
 msgid "Display header pane above message view"
 msgstr ""
 
-#: src/prefs_message.c:126
+#: src/prefs_message.c:128
 msgid "Display (X-)Face in message view"
 msgstr ""
 
-#: src/prefs_message.c:129
+#: src/prefs_message.c:130
+msgid "Save (X-)Face in address book if possible"
+msgstr ""
+
+#: src/prefs_message.c:133
 msgid "Display Face in message view"
 msgstr ""
 
-#: src/prefs_message.c:143
+#: src/prefs_message.c:135
+msgid "Save Face in address book if possible"
+msgstr ""
+
+#: src/prefs_message.c:149
 msgid "Display headers in message view"
 msgstr ""
 
-#: src/prefs_message.c:155
+#: src/prefs_message.c:161
 msgid "HTML messages"
 msgstr ""
 
-#: src/prefs_message.c:158
+#: src/prefs_message.c:164
 msgid "Render HTML messages as text"
 msgstr ""
 
-#: src/prefs_message.c:161
+#: src/prefs_message.c:167
 msgid "Render HTML-only messages with plugin if possible"
 msgstr ""
 
-#: src/prefs_message.c:164
+#: src/prefs_message.c:170
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr ""
 
-#: src/prefs_message.c:174
+#: src/prefs_message.c:180
 msgid "Line space"
 msgstr ""
 
-#: src/prefs_message.c:187 src/prefs_message.c:220
+#: src/prefs_message.c:193 src/prefs_message.c:226
 msgid "pixels"
 msgstr ""
 
-#: src/prefs_message.c:193
+#: src/prefs_message.c:199
 msgid "Scroll"
 msgstr ""
 
-#: src/prefs_message.c:195
+#: src/prefs_message.c:201
 msgid "Half page"
 msgstr ""
 
-#: src/prefs_message.c:201
+#: src/prefs_message.c:207
 msgid "Smooth scroll"
 msgstr ""
 
-#: src/prefs_message.c:207
+#: src/prefs_message.c:213
 msgid "Step"
 msgstr ""
 
-#: src/prefs_message.c:227
+#: src/prefs_message.c:233
 msgid "Show attachment descriptions (rather than names)"
 msgstr ""
 
-#: src/prefs_message.c:230
+#: src/prefs_message.c:236
 msgid "Quotation"
 msgstr ""
 
-#: src/prefs_message.c:239
+#: src/prefs_message.c:245
 msgid "Collapse quoted text on double click"
 msgstr ""
 
-#: src/prefs_message.c:246
+#: src/prefs_message.c:252
 msgid "Treat these characters as quotation marks"
 msgstr ""
 
-#: src/prefs_message.c:352
+#: src/prefs_message.c:363
 msgid "Text Options"
 msgstr ""
 
@@ -15558,131 +16065,131 @@ msgstr ""
 msgid "Configuration warning"
 msgstr ""
 
-#: src/prefs_msg_colors.c:155
+#: src/prefs_msg_colors.c:153
 msgid "Message view"
 msgstr ""
 
-#: src/prefs_msg_colors.c:162
+#: src/prefs_msg_colors.c:160
 msgid "Enable coloration of message text"
 msgstr "Enable colouration of message text"
 
-#: src/prefs_msg_colors.c:170
+#: src/prefs_msg_colors.c:168
 msgid "Quote"
 msgstr ""
 
-#: src/prefs_msg_colors.c:182
+#: src/prefs_msg_colors.c:180
 msgid "Cycle quote colors"
 msgstr "Cycle quote colours"
 
-#: src/prefs_msg_colors.c:186
+#: src/prefs_msg_colors.c:184
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "If there are more than 3 quote levels, the colours will be reused"
 
-#: src/prefs_msg_colors.c:192
+#: src/prefs_msg_colors.c:190
 msgid "1st Level"
 msgstr ""
 
-#: src/prefs_msg_colors.c:198 src/prefs_msg_colors.c:216
-#: src/prefs_msg_colors.c:234
+#: src/prefs_msg_colors.c:196 src/prefs_msg_colors.c:214
+#: src/prefs_msg_colors.c:232
 msgid "Text"
 msgstr ""
 
-#: src/prefs_msg_colors.c:202
+#: src/prefs_msg_colors.c:200
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "Pick colour for 1st level text"
 
-#: src/prefs_msg_colors.c:210
+#: src/prefs_msg_colors.c:208
 msgid "2nd Level"
 msgstr ""
 
-#: src/prefs_msg_colors.c:220
+#: src/prefs_msg_colors.c:218
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "Pick colour for 2nd level text"
 
-#: src/prefs_msg_colors.c:228
+#: src/prefs_msg_colors.c:226
 msgid "3rd Level"
 msgstr ""
 
-#: src/prefs_msg_colors.c:238
+#: src/prefs_msg_colors.c:236
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "Pick colour for 3rd level text"
 
-#: src/prefs_msg_colors.c:247
+#: src/prefs_msg_colors.c:245
 msgid "Enable coloration of text background"
 msgstr "Enable colouration of text background"
 
-#: src/prefs_msg_colors.c:256
+#: src/prefs_msg_colors.c:254
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
 msgstr "Pick colour for 1st level text background"
 
-#: src/prefs_msg_colors.c:269
+#: src/prefs_msg_colors.c:267
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
 msgstr "Pick colour for 2nd level text background"
 
-#: src/prefs_msg_colors.c:282
+#: src/prefs_msg_colors.c:280
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
 msgstr "Pick colour for 3rd level text background"
 
-#: src/prefs_msg_colors.c:294
+#: src/prefs_msg_colors.c:292
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "Pick colour for links"
 
-#: src/prefs_msg_colors.c:298
+#: src/prefs_msg_colors.c:296
 msgid "URI link"
 msgstr ""
 
-#: src/prefs_msg_colors.c:306
+#: src/prefs_msg_colors.c:304
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "Pick colour for signatures"
 
 #. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
 #. versions of the same text file
-#: src/prefs_msg_colors.c:316
+#: src/prefs_msg_colors.c:314
 msgid "Patch messages and attachments"
 msgstr ""
 
-#: src/prefs_msg_colors.c:324
+#: src/prefs_msg_colors.c:322
 msgctxt "Tooltip"
 msgid "Pick color for inserted lines"
 msgstr "Pick colour for inserted lines"
 
-#: src/prefs_msg_colors.c:326
+#: src/prefs_msg_colors.c:324
 msgid "Inserted lines"
 msgstr ""
 
-#: src/prefs_msg_colors.c:333
+#: src/prefs_msg_colors.c:331
 msgctxt "Tooltip"
 msgid "Pick color for removed lines"
 msgstr "Pick colour for removed lines"
 
-#: src/prefs_msg_colors.c:336
+#: src/prefs_msg_colors.c:334
 msgid "Removed lines"
 msgstr ""
 
 #. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
-#: src/prefs_msg_colors.c:344
+#: src/prefs_msg_colors.c:342
 msgctxt "Tooltip."
 msgid "Pick color for hunk lines"
 msgstr "Pick colour for hunk lines"
 
 #. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
-#: src/prefs_msg_colors.c:348
+#: src/prefs_msg_colors.c:346
 msgid "Hunk lines"
 msgstr ""
 
-#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:380
+#: src/prefs_msg_colors.c:348 src/prefs_summaries.c:380
 msgid "Folder list"
 msgstr ""
 
-#: src/prefs_msg_colors.c:357
+#: src/prefs_msg_colors.c:355
 msgctxt "Tooltip"
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
@@ -15691,22 +16198,22 @@ msgstr ""
 "Pick colour for Target folder. Target folder is used when the option "
 "'Execute immediately when moving or deleting messages' is turned off"
 
-#: src/prefs_msg_colors.c:362
+#: src/prefs_msg_colors.c:360
 msgid "Target folder"
 msgstr ""
 
-#: src/prefs_msg_colors.c:369
+#: src/prefs_msg_colors.c:367
 msgctxt "Tooltip"
 msgid "Pick color for folders containing new messages"
 msgstr "Pick colour for folders containing new messages"
 
-#: src/prefs_msg_colors.c:373
+#: src/prefs_msg_colors.c:371
 msgid "Folder containing new messages"
 msgstr ""
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:430
+#: src/prefs_msg_colors.c:396 src/prefs_msg_colors.c:428
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -15714,228 +16221,217 @@ msgstr "Pick colour for 'color %d'"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:434
+#: src/prefs_msg_colors.c:400 src/prefs_msg_colors.c:432
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr ""
 
-#: src/prefs_msg_colors.c:529
+#: src/prefs_msg_colors.c:527
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "Pick colour for 1st level text"
 
-#: src/prefs_msg_colors.c:531
+#: src/prefs_msg_colors.c:529
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "Pick colour for 2nd level text"
 
-#: src/prefs_msg_colors.c:533
+#: src/prefs_msg_colors.c:531
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
 msgstr "Pick colour for 3rd level text"
 
-#: src/prefs_msg_colors.c:535
+#: src/prefs_msg_colors.c:533
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "Pick colour for 1st level text background"
 
-#: src/prefs_msg_colors.c:537
+#: src/prefs_msg_colors.c:535
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "Pick colour for 2nd level text background"
 
-#: src/prefs_msg_colors.c:539
+#: src/prefs_msg_colors.c:537
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "Pick colour for 3rd level text background"
 
-#: src/prefs_msg_colors.c:541
+#: src/prefs_msg_colors.c:539
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "Pick colour for links"
 
-#: src/prefs_msg_colors.c:543
+#: src/prefs_msg_colors.c:541
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "Pick colour for target folder"
 
-#: src/prefs_msg_colors.c:545
+#: src/prefs_msg_colors.c:543
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
 msgstr "Pick colour for signatures"
 
-#: src/prefs_msg_colors.c:547
+#: src/prefs_msg_colors.c:545
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "Pick colour for folder"
 
-#: src/prefs_msg_colors.c:549
+#: src/prefs_msg_colors.c:547
 msgctxt "Dialog title"
 msgid "Pick color for inserted lines"
 msgstr "Pick colour for inserted lines"
 
-#: src/prefs_msg_colors.c:551
+#: src/prefs_msg_colors.c:549
 msgctxt "Dialog title"
 msgid "Pick color for removed lines"
 msgstr "Pick colour for removed lines"
 
-#: src/prefs_msg_colors.c:553
+#: src/prefs_msg_colors.c:551
 msgctxt "Dialog title"
 msgid "Pick color for hunk lines"
 msgstr "Pick colour for hunk lines"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:576
+#: src/prefs_msg_colors.c:574
 #, c-format
 msgctxt "Dialog title"
 msgid "Pick color for 'color %d'"
 msgstr "Pick colour for 'color %d'"
 
-#: src/prefs_msg_colors.c:777
+#: src/prefs_msg_colors.c:753
 msgid "Colors"
 msgstr "Colours"
 
-#: src/prefs_other.c:109
+#: src/prefs_other.c:108
 msgid "Choose preset keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:124
+#: src/prefs_other.c:123
 msgid "Select preset:"
 msgstr ""
 
-#: src/prefs_other.c:139
+#: src/prefs_other.c:138
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
 msgstr ""
 
-#: src/prefs_other.c:497
+#: src/prefs_other.c:495
 msgid "Add address to destination when double-clicked"
 msgstr ""
 
-#: src/prefs_other.c:500
+#: src/prefs_other.c:498
 msgid "On exit"
 msgstr ""
 
-#: src/prefs_other.c:503
+#: src/prefs_other.c:501
 msgid "Confirm on exit"
 msgstr ""
 
-#: src/prefs_other.c:510
+#: src/prefs_other.c:508
 msgid "Empty trash on exit"
 msgstr "Empty wastebin on exit"
 
-#: src/prefs_other.c:513
+#: src/prefs_other.c:511
 msgid "Warn if there are queued messages"
 msgstr ""
 
-#: src/prefs_other.c:515
+#: src/prefs_other.c:513
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:518
+#: src/prefs_other.c:516
 msgid "Enable keyboard shortcuts"
 msgstr ""
 
-#: src/prefs_other.c:521
-msgid "Enable customisable keyboard shortcuts"
-msgstr ""
-
-#: src/prefs_other.c:524
-msgid ""
-"If checked, you can change the keyboard shortcuts of most of the menu items "
-"by focusing on the menu item and pressing a key combination.\n"
-"Uncheck this option if you want to lock all existing keyboard shortcuts."
-msgstr ""
-
-#: src/prefs_other.c:531
+#: src/prefs_other.c:519
 msgid " Choose preset keyboard shortcuts... "
 msgstr ""
 
-#: src/prefs_other.c:541
+#: src/prefs_other.c:529
 msgid "Metadata handling"
 msgstr ""
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:530
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
 msgstr ""
 
-#: src/prefs_other.c:546
+#: src/prefs_other.c:535
 msgid "Safer"
 msgstr ""
 
-#: src/prefs_other.c:548
+#: src/prefs_other.c:537
 msgid "Faster"
 msgstr ""
 
-#: src/prefs_other.c:566
+#: src/prefs_other.c:555
 msgid "Socket I/O timeout"
 msgstr ""
 
-#: src/prefs_other.c:587
+#: src/prefs_other.c:576
 msgid "Translate header names"
 msgstr ""
 
-#: src/prefs_other.c:589
+#: src/prefs_other.c:578
 msgid ""
 "The display of standard headers (such as 'From:', 'Subject:') will be "
 "translated into your language."
 msgstr ""
 
-#: src/prefs_other.c:592
+#: src/prefs_other.c:581
 msgid "Ask before emptying trash"
 msgstr "Ask before emptying wastebin"
 
-#: src/prefs_other.c:594
+#: src/prefs_other.c:583
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr ""
 
-#: src/prefs_other.c:599
+#: src/prefs_other.c:588
 msgid "Use secure file deletion if possible"
 msgstr ""
 
-#: src/prefs_other.c:603
+#: src/prefs_other.c:592
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
 msgstr ""
 
-#: src/prefs_other.c:608
+#: src/prefs_other.c:597
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
 msgstr ""
 
-#: src/prefs_other.c:612
+#: src/prefs_other.c:601
 msgid "Synchronise offline folders as soon as possible"
 msgstr ""
 
-#: src/prefs_other.c:615
+#: src/prefs_other.c:604
 msgid "Master passphrase"
 msgstr ""
 
-#: src/prefs_other.c:618
+#: src/prefs_other.c:607
 msgid "Use a master passphrase"
 msgstr ""
 
-#: src/prefs_other.c:621
+#: src/prefs_other.c:610
 msgid ""
 "If checked, your saved account passwords will be protected by a master "
 "passphrase. If no master passphrase is set, you will be prompted to set one."
 msgstr ""
 
-#: src/prefs_other.c:626
+#: src/prefs_other.c:615
 msgid "Change master passphrase"
 msgstr ""
 
-#: src/prefs_other.c:816
+#: src/prefs_other.c:786
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+#: src/prefs_proxy.c:234 src/prefs_receive.c:415 src/prefs_send.c:411
 msgid "Mail Handling"
 msgstr ""
 
@@ -16036,144 +16532,144 @@ msgstr ""
 msgid "Outgoing encoding"
 msgstr ""
 
-#: src/prefs_send.c:250
+#: src/prefs_send.c:248
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr ""
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:263
 msgid "7bit ASCII (US-ASCII)"
 msgstr ""
 
-#: src/prefs_send.c:268
+#: src/prefs_send.c:264
 msgid "Unicode (UTF-8)"
 msgstr ""
 
-#: src/prefs_send.c:270
+#: src/prefs_send.c:266
 msgid "Western European (ISO-8859-1)"
 msgstr ""
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:267
 msgid "Western European (ISO-8859-15)"
 msgstr ""
 
-#: src/prefs_send.c:273
+#: src/prefs_send.c:269
 msgid "Central European (ISO-8859-2)"
 msgstr ""
 
-#: src/prefs_send.c:275
+#: src/prefs_send.c:271
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: src/prefs_send.c:276
+#: src/prefs_send.c:272
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: src/prefs_send.c:278
+#: src/prefs_send.c:274
 msgid "Greek (ISO-8859-7)"
 msgstr ""
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:276
 msgid "Hebrew (ISO-8859-8)"
 msgstr ""
 
-#: src/prefs_send.c:281
+#: src/prefs_send.c:277
 msgid "Hebrew (Windows-1255)"
 msgstr ""
 
-#: src/prefs_send.c:283
+#: src/prefs_send.c:279
 msgid "Arabic (ISO-8859-6)"
 msgstr ""
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:280
 msgid "Arabic (Windows-1256)"
 msgstr ""
 
-#: src/prefs_send.c:286
+#: src/prefs_send.c:282
 msgid "Turkish (ISO-8859-9)"
 msgstr ""
 
-#: src/prefs_send.c:288
+#: src/prefs_send.c:284
 msgid "Cyrillic (ISO-8859-5)"
 msgstr ""
 
-#: src/prefs_send.c:289
+#: src/prefs_send.c:285
 msgid "Cyrillic (KOI8-R)"
 msgstr ""
 
-#: src/prefs_send.c:290
+#: src/prefs_send.c:286
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr ""
 
-#: src/prefs_send.c:291
+#: src/prefs_send.c:287
 msgid "Cyrillic (KOI8-U)"
 msgstr ""
 
-#: src/prefs_send.c:292
+#: src/prefs_send.c:288
 msgid "Cyrillic (Windows-1251)"
 msgstr ""
 
-#: src/prefs_send.c:294
+#: src/prefs_send.c:290
 msgid "Japanese (ISO-2022-JP)"
 msgstr ""
 
-#: src/prefs_send.c:296
+#: src/prefs_send.c:292
 msgid "Japanese (EUC-JP)"
 msgstr ""
 
-#: src/prefs_send.c:297
+#: src/prefs_send.c:293
 msgid "Japanese (Shift_JIS)"
 msgstr ""
 
-#: src/prefs_send.c:300
+#: src/prefs_send.c:296
 msgid "Simplified Chinese (GB18030)"
 msgstr ""
 
-#: src/prefs_send.c:301
+#: src/prefs_send.c:297
 msgid "Simplified Chinese (GB2312)"
 msgstr ""
 
-#: src/prefs_send.c:302
+#: src/prefs_send.c:298
 msgid "Simplified Chinese (GBK)"
 msgstr ""
 
-#: src/prefs_send.c:303
+#: src/prefs_send.c:299
 msgid "Traditional Chinese (Big5)"
 msgstr ""
 
-#: src/prefs_send.c:305
+#: src/prefs_send.c:301
 msgid "Traditional Chinese (EUC-TW)"
 msgstr ""
 
-#: src/prefs_send.c:306
+#: src/prefs_send.c:302
 msgid "Chinese (ISO-2022-CN)"
 msgstr ""
 
-#: src/prefs_send.c:309
+#: src/prefs_send.c:305
 msgid "Korean (EUC-KR)"
 msgstr ""
 
-#: src/prefs_send.c:311
+#: src/prefs_send.c:307
 msgid "Thai (TIS-620)"
 msgstr ""
 
-#: src/prefs_send.c:312
+#: src/prefs_send.c:308
 msgid "Thai (Windows-874)"
 msgstr ""
 
-#: src/prefs_send.c:316
+#: src/prefs_send.c:312
 msgid "Transfer encoding"
 msgstr ""
 
-#: src/prefs_send.c:327
+#: src/prefs_send.c:321
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr ""
 
-#: src/prefs_send.c:420 src/send_message.c:520 src/send_message.c:524
-#: src/send_message.c:529
+#: src/prefs_send.c:412 src/send_message.c:524 src/send_message.c:528
+#: src/send_message.c:533
 msgid "Sending"
 msgstr ""
 
@@ -16205,23 +16701,23 @@ msgstr ""
 msgid "Dictionary"
 msgstr ""
 
-#: src/prefs_spelling.c:187
+#: src/prefs_spelling.c:181
 msgid "Check with both dictionaries"
 msgstr ""
 
-#: src/prefs_spelling.c:194
+#: src/prefs_spelling.c:187
 msgid "Get more dictionaries..."
 msgstr ""
 
-#: src/prefs_spelling.c:204
+#: src/prefs_spelling.c:196
 msgid "Misspelled word color"
 msgstr "Misspelled word colour:"
 
-#: src/prefs_spelling.c:216
+#: src/prefs_spelling.c:208
 msgid "Pick color for misspelled word. Use black to underline"
 msgstr "Pick colour for misspelled word. Use black to underline"
 
-#: src/prefs_spelling.c:333
+#: src/prefs_spelling.c:325
 msgid "Spell Checking"
 msgstr ""
 
@@ -16440,7 +16936,7 @@ msgstr "Confirm when changing colour labels"
 msgid "Show tooltips"
 msgstr ""
 
-#: src/prefs_summaries.c:616 src/quote_fmt.c:539
+#: src/prefs_summaries.c:616 src/quote_fmt.c:541
 msgid "Defaults"
 msgstr ""
 
@@ -16526,122 +17022,122 @@ msgstr ""
 msgid "newest unread email"
 msgstr ""
 
-#: src/prefs_summary_open.c:189
+#: src/prefs_summary_open.c:188
 msgid "Message selection when entering a folder"
 msgstr ""
 
-#: src/prefs_summary_open.c:234
+#: src/prefs_summary_open.c:233
 msgid "Available selections"
 msgstr ""
 
-#: src/prefs_summary_open.c:269
+#: src/prefs_summary_open.c:268
 msgid "Current selections"
 msgstr ""
 
-#: src/prefs_template.c:80
+#: src/prefs_template.c:79
 msgid "This name is used as the Menu item"
 msgstr ""
 
-#: src/prefs_template.c:82
+#: src/prefs_template.c:81
 msgid ""
 "Override composing account's From header. This doesn't change the composing "
 "account."
 msgstr ""
 
-#: src/prefs_template.c:309
+#: src/prefs_template.c:305
 msgid "Append the new template above to the list"
 msgstr ""
 
-#: src/prefs_template.c:318
+#: src/prefs_template.c:314
 msgid "Replace the selected template in list with the template above"
 msgstr ""
 
-#: src/prefs_template.c:328
+#: src/prefs_template.c:322
 msgid "Delete the selected template from the list"
 msgstr ""
 
-#: src/prefs_template.c:346
+#: src/prefs_template.c:338
 msgid "Show information on configuring templates"
 msgstr ""
 
-#: src/prefs_template.c:370
+#: src/prefs_template.c:362
 msgid "Move the selected template to the top"
 msgstr ""
 
-#: src/prefs_template.c:380
+#: src/prefs_template.c:372
 msgid "Move the selected template up"
 msgstr ""
 
-#: src/prefs_template.c:388
+#: src/prefs_template.c:380
 msgid "Move the selected template down"
 msgstr ""
 
-#: src/prefs_template.c:398
+#: src/prefs_template.c:390
 msgid "Move the selected template to the bottom"
 msgstr ""
 
-#: src/prefs_template.c:414
+#: src/prefs_template.c:406
 msgid "Template configuration"
 msgstr ""
 
-#: src/prefs_template.c:602
+#: src/prefs_template.c:595
 msgid "Templates list not saved"
 msgstr ""
 
-#: src/prefs_template.c:603
+#: src/prefs_template.c:596
 msgid "The templates list has been modified. Close anyway?"
 msgstr ""
 
-#: src/prefs_template.c:760
+#: src/prefs_template.c:753
 msgid "The template's name is not set."
 msgstr ""
 
-#: src/prefs_template.c:803
+#: src/prefs_template.c:796
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:809
+#: src/prefs_template.c:802
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:815
+#: src/prefs_template.c:808
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:821
+#: src/prefs_template.c:814
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:827
+#: src/prefs_template.c:820
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr ""
 
-#: src/prefs_template.c:833
+#: src/prefs_template.c:826
 msgid "The \"Subject\" field of the template is invalid."
 msgstr ""
 
-#: src/prefs_template.c:904
+#: src/prefs_template.c:897
 msgid "Delete template"
 msgstr ""
 
-#: src/prefs_template.c:905
+#: src/prefs_template.c:898
 msgid "Do you really want to delete this template?"
 msgstr ""
 
-#: src/prefs_template.c:917
+#: src/prefs_template.c:910
 msgid "Delete all templates"
 msgstr ""
 
-#: src/prefs_template.c:918
+#: src/prefs_template.c:911
 msgid "Do you really want to delete all the templates?"
 msgstr ""
 
-#: src/prefs_template.c:1234
+#: src/prefs_template.c:1225
 msgid "Current templates"
 msgstr ""
 
-#: src/prefs_template.c:1262
+#: src/prefs_template.c:1253
 msgid "Template"
 msgstr ""
 
@@ -16773,35 +17269,35 @@ msgstr ""
 msgid "Get more..."
 msgstr ""
 
-#: src/prefs_themes.c:983
+#: src/prefs_themes.c:984
 msgid "Information"
 msgstr ""
 
-#: src/prefs_themes.c:998
+#: src/prefs_themes.c:999
 msgid "Author"
 msgstr ""
 
-#: src/prefs_themes.c:1006
+#: src/prefs_themes.c:1005
 msgid "URL"
 msgstr ""
 
-#: src/prefs_themes.c:1048
+#: src/prefs_themes.c:1043
 msgid "Preview"
 msgstr ""
 
-#: src/prefs_themes.c:1105
+#: src/prefs_themes.c:1107
 msgid "SVG rendering"
 msgstr ""
 
-#: src/prefs_themes.c:1112
+#: src/prefs_themes.c:1114
 msgid "Enable alpha channel"
 msgstr ""
 
-#: src/prefs_themes.c:1113
+#: src/prefs_themes.c:1115
 msgid "Force scaling"
 msgstr ""
 
-#: src/prefs_themes.c:1119
+#: src/prefs_themes.c:1121
 msgid "Pixels per inch (PPI)"
 msgstr ""
 
@@ -16823,63 +17319,59 @@ msgstr ""
 msgid "Toolbar item"
 msgstr ""
 
-#: src/prefs_toolbar.c:912
+#: src/prefs_toolbar.c:913
 msgid "Item type"
 msgstr ""
 
-#: src/prefs_toolbar.c:922
+#: src/prefs_toolbar.c:921
 msgid "Internal Function"
 msgstr ""
 
-#: src/prefs_toolbar.c:923
+#: src/prefs_toolbar.c:922
 msgid "User Action"
 msgstr ""
 
-#: src/prefs_toolbar.c:925 src/toolbar.c:279
+#: src/prefs_toolbar.c:924 src/toolbar.c:279
 msgid "Separator"
 msgstr ""
 
-#: src/prefs_toolbar.c:932
+#: src/prefs_toolbar.c:929
 msgid "Event executed on click"
 msgstr ""
 
-#: src/prefs_toolbar.c:959
+#: src/prefs_toolbar.c:948
 msgid "Toolbar text"
 msgstr ""
 
-#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
+#: src/prefs_toolbar.c:961 src/prefs_toolbar.c:1336
 msgid "Icon"
 msgstr ""
 
-#: src/prefs_toolbar.c:1010
-msgid "A_dd"
-msgstr ""
-
-#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
+#: src/prefs_toolbar.c:1215 src/prefs_toolbar.c:1229 src/prefs_toolbar.c:1243
 msgid "Toolbars"
 msgstr ""
 
-#: src/prefs_toolbar.c:1231
+#: src/prefs_toolbar.c:1216
 msgid "Main Window"
 msgstr ""
 
-#: src/prefs_toolbar.c:1245
+#: src/prefs_toolbar.c:1230
 msgid "Message Window"
 msgstr ""
 
-#: src/prefs_toolbar.c:1259
+#: src/prefs_toolbar.c:1244
 msgid "Compose Window"
 msgstr ""
 
-#: src/prefs_toolbar.c:1374
+#: src/prefs_toolbar.c:1359
 msgid "Icon text"
 msgstr ""
 
-#: src/prefs_toolbar.c:1383
+#: src/prefs_toolbar.c:1368
 msgid "Mapped event"
 msgstr ""
 
-#: src/prefs_toolbar.c:1690
+#: src/prefs_toolbar.c:1675
 msgid "Toolbar item icon"
 msgstr ""
 
@@ -16907,35 +17399,35 @@ msgstr ""
 msgid "Wrapping"
 msgstr ""
 
-#: src/printing.c:431
+#: src/printing.c:436
 msgid "Print preview"
 msgstr ""
 
-#: src/printing.c:474
+#: src/printing.c:480
 msgid "First page"
 msgstr ""
 
-#: src/printing.c:484
+#: src/printing.c:490
 msgid "Last page"
 msgstr ""
 
-#: src/printing.c:490
+#: src/printing.c:496
 msgid "Zoom 100%"
 msgstr ""
 
-#: src/printing.c:492
+#: src/printing.c:498
 msgid "Zoom fit"
 msgstr ""
 
-#: src/printing.c:494
+#: src/printing.c:500
 msgid "Zoom in"
 msgstr ""
 
-#: src/printing.c:496
+#: src/printing.c:502
 msgid "Zoom out"
 msgstr ""
 
-#: src/printing.c:676
+#: src/printing.c:700
 #, c-format
 msgid "Page %d"
 msgstr ""
@@ -16952,7 +17444,7 @@ msgstr ""
 msgid "[Error decoding BASE64]\n"
 msgstr ""
 
-#: src/procmime.c:2755
+#: src/procmime.c:2797
 msgid "Could not decode part"
 msgstr ""
 
@@ -17002,142 +17494,142 @@ msgstr ""
 msgid "Filtering messages...\n"
 msgstr ""
 
-#: src/quote_fmt.c:47
+#: src/quote_fmt.c:46
 msgid "<span weight=\"bold\">symbols:</span>"
 msgstr ""
 
-#: src/quote_fmt.c:48
+#: src/quote_fmt.c:47
 msgid "customized date format (see 'man strftime')"
 msgstr "customised date format (see 'man strftime')"
 
-#: src/quote_fmt.c:51
+#: src/quote_fmt.c:50
 msgid "email address of sender"
 msgstr ""
 
-#: src/quote_fmt.c:52
+#: src/quote_fmt.c:51
 msgid "full name of sender"
 msgstr ""
 
-#: src/quote_fmt.c:53
+#: src/quote_fmt.c:52
 msgid "first name of sender"
 msgstr ""
 
-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:53
 msgid "last name of sender"
 msgstr ""
 
-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:54
 msgid "initials of sender"
 msgstr ""
 
-#: src/quote_fmt.c:62
+#: src/quote_fmt.c:61
 msgid "message body"
 msgstr ""
 
-#: src/quote_fmt.c:63
+#: src/quote_fmt.c:62
 msgid "quoted message body"
 msgstr ""
 
-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:63
 msgid "message body without signature"
 msgstr ""
 
-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:64
 msgid "quoted message body without signature"
 msgstr ""
 
-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:65
 msgid "message tags"
 msgstr ""
 
-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:66
 msgid "current dictionary"
 msgstr ""
 
-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:67
 msgid "cursor position"
 msgstr ""
 
-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:68
 msgid "account property: your name"
 msgstr ""
 
-#: src/quote_fmt.c:70
+#: src/quote_fmt.c:69
 msgid "account property: your email address"
 msgstr ""
 
-#: src/quote_fmt.c:71
+#: src/quote_fmt.c:70
 msgid "account property: account name"
 msgstr ""
 
-#: src/quote_fmt.c:72
+#: src/quote_fmt.c:71
 msgid "account property: organization"
 msgstr "account property: organisation"
 
-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:72
 msgid "account property: signature"
 msgstr ""
 
-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:73
 msgid "account property: signature path"
 msgstr ""
 
-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:74
 msgid "account property: default dictionary"
 msgstr ""
 
-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:75
 msgid "address book <span style=\"oblique\">completion</span>: Cc"
 msgstr ""
 
-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:76
 msgid "address book <span style=\"oblique\">completion</span>: From"
 msgstr ""
 
-#: src/quote_fmt.c:78
+#: src/quote_fmt.c:77
 msgid "address book <span style=\"oblique\">completion</span>: To"
 msgstr ""
 
-#: src/quote_fmt.c:80
+#: src/quote_fmt.c:79
 msgid "literal backslash"
 msgstr ""
 
-#: src/quote_fmt.c:81
+#: src/quote_fmt.c:80
 msgid "literal question mark"
 msgstr ""
 
-#: src/quote_fmt.c:82
+#: src/quote_fmt.c:81
 msgid "literal exclamation mark"
 msgstr ""
 
-#: src/quote_fmt.c:83
+#: src/quote_fmt.c:82
 msgid "literal pipe"
 msgstr ""
 
-#: src/quote_fmt.c:84
+#: src/quote_fmt.c:83
 msgid "literal opening curly brace"
 msgstr ""
 
-#: src/quote_fmt.c:85
+#: src/quote_fmt.c:84
 msgid "literal closing curly brace"
 msgstr ""
 
-#: src/quote_fmt.c:86
+#: src/quote_fmt.c:85
 msgid "tab"
 msgstr ""
 
-#: src/quote_fmt.c:89
+#: src/quote_fmt.c:88
 msgid "<span weight=\"bold\">commands:</span>"
 msgstr ""
 
-#: src/quote_fmt.c:90
+#: src/quote_fmt.c:89
 msgid ""
 "insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
 "the [dfNFLIstcnriT, ad, af, ao, as, asp, aT, ABc, ABf, ABt]\n"
 "symbols (or their long equivalent)"
 msgstr ""
 
-#: src/quote_fmt.c:91
+#: src/quote_fmt.c:90
 msgid ""
 "insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
 "of\n"
@@ -17145,14 +17637,14 @@ msgid ""
 "symbols (or their long equivalent)"
 msgstr ""
 
-#: src/quote_fmt.c:92
+#: src/quote_fmt.c:91
 msgid ""
 "insert file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
 "to insert"
 msgstr ""
 
-#: src/quote_fmt.c:93
+#: src/quote_fmt.c:92
 msgid ""
 "insert program output:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
@@ -17160,21 +17652,21 @@ msgid ""
 "the output from"
 msgstr ""
 
-#: src/quote_fmt.c:94
+#: src/quote_fmt.c:93
 msgid ""
 "insert user input:\n"
 "<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
 "user-entered text"
 msgstr ""
 
-#: src/quote_fmt.c:95
+#: src/quote_fmt.c:94
 msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
 "to attach"
 msgstr ""
 
-#: src/quote_fmt.c:96
+#: src/quote_fmt.c:95
 msgid ""
 "attach file:\n"
 "<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
@@ -17182,23 +17674,23 @@ msgid ""
 "the filename from"
 msgstr ""
 
-#: src/quote_fmt.c:98
+#: src/quote_fmt.c:97
 msgid "<span weight=\"bold\">definition of terms:</span>"
 msgstr ""
 
-#: src/quote_fmt.c:99
+#: src/quote_fmt.c:98
 msgid ""
 "text that can contain any of the symbols or\n"
 "commands above"
 msgstr ""
 
-#: src/quote_fmt.c:100
+#: src/quote_fmt.c:99
 msgid ""
 "text that can contain any of the symbols (no\n"
 "commands) above"
 msgstr ""
 
-#: src/quote_fmt.c:101
+#: src/quote_fmt.c:100
 msgid ""
 "completion from address book only works with the first\n"
 "address of the header, it outputs the full name\n"
@@ -17206,19 +17698,19 @@ msgid ""
 "one contact in the address book"
 msgstr ""
 
-#: src/quote_fmt.c:110
+#: src/quote_fmt.c:109
 msgid "Description of symbols"
 msgstr ""
 
-#: src/quote_fmt.c:111
+#: src/quote_fmt.c:110
 msgid "The following symbols and commands can be used:"
 msgstr ""
 
-#: src/quote_fmt.c:174
+#: src/quote_fmt.c:173
 msgid "Use template when composing new messages"
 msgstr ""
 
-#: src/quote_fmt.c:197
+#: src/quote_fmt.c:196
 msgid ""
 "Override From header. This doesn't change the account used to compose the "
 "new message."
@@ -17232,33 +17724,33 @@ msgstr ""
 msgid "Override From header. This doesn't change the account used to reply."
 msgstr ""
 
-#: src/quote_fmt.c:331 src/quote_fmt.c:459
+#: src/quote_fmt.c:331 src/quote_fmt.c:460
 msgid "Quotation mark"
 msgstr ""
 
-#: src/quote_fmt.c:425
+#: src/quote_fmt.c:426
 msgid "Use template when forwarding messages"
 msgstr ""
 
-#: src/quote_fmt.c:448
+#: src/quote_fmt.c:449
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr ""
 
-#: src/quote_fmt.c:557
+#: src/quote_fmt.c:559
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
 "address."
 msgstr ""
 
-#: src/quote_fmt.c:560
+#: src/quote_fmt.c:562
 msgid "The \"Subject\" field of the \"New message\" template is invalid."
 msgstr ""
 
-#: src/quote_fmt.c:577
+#: src/quote_fmt.c:579
 msgid "The \"Quotation mark\" field of the \"Reply\" template is invalid."
 msgstr ""
 
-#: src/quote_fmt.c:597
+#: src/quote_fmt.c:599
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr ""
 
@@ -17271,88 +17763,88 @@ msgstr ""
 msgid "Enter variable"
 msgstr ""
 
-#: src/send_message.c:154
+#: src/send_message.c:155
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr ""
 
-#: src/send_message.c:168
+#: src/send_message.c:169
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr ""
 
-#: src/send_message.c:204
+#: src/send_message.c:205
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr ""
 
-#: src/send_message.c:353
+#: src/send_message.c:357
 msgid "Connecting"
 msgstr ""
 
-#: src/send_message.c:358
+#: src/send_message.c:362
 msgid "Doing POP before SMTP..."
 msgstr ""
 
-#: src/send_message.c:361
+#: src/send_message.c:365
 msgid "POP before SMTP"
 msgstr ""
 
-#: src/send_message.c:366
+#: src/send_message.c:370
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr ""
 
-#: src/send_message.c:439
+#: src/send_message.c:443
 msgid "Mail sent successfully."
 msgstr ""
 
-#: src/send_message.c:505
+#: src/send_message.c:509
 msgid "Sending HELO..."
 msgstr ""
 
-#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
+#: src/send_message.c:510 src/send_message.c:515 src/send_message.c:520
 msgid "Authenticating"
 msgstr ""
 
-#: src/send_message.c:507 src/send_message.c:512
+#: src/send_message.c:511 src/send_message.c:516
 msgid "Sending message..."
 msgstr ""
 
-#: src/send_message.c:510
+#: src/send_message.c:514
 msgid "Sending EHLO..."
 msgstr ""
 
-#: src/send_message.c:519
+#: src/send_message.c:523
 msgid "Sending MAIL FROM..."
 msgstr ""
 
-#: src/send_message.c:523
+#: src/send_message.c:527
 msgid "Sending RCPT TO..."
 msgstr ""
 
-#: src/send_message.c:528
+#: src/send_message.c:532
 msgid "Sending DATA..."
 msgstr ""
 
-#: src/send_message.c:532
+#: src/send_message.c:536
 msgid "Quitting..."
 msgstr ""
 
-#: src/send_message.c:561
+#: src/send_message.c:565
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr ""
 
-#: src/send_message.c:614
+#: src/send_message.c:618
 msgid "Sending message"
 msgstr ""
 
-#: src/send_message.c:683 src/send_message.c:703
+#: src/send_message.c:687 src/send_message.c:707
 msgid "Error occurred while sending the message."
 msgstr ""
 
-#: src/send_message.c:686
+#: src/send_message.c:690
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -17388,464 +17880,464 @@ msgstr ""
 msgid "Saved SSL/TLS certificates"
 msgstr ""
 
-#: src/ssl_manager.c:445
+#: src/ssl_manager.c:446
 msgid "Delete certificate"
 msgstr ""
 
-#: src/ssl_manager.c:446
+#: src/ssl_manager.c:447
 msgid "Do you really want to delete this certificate?"
 msgstr ""
 
-#: src/summary_search.c:290
+#: src/summary_search.c:288
 msgid "Search messages"
 msgstr ""
 
-#: src/summary_search.c:313
+#: src/summary_search.c:311
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:315
+#: src/summary_search.c:313
 msgid "Match all of the following"
 msgstr ""
 
-#: src/summary_search.c:436
+#: src/summary_search.c:441
 msgid "Body:"
 msgstr ""
 
-#: src/summary_search.c:443
+#: src/summary_search.c:447
 msgid "Condition:"
 msgstr ""
 
-#: src/summary_search.c:477
+#: src/summary_search.c:480
 msgid "Find _all"
 msgstr ""
 
-#: src/summary_search.c:692 src/summaryview.c:1148 src/summaryview.c:1411
+#: src/summary_search.c:696 src/summaryview.c:1134 src/summaryview.c:1397
 #, c-format
 msgid "Searching in %s... \n"
 msgstr ""
 
-#: src/summary_search.c:787
+#: src/summary_search.c:791
 msgid "Beginning of list reached; continue from end?"
 msgstr ""
 
-#: src/summary_search.c:789
+#: src/summary_search.c:793
 msgid "End of list reached; continue from beginning?"
 msgstr ""
 
-#: src/summaryview.c:430
+#: src/summaryview.c:425
 msgid "Re-edit"
 msgstr ""
 
-#: src/summaryview.c:443
+#: src/summaryview.c:438
 msgid "Create _filter rule"
 msgstr ""
 
-#: src/summaryview.c:456
+#: src/summaryview.c:451
 msgid "_Set displayed columns"
 msgstr ""
 
-#: src/summaryview.c:461
+#: src/summaryview.c:456
 msgid "_Lock column headers"
 msgstr ""
 
-#: src/summaryview.c:598
+#: src/summaryview.c:593
 msgid "Toggle quick search bar"
 msgstr ""
 
-#: src/summaryview.c:635
+#: src/summaryview.c:630
 msgid "Toggle multiple selection"
 msgstr ""
 
-#: src/summaryview.c:1339
+#: src/summaryview.c:1325
 msgid "Process mark"
 msgstr ""
 
-#: src/summaryview.c:1340
+#: src/summaryview.c:1326
 msgid "Some marks are left. Process them?"
 msgstr ""
 
-#: src/summaryview.c:1390
+#: src/summaryview.c:1376
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr ""
 
-#: src/summaryview.c:1950 src/summaryview.c:1998
+#: src/summaryview.c:1937 src/summaryview.c:1985
 msgid "No more unread messages"
 msgstr ""
 
-#: src/summaryview.c:1951
+#: src/summaryview.c:1938
 msgid "No unread message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:1963 src/summaryview.c:2011 src/summaryview.c:2048
-#: src/summaryview.c:2096 src/summaryview.c:2163
+#: src/summaryview.c:1950 src/summaryview.c:1998 src/summaryview.c:2035
+#: src/summaryview.c:2083 src/summaryview.c:2150
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
-#: src/summaryview.c:1975
+#: src/summaryview.c:1962
 msgid "No unread messages."
 msgstr ""
 
-#: src/summaryview.c:1999
+#: src/summaryview.c:1986
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2035 src/summaryview.c:2083
+#: src/summaryview.c:2022 src/summaryview.c:2070
 msgid "No more new messages"
 msgstr ""
 
-#: src/summaryview.c:2036
+#: src/summaryview.c:2023
 msgid "No new message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:2060
+#: src/summaryview.c:2047
 msgid "No new messages."
 msgstr ""
 
-#: src/summaryview.c:2084
+#: src/summaryview.c:2071
 msgid "No new message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2117 src/summaryview.c:2150
+#: src/summaryview.c:2104 src/summaryview.c:2137
 msgid "No more marked messages"
 msgstr ""
 
-#: src/summaryview.c:2118
+#: src/summaryview.c:2105
 msgid "No marked message found. Search from the end?"
 msgstr ""
 
-#: src/summaryview.c:2127
+#: src/summaryview.c:2114
 msgid "No marked messages."
 msgstr ""
 
-#: src/summaryview.c:2151
+#: src/summaryview.c:2138
 msgid "No marked message found. Go to next folder?"
 msgstr ""
 
-#: src/summaryview.c:2184 src/summaryview.c:2213
+#: src/summaryview.c:2171 src/summaryview.c:2200
 msgid "No more labeled messages"
 msgstr "No more labelled messages"
 
-#: src/summaryview.c:2185
+#: src/summaryview.c:2172
 msgid "No labeled message found. Search from the end?"
 msgstr "No labelled message found. Search from the end?"
 
-#: src/summaryview.c:2194 src/summaryview.c:2227
+#: src/summaryview.c:2181 src/summaryview.c:2214
 msgid "No labeled messages."
 msgstr "No labelled messages."
 
-#: src/summaryview.c:2214
+#: src/summaryview.c:2201
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No labelled message found. Search from the beginning?"
 
-#: src/summaryview.c:2537
+#: src/summaryview.c:2524
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2722
+#: src/summaryview.c:2712
 #, c-format
 msgid "%d deleted"
 msgstr ""
 
-#: src/summaryview.c:2726
+#: src/summaryview.c:2716
 #, c-format
 msgid "%s%d moved"
 msgstr ""
 
-#: src/summaryview.c:2727 src/summaryview.c:2734
+#: src/summaryview.c:2717 src/summaryview.c:2724
 msgid ", "
 msgstr ""
 
-#: src/summaryview.c:2732
+#: src/summaryview.c:2722
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:2746
+#: src/summaryview.c:2736
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:2764 src/summaryview.c:2809
+#: src/summaryview.c:2754 src/summaryview.c:2799
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr ""
 
-#: src/summaryview.c:2784
+#: src/summaryview.c:2774
 msgid "Message summary"
 msgstr ""
 
-#: src/summaryview.c:2785
+#: src/summaryview.c:2775
 msgid "New:"
 msgstr ""
 
-#: src/summaryview.c:2786
+#: src/summaryview.c:2776
 msgid "Unread:"
 msgstr ""
 
-#: src/summaryview.c:2787
+#: src/summaryview.c:2777
 msgid "Total:"
 msgstr ""
 
-#: src/summaryview.c:2789
+#: src/summaryview.c:2779
 msgid "Marked:"
 msgstr ""
 
-#: src/summaryview.c:2790
+#: src/summaryview.c:2780
 msgid "Replied:"
 msgstr ""
 
-#: src/summaryview.c:2791
+#: src/summaryview.c:2781
 msgid "Forwarded:"
 msgstr ""
 
-#: src/summaryview.c:2792
+#: src/summaryview.c:2782
 msgid "Locked:"
 msgstr ""
 
-#: src/summaryview.c:2793
+#: src/summaryview.c:2783
 msgid "Ignored:"
 msgstr ""
 
-#: src/summaryview.c:2794
+#: src/summaryview.c:2784
 msgid "Watched:"
 msgstr ""
 
-#: src/summaryview.c:2804
+#: src/summaryview.c:2794
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr ""
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3082
 msgid "Sorting summary..."
 msgstr ""
 
-#: src/summaryview.c:3265
+#: src/summaryview.c:3250
 msgid "Setting summary from message data..."
 msgstr ""
 
-#: src/summaryview.c:3471
+#: src/summaryview.c:3456
 msgid "(No Date)"
 msgstr ""
 
-#: src/summaryview.c:3528
+#: src/summaryview.c:3513
 msgid "(No Recipient)"
 msgstr ""
 
-#: src/summaryview.c:3576
+#: src/summaryview.c:3561
 #, c-format
 msgid "From: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:3585
+#: src/summaryview.c:3570
 #, c-format
 msgid "To: %s, on %s"
 msgstr ""
 
-#: src/summaryview.c:4481
+#: src/summaryview.c:4455
 msgid "You're not the author of the article."
 msgstr ""
 
-#: src/summaryview.c:4571
+#: src/summaryview.c:4545
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4574
+#: src/summaryview.c:4548
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4738
+#: src/summaryview.c:4712
 msgid "Destination is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4793
+#: src/summaryview.c:4767
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:4844
+#: src/summaryview.c:4818
 msgid "Destination to copy is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:4878
+#: src/summaryview.c:4852
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/summaryview.c:5036
+#: src/summaryview.c:5010
 msgid "Append or Overwrite"
 msgstr ""
 
-#: src/summaryview.c:5037
+#: src/summaryview.c:5011
 msgid "Append or overwrite existing file?"
 msgstr ""
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5012
 msgid "_Append"
 msgstr ""
 
-#: src/summaryview.c:5038
+#: src/summaryview.c:5012
 msgid "_Overwrite"
 msgstr ""
 
-#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#: src/summaryview.c:5023 src/summaryview.c:5026 src/summaryview.c:5041
 #, c-format
 msgid "Couldn't save the file '%s'."
 msgstr ""
 
-#: src/summaryview.c:5086
+#: src/summaryview.c:5061
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr ""
 
-#: src/summaryview.c:5544
+#: src/summaryview.c:5519
 msgid "Building threads..."
 msgstr ""
 
-#: src/summaryview.c:5792
+#: src/summaryview.c:5767
 msgid "Skip these rules"
 msgstr ""
 
-#: src/summaryview.c:5795
+#: src/summaryview.c:5770
 msgid "Apply these rules regardless of the account they belong to"
 msgstr ""
 
-#: src/summaryview.c:5798
+#: src/summaryview.c:5773
 msgid "Apply these rules if they apply to the current account"
 msgstr ""
 
-#: src/summaryview.c:5827
+#: src/summaryview.c:5802
 msgid "Filtering"
 msgstr ""
 
-#: src/summaryview.c:5828
+#: src/summaryview.c:5803
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
 msgstr ""
 
-#: src/summaryview.c:5860
+#: src/summaryview.c:5835
 msgid "Filtering..."
 msgstr ""
 
-#: src/summaryview.c:5943
+#: src/summaryview.c:5918
 msgid "Processing configuration"
 msgstr ""
 
-#: src/summaryview.c:6091
+#: src/summaryview.c:6068
 msgid "Do you really want to reset the color label of all selected messages?"
 msgstr "Do you really want to reset the colour label of all selected messages?"
 
-#: src/summaryview.c:6093
+#: src/summaryview.c:6070
 msgid "Do you really want to apply this color label to all selected messages?"
 msgstr ""
 "Do you really want to apply this colour label to all selected messages?"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6071
 msgid "Reset color label"
 msgstr "Reset colour label"
 
-#: src/summaryview.c:6094
+#: src/summaryview.c:6071
 msgid "Set color label"
 msgstr "Set colour label"
 
-#: src/summaryview.c:6537
+#: src/summaryview.c:6512
 msgid "Ignored thread"
 msgstr ""
 
-#: src/summaryview.c:6539
+#: src/summaryview.c:6514
 msgid "Watched thread"
 msgstr ""
 
-#: src/summaryview.c:6547
+#: src/summaryview.c:6522
 msgid "Replied but also forwarded - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6549
+#: src/summaryview.c:6524
 msgid "Replied - click to see reply"
 msgstr ""
 
-#: src/summaryview.c:6561
+#: src/summaryview.c:6536
 msgid "To be moved"
 msgstr ""
 
-#: src/summaryview.c:6563
+#: src/summaryview.c:6538
 msgid "To be copied"
 msgstr ""
 
-#: src/summaryview.c:6575
+#: src/summaryview.c:6550
 msgid "Signed, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6579
+#: src/summaryview.c:6554
 msgid "Encrypted, has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:6581
+#: src/summaryview.c:6556
 msgid "Encrypted"
 msgstr ""
 
-#: src/summaryview.c:6583
+#: src/summaryview.c:6558
 msgid "Has attachment(s)"
 msgstr ""
 
-#: src/summaryview.c:8295
+#: src/summaryview.c:8269
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 "%s"
 msgstr ""
 
-#: src/summaryview.c:8398
+#: src/summaryview.c:8372
 msgid "Go back to the folder list (You have unread messages)"
 msgstr ""
 
-#: src/summaryview.c:8403
+#: src/summaryview.c:8377
 msgid "Go back to the folder list"
 msgstr ""
 
-#: src/textview.c:242
+#: src/textview.c:218
 msgid "_Open in web browser"
 msgstr ""
 
-#: src/textview.c:243
+#: src/textview.c:219
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:250
+#: src/textview.c:226
 msgid "_Reply to this address"
 msgstr ""
 
-#: src/textview.c:251
+#: src/textview.c:227
 msgid "Add to _Address book"
 msgstr ""
 
-#: src/textview.c:252
+#: src/textview.c:228
 msgid "Copy this add_ress"
 msgstr ""
 
-#: src/textview.c:702
+#: src/textview.c:669
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr ""
 
-#: src/textview.c:705
+#: src/textview.c:672
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr ""
 
-#: src/textview.c:875
+#: src/textview.c:842
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -17854,67 +18346,67 @@ msgid ""
 "  Use "
 msgstr ""
 
-#: src/textview.c:880
+#: src/textview.c:847
 msgid "'Network Log'"
 msgstr ""
 
-#: src/textview.c:881
+#: src/textview.c:848
 msgid " in the Tools menu for more information."
 msgstr ""
 
-#: src/textview.c:947
+#: src/textview.c:914
 msgid "  The following can be performed on this part\n"
 msgstr ""
 
-#: src/textview.c:949
+#: src/textview.c:916
 msgid "  by right-clicking the icon or list item:"
 msgstr ""
 
-#: src/textview.c:953
+#: src/textview.c:920
 msgid "     - To save, select "
 msgstr ""
 
-#: src/textview.c:954
+#: src/textview.c:921
 msgid "'Save as...'"
 msgstr ""
 
-#: src/textview.c:956 src/textview.c:968 src/textview.c:980 src/textview.c:990
+#: src/textview.c:923 src/textview.c:935 src/textview.c:947 src/textview.c:957
 msgid " (Shortcut key: '"
 msgstr ""
 
-#: src/textview.c:964
+#: src/textview.c:931
 msgid "     - To display as text, select "
 msgstr ""
 
-#: src/textview.c:965
+#: src/textview.c:932
 msgid "'Display as text'"
 msgstr ""
 
-#: src/textview.c:976
+#: src/textview.c:943
 msgid "     - To open with an external program, select "
 msgstr ""
 
-#: src/textview.c:977
+#: src/textview.c:944
 msgid "'Open'"
 msgstr ""
 
-#: src/textview.c:985
+#: src/textview.c:952
 msgid "       (alternately double-click, or click the middle "
 msgstr ""
 
-#: src/textview.c:986
+#: src/textview.c:953
 msgid "mouse button)\n"
 msgstr ""
 
-#: src/textview.c:988
+#: src/textview.c:955
 msgid "     - Or use "
 msgstr ""
 
-#: src/textview.c:989
+#: src/textview.c:956
 msgid "'Open with...'"
 msgstr ""
 
-#: src/textview.c:1111
+#: src/textview.c:1078
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -17922,31 +18414,31 @@ msgid ""
 "Exit code %d\n"
 msgstr ""
 
-#: src/textview.c:2195
+#: src/textview.c:2162
 msgid "Tags: "
 msgstr ""
 
-#: src/textview.c:2914
+#: src/textview.c:2879
 msgid "The real URL is different from the displayed URL."
 msgstr ""
 
-#: src/textview.c:2915
+#: src/textview.c:2880
 msgid "Displayed URL:"
 msgstr ""
 
-#: src/textview.c:2916
+#: src/textview.c:2881
 msgid "Real URL:"
 msgstr ""
 
-#: src/textview.c:2917
+#: src/textview.c:2882
 msgid "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2918
+#: src/textview.c:2883
 msgid "Phishing attempt warning"
 msgstr ""
 
-#: src/textview.c:2919
+#: src/textview.c:2884
 msgid "_Open URL"
 msgstr ""
 
@@ -18321,24 +18813,24 @@ msgstr ""
 msgid "Forward Message options"
 msgstr ""
 
-#: src/uri_opener.c:87
+#: src/uri_opener.c:85
 msgid "There are no URLs in this email."
 msgstr ""
 
-#: src/uri_opener.c:115
+#: src/uri_opener.c:113
 msgid "Available URLs:"
 msgstr ""
 
-#: src/uri_opener.c:189
+#: src/uri_opener.c:187
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr ""
 
-#: src/uri_opener.c:217
+#: src/uri_opener.c:215
 msgid "Please select the URL to open."
 msgstr ""
 
-#: src/uri_opener.c:225
+#: src/uri_opener.c:223
 msgid "Select All"
 msgstr ""
 
@@ -18419,11 +18911,11 @@ msgstr ""
 msgid "Please enter your SMTP username."
 msgstr ""
 
-#: src/wizard.c:976
+#: src/wizard.c:974
 msgid "Your name:"
 msgstr ""
 
-#: src/wizard.c:987
+#: src/wizard.c:986
 msgid "Your email address:"
 msgstr ""
 
@@ -18435,27 +18927,27 @@ msgstr "Your organisation:"
 msgid "Mailbox name:"
 msgstr ""
 
-#: src/wizard.c:1040
+#: src/wizard.c:1039
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr ""
 
-#: src/wizard.c:1111
+#: src/wizard.c:1109
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr ""
 
-#: src/wizard.c:1114
+#: src/wizard.c:1112
 msgid "SMTP server address:"
 msgstr ""
 
-#: src/wizard.c:1129
+#: src/wizard.c:1127
 msgid "(empty to use the same as receive)"
 msgstr ""
 
-#: src/wizard.c:1143
+#: src/wizard.c:1142
 msgid "SMTP username:"
 msgstr ""
 
@@ -18463,67 +18955,67 @@ msgstr ""
 msgid "SMTP password:"
 msgstr ""
 
-#: src/wizard.c:1167
+#: src/wizard.c:1169
 msgid "Use SSL/TLS to connect to SMTP server"
 msgstr ""
 
-#: src/wizard.c:1178 src/wizard.c:1598
+#: src/wizard.c:1180 src/wizard.c:1609
 msgid "Use STARTTLS command to start encryption"
 msgstr ""
 
-#: src/wizard.c:1190 src/wizard.c:1610
+#: src/wizard.c:1192 src/wizard.c:1622
 msgid "Client SSL/TLS certificate (optional)"
 msgstr ""
 
-#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
+#: src/wizard.c:1267 src/wizard.c:1299 src/wizard.c:1552
 msgid "Server address:"
 msgstr ""
 
-#: src/wizard.c:1322
+#: src/wizard.c:1331
 msgid "Local mailbox:"
 msgstr ""
 
-#: src/wizard.c:1491
+#: src/wizard.c:1499
 msgid "Server type:"
 msgstr ""
 
-#: src/wizard.c:1500
+#: src/wizard.c:1508
 msgid "POP3"
 msgstr ""
 
-#: src/wizard.c:1556
+#: src/wizard.c:1563
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr ""
 
-#: src/wizard.c:1587
+#: src/wizard.c:1598
 msgid "Use SSL/TLS to connect to receiving server"
 msgstr ""
 
-#: src/wizard.c:1652
+#: src/wizard.c:1671
 msgid "IMAP server directory:"
 msgstr ""
 
-#: src/wizard.c:1663
+#: src/wizard.c:1682
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: src/wizard.c:1671
+#: src/wizard.c:1690
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
 msgstr ""
 
-#: src/wizard.c:1789
+#: src/wizard.c:1809
 msgid "Claws Mail Setup Wizard"
 msgstr ""
 
-#: src/wizard.c:1822
+#: src/wizard.c:1843
 msgid "Welcome to Claws Mail"
 msgstr ""
 
-#: src/wizard.c:1829
+#: src/wizard.c:1850
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -18532,31 +19024,31 @@ msgid ""
 "five minutes."
 msgstr ""
 
-#: src/wizard.c:1842
+#: src/wizard.c:1863
 msgid "About You"
 msgstr ""
 
-#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
+#: src/wizard.c:1870 src/wizard.c:1884 src/wizard.c:1898 src/wizard.c:1913
 msgid "Bold fields must be completed"
 msgstr ""
 
-#: src/wizard.c:1857
+#: src/wizard.c:1877
 msgid "Receiving mail"
 msgstr ""
 
-#: src/wizard.c:1872
+#: src/wizard.c:1891
 msgid "Sending mail"
 msgstr ""
 
-#: src/wizard.c:1888
+#: src/wizard.c:1906
 msgid "Saving mail on disk"
 msgstr ""
 
-#: src/wizard.c:1904
+#: src/wizard.c:1921
 msgid "Configuration finished"
 msgstr ""
 
-#: src/wizard.c:1911
+#: src/wizard.c:1928
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."